diff options
author | Olivier Abad <oabad@noos.fr> | 2003-12-16 18:43:35 +0000 |
---|---|---|
committer | Olivier Abad <oabad@noos.fr> | 2003-12-16 18:43:35 +0000 |
commit | abb4aec1fe46e0a8e9ef34b1bc150c693d7c1e43 (patch) | |
tree | dd4d79b69fcb1a2a5ae65ba12bcfefd3ba4946de | |
parent | e411cd98b8b09f2ee953bd6a692bf09e313064ad (diff) | |
download | wireshark-abb4aec1fe46e0a8e9ef34b1bc150c693d7c1e43.tar.gz |
Use gtk compatibility macros (from compat_macros.h) instead of some gtk+
v1.2 functions which are deprecated in gtk+ v2.
Update OBJECT_SET_DATA macros to cast "data" to (gpointer).
svn path=/trunk/; revision=9296
-rw-r--r-- | gtk/ansi_a_stat.c | 19 | ||||
-rw-r--r-- | gtk/ansi_map_stat.c | 19 | ||||
-rw-r--r-- | gtk/bootp_stat.c | 4 | ||||
-rw-r--r-- | gtk/capture_info_dlg.c | 10 | ||||
-rw-r--r-- | gtk/compat_macros.h | 6 | ||||
-rw-r--r-- | gtk/dcerpc_stat.c | 6 | ||||
-rw-r--r-- | gtk/fc_stat.c | 4 | ||||
-rw-r--r-- | gtk/gsm_a_stat.c | 19 | ||||
-rw-r--r-- | gtk/h225_counter.c | 4 | ||||
-rw-r--r-- | gtk/h225_ras_srt.c | 4 | ||||
-rw-r--r-- | gtk/http_stat.c | 4 | ||||
-rw-r--r-- | gtk/io_stat.c | 32 | ||||
-rw-r--r-- | gtk/isup_stat.c | 19 | ||||
-rw-r--r-- | gtk/ldap_stat.c | 4 | ||||
-rw-r--r-- | gtk/main.c | 8 | ||||
-rw-r--r-- | gtk/menu.c | 4 | ||||
-rw-r--r-- | gtk/mgcp_stat.c | 4 | ||||
-rw-r--r-- | gtk/proto_draw.c | 4 | ||||
-rw-r--r-- | gtk/rpc_stat.c | 4 | ||||
-rw-r--r-- | gtk/rtp_analysis.c | 65 | ||||
-rw-r--r-- | gtk/rtp_stream_dlg.c | 133 | ||||
-rw-r--r-- | gtk/smb_stat.c | 4 | ||||
-rw-r--r-- | gtk/wsp_stat.c | 4 |
23 files changed, 171 insertions, 213 deletions
diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c index 09faa4bb6f..f99eb36913 100644 --- a/gtk/ansi_a_stat.c +++ b/gtk/ansi_a_stat.c @@ -5,7 +5,7 @@ * * 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> @@ -321,8 +321,8 @@ ansi_a_stat_gtk_win_create( 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); @@ -330,8 +330,7 @@ ansi_a_stat_gtk_win_create( 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); @@ -339,16 +338,15 @@ ansi_a_stat_gtk_win_create( 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); @@ -356,8 +354,7 @@ ansi_a_stat_gtk_win_create( 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); diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c index c989ecefce..799c80e649 100644 --- a/gtk/ansi_map_stat.c +++ b/gtk/ansi_map_stat.c @@ -5,7 +5,7 @@ * * 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> @@ -291,8 +291,8 @@ ansi_map_stat_gtk_win_create( 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); @@ -300,8 +300,7 @@ ansi_map_stat_gtk_win_create( 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); @@ -309,16 +308,15 @@ ansi_map_stat_gtk_win_create( 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); @@ -326,8 +324,7 @@ ansi_map_stat_gtk_win_create( 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); diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c index ea606b4b1c..7c26790242 100644 --- a/gtk/bootp_stat.c +++ b/gtk/bootp_stat.c @@ -1,7 +1,7 @@ /* 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> @@ -314,7 +314,7 @@ gtk_dhcpstat_cb(GtkWidget *w _U_, gpointer d _U_) /* 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); diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c index 1cddaf4c6e..2eac3a8f1c 100644 --- a/gtk/capture_info_dlg.c +++ b/gtk/capture_info_dlg.c @@ -1,7 +1,7 @@ /* 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> @@ -208,10 +208,10 @@ capture_info *cinfo) #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); diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h index cb4ace381f..7bebad8573 100644 --- a/gtk/compat_macros.h +++ b/gtk/compat_macros.h @@ -1,7 +1,7 @@ /* 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> @@ -46,7 +46,7 @@ gtk_signal_connect_object(GTK_OBJECT(widget), name, GTK_SIGNAL_FUNC(callback), \ 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), \ @@ -87,7 +87,7 @@ g_signal_connect_swapped(G_OBJECT(widget), name, G_CALLBACK(callback), \ 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), \ diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c index d504896f90..e902325451 100644 --- a/gtk/dcerpc_stat.c +++ b/gtk/dcerpc_stat.c @@ -1,7 +1,7 @@ /* 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> @@ -608,11 +608,11 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_) /* 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)); diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c index b4ca7f85c3..1f94795150 100644 --- a/gtk/fc_stat.c +++ b/gtk/fc_stat.c @@ -1,7 +1,7 @@ /* 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> @@ -259,7 +259,7 @@ gtk_fcstat_cb(GtkWidget *w _U_, gpointer d _U_) /* 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); diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c index 7722ab25cf..c632cfaf36 100644 --- a/gtk/gsm_a_stat.c +++ b/gtk/gsm_a_stat.c @@ -5,7 +5,7 @@ * * 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> @@ -404,8 +404,8 @@ gsm_a_stat_gtk_win_create( 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); @@ -413,8 +413,7 @@ gsm_a_stat_gtk_win_create( 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); @@ -422,16 +421,15 @@ gsm_a_stat_gtk_win_create( 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); @@ -439,8 +437,7 @@ gsm_a_stat_gtk_win_create( 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); diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c index f28e3b7294..0226ae663b 100644 --- a/gtk/h225_counter.c +++ b/gtk/h225_counter.c @@ -2,7 +2,7 @@ * 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> @@ -575,7 +575,7 @@ gtk_h225counter_cb(GtkWidget *w _U_, gpointer d _U_) /* 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){ diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c index 10c1735ef5..d99168c692 100644 --- a/gtk/h225_ras_srt.c +++ b/gtk/h225_ras_srt.c @@ -2,7 +2,7 @@ * 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> @@ -372,7 +372,7 @@ gtk_h225rassrt_cb(GtkWidget *w _U_, gpointer d _U_) /* 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){ diff --git a/gtk/http_stat.c b/gtk/http_stat.c index a0047390c9..411021b7d9 100644 --- a/gtk/http_stat.c +++ b/gtk/http_stat.c @@ -1,7 +1,7 @@ /* 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> @@ -559,7 +559,7 @@ gtk_httpstat_cb(GtkWidget *w _U_, gpointer d _U_) /* 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); diff --git a/gtk/io_stat.c b/gtk/io_stat.c index 7cfdacdd59..74e015fa2c 100644 --- a/gtk/io_stat.c +++ b/gtk/io_stat.c @@ -1,7 +1,7 @@ /* 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> @@ -1003,7 +1003,7 @@ quit(GtkWidget *widget, GdkEventExpose *event _U_) 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){ @@ -1030,7 +1030,7 @@ configure_event(GtkWidget *widget, GdkEventConfigure *event _U_) 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); } @@ -1103,7 +1103,7 @@ expose_event(GtkWidget *widget, GdkEventExpose *event) { 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); } @@ -1125,7 +1125,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); - 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); @@ -1152,7 +1152,7 @@ tick_interval_select(GtkWidget *item, gpointer key) 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); @@ -1167,7 +1167,7 @@ pixels_per_tick_select(GtkWidget *item, gpointer key) 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]); @@ -1180,7 +1180,7 @@ plot_style_select(GtkWidget *item, gpointer key) 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; @@ -1200,7 +1200,8 @@ create_pixels_per_tick_menu_items(io_stat_t *io, GtkWidget *menu) 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); @@ -1217,7 +1218,7 @@ yscale_select(GtkWidget *item, gpointer key) 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; @@ -1243,7 +1244,8 @@ create_tick_interval_menu_items(io_stat_t *io, GtkWidget *menu) } 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); @@ -1266,7 +1268,7 @@ create_yscale_max_menu_items(io_stat_t *io, GtkWidget *menu) 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); @@ -1281,7 +1283,7 @@ count_type_select(GtkWidget *item, gpointer key) 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; @@ -1319,7 +1321,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]); - 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); @@ -1747,7 +1749,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]); - 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); diff --git a/gtk/isup_stat.c b/gtk/isup_stat.c index 0a882cfa47..687b32fcc0 100644 --- a/gtk/isup_stat.c +++ b/gtk/isup_stat.c @@ -5,7 +5,7 @@ * * 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> @@ -292,8 +292,8 @@ isup_stat_gtk_win_create( 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); @@ -301,8 +301,7 @@ isup_stat_gtk_win_create( 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); @@ -310,16 +309,15 @@ isup_stat_gtk_win_create( 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); @@ -327,8 +325,7 @@ isup_stat_gtk_win_create( 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); diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c index f2b22a4447..1fd5e52512 100644 --- a/gtk/ldap_stat.c +++ b/gtk/ldap_stat.c @@ -1,7 +1,7 @@ /* 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> @@ -294,7 +294,7 @@ gtk_ldapstat_cb(GtkWidget *w _U_, gpointer d _U_) /* 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); diff --git a/gtk/main.c b/gtk/main.c index d01a01fd69..6ffe9d27c0 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* 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> @@ -715,7 +715,7 @@ static guint dfilter_combo_max_recent = 10; 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 @@ -733,7 +733,7 @@ dfilter_combo_add(GtkWidget *filter_cm, char *s) { } 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); @@ -746,7 +746,7 @@ dfilter_combo_add(GtkWidget *filter_cm, char *s) { 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; diff --git a/gtk/menu.c b/gtk/menu.c index cd46d55531..fbbb2c6ccf 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -1,7 +1,7 @@ /* 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> @@ -752,7 +752,7 @@ add_menu_recent_capture_file_absolute(gchar *cf_name) { 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); } diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c index 7693b21412..5742d5f138 100644 --- a/gtk/mgcp_stat.c +++ b/gtk/mgcp_stat.c @@ -2,7 +2,7 @@ * 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> @@ -376,7 +376,7 @@ gtk_mgcpstat_cb(GtkWidget *w _U_, gpointer d _U_) /* 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){ diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c index 90b168c722..33c9701813 100644 --- a/gtk/proto_draw.c +++ b/gtk/proto_draw.c @@ -1,7 +1,7 @@ /* 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> @@ -795,7 +795,7 @@ void savehex_cb(GtkWidget * w _U_, gpointer data _U_) /* 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); diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c index c584df8deb..f91d2c3191 100644 --- a/gtk/rpc_stat.c +++ b/gtk/rpc_stat.c @@ -1,7 +1,7 @@ /* 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> @@ -469,7 +469,7 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_) /* 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); diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index 03257a9468..509b5088fd 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -1,7 +1,7 @@ /* 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> @@ -760,8 +760,8 @@ static void on_graph_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) 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*/ @@ -952,8 +952,8 @@ static void save_csv_as_cb(GtkWidget *bt _U_, user_data_t *user_data _U_) } 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); @@ -1021,8 +1021,8 @@ static void save_csv_as_cb(GtkWidget *bt _U_, user_data_t *user_data _U_) 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); } @@ -1363,8 +1363,8 @@ static void on_save_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) } 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); @@ -1471,8 +1471,8 @@ static void on_save_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) 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); } @@ -1571,8 +1571,7 @@ void create_rtp_dialog(user_data_t* user_data) 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); @@ -1599,10 +1598,9 @@ void create_rtp_dialog(user_data_t* user_data) /* 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); @@ -1610,7 +1608,7 @@ void create_rtp_dialog(user_data_t* user_data) /* 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); @@ -1627,9 +1625,7 @@ void create_rtp_dialog(user_data_t* user_data) 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); @@ -1655,7 +1651,7 @@ void create_rtp_dialog(user_data_t* user_data) 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); @@ -1667,9 +1663,7 @@ void create_rtp_dialog(user_data_t* user_data) 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); @@ -1715,46 +1709,39 @@ void create_rtp_dialog(user_data_t* user_data) 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); diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c index 384a999653..d4555fc525 100644 --- a/gtk/rtp_stream_dlg.c +++ b/gtk/rtp_stream_dlg.c @@ -1,7 +1,7 @@ /* 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> @@ -237,8 +237,8 @@ rtpstream_on_save (GtkButton *button _U_, } 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); @@ -260,8 +260,7 @@ rtpstream_on_save (GtkButton *button _U_, 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); } @@ -482,34 +481,32 @@ static void rtpstream_dlg_create (void) 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); @@ -522,73 +519,73 @@ static void rtpstream_dlg_create (void) 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); @@ -599,8 +596,8 @@ static void rtpstream_dlg_create (void) 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); @@ -608,89 +605,73 @@ static void rtpstream_dlg_create (void) 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), diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c index 8806f4bc8e..0a0dc6ce10 100644 --- a/gtk/smb_stat.c +++ b/gtk/smb_stat.c @@ -1,7 +1,7 @@ /* 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> @@ -299,7 +299,7 @@ gtk_smbstat_cb(GtkWidget *w _U_, gpointer d _U_) /* 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); diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c index 84bb0b1093..f162e6aa25 100644 --- a/gtk/wsp_stat.c +++ b/gtk/wsp_stat.c @@ -1,7 +1,7 @@ /* 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> @@ -463,7 +463,7 @@ gtk_wspstat_cb(GtkWidget *w _U_, gpointer d _U_) /* 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); |