osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

OBECT_..._DATA --> g_object_..._data 

svn path=/trunk/; revision=24894
This commit is contained in:
Bill Meier 2008-04-11 16:26:32 +00:00
parent 42acebd42c
commit 10f2ea11d5
10 changed files with 202 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gtk/capture_prefs.c
View File

@ -124,7 +124,7 @@ capture_prefs_show(void)
gtk_tooltips_set_tip(tooltips, GTK_COMBO(if_cb)->entry,
"The default interface to be captured from.", NULL);
gtk_widget_show(if_cb);
OBJECT_SET_DATA(main_vb, DEVICE_KEY, if_cb);
g_object_set_data(G_OBJECT(main_vb), DEVICE_KEY, if_cb);
row++;
/* Interface properties */
@ -148,7 +148,7 @@ capture_prefs_show(void)
"Usually a network card will only capture the traffic sent to its own network address. "
"If you want to capture all traffic that the network card can \"see\", mark this option. "
"See the FAQ for some more details of capturing packets from a switched network.", NULL);
OBJECT_SET_DATA(main_vb, PROM_MODE_KEY, promisc_cb);
g_object_set_data(G_OBJECT(main_vb), PROM_MODE_KEY, promisc_cb);
/* Real-time capture */
sync_cb = create_preference_check_button(main_tb, row++,
@ -157,7 +157,7 @@ capture_prefs_show(void)
gtk_tooltips_set_tip(tooltips, sync_cb,
"Update the list of packets while capture is in progress. "
"Don't use this option if you notice packet drops.", NULL);
OBJECT_SET_DATA(main_vb, CAPTURE_REAL_TIME_KEY, sync_cb);
g_object_set_data(G_OBJECT(main_vb), CAPTURE_REAL_TIME_KEY, sync_cb);
/* Auto-scroll real-time capture */
auto_scroll_cb = create_preference_check_button(main_tb, row++,
@ -165,7 +165,7 @@ capture_prefs_show(void)
prefs.capture_auto_scroll);
gtk_tooltips_set_tip(tooltips, auto_scroll_cb,
"Automatic scrolling of the packet list while live capture is in progress. ", NULL);
OBJECT_SET_DATA(main_vb, AUTO_SCROLL_KEY, auto_scroll_cb);
g_object_set_data(G_OBJECT(main_vb), AUTO_SCROLL_KEY, auto_scroll_cb);
/* Show capture info dialog */
show_info_cb = create_preference_check_button(main_tb, row++,
@ -173,7 +173,7 @@ capture_prefs_show(void)
!prefs.capture_show_info);
gtk_tooltips_set_tip(tooltips, show_info_cb,
"Hide the capture info dialog while capturing. ", NULL);
OBJECT_SET_DATA(main_vb, SHOW_INFO_KEY, show_info_cb);
g_object_set_data(G_OBJECT(main_vb), SHOW_INFO_KEY, show_info_cb);
/* Show 'em what we got */
gtk_widget_show_all(main_vb);
@ -187,11 +187,11 @@ capture_prefs_fetch(GtkWidget *w)
GtkWidget *if_cb, *promisc_cb, *sync_cb, *auto_scroll_cb, *show_info_cb;
gchar *if_text;
if_cb = (GtkWidget *)OBJECT_GET_DATA(w, DEVICE_KEY);
promisc_cb = (GtkWidget *)OBJECT_GET_DATA(w, PROM_MODE_KEY);
sync_cb = (GtkWidget *)OBJECT_GET_DATA(w, CAPTURE_REAL_TIME_KEY);
auto_scroll_cb = (GtkWidget *)OBJECT_GET_DATA(w, AUTO_SCROLL_KEY);
show_info_cb = (GtkWidget *)OBJECT_GET_DATA(w, SHOW_INFO_KEY);
if_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), DEVICE_KEY);
promisc_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), PROM_MODE_KEY);
sync_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), CAPTURE_REAL_TIME_KEY);
auto_scroll_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), AUTO_SCROLL_KEY);
show_info_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), SHOW_INFO_KEY);
if (prefs.capture_device != NULL) {
g_free(prefs.capture_device);
@ -231,7 +231,7 @@ capture_prefs_destroy(GtkWidget *w)
/* Is there an interface descriptions dialog associated with this
Preferences dialog? */
dlg = OBJECT_GET_DATA(caller, IFOPTS_DIALOG_PTR_KEY);
dlg = g_object_get_data(G_OBJECT(caller), IFOPTS_DIALOG_PTR_KEY);
if (dlg != NULL) {
/* Yes. Destroy it. */
@ -256,7 +256,7 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_)
/* Has an edit dialog box already been opened for that top-level
widget? */
ifopts_edit_dlg = OBJECT_GET_DATA(caller, IFOPTS_DIALOG_PTR_KEY);
ifopts_edit_dlg = g_object_get_data(G_OBJECT(caller), IFOPTS_DIALOG_PTR_KEY);
if (ifopts_edit_dlg != NULL) {
/* Yes. Just re-activate that dialog box. */
reactivate_window(ifopts_edit_dlg);
@ -366,31 +366,31 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_)
cur_clist);
gtk_table_attach_defaults(GTK_TABLE(main_tb), if_hide_cb, 1, 2, row, row+1);
gtk_widget_show(if_hide_cb);
row++;
row++;
/* button row: OK and Cancel buttons */
bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL);
gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
gtk_widget_show(bbox);
ok_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_OK);
ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
SIGNAL_CONNECT(ok_bt, "clicked", ifopts_edit_ok_cb, ifopts_edit_dlg);
cancel_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
window_set_cancel_button(ifopts_edit_dlg, cancel_bt, window_cancel_button_cb);
cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
window_set_cancel_button(ifopts_edit_dlg, cancel_bt, window_cancel_button_cb);
gtk_widget_grab_default(ok_bt);
SIGNAL_CONNECT(ifopts_edit_dlg, "delete_event", window_delete_event_cb,
SIGNAL_CONNECT(ifopts_edit_dlg, "delete_event", window_delete_event_cb,
NULL);
/* Call a handler when we're destroyed, so we can inform
our caller, if any, that we've been destroyed. */
SIGNAL_CONNECT(ifopts_edit_dlg, "destroy", ifopts_edit_destroy_cb, NULL);
/* Set the key for the new dialog to point to our caller. */
OBJECT_SET_DATA(ifopts_edit_dlg, IFOPTS_CALLER_PTR_KEY, caller);
g_object_set_data(G_OBJECT(ifopts_edit_dlg), IFOPTS_CALLER_PTR_KEY, caller);
/* Set the key for the caller to point to us */
OBJECT_SET_DATA(caller, IFOPTS_DIALOG_PTR_KEY, ifopts_edit_dlg);
g_object_set_data(G_OBJECT(caller), IFOPTS_DIALOG_PTR_KEY, ifopts_edit_dlg);
/* select the first row in if list, all option fields must exist for this */
gtk_clist_select_row(GTK_CLIST(cur_clist), 0, -1);
@ -426,11 +426,11 @@ ifopts_edit_destroy_cb(GtkWidget *win, gpointer data _U_)
/* Get the widget that requested that we be popped up, if any.
(It should arrange to destroy us if it's destroyed, so
that we don't get a pointer to a non-existent window here.) */
caller = OBJECT_GET_DATA(win, IFOPTS_CALLER_PTR_KEY);
caller = g_object_get_data(G_OBJECT(win), IFOPTS_CALLER_PTR_KEY);
if (caller != NULL) {
/* Tell it we no longer exist. */
OBJECT_SET_DATA(caller, IFOPTS_DIALOG_PTR_KEY, NULL);
g_object_set_data(G_OBJECT(caller), IFOPTS_DIALOG_PTR_KEY, NULL);
}
}

30
gtk/conversations_table.c
View File

