diff options
| author | Olivier Abad <oabad@noos.fr> | 2002-11-11 15:39:06 +0000 |
|---|---|---|
| committer | Olivier Abad <oabad@noos.fr> | 2002-11-11 15:39:06 +0000 |
| commit | 29011060dee28a8ef2be7a833ee4bafb2137c3e1 (patch) | |
| tree | e43f3076f0ab40791245e274e7f18470533bdd30 /gtk/rpc_stat.c | |
| parent | c2c5e20927a17ab9d0ede271f947881ab6f4650b (diff) | |
Use gtk1/gtk2 compatibility macros to reduce #ifdefs.
svn path=/trunk/; revision=6610
Diffstat (limited to 'gtk/rpc_stat.c')
| -rw-r--r-- | gtk/rpc_stat.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c index b91ea14c13..0b08f33466 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.5 2002/11/06 10:53:36 sahlberg Exp $ + * $Id: rpc_stat.c,v 1.6 2002/11/11 15:39:06 oabad Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -40,6 +40,7 @@ #include "rpc_stat.h" #include "packet-rpc.h" #include "../globals.h" +#include "compat_macros.h" /* used to keep track of statistics for a specific procedure */ typedef struct _rpc_procedure_t { @@ -305,7 +306,7 @@ gtk_rpcstat_init(char *optarg) rs->win=gtk_window_new(GTK_WINDOW_TOPLEVEL); sprintf(title_string,"ONC-RPC RTT Stat for %s version %d", rs->prog, rs->version); gtk_window_set_title(GTK_WINDOW(rs->win), title_string); - gtk_signal_connect(GTK_OBJECT(rs->win), "destroy", GTK_SIGNAL_FUNC(win_destroy_cb), rs); + SIGNAL_CONNECT(rs->win, "destroy", win_destroy_cb, rs); vbox=gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(rs->win), vbox); @@ -471,8 +472,8 @@ rpcstat_program_select(GtkWidget *item _U_, gpointer key) char vs[5]; sprintf(vs,"%d",i); menu_item=gtk_menu_item_new_with_label(vs); - gtk_signal_connect(GTK_OBJECT(menu_item), "activate", - GTK_SIGNAL_FUNC(rpcstat_version_select), (gpointer)i); + SIGNAL_CONNECT(menu_item, "activate", rpcstat_version_select, + i); gtk_widget_show(menu_item); gtk_menu_append(GTK_MENU(vers_menu), menu_item); @@ -488,8 +489,7 @@ rpcstat_list_programs(gpointer *key, gpointer *value, gpointer *user_data _U_) GtkWidget *menu_item; menu_item=gtk_menu_item_new_with_label(v->progname); - gtk_signal_connect(GTK_OBJECT(menu_item), "activate", - GTK_SIGNAL_FUNC(rpcstat_program_select), (gpointer)k); + SIGNAL_CONNECT(menu_item, "activate", rpcstat_program_select, k); gtk_widget_show(menu_item); gtk_menu_append(GTK_MENU(prog_menu), menu_item); @@ -520,7 +520,7 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_) dlg=gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(dlg), "ONC-RPC RTT Statistics"); - gtk_signal_connect(GTK_OBJECT(dlg), "destroy", GTK_SIGNAL_FUNC(dlg_destroy_cb), NULL); + SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL); dlg_box=gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(dlg), dlg_box); gtk_widget_show(dlg_box); @@ -559,8 +559,8 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_) char vs[5]; sprintf(vs,"%d",i); menu_item=gtk_menu_item_new_with_label(vs); - gtk_signal_connect(GTK_OBJECT(menu_item), "activate", - GTK_SIGNAL_FUNC(rpcstat_version_select), (gpointer)i); + SIGNAL_CONNECT(menu_item, "activate", rpcstat_version_select, + i); gtk_widget_show(menu_item); gtk_menu_append(GTK_MENU(vers_menu), menu_item); @@ -592,9 +592,8 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_) /* the start button */ start_button=gtk_button_new_with_label("Create Stat"); - gtk_signal_connect_object(GTK_OBJECT(start_button), "clicked", - GTK_SIGNAL_FUNC(rpcstat_start_button_clicked), - NULL); + SIGNAL_CONNECT_OBJECT(start_button, "clicked", + rpcstat_start_button_clicked, NULL); gtk_box_pack_start(GTK_BOX(dlg_box), start_button, TRUE, TRUE, 0); gtk_widget_show(start_button); |