*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: ansi_a_stat.c,v 1.4 2003/12/13 22:23:17 guy Exp $
+ * $Id: ansi_a_stat.c,v 1.5 2003/12/16 18:43:33 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
hbuttonbox = gtk_hbutton_box_new();
gtk_widget_ref(hbuttonbox);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "hbuttonbox", hbuttonbox,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "hbuttonbox", hbuttonbox,
+ gtk_widget_unref);
gtk_widget_show(hbuttonbox);
gtk_box_pack_start(GTK_BOX(dialog_action_area), hbuttonbox, FALSE, FALSE, 0);
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END);
bt_close = gtk_button_new_with_label("Close");
gtk_widget_ref(bt_close);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "bt_close", bt_close,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "bt_close", bt_close, gtk_widget_unref);
gtk_widget_show(bt_close);
gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_close);
GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
vbox = gtk_vbox_new(FALSE, 0);
gtk_widget_ref(vbox);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "vbox", vbox,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "vbox", vbox, gtk_widget_unref);
gtk_widget_show(vbox);
gtk_box_pack_start(GTK_BOX(dialog_vbox), vbox, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
dlg_p->scrolled_win = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_ref(dlg_p->scrolled_win);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "scrolled_win", dlg_p->scrolled_win,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "scrolled_win", dlg_p->scrolled_win,
+ gtk_widget_unref);
gtk_widget_show(dlg_p->scrolled_win);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dlg_p->scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
dlg_p->table = gtk_clist_new(INIT_TABLE_NUM_COLUMNS);
gtk_widget_ref(dlg_p->table);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "table", GTK_CLIST(dlg_p->table),
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "table", dlg_p->table, gtk_widget_unref);
gtk_widget_show(dlg_p->table);
gtk_widget_show(dlg_p->win);
*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: ansi_map_stat.c,v 1.3 2003/12/13 22:23:17 guy Exp $
+ * $Id: ansi_map_stat.c,v 1.4 2003/12/16 18:43:33 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
hbuttonbox = gtk_hbutton_box_new();
gtk_widget_ref(hbuttonbox);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "hbuttonbox", hbuttonbox,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "hbuttonbox", hbuttonbox,
+ gtk_widget_unref);
gtk_widget_show(hbuttonbox);
gtk_box_pack_start(GTK_BOX(dialog_action_area), hbuttonbox, FALSE, FALSE, 0);
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END);
bt_close = gtk_button_new_with_label("Close");
gtk_widget_ref(bt_close);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "bt_close", bt_close,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "bt_close", bt_close, gtk_widget_unref);
gtk_widget_show(bt_close);
gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_close);
GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
vbox = gtk_vbox_new(FALSE, 0);
gtk_widget_ref(vbox);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "vbox", vbox,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "vbox", vbox, gtk_widget_unref);
gtk_widget_show(vbox);
gtk_box_pack_start(GTK_BOX(dialog_vbox), vbox, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
dlg_p->scrolled_win = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_ref(dlg_p->scrolled_win);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "scrolled_win", dlg_p->scrolled_win,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "scrolled_win", dlg_p->scrolled_win,
+ gtk_widget_unref);
gtk_widget_show(dlg_p->scrolled_win);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dlg_p->scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
dlg_p->table = gtk_clist_new(INIT_TABLE_NUM_COLUMNS);
gtk_widget_ref(dlg_p->table);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "table", GTK_CLIST(dlg_p->table),
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "table", dlg_p->table, gtk_widget_unref);
gtk_widget_show(dlg_p->table);
gtk_widget_show(dlg_p->win);
/* bootp_stat.c
* boop_stat 2003 Jean-Michel FAYARD
*
- * $Id: bootp_stat.c,v 1.7 2003/12/13 22:23:18 guy Exp $
+ * $Id: bootp_stat.c,v 1.8 2003/12/16 18:43:33 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
/* Filter entry */
filter_entry=gtk_entry_new();
- gtk_widget_set_usize(filter_entry, 300, -2);
+ WIDGET_SET_SIZE(filter_entry, 300, -2);
gtk_box_pack_start(GTK_BOX(filter_box), filter_entry, TRUE, TRUE, 0);
gtk_widget_show(filter_entry);
/* capture_info_dlg.c
* Routines for packet capture info dialog
*
- * $Id: capture_info_dlg.c,v 1.6 2003/11/28 19:00:28 ulfl Exp $
+ * $Id: capture_info_dlg.c,v 1.7 2003/12/16 18:43:33 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
#else
stop_bt = gtk_button_new_from_stock(GTK_STOCK_STOP);
#endif
- gtk_signal_connect(GTK_OBJECT(stop_bt), "clicked",
- GTK_SIGNAL_FUNC(capture_info_stop_cb), cinfo->callback_data);
- gtk_signal_connect(GTK_OBJECT(info->cap_w), "delete_event",
- GTK_SIGNAL_FUNC(capture_info_delete_cb), cinfo->callback_data);
+ SIGNAL_CONNECT(stop_bt, "clicked", capture_info_stop_cb,
+ cinfo->callback_data);
+ SIGNAL_CONNECT(info->cap_w, "delete_event", capture_info_delete_cb,
+ cinfo->callback_data);
gtk_box_pack_start(GTK_BOX(main_vb), stop_bt, FALSE, FALSE, 3);
GTK_WIDGET_SET_FLAGS(stop_bt, GTK_CAN_DEFAULT);
gtk_widget_grab_default(stop_bt);
/* compat_macros.h
* GTK-related Global defines, etc.
*
- * $Id: compat_macros.h,v 1.3 2002/11/15 23:50:06 oabad Exp $
+ * $Id: compat_macros.h,v 1.4 2003/12/16 18:43:33 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
gtk_signal_disconnect_by_func(GTK_OBJECT(object), func, data)
#define OBJECT_SET_DATA(widget, key, data) \
-gtk_object_set_data(GTK_OBJECT(widget), key, data)
+gtk_object_set_data(GTK_OBJECT(widget), key, (gpointer)data)
#define OBJECT_SET_DATA_FULL(widget, key, data, destroy) \
gtk_object_set_data_full(GTK_OBJECT(widget), key, (gpointer)(data), \
g_signal_handlers_disconnect_by_func(G_OBJECT(object), func, data)
#define OBJECT_SET_DATA(widget, key, data) \
-g_object_set_data(G_OBJECT(widget), key, data)
+g_object_set_data(G_OBJECT(widget), key, (gpointer)data)
#define OBJECT_SET_DATA_FULL(widget, key, data, destroy) \
g_object_set_data_full(G_OBJECT(widget), key, (gpointer)(data), \
/* dcerpc_stat.c
* dcerpc_stat 2002 Ronnie Sahlberg
*
- * $Id: dcerpc_stat.c,v 1.34 2003/12/15 20:15:03 guy Exp $
+ * $Id: dcerpc_stat.c,v 1.35 2003/12/16 18:43:33 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
/* Filter entry */
filter_entry=gtk_entry_new();
- gtk_widget_set_usize(filter_entry, 300, -2);
+ WIDGET_SET_SIZE(filter_entry, 300, -2);
/* Filter entry */
filter_entry=gtk_entry_new();
- gtk_widget_set_usize(filter_entry, 300, -2);
+ WIDGET_SET_SIZE(filter_entry, 300, -2);
gtk_box_pack_start(GTK_BOX(filter_box), filter_entry, TRUE, TRUE, 0);
filter=gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget));
/* fc_stat.c
* fc_stat 2003 Ronnie Sahlberg
*
- * $Id: fc_stat.c,v 1.14 2003/12/04 00:45:38 guy Exp $
+ * $Id: fc_stat.c,v 1.15 2003/12/16 18:43:33 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
/* Filter entry */
filter_entry=gtk_entry_new();
- gtk_widget_set_usize(filter_entry, 300, -2);
+ WIDGET_SET_SIZE(filter_entry, 300, -2);
/* filter prefs dialog */
OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_entry);
*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: gsm_a_stat.c,v 1.4 2003/12/13 22:23:18 guy Exp $
+ * $Id: gsm_a_stat.c,v 1.5 2003/12/16 18:43:33 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
hbuttonbox = gtk_hbutton_box_new();
gtk_widget_ref(hbuttonbox);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "hbuttonbox", hbuttonbox,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "hbuttonbox", hbuttonbox,
+ gtk_widget_unref);
gtk_widget_show(hbuttonbox);
gtk_box_pack_start(GTK_BOX(dialog_action_area), hbuttonbox, FALSE, FALSE, 0);
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END);
bt_close = gtk_button_new_with_label("Close");
gtk_widget_ref(bt_close);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "bt_close", bt_close,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "bt_close", bt_close, gtk_widget_unref);
gtk_widget_show(bt_close);
gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_close);
GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
vbox = gtk_vbox_new(FALSE, 0);
gtk_widget_ref(vbox);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "vbox", vbox,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "vbox", vbox, gtk_widget_unref);
gtk_widget_show(vbox);
gtk_box_pack_start(GTK_BOX(dialog_vbox), vbox, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
dlg_p->scrolled_win = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_ref(dlg_p->scrolled_win);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "scrolled_win", dlg_p->scrolled_win,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "scrolled_win", dlg_p->scrolled_win,
+ gtk_widget_unref);
gtk_widget_show(dlg_p->scrolled_win);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dlg_p->scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
dlg_p->table = gtk_clist_new(INIT_TABLE_NUM_COLUMNS);
gtk_widget_ref(dlg_p->table);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "table", GTK_CLIST(dlg_p->table),
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "table", dlg_p->table, gtk_widget_unref);
gtk_widget_show(dlg_p->table);
gtk_widget_show(dlg_p->win);
* h225 message counter for ethereal
* Copyright 2003 Lars Roland
*
- * $Id: h225_counter.c,v 1.3 2003/12/15 04:23:55 guy Exp $
+ * $Id: h225_counter.c,v 1.4 2003/12/16 18:43:34 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
/* Filter entry */
filter_entry=gtk_entry_new();
- gtk_widget_set_usize(filter_entry, 300, -2);
+ WIDGET_SET_SIZE(filter_entry, 300, -2);
gtk_box_pack_start(GTK_BOX(filter_box), filter_entry, TRUE, TRUE, 0);
filter=gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget));
if(filter){
* h225 RAS Service Response Time statistics for ethereal
* Copyright 2003 Lars Roland
*
- * $Id: h225_ras_srt.c,v 1.2 2003/12/04 00:45:38 guy Exp $
+ * $Id: h225_ras_srt.c,v 1.3 2003/12/16 18:43:34 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
/* Filter entry */
filter_entry=gtk_entry_new();
- gtk_widget_set_usize(filter_entry, 300, -2);
+ WIDGET_SET_SIZE(filter_entry, 300, -2);
gtk_box_pack_start(GTK_BOX(filter_box), filter_entry, TRUE, TRUE, 0);
filter=gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget));
if(filter){
/* http_stat.c
* http_stat 2003 Jean-Michel FAYARD
*
- * $Id: http_stat.c,v 1.9 2003/12/13 22:23:18 guy Exp $
+ * $Id: http_stat.c,v 1.10 2003/12/16 18:43:34 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
/* Filter entry */
filter_entry=gtk_entry_new();
- gtk_widget_set_usize(filter_entry, 300, -2);
+ WIDGET_SET_SIZE(filter_entry, 300, -2);
gtk_box_pack_start(GTK_BOX(filter_box), filter_entry, TRUE, TRUE, 0);
gtk_widget_show(filter_entry);
/* io_stat.c
* io_stat 2002 Ronnie Sahlberg
*
- * $Id: io_stat.c,v 1.49 2003/12/14 10:24:24 guy Exp $
+ * $Id: io_stat.c,v 1.50 2003/12/16 18:43:34 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
int i;
io_stat_t *io;
- io=(io_stat_t *)gtk_object_get_data(GTK_OBJECT(widget), "io_stat_t");
+ io=(io_stat_t *)OBJECT_GET_DATA(widget, "io_stat_t");
for(i=0;i<MAX_GRAPHS;i++){
if(io->graphs[i].display){
int i;
io_stat_t *io;
- io=(io_stat_t *)gtk_object_get_data(GTK_OBJECT(widget), "io_stat_t");
+ io=(io_stat_t *)OBJECT_GET_DATA(widget, "io_stat_t");
if(!io){
exit(10);
}
{
io_stat_t *io;
- io=(io_stat_t *)gtk_object_get_data(GTK_OBJECT(widget), "io_stat_t");
+ io=(io_stat_t *)OBJECT_GET_DATA(widget, "io_stat_t");
if(!io){
exit(10);
}
{
io->draw_area=gtk_drawing_area_new();
SIGNAL_CONNECT(io->draw_area, "destroy", quit, io);
- gtk_object_set_data(GTK_OBJECT(io->draw_area), "io_stat_t", (gpointer)io);
+ OBJECT_SET_DATA(io->draw_area, "io_stat_t", io);
WIDGET_SET_SIZE(io->draw_area, io->pixmap_width, io->pixmap_height);
io_stat_t *io;
io=(io_stat_t *)key;
- val=(int)gtk_object_get_data(GTK_OBJECT(item), "tick_interval");
+ val=(int)OBJECT_GET_DATA(item, "tick_interval");
io->interval=val;
redissect_packets(&cfile);
io_stat_t *io;
io=(io_stat_t *)key;
- val=(int)gtk_object_get_data(GTK_OBJECT(item), "pixels_per_tick");
+ val=(int)OBJECT_GET_DATA(item, "pixels_per_tick");
io->pixels_per_tick=val;
io->needs_redraw=TRUE;
gtk_iostat_draw(&io->graphs[0]);
io_stat_graph_t *ppt;
ppt=(io_stat_graph_t *)key;
- val=(int)gtk_object_get_data(GTK_OBJECT(item), "plot_style");
+ val=(int)OBJECT_GET_DATA(item, "plot_style");
ppt->plot_style=val;
menu_item=gtk_menu_item_new_with_label(str);
io->pixels_per_tick=DEFAULT_PIXELS_PER_TICK;
- gtk_object_set_data(GTK_OBJECT(menu_item), "pixels_per_tick", (gpointer)pixels_per_tick[i]);
+ OBJECT_SET_DATA(menu_item, "pixels_per_tick",
+ pixels_per_tick[i]);
SIGNAL_CONNECT(menu_item, "activate", pixels_per_tick_select, io);
gtk_widget_show(menu_item);
gtk_menu_append(GTK_MENU(menu), menu_item);
io_stat_t *io;
io=(io_stat_t *)key;
- val=(int)gtk_object_get_data(GTK_OBJECT(item), "yscale_max");
+ val=(int)OBJECT_GET_DATA(item, "yscale_max");
io->max_y_units=val;
io->needs_redraw=TRUE;
}
menu_item=gtk_menu_item_new_with_label(str);
- gtk_object_set_data(GTK_OBJECT(menu_item), "tick_interval", (gpointer)tick_interval_values[i]);
+ OBJECT_SET_DATA(menu_item, "tick_interval",
+ tick_interval_values[i]);
SIGNAL_CONNECT(menu_item, "activate", tick_interval_select, (gpointer)io);
gtk_widget_show(menu_item);
gtk_menu_append(GTK_MENU(menu), menu_item);
sprintf(str,"%d", yscale_max[i]);
}
menu_item=gtk_menu_item_new_with_label(str);
- gtk_object_set_data(GTK_OBJECT(menu_item), "yscale_max", (gpointer)yscale_max[i]);
+ OBJECT_SET_DATA(menu_item, "yscale_max", yscale_max[i]);
SIGNAL_CONNECT(menu_item, "activate", yscale_select, io);
gtk_widget_show(menu_item);
gtk_menu_append(GTK_MENU(menu), menu_item);
io_stat_t *io;
io=(io_stat_t *)key;
- val=(int)gtk_object_get_data(GTK_OBJECT(item), "count_type");
+ val=(int)OBJECT_GET_DATA(item, "count_type");
io->count_type=val;
for(i=0;i<MAX_COUNT_TYPES;i++){
menu_item=gtk_menu_item_new_with_label(count_type_names[i]);
- gtk_object_set_data(GTK_OBJECT(menu_item), "count_type", (gpointer)i);
+ OBJECT_SET_DATA(menu_item, "count_type", i);
SIGNAL_CONNECT(menu_item, "activate", count_type_select, io);
gtk_widget_show(menu_item);
gtk_menu_append(GTK_MENU(menu), menu_item);
menu=gtk_menu_new();
for(i=0;i<MAX_PLOT_STYLES;i++){
menu_item=gtk_menu_item_new_with_label(plot_style_name[i]);
- gtk_object_set_data(GTK_OBJECT(menu_item), "plot_style", (gpointer)i);
+ OBJECT_SET_DATA(menu_item, "plot_style", 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);
*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: isup_stat.c,v 1.3 2003/12/13 22:23:18 guy Exp $
+ * $Id: isup_stat.c,v 1.4 2003/12/16 18:43:34 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
hbuttonbox = gtk_hbutton_box_new();
gtk_widget_ref(hbuttonbox);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "hbuttonbox", hbuttonbox,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "hbuttonbox", hbuttonbox,
+ gtk_widget_unref);
gtk_widget_show(hbuttonbox);
gtk_box_pack_start(GTK_BOX(dialog_action_area), hbuttonbox, FALSE, FALSE, 0);
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END);
bt_close = gtk_button_new_with_label("Close");
gtk_widget_ref(bt_close);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "bt_close", bt_close,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "bt_close", bt_close, gtk_widget_unref);
gtk_widget_show(bt_close);
gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_close);
GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
vbox = gtk_vbox_new(FALSE, 0);
gtk_widget_ref(vbox);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "vbox", vbox,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "vbox", vbox, gtk_widget_unref);
gtk_widget_show(vbox);
gtk_box_pack_start(GTK_BOX(dialog_vbox), vbox, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
dlg_p->scrolled_win = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_ref(dlg_p->scrolled_win);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "scrolled_win", dlg_p->scrolled_win,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "scrolled_win", dlg_p->scrolled_win,
+ gtk_widget_unref);
gtk_widget_show(dlg_p->scrolled_win);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dlg_p->scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
dlg_p->table = gtk_clist_new(INIT_TABLE_NUM_COLUMNS);
gtk_widget_ref(dlg_p->table);
- gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "table", GTK_CLIST(dlg_p->table),
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(dlg_p->win, "table", dlg_p->table, gtk_widget_unref);
gtk_widget_show(dlg_p->table);
gtk_widget_show(dlg_p->win);
/* ldap_stat.c
* ldap_stat 2003 Ronnie Sahlberg
*
- * $Id: ldap_stat.c,v 1.2 2003/12/04 00:45:38 guy Exp $
+ * $Id: ldap_stat.c,v 1.3 2003/12/16 18:43:34 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
/* Filter entry */
filter_entry=gtk_entry_new();
- gtk_widget_set_usize(filter_entry, 300, -2);
+ WIDGET_SET_SIZE(filter_entry, 300, -2);
/* filter prefs dialog */
OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_entry);
/* main.c
*
- * $Id: main.c,v 1.342 2003/12/13 22:05:08 guy Exp $
+ * $Id: main.c,v 1.343 2003/12/16 18:43:34 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
static gboolean
dfilter_combo_add(GtkWidget *filter_cm, char *s) {
GList *li;
- GList *filter_list = gtk_object_get_data(GTK_OBJECT(filter_cm), E_DFILTER_FL_KEY);
+ GList *filter_list = OBJECT_GET_DATA(filter_cm, E_DFILTER_FL_KEY);
/* GtkCombos don't let us get at their list contents easily, so we maintain
}
filter_list = g_list_append(filter_list, s);
- gtk_object_set_data(GTK_OBJECT(filter_cm), E_DFILTER_FL_KEY, filter_list);
+ OBJECT_SET_DATA(filter_cm, E_DFILTER_FL_KEY, filter_list);
gtk_combo_set_popdown_strings(GTK_COMBO(filter_cm), filter_list);
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(filter_cm)->entry), g_list_last(filter_list)->data);
void
dfilter_combo_write_all(FILE *rf) {
GtkWidget *filter_cm = OBJECT_GET_DATA(top_level, E_DFILTER_CM_KEY);
- GList *filter_list = gtk_object_get_data(GTK_OBJECT(filter_cm), E_DFILTER_FL_KEY);
+ GList *filter_list = OBJECT_GET_DATA(filter_cm, E_DFILTER_FL_KEY);
GList *li;
guint max_count = 0;
/* menu.c
* Menu routines
*
- * $Id: menu.c,v 1.125 2003/12/15 06:38:48 ulfl Exp $
+ * $Id: menu.c,v 1.126 2003/12/16 18:43:34 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
menu_item = gtk_menu_item_new_with_label(cf_name);
gtk_menu_prepend (GTK_MENU(submenu_recent_files), menu_item);
- gtk_signal_connect_object(GTK_OBJECT(menu_item), "activate",
+ SIGNAL_CONNECT_OBJECT(GTK_OBJECT(menu_item), "activate",
menu_open_recent_file_cmd_cb, (GtkObject *) menu_item);
gtk_widget_show (menu_item);
}
* mgcp-statistics for ethereal
* Copyright 2003 Lars Roland
*
- * $Id: mgcp_stat.c,v 1.18 2003/12/04 00:45:39 guy Exp $
+ * $Id: mgcp_stat.c,v 1.19 2003/12/16 18:43:34 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
/* Filter entry */
filter_entry=gtk_entry_new();
- gtk_widget_set_usize(filter_entry, 300, -2);
+ WIDGET_SET_SIZE(filter_entry, 300, -2);
gtk_box_pack_start(GTK_BOX(filter_box), filter_entry, TRUE, TRUE, 0);
filter=gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget));
if(filter){
/* proto_draw.c
* Routines for GTK+ packet display
*
- * $Id: proto_draw.c,v 1.71 2003/12/04 10:59:34 guy Exp $
+ * $Id: proto_draw.c,v 1.72 2003/12/16 18:43:35 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
/* File entry */
file_entry=gtk_entry_new();
- gtk_widget_set_usize(file_entry, 300, -2);
+ WIDGET_SET_SIZE(file_entry, 300, -2);
gtk_tooltips_set_tip(tooltips, file_entry, ("Enter Save Data filename"), NULL);
gtk_box_pack_start(GTK_BOX(file_box), file_entry, TRUE, TRUE, 0);
gtk_widget_show(file_entry);
/* rpc_stat.c
* rpc_stat 2002 Ronnie Sahlberg
*
- * $Id: rpc_stat.c,v 1.27 2003/12/13 22:23:18 guy Exp $
+ * $Id: rpc_stat.c,v 1.28 2003/12/16 18:43:35 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
/* Filter entry */
filter_entry=gtk_entry_new();
- gtk_widget_set_usize(filter_entry, 300, -2);
+ WIDGET_SET_SIZE(filter_entry, 300, -2);
/* filter prefs dialog */
OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_entry);
/* rtp_analysis.c
* RTP analysis addition for ethereal
*
- * $Id: rtp_analysis.c,v 1.13 2003/12/04 10:59:34 guy Exp $
+ * $Id: rtp_analysis.c,v 1.14 2003/12/16 18:43:35 oabad Exp $
*
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
user_data->dlg.graph_window = show_conversation_graph(list, title1, title2,
&graph_selection_callback, user_data);
- gtk_signal_connect(GTK_OBJECT(user_data->dlg.graph_window), "destroy",
- GTK_SIGNAL_FUNC(on_destroy_graph), user_data);
+ SIGNAL_CONNECT(user_data->dlg.graph_window, "destroy",
+ on_destroy_graph, user_data);
}
#endif /*USE_CONVERSATION_GRAPH*/
}
user_data->dlg.save_csv_as_w = gtk_file_selection_new("Ethereal: Save Data As CSV");
- gtk_signal_connect(GTK_OBJECT(user_data->dlg.save_csv_as_w), "destroy",
- GTK_SIGNAL_FUNC(save_csv_as_destroy_cb), user_data);
+ SIGNAL_CONNECT(user_data->dlg.save_csv_as_w, "destroy",
+ save_csv_as_destroy_cb, user_data);
/* Container for each row of widgets */
vertb = gtk_vbox_new(FALSE, 0);
been selected. */
dlg_set_cancel(user_data->dlg.save_csv_as_w, GTK_FILE_SELECTION(user_data->dlg.save_csv_as_w)->cancel_button);
- gtk_signal_connect(GTK_OBJECT(ok_bt), "clicked",
- GTK_SIGNAL_FUNC(save_csv_as_ok_cb), user_data->dlg.save_csv_as_w);
+ SIGNAL_CONNECT(ok_bt, "clicked", save_csv_as_ok_cb,
+ user_data->dlg.save_csv_as_w);
gtk_widget_show(user_data->dlg.save_csv_as_w);
}
}
user_data->dlg.save_voice_as_w = gtk_file_selection_new("Ethereal: Save Payload As ...");
- gtk_signal_connect(GTK_OBJECT(user_data->dlg.save_voice_as_w), "destroy",
- GTK_SIGNAL_FUNC(save_voice_as_destroy_cb), user_data);
+ SIGNAL_CONNECT(user_data->dlg.save_voice_as_w, "destroy",
+ save_voice_as_destroy_cb, user_data);
/* Container for each row of widgets */
vertb = gtk_vbox_new(FALSE, 0);
been selected. */
dlg_set_cancel(user_data->dlg.save_voice_as_w, GTK_FILE_SELECTION(user_data->dlg.save_voice_as_w)->cancel_button);
- gtk_signal_connect(GTK_OBJECT(ok_bt), "clicked",
- GTK_SIGNAL_FUNC(save_voice_as_ok_cb), user_data->dlg.save_voice_as_w);
+ SIGNAL_CONNECT(ok_bt, "clicked", save_voice_as_ok_cb,
+ user_data->dlg.save_voice_as_w);
gtk_widget_show(user_data->dlg.save_voice_as_w);
}
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (window), "Ethereal: RTP Stream Analysis");
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
- gtk_signal_connect(GTK_OBJECT(window), "destroy",
- GTK_SIGNAL_FUNC(on_destroy), user_data);
+ SIGNAL_CONNECT(window, "destroy", on_destroy, user_data);
/* Container for each row of widgets */
main_vb = gtk_vbox_new(FALSE, 3);
/* Start a notebook for flipping between sets of changes */
notebook = gtk_notebook_new();
gtk_container_add(GTK_CONTAINER(main_vb), notebook);
- gtk_object_set_data(GTK_OBJECT(window), "notebook", notebook);
- gtk_signal_connect(GTK_OBJECT (notebook), "switch_page",
- GTK_SIGNAL_FUNC (on_notebook_switch_page),
- user_data);
+ OBJECT_SET_DATA(window, "notebook", notebook);
+ SIGNAL_CONNECT(notebook, "switch_page", on_notebook_switch_page,
+ user_data);
/* page for forward connection */
page = gtk_vbox_new(FALSE, 5);
/* scrolled window */
scrolled_window = gtk_scrolled_window_new(NULL, NULL);
- gtk_widget_set_usize(scrolled_window, 600, 200);
+ WIDGET_SET_SIZE(scrolled_window, 600, 200);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
gtk_widget_show(clist_fwd);
gtk_container_add(GTK_CONTAINER(scrolled_window), clist_fwd);
gtk_box_pack_start(GTK_BOX(page), scrolled_window, TRUE, TRUE, 0);
- gtk_signal_connect(GTK_OBJECT (clist_fwd), "select_row",
- GTK_SIGNAL_FUNC (on_clist_select_row),
- user_data);
+ SIGNAL_CONNECT(clist_fwd, "select_row", on_clist_select_row, user_data);
/* Hide date and length column */
gtk_clist_set_column_visibility(GTK_CLIST(clist_fwd), 6, FALSE);
gtk_clist_set_column_visibility(GTK_CLIST(clist_fwd), 7, FALSE);
page_r = gtk_vbox_new(FALSE, 5);
gtk_container_set_border_width(GTK_CONTAINER(page_r), 20);
scrolled_window_r = gtk_scrolled_window_new(NULL, NULL);
- gtk_widget_set_usize(scrolled_window_r, 600, 200);
+ WIDGET_SET_SIZE(scrolled_window_r, 600, 200);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window_r),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
label3 = gtk_label_new(label_reverse);
gtk_clist_set_column_visibility(GTK_CLIST(clist_rev), 6, FALSE);
gtk_clist_set_column_visibility(GTK_CLIST(clist_rev), 7, FALSE);
- gtk_signal_connect(GTK_OBJECT (clist_rev), "select_row",
- GTK_SIGNAL_FUNC (on_clist_select_row),
- user_data);
+ SIGNAL_CONNECT(clist_rev, "select_row", on_clist_select_row, user_data);
gtk_container_add(GTK_CONTAINER(scrolled_window_r), clist_rev);
gtk_box_pack_start(GTK_BOX(page_r), scrolled_window_r, TRUE, TRUE, 0);
voice_bt = gtk_button_new_with_label("Save payload...");
gtk_container_add(GTK_CONTAINER(box4), voice_bt);
gtk_widget_show(voice_bt);
- gtk_signal_connect(GTK_OBJECT(voice_bt), "clicked",
- GTK_SIGNAL_FUNC(on_save_bt_clicked), user_data);
+ SIGNAL_CONNECT(voice_bt, "clicked", on_save_bt_clicked, user_data);
csv_bt = gtk_button_new_with_label("Save as CSV...");
gtk_container_add(GTK_CONTAINER(box4), csv_bt);
gtk_widget_show(csv_bt);
- gtk_signal_connect(GTK_OBJECT(csv_bt), "clicked",
- GTK_SIGNAL_FUNC(save_csv_as_cb), user_data);
+ SIGNAL_CONNECT(csv_bt, "clicked", save_csv_as_cb, user_data);
refresh_bt = gtk_button_new_with_label("Refresh");
gtk_container_add(GTK_CONTAINER(box4), refresh_bt);
gtk_widget_show(refresh_bt);
- gtk_signal_connect(GTK_OBJECT(refresh_bt), "clicked",
- GTK_SIGNAL_FUNC(on_refresh_bt_clicked), user_data);
+ SIGNAL_CONNECT(refresh_bt, "clicked", on_refresh_bt_clicked, user_data);
goto_bt = gtk_button_new_with_label("Go to frame");
gtk_container_add(GTK_CONTAINER(box4), goto_bt);
gtk_widget_show(goto_bt);
- gtk_signal_connect(GTK_OBJECT(goto_bt), "clicked",
- GTK_SIGNAL_FUNC(on_goto_bt_clicked), user_data);
+ SIGNAL_CONNECT(goto_bt, "clicked", on_goto_bt_clicked, user_data);
#ifdef USE_CONVERSATION_GRAPH
graph_bt = gtk_button_new_with_label("Graph");
gtk_container_add(GTK_CONTAINER(box4), graph_bt);
gtk_widget_show(graph_bt);
- gtk_signal_connect(GTK_OBJECT(graph_bt), "clicked",
- GTK_SIGNAL_FUNC(on_graph_bt_clicked), user_data);
+ SIGNAL_CONNECT(graph_bt, "clicked", on_graph_bt_clicked, user_data);
#endif
next_bt = gtk_button_new_with_label("Next");
gtk_container_add(GTK_CONTAINER(box4), next_bt);
gtk_widget_show(next_bt);
- gtk_signal_connect(GTK_OBJECT(next_bt), "clicked",
- GTK_SIGNAL_FUNC(on_next_bt_clicked), user_data);
+ SIGNAL_CONNECT(next_bt, "clicked", on_next_bt_clicked, user_data);
close_bt = gtk_button_new_with_label("Close");
gtk_container_add(GTK_CONTAINER(box4), close_bt);
gtk_widget_show(close_bt);
- gtk_signal_connect(GTK_OBJECT(close_bt), "clicked",
- GTK_SIGNAL_FUNC(on_close_bt_clicked), user_data);
+ SIGNAL_CONNECT(close_bt, "clicked", on_close_bt_clicked, user_data);
gtk_widget_show(window);
/* rtp_stream_dlg.c
* RTP streams summary addition for ethereal
*
- * $Id: rtp_stream_dlg.c,v 1.5 2003/11/20 23:34:31 guy Exp $
+ * $Id: rtp_stream_dlg.c,v 1.6 2003/12/16 18:43:35 oabad Exp $
*
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
}
rtpstream_save_dlg = gtk_file_selection_new("Ethereal: Save selected stream in rtpdump ('-F dump') format");
- gtk_signal_connect(GTK_OBJECT(rtpstream_save_dlg), "destroy",
- GTK_SIGNAL_FUNC(save_stream_destroy_cb), NULL);
+ SIGNAL_CONNECT(rtpstream_save_dlg, "destroy", save_stream_destroy_cb,
+ NULL);
/* Container for each row of widgets */
vertb = gtk_vbox_new(FALSE, 0);
been selected. */
dlg_set_cancel(rtpstream_save_dlg, GTK_FILE_SELECTION(rtpstream_save_dlg)->cancel_button);
- gtk_signal_connect(GTK_OBJECT(ok_bt), "clicked",
- GTK_SIGNAL_FUNC(save_stream_ok_cb), tapinfo);
+ SIGNAL_CONNECT(ok_bt, "clicked", save_stream_ok_cb, tapinfo);
gtk_widget_show(rtpstream_save_dlg);
}
vbox1 = gtk_vbox_new (FALSE, 0);
gtk_widget_ref (vbox1);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "vbox1", vbox1,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "vbox1", vbox1, gtk_widget_unref);
gtk_widget_show (vbox1);
gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox1, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), 8);
label10 = gtk_label_new ("Detected RTP streams. Choose one for forward and reverse direction for analysis");
gtk_widget_ref (label10);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "label10", label10,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "label10", label10,
+ gtk_widget_unref);
gtk_widget_show (label10);
gtk_box_pack_start (GTK_BOX (vbox1), label10, FALSE, FALSE, 0);
- gtk_widget_set_usize (label10, -2, 32);
+ WIDGET_SET_SIZE(label10, -2, 32);
scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_ref (scrolledwindow1);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "scrolledwindow1", scrolledwindow1,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "scrolledwindow1",
+ scrolledwindow1, gtk_widget_unref);
gtk_widget_show (scrolledwindow1);
gtk_box_pack_start (GTK_BOX (vbox1), scrolledwindow1, TRUE, TRUE, 0);
clist = gtk_clist_new (7); /* defines number of columns */
gtk_widget_ref (clist);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "clist", clist,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "clist", clist, gtk_widget_unref);
gtk_widget_show (clist);
gtk_container_add (GTK_CONTAINER (scrolledwindow1), clist);
- gtk_widget_set_usize (clist, 640, 200);
+ WIDGET_SET_SIZE(clist, 640, 200);
gtk_clist_set_column_width (GTK_CLIST (clist), 0, 100);
gtk_clist_set_column_width (GTK_CLIST (clist), 1, 50);
gtk_clist_set_column_width (GTK_CLIST (clist), 2, 100);
label2 = gtk_label_new ("Src IP addr");
gtk_widget_ref (label2);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "label2", label2,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "label2", label2,
+ gtk_widget_unref);
gtk_widget_show (label2);
gtk_clist_set_column_widget (GTK_CLIST (clist), 0, label2);
label3 = gtk_label_new ("Src port");
gtk_widget_ref (label3);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "label3", label3,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "label3", label3,
+ gtk_widget_unref);
gtk_widget_show (label3);
gtk_clist_set_column_widget (GTK_CLIST (clist), 1, label3);
label4 = gtk_label_new ("Dest IP addr");
gtk_widget_ref (label4);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "label4", label4,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "label4", label4,
+ gtk_widget_unref);
gtk_widget_show (label4);
gtk_clist_set_column_widget (GTK_CLIST (clist), 2, label4);
label5 = gtk_label_new ("Dest port");
gtk_widget_ref (label5);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "label5", label5,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "label5", label5,
+ gtk_widget_unref);
gtk_widget_show (label5);
gtk_clist_set_column_widget (GTK_CLIST (clist), 3, label5);
label6 = gtk_label_new ("SSRC");
gtk_widget_ref (label6);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "label6", label6,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "label6", label6,
+ gtk_widget_unref);
gtk_widget_show (label6);
gtk_clist_set_column_widget (GTK_CLIST (clist), 4, label6);
- gtk_widget_set_usize (label6, 80, -2);
+ WIDGET_SET_SIZE(label6, 80, -2);
label7 = gtk_label_new ("Payload");
gtk_widget_ref (label7);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "label7", label7,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "label7", label7,
+ gtk_widget_unref);
gtk_widget_show (label7);
gtk_clist_set_column_widget (GTK_CLIST (clist), 5, label7);
label8 = gtk_label_new ("Packets");
gtk_widget_ref (label8);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "label8", label8,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "label8", label8,
+ gtk_widget_unref);
gtk_widget_show (label8);
gtk_clist_set_column_widget (GTK_CLIST (clist), 6, label8);
/*
label9 = gtk_label_new ("Comment");
gtk_widget_ref (label9);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "label9", label9,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "label9", label9,
+ gtk_widget_unref);
gtk_widget_show (label9);
gtk_clist_set_column_widget (GTK_CLIST (clist), 7, label9);
*/
label_fwd = gtk_label_new (FWD_LABEL_TEXT);
gtk_widget_ref (label_fwd);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "label_fwd", label_fwd,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "label_fwd", label_fwd,
+ gtk_widget_unref);
gtk_widget_show (label_fwd);
gtk_box_pack_start (GTK_BOX (vbox1), label_fwd, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (label_fwd), GTK_JUSTIFY_LEFT);
label_rev = gtk_label_new (REV_LABEL_TEXT);
gtk_widget_ref (label_rev);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "label_rev", label_rev,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "label_rev", label_rev,
+ gtk_widget_unref);
gtk_widget_show (label_rev);
gtk_box_pack_start (GTK_BOX (vbox1), label_rev, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (label_rev), GTK_JUSTIFY_LEFT);
hbuttonbox2 = gtk_hbutton_box_new ();
gtk_widget_ref (hbuttonbox2);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "hbuttonbox2", hbuttonbox2,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "hbuttonbox2", hbuttonbox2,
+ gtk_widget_unref);
gtk_widget_show (hbuttonbox2);
gtk_box_pack_start (GTK_BOX (dialog_action_area1), hbuttonbox2, FALSE, FALSE, 0);
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox2), GTK_BUTTONBOX_END);
bt_unselect = gtk_button_new_with_label ("Unselect");
gtk_widget_ref (bt_unselect);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "bt_unselect", bt_unselect,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "bt_unselect", bt_unselect,
+ gtk_widget_unref);
gtk_widget_show (bt_unselect);
gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_unselect);
GTK_WIDGET_SET_FLAGS (bt_unselect, GTK_CAN_DEFAULT);
/*
bt_goto = gtk_button_new_with_label ("Go to Frame");
gtk_widget_ref (bt_goto);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "bt_goto", bt_goto,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "bt_goto", bt_goto,
+ gtk_widget_unref);
gtk_widget_show (bt_goto);
gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_goto);
GTK_WIDGET_SET_FLAGS (bt_goto, GTK_CAN_DEFAULT);
*/
bt_save = gtk_button_new_with_label ("Save as...");
gtk_widget_ref (bt_save);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "bt_save", bt_save,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "bt_save", bt_save,
+ gtk_widget_unref);
gtk_widget_show (bt_save);
gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_save);
GTK_WIDGET_SET_FLAGS (bt_save, GTK_CAN_DEFAULT);
bt_frames = gtk_button_new_with_label ("Mark frames");
gtk_widget_ref (bt_frames);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "bt_frames", bt_frames,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "bt_frames", bt_frames,
+ gtk_widget_unref);
gtk_widget_show (bt_frames);
gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_frames);
GTK_WIDGET_SET_FLAGS (bt_frames, GTK_CAN_DEFAULT);
bt_filter = gtk_button_new_with_label ("Set filter");
gtk_widget_ref (bt_filter);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "bt_filter", bt_filter,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "bt_filter", bt_filter,
+ gtk_widget_unref);
gtk_widget_show (bt_filter);
gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_filter);
GTK_WIDGET_SET_FLAGS (bt_filter, GTK_CAN_DEFAULT);
bt_analyse = gtk_button_new_with_label ("Analyse");
gtk_widget_ref (bt_analyse);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "bt_analyse", bt_analyse,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "bt_analyse", bt_analyse,
+ gtk_widget_unref);
gtk_widget_show (bt_analyse);
gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_analyse);
GTK_WIDGET_SET_FLAGS (bt_analyse, GTK_CAN_DEFAULT);
bt_close = gtk_button_new_with_label ("Close");
gtk_widget_ref (bt_close);
- gtk_object_set_data_full (GTK_OBJECT (rtpstream_dlg_w), "bt_close", bt_close,
- (GtkDestroyNotify) gtk_widget_unref);
+ OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "bt_close", bt_close,
+ gtk_widget_unref);
gtk_widget_show (bt_close);
gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_close);
GTK_WIDGET_SET_FLAGS (bt_close, GTK_CAN_DEFAULT);
- gtk_signal_connect (GTK_OBJECT (rtpstream_dlg_w), "destroy",
- GTK_SIGNAL_FUNC (rtpstream_on_destroy),
- NULL);
- gtk_signal_connect (GTK_OBJECT (clist), "select_row",
- GTK_SIGNAL_FUNC (rtpstream_on_select_row),
- NULL);
- gtk_signal_connect (GTK_OBJECT (bt_unselect), "clicked",
- GTK_SIGNAL_FUNC (rtpstream_on_unselect),
- NULL);
+ SIGNAL_CONNECT(rtpstream_dlg_w, "destroy", rtpstream_on_destroy, NULL);
+ SIGNAL_CONNECT(clist, "select_row", rtpstream_on_select_row, NULL);
+ SIGNAL_CONNECT(bt_unselect, "clicked", rtpstream_on_unselect, NULL);
/*
gtk_signal_connect (GTK_OBJECT (bt_goto), "clicked",
GTK_SIGNAL_FUNC (rtpstream_on_goto),
NULL);
*/
- gtk_signal_connect (GTK_OBJECT (bt_save), "clicked",
- GTK_SIGNAL_FUNC (rtpstream_on_save),
- NULL);
- gtk_signal_connect (GTK_OBJECT (bt_frames), "clicked",
- GTK_SIGNAL_FUNC (rtpstream_on_mark),
- NULL);
- gtk_signal_connect (GTK_OBJECT (bt_filter), "clicked",
- GTK_SIGNAL_FUNC (rtpstream_on_filter),
- NULL);
- gtk_signal_connect (GTK_OBJECT (bt_analyse), "clicked",
- GTK_SIGNAL_FUNC (rtpstream_on_analyse),
- NULL);
- gtk_signal_connect (GTK_OBJECT (bt_close), "clicked",
- GTK_SIGNAL_FUNC (rtpstream_on_close),
- NULL);
+ SIGNAL_CONNECT(bt_save, "clicked", rtpstream_on_save, NULL);
+ SIGNAL_CONNECT(bt_frames, "clicked", rtpstream_on_mark, NULL);
+ SIGNAL_CONNECT(bt_filter, "clicked", rtpstream_on_filter, NULL);
+ SIGNAL_CONNECT(bt_analyse, "clicked", rtpstream_on_analyse, NULL);
+ SIGNAL_CONNECT(bt_close, "clicked", rtpstream_on_close, NULL);
/* XXX: see rtpstream_on_update for comment
gtk_signal_connect (GTK_OBJECT (top_level), "signal_rtpstream_update",
GTK_SIGNAL_FUNC (rtpstream_on_update),
/* smb_stat.c
* smb_stat 2003 Ronnie Sahlberg
*
- * $Id: smb_stat.c,v 1.25 2003/12/04 00:45:39 guy Exp $
+ * $Id: smb_stat.c,v 1.26 2003/12/16 18:43:35 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
/* Filter entry */
filter_entry=gtk_entry_new();
- gtk_widget_set_usize(filter_entry, 300, -2);
+ WIDGET_SET_SIZE(filter_entry, 300, -2);
/* filter prefs dialog */
OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_entry);
/* wsp_stat.c
* wsp_stat 2003 Jean-Michel FAYARD
*
- * $Id: wsp_stat.c,v 1.7 2003/12/13 22:23:18 guy Exp $
+ * $Id: wsp_stat.c,v 1.8 2003/12/16 18:43:35 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
/* Filter entry */
filter_entry=gtk_entry_new();
- gtk_widget_set_usize(filter_entry, 300, -2);
+ WIDGET_SET_SIZE(filter_entry, 300, -2);
gtk_box_pack_start(GTK_BOX(filter_box), filter_entry, TRUE, TRUE, 0);
gtk_widget_show(filter_entry);
git.samba.org / obnox / wireshark / wip.git / commitdiff