@ -377,7 +377,7 @@ static gint
ct_sort_column(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
{
guint32 idx1, idx2;
conversations_table *ct = OBJECT_GET_DATA(clist, CONV_PTR_KEY);
conversations_table *ct = g_object_get_data(G_OBJECT(clist), CONV_PTR_KEY);
conv_t *conv1 = NULL;
conv_t *conv2 = NULL;
double duration1, duration2;
@ -1261,7 +1261,7 @@ copy_as_csv_cb(GtkWindow *copy_bt, gpointer data _U_)
GtkClipboard *cb;
GString *CSV_str = g_string_new("");
conversations_table *talkers=OBJECT_GET_DATA(copy_bt, CONV_PTR_KEY);
conversations_table *talkers=g_object_get_data(G_OBJECT(copy_bt), CONV_PTR_KEY);
if (!talkers)
return;
@ -1335,7 +1335,7 @@ init_ct_table_page(conversations_table *conversations, GtkWidget *vbox, gboolean
gtk_box_pack_start(GTK_BOX(vbox), conversations->scrolled_window, TRUE, TRUE, 0);
conversations->table=(GtkCList *)gtk_clist_new(NUM_COLS);
OBJECT_SET_DATA(conversations->table, CONV_PTR_KEY, conversations);
g_object_set_data(G_OBJECT(conversations->table), CONV_PTR_KEY, conversations);
col_arrows = (column_arrows *) g_malloc(sizeof(column_arrows) * NUM_COLS);
win_style = gtk_widget_get_style(conversations->scrolled_window);
@ -1441,17 +1441,17 @@ init_conversation_table(gboolean hide_ports, const char *table_name, const char
gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(conversations->win, close_bt, window_cancel_button_cb);
copy_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_COPY);
copy_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_COPY);
gtk_tooltips_set_tip(tooltips, copy_bt,
"Copy all statistical values of this page to the clipboard in CSV (Comma Separated Values) format.", NULL);
OBJECT_SET_DATA(copy_bt, CONV_PTR_KEY, conversations);
g_object_set_data(G_OBJECT(copy_bt), CONV_PTR_KEY, conversations);
SIGNAL_CONNECT(copy_bt, "clicked", copy_as_csv_cb, NULL);
if(topic_available(HELP_STATS_CONVERSATIONS_DIALOG)) {
help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_CONVERSATIONS_DIALOG);
}
@ -1478,12 +1478,12 @@ static void
ct_nb_switch_page_cb(GtkNotebook *nb, GtkNotebookPage *pg _U_, guint page, gpointer data)
{
GtkWidget *copy_bt = (GtkWidget *) data;
void ** pages = OBJECT_GET_DATA(nb, NB_PAGES_KEY);
void ** pages = g_object_get_data(G_OBJECT(nb), NB_PAGES_KEY);
page++;
if (pages && page > 0 && (int) page <= GPOINTER_TO_INT(pages[0]) && copy_bt) {
OBJECT_SET_DATA(copy_bt, CONV_PTR_KEY, pages[page]);
g_object_set_data(G_OBJECT(copy_bt), CONV_PTR_KEY, pages[page]);
}
}
@ -1637,7 +1637,7 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
nb = gtk_notebook_new();
gtk_container_add(GTK_CONTAINER(vbox), nb);
OBJECT_SET_DATA(nb, NB_PAGES_KEY, pages);
g_object_set_data(G_OBJECT(nb), NB_PAGES_KEY, pages);
page = 0;
@ -1647,7 +1647,7 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
page_lb = gtk_label_new("");
conversations = init_ct_notebook_page_cb(registered->hide_ports, registered->table_name, registered->tap_name,
registered->filter, registered->packet_func);
OBJECT_SET_DATA(conversations->win, CONV_PTR_KEY, conversations);
g_object_set_data(G_OBJECT(conversations->win), CONV_PTR_KEY, conversations);
gtk_notebook_append_page(GTK_NOTEBOOK(nb), conversations->win, page_lb);
conversations->win = win;
conversations->page_lb = page_lb;
@ -1687,19 +1687,19 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(win, close_bt, window_cancel_button_cb);
copy_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_COPY);
copy_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_COPY);
gtk_tooltips_set_tip(tooltips, copy_bt,
"Copy all statistical values of this page to the clipboard in CSV (Comma Separated Values) format.", NULL);
SIGNAL_CONNECT(copy_bt, "clicked", copy_as_csv_cb, NULL);
OBJECT_SET_DATA(copy_bt, CONV_PTR_KEY, pages[page]);
g_object_set_data(G_OBJECT(copy_bt), CONV_PTR_KEY, pages[page]);
SIGNAL_CONNECT(nb, "switch-page", ct_nb_switch_page_cb, copy_bt);
if(topic_available(HELP_STATS_CONVERSATIONS_DIALOG)) {
help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_CONVERSATIONS_DIALOG);
}

26
gtk/hostlist_table.c
View File

@ -638,7 +638,7 @@ copy_as_csv_cb(GtkWindow *copy_bt, gpointer data _U_)
GtkClipboard *cb;
GString *CSV_str = g_string_new("");
hostlist_table *hosts=OBJECT_GET_DATA(copy_bt, HOST_PTR_KEY);
hostlist_table *hosts=g_object_get_data(G_OBJECT(copy_bt), HOST_PTR_KEY);
if (!hosts)
return;
@ -807,17 +807,17 @@ init_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap
gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(hosttable->win, close_bt, window_cancel_button_cb);
copy_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_COPY);
copy_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_COPY);
gtk_tooltips_set_tip(tooltips, copy_bt,
"Copy all statistical values of this page to the clipboard in CSV (Comma Seperated Values) format.", NULL);
OBJECT_SET_DATA(copy_bt, HOST_PTR_KEY, hosttable);
g_object_set_data(G_OBJECT(copy_bt), HOST_PTR_KEY, hosttable);
SIGNAL_CONNECT(copy_bt, "clicked", copy_as_csv_cb, NULL);
if(topic_available(HELP_STATS_ENDPOINTS_DIALOG)) {
help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_ENDPOINTS_DIALOG);
}
@ -843,12 +843,12 @@ static void
ct_nb_switch_page_cb(GtkNotebook *nb, GtkNotebookPage *pg _U_, guint page, gpointer data)
{
GtkWidget *copy_bt = (GtkWidget *) data;
void ** pages = OBJECT_GET_DATA(nb, NB_PAGES_KEY);
void ** pages = g_object_get_data(G_OBJECT(nb), NB_PAGES_KEY);
page++;
if (pages && page > 0 && (int) page <= GPOINTER_TO_INT(pages[0]) && copy_bt) {
OBJECT_SET_DATA(copy_bt, HOST_PTR_KEY, pages[page]);
g_object_set_data(G_OBJECT(copy_bt), HOST_PTR_KEY, pages[page]);
}
}
@ -1007,7 +1007,7 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
nb = gtk_notebook_new();
gtk_container_add(GTK_CONTAINER(vbox), nb);
OBJECT_SET_DATA(nb, NB_PAGES_KEY, pages);
g_object_set_data(G_OBJECT(nb), NB_PAGES_KEY, pages);
page = 0;
@ -1017,7 +1017,7 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
page_lb = gtk_label_new("");
hosttable = init_hostlist_notebook_page_cb(registered->hide_ports, registered->table_name, registered->tap_name,
registered->filter, registered->packet_func);
OBJECT_SET_DATA(hosttable->win, HOST_PTR_KEY, hosttable);
g_object_set_data(G_OBJECT(hosttable->win), HOST_PTR_KEY, hosttable);
gtk_notebook_append_page(GTK_NOTEBOOK(nb), hosttable->win, page_lb);
hosttable->win = win;
hosttable->page_lb = page_lb;
@ -1055,19 +1055,19 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(win, close_bt, window_cancel_button_cb);
copy_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_COPY);
copy_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_COPY);
gtk_tooltips_set_tip(tooltips, copy_bt,
"Copy all statistical values of this page to the clipboard in CSV (Comma Separated Values) format.", NULL);
SIGNAL_CONNECT(copy_bt, "clicked", copy_as_csv_cb, NULL);
OBJECT_SET_DATA(copy_bt, HOST_PTR_KEY, pages[page]);
g_object_set_data(G_OBJECT(copy_bt), HOST_PTR_KEY, pages[page]);
SIGNAL_CONNECT(nb, "switch-page", ct_nb_switch_page_cb, copy_bt);
if(topic_available(HELP_STATS_ENDPOINTS_DIALOG)) {
help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_ENDPOINTS_DIALOG);
}

46
gtk/io_stat.c
View File

@ -1217,7 +1217,7 @@ quit(GtkWidget *widget, GdkEventExpose *event _U_)
int i;
io_stat_t *io;
io=(io_stat_t *)OBJECT_GET_DATA(widget, "io_stat_t");
io=(io_stat_t *)g_object_get_data(G_OBJECT(widget), "io_stat_t");
for(i=0;i<MAX_GRAPHS;i++){
if(io->graphs[i].display){
@ -1240,7 +1240,7 @@ quit(GtkWidget *widget, GdkEventExpose *event _U_)
static gint
pixmap_clicked_event(GtkWidget *widget, GdkEventButton *event)
{
io_stat_t *io=(io_stat_t *)OBJECT_GET_DATA(widget, "io_stat_t");
io_stat_t *io=(io_stat_t *)g_object_get_data(G_OBJECT(widget), "io_stat_t");
guint32 draw_width, interval, last_interval;
guint frame_num;
@ -1287,7 +1287,7 @@ configure_event(GtkWidget *widget, GdkEventConfigure *event _U_)
GtkWidget *save_bt;
#endif
io=(io_stat_t *)OBJECT_GET_DATA(widget, "io_stat_t");
io=(io_stat_t *)g_object_get_data(G_OBJECT(widget), "io_stat_t");
if(!io){
exit(10);
}
@ -1305,8 +1305,8 @@ configure_event(GtkWidget *widget, GdkEventConfigure *event _U_)
io->pixmap_height=widget->allocation.height;
#if GTK_CHECK_VERSION(2,6,0)
save_bt = OBJECT_GET_DATA(io->window, "save_bt");
OBJECT_SET_DATA(save_bt, "pixmap", io->pixmap);
save_bt = g_object_get_data(G_OBJECT(io->window), "save_bt");
g_object_set_data(G_OBJECT(save_bt), "pixmap", io->pixmap);
gtk_widget_set_sensitive(save_bt, TRUE);
#endif
@ -1354,7 +1354,7 @@ expose_event(GtkWidget *widget, GdkEventExpose *event)
{
io_stat_t *io;
io=(io_stat_t *)OBJECT_GET_DATA(widget, "io_stat_t");
io=(io_stat_t *)g_object_get_data(G_OBJECT(widget), "io_stat_t");
if(!io){
exit(10);
}
@ -1376,7 +1376,7 @@ create_draw_area(io_stat_t *io, GtkWidget *box)
{
io->draw_area=gtk_drawing_area_new();
SIGNAL_CONNECT(io->draw_area, "destroy", quit, io);
OBJECT_SET_DATA(io->draw_area, "io_stat_t", io);
g_object_set_data(G_OBJECT(io->draw_area), "io_stat_t", io);
WIDGET_SET_SIZE(io->draw_area, io->pixmap_width, io->pixmap_height);
@ -1405,7 +1405,7 @@ tick_interval_select(GtkWidget *item, gpointer key)
io_stat_t *io;
io=(io_stat_t *)key;
val=(long)OBJECT_GET_DATA(item, "tick_interval");
val=(long)g_object_get_data(G_OBJECT(item), "tick_interval");
io->interval=val;
cf_retap_packets(&cfile, FALSE);
@ -1419,7 +1419,7 @@ pixels_per_tick_select(GtkWidget *item, gpointer key)
io_stat_t *io;
io=(io_stat_t *)key;
val=(long)OBJECT_GET_DATA(item, "pixels_per_tick");
val=(long)g_object_get_data(G_OBJECT(item), "pixels_per_tick");
io->pixels_per_tick=val;
io_stat_redraw(io);
}
@ -1431,7 +1431,7 @@ plot_style_select(GtkWidget *item, gpointer key)
io_stat_graph_t *ppt;
ppt=(io_stat_graph_t *)key;
val=(long)OBJECT_GET_DATA(item, "plot_style");
val=(long)g_object_get_data(G_OBJECT(item), "plot_style");
ppt->plot_style=val;
@ -1449,7 +1449,7 @@ create_pixels_per_tick_menu_items(io_stat_t *io, GtkWidget *menu)
g_snprintf(str, 5, "%u", pixels_per_tick[i]);
menu_item=gtk_menu_item_new_with_label(str);
OBJECT_SET_DATA(menu_item, "pixels_per_tick",
g_object_set_data(G_OBJECT(menu_item), "pixels_per_tick",
GUINT_TO_POINTER(pixels_per_tick[i]));
SIGNAL_CONNECT(menu_item, "activate", pixels_per_tick_select, io);
gtk_widget_show(menu_item);
@ -1467,7 +1467,7 @@ yscale_select(GtkWidget *item, gpointer key)
io_stat_t *io;
io=(io_stat_t *)key;
val=(long)OBJECT_GET_DATA(item, "yscale_max");
val=(long)g_object_get_data(G_OBJECT(item), "yscale_max");
io->max_y_units=val;
io_stat_redraw(io);
@ -1494,7 +1494,7 @@ create_tick_interval_menu_items(io_stat_t *io, GtkWidget *menu)
}
menu_item=gtk_menu_item_new_with_label(str);
OBJECT_SET_DATA(menu_item, "tick_interval",
g_object_set_data(G_OBJECT(menu_item), "tick_interval",
GUINT_TO_POINTER(tick_interval_values[i]));
SIGNAL_CONNECT(menu_item, "activate", tick_interval_select, (gpointer)io);
gtk_widget_show(menu_item);
@ -1520,7 +1520,7 @@ create_yscale_max_menu_items(io_stat_t *io, GtkWidget *menu)
g_snprintf(str, 15, "%u", yscale_max[i]);
}
menu_item=gtk_menu_item_new_with_label(str);
OBJECT_SET_DATA(menu_item, "yscale_max",
g_object_set_data(G_OBJECT(menu_item), "yscale_max",
GUINT_TO_POINTER(yscale_max[i]));
SIGNAL_CONNECT(menu_item, "activate", yscale_select, io);
gtk_widget_show(menu_item);
@ -1538,7 +1538,7 @@ count_type_select(GtkWidget *item, gpointer key)
io_stat_t *io;
io=(io_stat_t *)key;
val=(long)OBJECT_GET_DATA(item, "count_type");
val=(long)g_object_get_data(G_OBJECT(item), "count_type");
io->count_type=val;
@ -1576,7 +1576,7 @@ create_frames_or_bytes_menu_items(io_stat_t *io, GtkWidget *menu)
for(i=0;i<MAX_COUNT_TYPES;i++){
menu_item=gtk_menu_item_new_with_label(count_type_names[i]);
OBJECT_SET_DATA(menu_item, "count_type", GINT_TO_POINTER(i));
g_object_set_data(G_OBJECT(menu_item), "count_type", GINT_TO_POINTER(i));
SIGNAL_CONNECT(menu_item, "activate", count_type_select, io);
gtk_widget_show(menu_item);
gtk_menu_append(GTK_MENU(menu), menu_item);
@ -1952,7 +1952,7 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num)
gio->filter_field=gtk_entry_new_with_max_length(256);
/* filter prefs dialog */
OBJECT_SET_DATA(gio->filter_bt, E_FILT_TE_PTR_KEY, gio->filter_field);
g_object_set_data(G_OBJECT(gio->filter_bt), E_FILT_TE_PTR_KEY, gio->filter_field);
/* filter prefs dialog */
gtk_box_pack_start(GTK_BOX(hbox), gio->filter_field, TRUE, TRUE, 0);
@ -1975,7 +1975,7 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num)
menu=gtk_menu_new();
for(i=0;i<MAX_PLOT_STYLES;i++){
menu_item=gtk_menu_item_new_with_label(plot_style_name[i]);
OBJECT_SET_DATA(menu_item, "plot_style", GINT_TO_POINTER(i));
g_object_set_data(G_OBJECT(menu_item), "plot_style", GINT_TO_POINTER(i));
SIGNAL_CONNECT(menu_item, "activate", plot_style_select, &gio->io->graphs[num-1]);
gtk_widget_show(menu_item);
gtk_menu_append(GTK_MENU(menu), menu_item);
@ -2103,25 +2103,25 @@ init_io_stat_window(io_stat_t *io)
gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
gtk_widget_show(bbox);
close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(io->window, close_bt, window_cancel_button_cb);
gtk_tooltips_set_tip(tooltips, close_bt, "Close this dialog", NULL);
#if GTK_CHECK_VERSION(2,6,0)
save_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_SAVE);
save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE);
gtk_widget_set_sensitive(save_bt, FALSE);
gtk_tooltips_set_tip(tooltips, save_bt, "Save the displayed graph to a file", NULL);
SIGNAL_CONNECT(save_bt, "clicked", pixmap_save_cb, NULL);
OBJECT_SET_DATA(io->window, "save_bt", save_bt);
g_object_set_data(G_OBJECT(io->window), "save_bt", save_bt);
#endif
copy_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_COPY);
copy_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_COPY);
gtk_tooltips_set_tip(tooltips, copy_bt,
"Copy values from selected graphs to the clipboard in CSV (Comma Seperated Values) format", NULL);
SIGNAL_CONNECT(copy_bt, "clicked", copy_as_csv_cb, io);
if(topic_available(HELP_STATS_IO_GRAPH_DIALOG)) {
help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_IO_GRAPH_DIALOG);
gtk_tooltips_set_tip (tooltips, help_bt, "Show topic specific help", NULL);
}

20
gtk/mcast_stream_dlg.c
View File

@ -339,7 +339,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
gint32 fnumber;
char *p;
fnumber_te = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_MCAST_ENTRY_1);
fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_1);
fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
fnumber = strtoul(fnumber_text, &p, 10);
if ( (p == fnumber_text || *p != '\0') || (fnumber <=0) || (fnumber > 1000) ){
@ -347,7 +347,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
return; }
burstint = fnumber;
fnumber_te = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_MCAST_ENTRY_2);
fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_2);
fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
fnumber = strtoul(fnumber_text, &p, 10);
if ( (p == fnumber_text || *p != '\0') || (fnumber <=0) ){
@ -355,7 +355,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
return; }
trigger = fnumber;
fnumber_te = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_MCAST_ENTRY_3);
fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_3);
fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
fnumber = strtoul(fnumber_text, &p, 10);
if ( (p == fnumber_text || *p != '\0') || (fnumber <=0) ){
@ -363,7 +363,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
return; }
bufferalarm = fnumber;
fnumber_te = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_MCAST_ENTRY_4);
fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_4);
fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
fnumber = strtoul(fnumber_text, &p, 10);
if ( (p == fnumber_text || *p != '\0') || (fnumber <=0) || (fnumber > 10000000) ){
@ -371,7 +371,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
return; }
emptyspeed = fnumber;
fnumber_te = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_MCAST_ENTRY_5);
fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_5);
fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
fnumber = strtoul(fnumber_text, &p, 10);
if ( (p == fnumber_text || *p != '\0') || (fnumber <=0) || (fnumber > 10000000) ){
@ -470,11 +470,11 @@ mcast_on_params (GtkButton *button _U_,
window_set_cancel_button(mcast_params_dlg, cancel_bt, window_cancel_button_cb);
/* Attach pointers to needed widgets */
OBJECT_SET_DATA(mcast_params_dlg, E_MCAST_ENTRY_1, entry1);
OBJECT_SET_DATA(mcast_params_dlg, E_MCAST_ENTRY_2, entry2);
OBJECT_SET_DATA(mcast_params_dlg, E_MCAST_ENTRY_3, entry3);
OBJECT_SET_DATA(mcast_params_dlg, E_MCAST_ENTRY_4, entry4);
OBJECT_SET_DATA(mcast_params_dlg, E_MCAST_ENTRY_5, entry5);
g_object_set_data(G_OBJECT(mcast_params_dlg), E_MCAST_ENTRY_1, entry1);
g_object_set_data(G_OBJECT(mcast_params_dlg), E_MCAST_ENTRY_2, entry2);
g_object_set_data(G_OBJECT(mcast_params_dlg), E_MCAST_ENTRY_3, entry3);
g_object_set_data(G_OBJECT(mcast_params_dlg), E_MCAST_ENTRY_4, entry4);
g_object_set_data(G_OBJECT(mcast_params_dlg), E_MCAST_ENTRY_5, entry5);
gtk_widget_show_all(mcast_params_dlg);
window_present(mcast_params_dlg);

28
gtk/menu.c
View File

@ -373,7 +373,7 @@ conversation_cb(GtkWidget * w, gpointer data _U_, int action)
/* Run the display filter so it goes in effect - even if it's the
same as the previous display filter. */
filter_te = OBJECT_GET_DATA(w, E_DFILTER_TE_KEY);
filter_te = g_object_get_data(G_OBJECT(w), E_DFILTER_TE_KEY);
gtk_entry_set_text(GTK_ENTRY(filter_te), filter);
main_filter_packets(&cfile, filter, TRUE);
@ -1084,7 +1084,7 @@ void menu_dissector_filter_cb( GtkWidget *widget _U_,
const char *buf;
filter_te = OBJECT_GET_DATA(popup_menu_object, E_DFILTER_TE_KEY);
filter_te = g_object_get_data(G_OBJECT(popup_menu_object), E_DFILTER_TE_KEY);
/* XXX - this gets the packet_info of the last dissected packet, */
/* which is not necessarily the last selected packet */
@ -1136,18 +1136,18 @@ menus_init(void) {
packet_list_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
popup_menu_object = gtk_menu_new();
gtk_item_factory_create_items_ac(packet_list_menu_factory, sizeof(packet_list_menu_items)/sizeof(packet_list_menu_items[0]), packet_list_menu_items, popup_menu_object, 2);
OBJECT_SET_DATA(popup_menu_object, PM_PACKET_LIST_KEY,
g_object_set_data(G_OBJECT(popup_menu_object), PM_PACKET_LIST_KEY,
packet_list_menu_factory->widget);
popup_menu_list = g_slist_append((GSList *)popup_menu_list, packet_list_menu_factory);
tree_view_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
gtk_item_factory_create_items_ac(tree_view_menu_factory, sizeof(tree_view_menu_items)/sizeof(tree_view_menu_items[0]), tree_view_menu_items, popup_menu_object, 2);
OBJECT_SET_DATA(popup_menu_object, PM_TREE_VIEW_KEY,
g_object_set_data(G_OBJECT(popup_menu_object), PM_TREE_VIEW_KEY,
tree_view_menu_factory->widget);
popup_menu_list = g_slist_append((GSList *)popup_menu_list, tree_view_menu_factory);
hexdump_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
OBJECT_SET_DATA(popup_menu_object, PM_HEXDUMP_KEY,
g_object_set_data(G_OBJECT(popup_menu_object), PM_HEXDUMP_KEY,
hexdump_menu_factory->widget);
popup_menu_list = g_slist_append((GSList *)popup_menu_list, hexdump_menu_factory);
/* main */
@ -1567,7 +1567,7 @@ set_menu_object_data_meat(GtkItemFactory *ifactory, const gchar *path, const gch
GtkWidget *menu = NULL;
if ((menu = gtk_item_factory_get_widget(ifactory, path)) != NULL)
OBJECT_SET_DATA(menu, key, data);
g_object_set_data(G_OBJECT(menu), key, data);
}
void
@ -1597,7 +1597,7 @@ static void
update_menu_recent_capture_file1(GtkWidget *widget, gpointer cnt) {
gchar *widget_cf_name;
widget_cf_name = OBJECT_GET_DATA(widget, MENU_RECENT_FILES_KEY);
widget_cf_name = g_object_get_data(G_OBJECT(widget), MENU_RECENT_FILES_KEY);
/* if this menu item is a file, count it */
if (widget_cf_name) {
@ -1626,7 +1626,7 @@ remove_menu_recent_capture_file(GtkWidget *widget, gpointer unused _U_) {
gchar *widget_cf_name;
widget_cf_name = OBJECT_GET_DATA(widget, MENU_RECENT_FILES_KEY);
widget_cf_name = g_object_get_data(G_OBJECT(widget), MENU_RECENT_FILES_KEY);
g_free(widget_cf_name);
/* get the submenu container item */
@ -1747,7 +1747,7 @@ add_menu_recent_capture_file_absolute(gchar *cf_name) {
for (li = g_list_first(menu_item_list); li; li = li->next, cnt++) {
/* get capture filename */
menu_item = GTK_WIDGET(li->data);
widget_cf_name = OBJECT_GET_DATA(menu_item, MENU_RECENT_FILES_KEY);
widget_cf_name = g_object_get_data(G_OBJECT(menu_item), MENU_RECENT_FILES_KEY);
/* if this element string is one of our special items (seperator, ...) or
* already in the list or
@ -1770,7 +1770,7 @@ add_menu_recent_capture_file_absolute(gchar *cf_name) {
/* add new item at latest position */
menu_item = gtk_menu_item_new_with_label(normalized_cf_name);
OBJECT_SET_DATA(menu_item, MENU_RECENT_FILES_KEY, normalized_cf_name);
g_object_set_data(G_OBJECT(menu_item), MENU_RECENT_FILES_KEY, normalized_cf_name);
gtk_menu_prepend (GTK_MENU(submenu_recent_files), menu_item);
g_signal_connect_swapped(GTK_OBJECT(menu_item), "activate",
G_CALLBACK(menu_open_recent_file_cmd_cb), (GtkObject *) menu_item);
@ -1833,7 +1833,7 @@ menu_recent_file_write_all(FILE *rf) {
child = g_list_last(children);
while(child != NULL) {
/* get capture filename from the menu item label */
cf_name = OBJECT_GET_DATA(child->data, MENU_RECENT_FILES_KEY);
cf_name = g_object_get_data(G_OBJECT(child->data), MENU_RECENT_FILES_KEY);
if (cf_name) {
if(u3_active())
fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", u3_contract_device_path(cf_name));
@ -2321,13 +2321,13 @@ popup_menu_handler(GtkWidget *widget, GdkEvent *event, gpointer data)
* as a pixmap.
*/
/* Check if we are on packet_list object */
if (widget == OBJECT_GET_DATA(popup_menu_object, E_MPACKET_LIST_KEY) &&
if (widget == g_object_get_data(G_OBJECT(popup_menu_object), E_MPACKET_LIST_KEY) &&
((GdkEventButton *)event)->button != 1) {
if (packet_list_get_event_row_column(widget, (GdkEventButton *)event,
&row, &column)) {
OBJECT_SET_DATA(popup_menu_object, E_MPACKET_LIST_ROW_KEY,
g_object_set_data(G_OBJECT(popup_menu_object), E_MPACKET_LIST_ROW_KEY,
GINT_TO_POINTER(row));
OBJECT_SET_DATA(popup_menu_object, E_MPACKET_LIST_COL_KEY,
g_object_set_data(G_OBJECT(popup_menu_object), E_MPACKET_LIST_COL_KEY,
GINT_TO_POINTER(column));
packet_list_set_selected_row(row);
}

30
gtk/nameres_prefs.c
View File

@ -101,28 +101,28 @@ nameres_prefs_show(void)
gtk_table_set_row_spacings(GTK_TABLE(main_tb), 10);
gtk_table_set_col_spacings(GTK_TABLE(main_tb), 15);
gtk_widget_show(main_tb);
OBJECT_SET_DATA(main_tb, E_TOOLTIPS_KEY, tooltips);
g_object_set_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY, tooltips);
/* Resolve MAC addresses */
table_row = 0;
m_resolv_cb = create_preference_check_button(main_tb, table_row,
"Enable MAC name resolution:", "e.g. Ethernet address to manufacturer name",
prefs.name_resolve & RESOLV_MAC);
OBJECT_SET_DATA(main_vb, M_RESOLVE_KEY, m_resolv_cb);
g_object_set_data(G_OBJECT(main_vb), M_RESOLVE_KEY, m_resolv_cb);
/* Resolve network addresses */
table_row++;
n_resolv_cb = create_preference_check_button(main_tb, table_row,
"Enable network name resolution:", "e.g. IP address to DNS name (hostname)",
prefs.name_resolve & RESOLV_NETWORK);
OBJECT_SET_DATA(main_vb, N_RESOLVE_KEY, n_resolv_cb);
g_object_set_data(G_OBJECT(main_vb), N_RESOLVE_KEY, n_resolv_cb);
/* Resolve transport addresses */
table_row++;
t_resolv_cb = create_preference_check_button(main_tb, table_row,
"Enable transport name resolution:", "e.g. TCP/UDP port to service name",
prefs.name_resolve & RESOLV_TRANSPORT);
OBJECT_SET_DATA(main_vb, T_RESOLVE_KEY, t_resolv_cb);
g_object_set_data(G_OBJECT(main_vb), T_RESOLVE_KEY, t_resolv_cb);
#ifdef HAVE_GNU_ADNS
/* Enable concurrent (asynchronous) DNS lookups */
@ -130,14 +130,14 @@ nameres_prefs_show(void)
c_resolv_cb = create_preference_check_button(main_tb, table_row,
"Enable concurrent DNS name resolution:", "be sure to enable network name resolution",
prefs.name_resolve & RESOLV_CONCURRENT);
OBJECT_SET_DATA(main_vb, C_RESOLVE_KEY, c_resolv_cb);
g_object_set_data(G_OBJECT(main_vb), C_RESOLVE_KEY, c_resolv_cb);
/* Max concurrent requests */
table_row++;
g_snprintf(concur_str, 10+1, "%d", prefs.name_resolve_concurrency);
resolv_concurrency_te = create_preference_entry(main_tb, table_row,
"Maximum concurrent requests:", "maximum parallel running DNS requests", concur_str);
OBJECT_SET_DATA(main_vb, RESOLVE_CONCURRENCY_KEY, resolv_concurrency_te);
g_object_set_data(G_OBJECT(main_vb), RESOLVE_CONCURRENCY_KEY, resolv_concurrency_te);
#endif /* HAVE_GNU_ADNS */
#ifdef HAVE_LIBSMI
@ -150,7 +150,7 @@ nameres_prefs_show(void)
"Search paths for SMI (MIB and PIB) modules. You must\n"
"restart Wireshark for these changes to take effect.",
smi_paths_uat);
OBJECT_SET_DATA(main_vb, SP_RESOLVE_KEY, sp_resolv_cb);
g_object_set_data(G_OBJECT(main_vb), SP_RESOLVE_KEY, sp_resolv_cb);
}
/* SMI modules UAT */
@ -162,7 +162,7 @@ nameres_prefs_show(void)
"List of enabled SMI (MIB and PIB) modules. You must\n"
"restart Wireshark for these changes to take effect.",
smi_modules_uat);
OBJECT_SET_DATA(main_vb, SM_RESOLVE_KEY, sm_resolv_cb);
g_object_set_data(G_OBJECT(main_vb), SM_RESOLVE_KEY, sm_resolv_cb);
}
#endif
@ -183,17 +183,17 @@ nameres_prefs_fetch(GtkWidget *w)
GtkWidget *sp_resolv_cb, *sm_resolv_cb;
#endif
m_resolv_cb = (GtkWidget *)OBJECT_GET_DATA(w, M_RESOLVE_KEY);
n_resolv_cb = (GtkWidget *)OBJECT_GET_DATA(w, N_RESOLVE_KEY);
t_resolv_cb = (GtkWidget *)OBJECT_GET_DATA(w, T_RESOLVE_KEY);
m_resolv_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), M_RESOLVE_KEY);
n_resolv_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), N_RESOLVE_KEY);
t_resolv_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), T_RESOLVE_KEY);
#ifdef HAVE_GNU_ADNS
c_resolv_cb = (GtkWidget *)OBJECT_GET_DATA(w, C_RESOLVE_KEY);
c_resolv_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), C_RESOLVE_KEY);
resolv_concurrency_te = (GtkWidget *)OBJECT_GET_DATA(w, RESOLVE_CONCURRENCY_KEY);
resolv_concurrency_te = (GtkWidget *)g_object_get_data(G_OBJECT(w), RESOLVE_CONCURRENCY_KEY);
#endif /* HAVE_GNU_ADNS */
#ifdef HAVE_LIBSMI
sp_resolv_cb = (GtkWidget *)OBJECT_GET_DATA(w, SP_RESOLVE_KEY);
sm_resolv_cb = (GtkWidget *)OBJECT_GET_DATA(w, SM_RESOLVE_KEY);
sp_resolv_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), SP_RESOLVE_KEY);
sm_resolv_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), SM_RESOLVE_KEY);
#endif
prefs.name_resolve = RESOLV_NONE;

112
gtk/prefs_dlg.c
View File

@ -332,7 +332,7 @@ module_prefs_show(module_t *module, gpointer user_data)
frame = gtk_frame_new(module->description);
gtk_container_set_border_width(GTK_CONTAINER(frame), 5);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(main_sw), frame);
OBJECT_SET_DATA(main_sw, E_PAGESW_FRAME_KEY, frame);
g_object_set_data(G_OBJECT(main_sw), E_PAGESW_FRAME_KEY, frame);
/* Main vertical box */
main_vb = gtk_vbox_new(FALSE, 5);
@ -344,22 +344,22 @@ module_prefs_show(module_t *module, gpointer user_data)
gtk_box_pack_start(GTK_BOX(main_vb), main_tb, FALSE, FALSE, 0);
gtk_table_set_row_spacings(GTK_TABLE(main_tb), 10);
gtk_table_set_col_spacings(GTK_TABLE(main_tb), 15);
OBJECT_SET_DATA(main_tb, E_TOOLTIPS_KEY, cts->tooltips);
g_object_set_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY, cts->tooltips);
/* Add items for each of the preferences */
prefs_pref_foreach(module, pref_show, main_tb);
/* Associate this module with the page's frame. */
OBJECT_SET_DATA(frame, E_PAGE_MODULE_KEY, module);
g_object_set_data(G_OBJECT(frame), E_PAGE_MODULE_KEY, module);
/* Add the page to the notebook */
gtk_notebook_append_page(GTK_NOTEBOOK(cts->notebook), main_sw, NULL);
/* Attach the page to the tree item */
gtk_tree_store_set(model, &iter, 0, label_str, 1, cts->page, -1);
OBJECT_SET_DATA(frame, E_PAGE_ITER_KEY, gtk_tree_iter_copy(&iter));
g_object_set_data(G_OBJECT(frame), E_PAGE_ITER_KEY, gtk_tree_iter_copy(&iter));
cts->page++;
cts->page++;
/* Show 'em what we got */
gtk_widget_show_all(main_sw);
@ -400,7 +400,7 @@ prefs_nb_page_add(GtkWidget *notebook, const gchar *title, GtkWidget *page, cons
gtk_widget_show(frame);
if(page) {
gtk_container_add(GTK_CONTAINER(frame), page);
OBJECT_SET_DATA(prefs_w, page_key, page);
g_object_set_data(G_OBJECT(prefs_w), page_key, page);
}
gtk_notebook_append_page (GTK_NOTEBOOK(notebook), frame, NULL);
@ -464,13 +464,13 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(top_hb), ct_sb);
gtk_widget_show(ct_sb);
OBJECT_SET_DATA(prefs_w, E_PREFSW_SCROLLW_KEY, ct_sb);
g_object_set_data(G_OBJECT(prefs_w), E_PREFSW_SCROLLW_KEY, ct_sb);
/* categories tree */
store = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_INT);
cts.tree = tree_view_new(GTK_TREE_MODEL(store));
cts.iter.stamp = 0; /* mark this as the toplevel */
OBJECT_SET_DATA(prefs_w, E_PREFSW_TREE_KEY, cts.tree);
g_object_set_data(G_OBJECT(prefs_w), E_PREFSW_TREE_KEY, cts.tree);
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(cts.tree), FALSE);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cts.tree));
gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
@ -488,7 +488,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
/* A notebook widget without tabs is used to flip between prefs */
prefs_nb = gtk_notebook_new();
OBJECT_SET_DATA(prefs_w, E_PREFSW_NOTEBOOK_KEY, prefs_nb);
g_object_set_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY, prefs_nb);
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(prefs_nb), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(prefs_nb), FALSE);
gtk_container_add(GTK_CONTAINER(top_hb), prefs_nb);
@ -606,24 +606,24 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
gtk_box_pack_start(GTK_BOX(cts.main_vb), bbox, FALSE, FALSE, 0);
gtk_widget_show(bbox);
ok_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_OK);
ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
SIGNAL_CONNECT(ok_bt, "clicked", prefs_main_ok_cb, prefs_w);
apply_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_APPLY);
apply_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY);
SIGNAL_CONNECT(apply_bt, "clicked", prefs_main_apply_cb, prefs_w);
save_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_SAVE);
save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE);
SIGNAL_CONNECT(save_bt, "clicked", prefs_main_save_cb, prefs_w);
OBJECT_SET_DATA(prefs_w, E_PREFSW_SAVE_BT_KEY, save_bt);
g_object_set_data(G_OBJECT(prefs_w), E_PREFSW_SAVE_BT_KEY, save_bt);
cancel_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
SIGNAL_CONNECT(cancel_bt, "clicked", prefs_main_cancel_cb, prefs_w);
window_set_cancel_button(prefs_w, cancel_bt, NULL);
gtk_widget_grab_default(ok_bt);
if(topic_available(HELP_PREFERENCES_DIALOG)) {
help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_PREFERENCES_DIALOG);
}
@ -669,7 +669,7 @@ create_preference_check_button(GtkWidget *main_tb, int table_position,
GtkTooltips *tooltips;
GtkWidget *check_box;
tooltips = OBJECT_GET_DATA(main_tb, E_TOOLTIPS_KEY);
tooltips = g_object_get_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY);
set_option_label(main_tb, table_position, label_text, tooltip_text,
tooltips);
@ -696,7 +696,7 @@ create_preference_radio_buttons(GtkWidget *main_tb, int table_position,
const enum_val_t *enum_valp;
GtkWidget *event_box;
tooltips = OBJECT_GET_DATA(main_tb, E_TOOLTIPS_KEY);
tooltips = g_object_get_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY);
set_option_label(main_tb, table_position, label_text, tooltip_text,
tooltips);
@ -790,7 +790,7 @@ create_preference_option_menu(GtkWidget *main_tb, int table_position,
const enum_val_t *enum_valp;
GtkWidget *event_box;
tooltips = OBJECT_GET_DATA(main_tb, E_TOOLTIPS_KEY);
tooltips = g_object_get_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY);
set_option_label(main_tb, table_position, label_text, tooltip_text,
tooltips);
@ -856,7 +856,7 @@ create_preference_entry(GtkWidget *main_tb, int table_position,
GtkTooltips *tooltips;
GtkWidget *entry;
tooltips = OBJECT_GET_DATA(main_tb, E_TOOLTIPS_KEY);
tooltips = g_object_get_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY);
set_option_label(main_tb, table_position, label_text, tooltip_text,
tooltips);
@ -880,7 +880,7 @@ create_preference_static_text(GtkWidget *main_tb, int table_position,
GtkTooltips *tooltips;
GtkWidget *label;
tooltips = OBJECT_GET_DATA(main_tb, E_TOOLTIPS_KEY);
tooltips = g_object_get_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY);
if(label_text != NULL)
label = gtk_label_new(label_text);
@ -902,7 +902,7 @@ create_preference_uat(GtkWidget *main_tb, int table_position,
GtkTooltips *tooltips;
GtkWidget *button = NULL;
tooltips = OBJECT_GET_DATA(main_tb, E_TOOLTIPS_KEY);
tooltips = g_object_get_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY);
set_option_label(main_tb, table_position, label_text, tooltip_text,
tooltips);
@ -1115,7 +1115,7 @@ prefs_airpcap_update()
gboolean airpcap_decryption_was_enabled;
gboolean wireshark_decryption_is_now_enabled;
decryption_cm = GTK_WIDGET(OBJECT_GET_DATA(airpcap_tb,AIRPCAP_TOOLBAR_DECRYPTION_KEY));
decryption_cm = GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY));
decryption_en = GTK_WIDGET(GTK_ENTRY(GTK_COMBO(decryption_cm)->entry));
if( g_ascii_strcasecmp(gtk_entry_get_text(GTK_ENTRY(decryption_en)),AIRPCAP_DECRYPTION_TYPE_STRING_WIRESHARK) == 0 )
@ -1244,25 +1244,25 @@ prefs_main_fetch_all(GtkWidget *dlg, gboolean *must_redissect)
/* Fetch the preferences (i.e., make sure all the values set in all of
the preferences panes have been copied to "prefs" and the registered
preferences). */
gui_prefs_fetch(OBJECT_GET_DATA(dlg, E_GUI_PAGE_KEY));
layout_prefs_fetch(OBJECT_GET_DATA(dlg, E_GUI_LAYOUT_PAGE_KEY));
column_prefs_fetch(OBJECT_GET_DATA(dlg, E_GUI_COLUMN_PAGE_KEY));
stream_prefs_fetch(OBJECT_GET_DATA(dlg, E_GUI_COLORS_PAGE_KEY));
gui_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_GUI_PAGE_KEY));
layout_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_GUI_LAYOUT_PAGE_KEY));
column_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_GUI_COLUMN_PAGE_KEY));
stream_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_GUI_COLORS_PAGE_KEY));
#ifdef HAVE_LIBPCAP
#ifdef _WIN32
/* Is WPcap loaded? */
if (has_wpcap) {
#endif /* _WIN32 */
capture_prefs_fetch(OBJECT_GET_DATA(dlg, E_CAPTURE_PAGE_KEY));
capture_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_CAPTURE_PAGE_KEY));
#ifdef _WIN32
}
#endif /* _WIN32 */
#endif /* HAVE_LIBPCAP */
printer_prefs_fetch(OBJECT_GET_DATA(dlg, E_PRINT_PAGE_KEY));
nameres_prefs_fetch(OBJECT_GET_DATA(dlg, E_NAMERES_PAGE_KEY));
printer_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_PRINT_PAGE_KEY));
nameres_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_NAMERES_PAGE_KEY));
#ifdef HAVE_LIBPORTAUDIO
rtp_player_prefs_fetch(OBJECT_GET_DATA(dlg, E_RTP_PLAYER_PAGE_KEY));
rtp_player_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_RTP_PLAYER_PAGE_KEY));
#endif
prefs_modules_foreach(module_prefs_fetch, must_redissect);
@ -1282,29 +1282,29 @@ prefs_main_apply_all(GtkWidget *dlg, gboolean redissect)
*/
prefs_apply_all();
gui_prefs_apply(OBJECT_GET_DATA(dlg, E_GUI_PAGE_KEY), redissect);
layout_prefs_apply(OBJECT_GET_DATA(dlg, E_GUI_LAYOUT_PAGE_KEY));
column_prefs_apply(OBJECT_GET_DATA(dlg, E_GUI_COLUMN_PAGE_KEY));
stream_prefs_apply(OBJECT_GET_DATA(dlg, E_GUI_COLORS_PAGE_KEY));
gui_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_GUI_PAGE_KEY), redissect);
layout_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_GUI_LAYOUT_PAGE_KEY));
column_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_GUI_COLUMN_PAGE_KEY));
stream_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_GUI_COLORS_PAGE_KEY));
#ifdef HAVE_LIBPCAP
#ifdef _WIN32
/* Is WPcap loaded? */
if (has_wpcap) {
#endif /* _WIN32 */
capture_prefs_apply(OBJECT_GET_DATA(dlg, E_CAPTURE_PAGE_KEY));
capture_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_CAPTURE_PAGE_KEY));
#ifdef _WIN32
}
#endif /* _WIN32 */
#endif /* HAVE_LIBPCAP */
printer_prefs_apply(OBJECT_GET_DATA(dlg, E_PRINT_PAGE_KEY));
nameres_prefs_apply(OBJECT_GET_DATA(dlg, E_NAMERES_PAGE_KEY));
printer_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_PRINT_PAGE_KEY));
nameres_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_NAMERES_PAGE_KEY));
#ifdef HAVE_LIBPORTAUDIO
rtp_player_prefs_apply(OBJECT_GET_DATA(dlg, E_RTP_PLAYER_PAGE_KEY));
rtp_player_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_RTP_PLAYER_PAGE_KEY));
#endif
/* show/hide the Save button - depending on setting */
save_bt = OBJECT_GET_DATA(prefs_w, E_PREFSW_SAVE_BT_KEY);
save_bt = g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_SAVE_BT_KEY);
if(prefs.gui_use_pref_save) {
gtk_widget_show(save_bt);
} else {
@ -1321,31 +1321,31 @@ prefs_main_destroy_all(GtkWidget *dlg)
GtkWidget *frame;
for (page_num = 0;
(frame = gtk_notebook_get_nth_page(OBJECT_GET_DATA(prefs_w, E_PREFSW_NOTEBOOK_KEY), page_num)) != NULL;
(frame = gtk_notebook_get_nth_page(g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), page_num)) != NULL;
page_num++) {
if(OBJECT_GET_DATA(frame, E_PAGE_ITER_KEY))
gtk_tree_iter_free(OBJECT_GET_DATA(frame, E_PAGE_ITER_KEY));
if(g_object_get_data(G_OBJECT(frame), E_PAGE_ITER_KEY))
gtk_tree_iter_free(g_object_get_data(G_OBJECT(frame), E_PAGE_ITER_KEY));
}
gui_prefs_destroy(OBJECT_GET_DATA(dlg, E_GUI_PAGE_KEY));
layout_prefs_destroy(OBJECT_GET_DATA(dlg, E_GUI_LAYOUT_PAGE_KEY));
column_prefs_destroy(OBJECT_GET_DATA(dlg, E_GUI_COLUMN_PAGE_KEY));
stream_prefs_destroy(OBJECT_GET_DATA(dlg, E_GUI_COLORS_PAGE_KEY));
gui_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_GUI_PAGE_KEY));
layout_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_GUI_LAYOUT_PAGE_KEY));
column_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_GUI_COLUMN_PAGE_KEY));
stream_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_GUI_COLORS_PAGE_KEY));
#ifdef HAVE_LIBPCAP
#ifdef _WIN32
/* Is WPcap loaded? */
if (has_wpcap) {
#endif /* _WIN32 */
capture_prefs_destroy(OBJECT_GET_DATA(dlg, E_CAPTURE_PAGE_KEY));
capture_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_CAPTURE_PAGE_KEY));
#ifdef _WIN32
}
#endif /* _WIN32 */
#endif /* HAVE_LIBPCAP */
printer_prefs_destroy(OBJECT_GET_DATA(dlg, E_PRINT_PAGE_KEY));
nameres_prefs_destroy(OBJECT_GET_DATA(dlg, E_NAMERES_PAGE_KEY));
printer_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_PRINT_PAGE_KEY));
nameres_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_NAMERES_PAGE_KEY));
#ifdef HAVE_LIBPORTAUDIO
rtp_player_prefs_destroy(OBJECT_GET_DATA(dlg, E_RTP_PLAYER_PAGE_KEY));
rtp_player_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_RTP_PLAYER_PAGE_KEY));
#endif
/* Free up the saved preferences (both for "prefs" and for registered
@ -1723,18 +1723,18 @@ properties_cb(GtkWidget *w, gpointer dummy)
/* Search all the pages in that window for the one with the specified
module. */
for (page_num = 0;
(sw = gtk_notebook_get_nth_page(OBJECT_GET_DATA(prefs_w, E_PREFSW_NOTEBOOK_KEY), page_num)) != NULL;
(sw = gtk_notebook_get_nth_page(g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), page_num)) != NULL;
page_num++) {
/* Get the frame from the scrollable window */
frame = OBJECT_GET_DATA(sw, E_PAGESW_FRAME_KEY);
frame = g_object_get_data(G_OBJECT(sw), E_PAGESW_FRAME_KEY);
/* Get the module for this page (non-protocol prefs don't have one). */
if(frame) {
page_module = OBJECT_GET_DATA(frame, E_PAGE_MODULE_KEY);
page_module = g_object_get_data(G_OBJECT(frame), E_PAGE_MODULE_KEY);
if (page_module != NULL) {
if (page_module == p.module) {
tree_select_node(
OBJECT_GET_DATA(prefs_w, E_PREFSW_TREE_KEY),
OBJECT_GET_DATA(frame, E_PAGE_ITER_KEY));
g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_TREE_KEY),
g_object_get_data(G_OBJECT(frame), E_PAGE_ITER_KEY));
return;
}
}
@ -1755,6 +1755,6 @@ prefs_tree_select_cb(GtkTreeSelection *sel, gpointer dummy _U_)
{
gtk_tree_model_get(model, &iter, 1, &page, -1);
if (page >= 0)
gtk_notebook_set_page(OBJECT_GET_DATA(prefs_w, E_PREFSW_NOTEBOOK_KEY), page);
gtk_notebook_set_page(g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), page);
}
}

54
gtk/proto_draw.c
View File

@ -167,7 +167,7 @@ get_byte_view_data_and_length(GtkWidget *byte_view, guint *data_len)
tvbuff_t *byte_view_tvb;
const guint8 *data_ptr;
byte_view_tvb = OBJECT_GET_DATA(byte_view, E_BYTE_VIEW_TVBUFF_KEY);
byte_view_tvb = g_object_get_data(G_OBJECT(byte_view), E_BYTE_VIEW_TVBUFF_KEY);
if (byte_view_tvb == NULL)
return NULL;
@ -191,7 +191,7 @@ set_notebook_page(GtkWidget *nb_ptr, tvbuff_t *tvb)
(bv_page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(nb_ptr), num)) != NULL;
num++) {
bv = GTK_BIN(bv_page)->child;
bv_tvb = OBJECT_GET_DATA(bv, E_BYTE_VIEW_TVBUFF_KEY);
bv_tvb = g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_TVBUFF_KEY);
if (bv_tvb == tvb) {
/* Found it. */
gtk_notebook_set_page(GTK_NOTEBOOK(nb_ptr), num);
@ -368,7 +368,7 @@ byte_view_select(GtkWidget *widget, GdkEventButton *event)
* Get the number of digits of offset being displayed, and
* compute the columns of various parts of the display.
*/
ndigits = GPOINTER_TO_UINT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_NDIGITS_KEY));
ndigits = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_NDIGITS_KEY));
/*
* The column of the first hex digit in the first half.
@ -437,14 +437,14 @@ byte_view_select(GtkWidget *widget, GdkEventButton *event)
*/
text_end_2 = text_start_2 + BYTES_PER_LINE/2 - 1;
tree = OBJECT_GET_DATA(widget, E_BYTE_VIEW_TREE_PTR);
tree = g_object_get_data(G_OBJECT(widget), E_BYTE_VIEW_TREE_PTR);
if (tree == NULL) {
/*
* Somebody clicked on the dummy byte view; do nothing.
*/
return FALSE;
}
tree_view = GTK_TREE_VIEW(OBJECT_GET_DATA(widget,
tree_view = GTK_TREE_VIEW(g_object_get_data(G_OBJECT(widget),
E_BYTE_VIEW_TREE_VIEW_PTR));
/* get the row/column selected */
@ -486,7 +486,7 @@ byte_view_select(GtkWidget *widget, GdkEventButton *event)
byte += row * 16;
/* Get the data source tvbuff */
tvb = OBJECT_GET_DATA(widget, E_BYTE_VIEW_TVBUFF_KEY);
tvb = g_object_get_data(G_OBJECT(widget), E_BYTE_VIEW_TVBUFF_KEY);
return highlight_field(tvb, byte, tree_view, tree);
}
@ -638,15 +638,15 @@ add_byte_tab(GtkWidget *byte_nb, const char *name, tvbuff_t *tvb,
"background-gdk", &style->base[GTK_STATE_SELECTED],
NULL);
gtk_text_buffer_create_tag(buf, "bold", "font-desc", user_font_get_bold(), NULL);
OBJECT_SET_DATA(byte_view, E_BYTE_VIEW_TVBUFF_KEY, tvb);
g_object_set_data(G_OBJECT(byte_view), E_BYTE_VIEW_TVBUFF_KEY, tvb);
gtk_container_add(GTK_CONTAINER(byte_scrollw), byte_view);
SIGNAL_CONNECT(byte_view, "show", byte_view_realize_cb, NULL);
SIGNAL_CONNECT(byte_view, "button_press_event", byte_view_button_press_cb,
OBJECT_GET_DATA(popup_menu_object, PM_HEXDUMP_KEY));
g_object_get_data(G_OBJECT(popup_menu_object), PM_HEXDUMP_KEY));
OBJECT_SET_DATA(byte_view, E_BYTE_VIEW_TREE_PTR, tree);
OBJECT_SET_DATA(byte_view, E_BYTE_VIEW_TREE_VIEW_PTR, tree_view);
g_object_set_data(G_OBJECT(byte_view), E_BYTE_VIEW_TREE_PTR, tree);
g_object_set_data(G_OBJECT(byte_view), E_BYTE_VIEW_TREE_VIEW_PTR, tree_view);
gtk_widget_show(byte_view);
@ -828,8 +828,8 @@ copy_hex_cb(GtkWidget * w _U_, gpointer data _U_, copy_data_type data_type)
* Should this be fixed? There is one exception - packet_hex_reprint,
* so can't just change it round without functional change.
*/
end = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_START_KEY));
start = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_END_KEY));
end = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_START_KEY));
start = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_END_KEY));
if(start >= 0 && end > start && (end - start <= (int)len)) {
len = end - start;
@ -911,8 +911,8 @@ savehex_save_clicked_cb(GtkWidget * w _U_, gpointer data _U_)
/*
* Retrieve the info we need
*/
end = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_START_KEY));
start = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_END_KEY));
end = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_START_KEY));
start = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_END_KEY));
data_p = get_byte_view_data_and_length(bv, &len);
if (data_p == NULL || start == -1 || start > end) {
@ -963,8 +963,8 @@ void savehex_cb(GtkWidget * w _U_, gpointer data _U_)
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not find the corresponding text window!");
return;
}
end = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_START_KEY));
start = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_END_KEY));
end = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_START_KEY));
start = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_END_KEY));
data_p = get_byte_view_data_and_length(bv, &len);
if (data_p == NULL || start == -1 || start > end) {
@ -1084,7 +1084,7 @@ packet_hex_print_common(GtkWidget *bv, const guint8 *pd, int len, int bstart,
use_digits = 4; /* we'll supply 4 digits */
/* Record the number of digits in this text view. */
OBJECT_SET_DATA(bv, E_BYTE_VIEW_NDIGITS_KEY, GUINT_TO_POINTER(use_digits));
g_object_set_data(G_OBJECT(bv), E_BYTE_VIEW_NDIGITS_KEY, GUINT_TO_POINTER(use_digits));
/* Update the progress bar when it gets to this value. */
progbar_nextstep = 0;
@ -1313,11 +1313,11 @@ packet_hex_print(GtkWidget *bv, const guint8 *pd, frame_data *fd,
/* save the information needed to redraw the text */
/* should we save the fd & finfo pointers instead ?? */
OBJECT_SET_DATA(bv, E_BYTE_VIEW_START_KEY, GINT_TO_POINTER(bend));
OBJECT_SET_DATA(bv, E_BYTE_VIEW_END_KEY, GINT_TO_POINTER(bstart));
OBJECT_SET_DATA(bv, E_BYTE_VIEW_APP_START_KEY, GINT_TO_POINTER(aend));
OBJECT_SET_DATA(bv, E_BYTE_VIEW_APP_END_KEY, GINT_TO_POINTER(astart));
OBJECT_SET_DATA(bv, E_BYTE_VIEW_ENCODE_KEY,
g_object_set_data(G_OBJECT(bv), E_BYTE_VIEW_START_KEY, GINT_TO_POINTER(bend));
g_object_set_data(G_OBJECT(bv), E_BYTE_VIEW_END_KEY, GINT_TO_POINTER(bstart));
g_object_set_data(G_OBJECT(bv), E_BYTE_VIEW_APP_START_KEY, GINT_TO_POINTER(aend));
g_object_set_data(G_OBJECT(bv), E_BYTE_VIEW_APP_END_KEY, GINT_TO_POINTER(astart));
g_object_set_data(G_OBJECT(bv), E_BYTE_VIEW_ENCODE_KEY,
GUINT_TO_POINTER((guint)fd->flags.encoding));
packet_hex_print_common(bv, pd, len, bstart, bend, astart, aend, fd->flags.encoding);
@ -1335,13 +1335,13 @@ packet_hex_reprint(GtkWidget *bv)
const guint8 *data;
guint len = 0;
start = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_START_KEY));
end = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_END_KEY));
astart = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_APP_START_KEY));
aend = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_APP_END_KEY));
start = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_START_KEY));
end = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_END_KEY));
astart = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_APP_START_KEY));
aend = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_APP_END_KEY));
data = get_byte_view_data_and_length(bv, &len);
g_assert(data != NULL);
encoding = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_ENCODE_KEY));
encoding = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_ENCODE_KEY));
packet_hex_print_common(bv, data, len, start, end, astart, aend, encoding);
}

16
gtk/toolbar.c
View File

@ -281,7 +281,7 @@ toolbar_redraw_all(void)
{
GtkWidget *main_tb;
main_tb = OBJECT_GET_DATA(top_level, E_TB_MAIN_KEY);
main_tb = g_object_get_data(G_OBJECT(top_level), E_TB_MAIN_KEY);
gtk_toolbar_set_style(GTK_TOOLBAR(main_tb),
prefs.gui_toolbar_main_style);
@ -314,7 +314,7 @@ void set_toolbar_for_unsaved_capture_file(gboolean have_unsaved_capture_file) {
GTK_STOCK_SAVE);
gtk_tool_item_set_tooltip(save_button, tooltips,
SAVE_BUTTON_TOOLTIP_TEXT, NULL);
OBJECT_SET_DATA(save_button, "save", GINT_TO_POINTER(1));
g_object_set_data(G_OBJECT(save_button), "save", GINT_TO_POINTER(1));
#else /* GTK_CHECK_VERSION(2,4,0) */
gtk_widget_hide(GTK_WIDGET(save_as_button));
gtk_widget_show(GTK_WIDGET(save_button));
@ -325,7 +325,7 @@ void set_toolbar_for_unsaved_capture_file(gboolean have_unsaved_capture_file) {
GTK_STOCK_SAVE_AS);
gtk_tool_item_set_tooltip(save_button, tooltips,
SAVE_AS_BUTTON_TOOLTIP_TEXT, NULL);
OBJECT_SET_DATA(save_button, "save", GINT_TO_POINTER(0));
g_object_set_data(G_OBJECT(save_button), "save", GINT_TO_POINTER(0));
#else /* GTK_CHECK_VERSION(2,4,0) */
gtk_widget_show(GTK_WIDGET(save_as_button));
gtk_widget_hide(GTK_WIDGET(save_button));
@ -342,7 +342,7 @@ void set_toolbar_for_unsaved_capture_file(gboolean have_unsaved_capture_file) {
#if GTK_CHECK_VERSION(2,4,0)
static void file_save_or_save_as_cmd_cb(GtkWidget *w, gpointer data) {
if (GPOINTER_TO_INT(OBJECT_GET_DATA(save_button,"save")) == 1) {
if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(save_button),"save")) == 1) {
file_save_cmd_cb(w, data);
}
else {
@ -566,7 +566,7 @@ toolbar_new(void)
gtk_toolbar_set_orientation(GTK_TOOLBAR(main_tb),
GTK_ORIENTATION_HORIZONTAL);
OBJECT_SET_DATA(top_level, E_TB_MAIN_KEY, main_tb);
g_object_set_data(G_OBJECT(top_level), E_TB_MAIN_KEY, main_tb);
#ifdef HAVE_LIBPCAP
@ -607,7 +607,7 @@ toolbar_new(void)
#else
toolbar_item(save_button, window, main_tb,
GTK_STOCK_SAVE, tooltips, SAVE_BUTTON_TOOLTIP_TEXT, stock_save_24_xpm, file_save_or_save_as_cmd_cb, NULL);
OBJECT_SET_DATA(save_button, "save", GINT_TO_POINTER(1));
g_object_set_data(G_OBJECT(save_button), "save", GINT_TO_POINTER(1));
#endif
toolbar_item(close_button, window, main_tb,
@ -703,6 +703,6 @@ toolbar_new(void)
void
set_toolbar_object_data(gchar *key, gpointer data)
{
OBJECT_SET_DATA(open_button, key, data);
OBJECT_SET_DATA(reload_button, key, data);
g_object_set_data(G_OBJECT(open_button), key, data);
g_object_set_data(G_OBJECT(reload_button), key, data);
}