Use gtk1/gtk2 compatibility macros.
svn path=/trunk/; revision=6616
This commit is contained in:
Olivier Abad
parent
189640857a
commit
3cd4fed22d
|
|
@ -1,7 +1,7 @@
|
|||
/* capture_prefs.c
|
||||
* Dialog box for capture preferences
|
||||
*
|
||||
* $Id: capture_prefs.c,v 1.16 2002/09/05 18:47:44 jmayer Exp $
|
||||
* $Id: capture_prefs.c,v 1.17 2002/11/11 18:57:00 oabad Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -40,6 +40,7 @@
|
|||
#include "ui_util.h"
|
||||
#include "pcap-util.h"
|
||||
#include "main.h"
|
||||
#include "compat_macros.h"
|
||||
|
||||
#define DEVICE_KEY "device"
|
||||
#define PROM_MODE_KEY "prom_mode"
|
||||
|
|
@ -85,7 +86,7 @@ capture_prefs_show(void)
|
|||
prefs.capture_device);
|
||||
gtk_table_attach_defaults(GTK_TABLE(main_tb), if_cb, 1, 2, 0, 1);
|
||||
gtk_widget_show(if_cb);
|
||||
gtk_object_set_data(GTK_OBJECT(main_vb), DEVICE_KEY, if_cb);
|
||||
OBJECT_SET_DATA(main_vb, DEVICE_KEY, if_cb);
|
||||
|
||||
free_interface_list(if_list);
|
||||
|
||||
|
|
@ -93,21 +94,19 @@ capture_prefs_show(void)
|
|||
promisc_cb = create_preference_check_button(main_tb, 1,
|
||||
"Capture packets in promiscuous mode:", NULL,
|
||||
prefs.capture_prom_mode);
|
||||
gtk_object_set_data(GTK_OBJECT(main_vb), PROM_MODE_KEY, promisc_cb);
|
||||
OBJECT_SET_DATA(main_vb, PROM_MODE_KEY, promisc_cb);
|
||||
|
||||
/* Real-time capture */
|
||||
sync_cb = create_preference_check_button(main_tb, 2,
|
||||
"Update list of packets in real time:", NULL,
|
||||
prefs.capture_real_time);
|
||||
gtk_object_set_data(GTK_OBJECT(main_vb), CAPTURE_REAL_TIME_KEY,
|
||||
sync_cb);
|
||||
OBJECT_SET_DATA(main_vb, CAPTURE_REAL_TIME_KEY, sync_cb);
|
||||
|
||||
/* Auto-scroll real-time capture */
|
||||
auto_scroll_cb = create_preference_check_button(main_tb, 3,
|
||||
"Automatic scrolling in live capture:", NULL,
|
||||
prefs.capture_auto_scroll);
|
||||
gtk_object_set_data(GTK_OBJECT(main_vb), AUTO_SCROLL_KEY,
|
||||
auto_scroll_cb);
|
||||
OBJECT_SET_DATA(main_vb, AUTO_SCROLL_KEY, auto_scroll_cb);
|
||||
|
||||
/* Show 'em what we got */
|
||||
gtk_widget_show_all(main_vb);
|
||||
|
|
@ -121,13 +120,10 @@ capture_prefs_fetch(GtkWidget *w)
|
|||
GtkWidget *if_cb, *promisc_cb, *sync_cb, *auto_scroll_cb;
|
||||
gchar *if_text;
|
||||
|
||||
if_cb = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(w), DEVICE_KEY);
|
||||
promisc_cb = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(w),
|
||||
PROM_MODE_KEY);
|
||||
sync_cb = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(w),
|
||||
CAPTURE_REAL_TIME_KEY);
|
||||
auto_scroll_cb = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(w),
|
||||
AUTO_SCROLL_KEY);
|
||||
if_cb = (GtkWidget *)OBJECT_GET_DATA(w, DEVICE_KEY);
|
||||
promisc_cb = (GtkWidget *)OBJECT_GET_DATA(w, PROM_MODE_KEY);
|
||||
sync_cb = (GtkWidget *)OBJECT_GET_DATA(w, CAPTURE_REAL_TIME_KEY);
|
||||
auto_scroll_cb = (GtkWidget *)OBJECT_GET_DATA(w, AUTO_SCROLL_KEY);
|
||||
|
||||
if (prefs.capture_device != NULL) {
|
||||
g_free(prefs.capture_device);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* decode_as_dlg.c
|
||||
*
|
||||
* $Id: decode_as_dlg.c,v 1.29 2002/11/09 20:52:39 oabad Exp $
|
||||
* $Id: decode_as_dlg.c,v 1.30 2002/11/11 18:57:00 oabad Exp $
|
||||
*
|
||||
* Routines to modify dissector tables on the fly.
|
||||
*
|
||||
|
|
@ -692,7 +692,7 @@ decode_transport(GtkWidget *notebook_pg)
|
|||
menu = OBJECT_GET_DATA(notebook_pg, E_MENU_SRCDST);
|
||||
|
||||
menuitem = gtk_menu_get_active(GTK_MENU(menu));
|
||||
requested_srcdst = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(menuitem)));
|
||||
requested_srcdst = GPOINTER_TO_INT(OBJECT_GET_DATA(menuitem, "user_data"));
|
||||
|
||||
#ifdef DEBUG
|
||||
string = OBJECT_GET_DATA(notebook_pg, E_PAGE_TITLE);
|
||||
|
|
@ -908,21 +908,18 @@ decode_add_srcdst_menu (GtkWidget *page)
|
|||
menu = gtk_menu_new();
|
||||
sprintf(tmp, "source (%u)", cfile.edt->pi.srcport);
|
||||
menuitem = gtk_menu_item_new_with_label(tmp);
|
||||
gtk_object_set_user_data(GTK_OBJECT(menuitem),
|
||||
GINT_TO_POINTER(E_DECODE_SPORT));
|
||||
OBJECT_SET_DATA(menuitem, "user_data", GINT_TO_POINTER(E_DECODE_SPORT));
|
||||
gtk_menu_append(GTK_MENU(menu), menuitem);
|
||||
gtk_widget_show(menuitem); /* gtk_widget_show_all() doesn't show this */
|
||||
|
||||
sprintf(tmp, "destination (%u)", cfile.edt->pi.destport);
|
||||
menuitem = gtk_menu_item_new_with_label(tmp);
|
||||
gtk_object_set_user_data(GTK_OBJECT(menuitem),
|
||||
GINT_TO_POINTER(E_DECODE_DPORT));
|
||||
OBJECT_SET_DATA(menuitem, "user_data", GINT_TO_POINTER(E_DECODE_DPORT));
|
||||
gtk_menu_append(GTK_MENU(menu), menuitem);
|
||||
gtk_widget_show(menuitem); /* gtk_widget_show_all() doesn't show this */
|
||||
|
||||
menuitem = gtk_menu_item_new_with_label("both");
|
||||
gtk_object_set_user_data(GTK_OBJECT(menuitem),
|
||||
GINT_TO_POINTER(E_DECODE_BPORT));
|
||||
OBJECT_SET_DATA(menuitem, "user_data", GINT_TO_POINTER(E_DECODE_BPORT));
|
||||
gtk_menu_append(GTK_MENU(menu), menuitem);
|
||||
gtk_widget_show(menuitem); /* gtk_widget_show_all() doesn't show this */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* nameres_prefs.c
|
||||
* Dialog box for name resolution preferences
|
||||
*
|
||||
* $Id: nameres_prefs.c,v 1.6 2002/09/05 18:47:46 jmayer Exp $
|
||||
* $Id: nameres_prefs.c,v 1.7 2002/11/11 18:57:00 oabad Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -36,6 +36,7 @@
|
|||
#include "prefs_dlg.h"
|
||||
#include "ui_util.h"
|
||||
#include "main.h"
|
||||
#include "compat_macros.h"
|
||||
|
||||
#define M_RESOLVE_KEY "m_resolve"
|
||||
#define N_RESOLVE_KEY "n_resolve"
|
||||
|
|
@ -73,19 +74,19 @@ nameres_prefs_show(void)
|
|||
m_resolv_cb = create_preference_check_button(main_tb, 0,
|
||||
"Enable MAC name resolution:", NULL,
|
||||
prefs.name_resolve & RESOLV_MAC);
|
||||
gtk_object_set_data(GTK_OBJECT(main_vb), M_RESOLVE_KEY, m_resolv_cb);
|
||||
OBJECT_SET_DATA(main_vb, M_RESOLVE_KEY, m_resolv_cb);
|
||||
|
||||
/* Resolve network addresses */
|
||||
n_resolv_cb = create_preference_check_button(main_tb, 1,
|
||||
"Enable network name resolution:", NULL,
|
||||
prefs.name_resolve & RESOLV_NETWORK);
|
||||
gtk_object_set_data(GTK_OBJECT(main_vb), N_RESOLVE_KEY, n_resolv_cb);
|
||||
OBJECT_SET_DATA(main_vb, N_RESOLVE_KEY, n_resolv_cb);
|
||||
|
||||
/* Resolve transport addresses */
|
||||
t_resolv_cb = create_preference_check_button(main_tb, 2,
|
||||
"Enable transport name resolution:", NULL,
|
||||
prefs.name_resolve & RESOLV_TRANSPORT);
|
||||
gtk_object_set_data(GTK_OBJECT(main_vb), T_RESOLVE_KEY, t_resolv_cb);
|
||||
OBJECT_SET_DATA(main_vb, T_RESOLVE_KEY, t_resolv_cb);
|
||||
|
||||
/* Show 'em what we got */
|
||||
gtk_widget_show_all(main_vb);
|
||||
|
|
@ -98,12 +99,9 @@ nameres_prefs_fetch(GtkWidget *w)
|
|||
{
|
||||
GtkWidget *m_resolv_cb, *n_resolv_cb, *t_resolv_cb;
|
||||
|
||||
m_resolv_cb = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(w),
|
||||
M_RESOLVE_KEY);
|
||||
n_resolv_cb = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(w),
|
||||
N_RESOLVE_KEY);
|
||||
t_resolv_cb = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(w),
|
||||
T_RESOLVE_KEY);
|
||||
m_resolv_cb = (GtkWidget *)OBJECT_GET_DATA(w, M_RESOLVE_KEY);
|
||||
n_resolv_cb = (GtkWidget *)OBJECT_GET_DATA(w, N_RESOLVE_KEY);
|
||||
t_resolv_cb = (GtkWidget *)OBJECT_GET_DATA(w, T_RESOLVE_KEY);
|
||||
|
||||
prefs.name_resolve = RESOLV_NONE;
|
||||
prefs.name_resolve |= (GTK_TOGGLE_BUTTON (m_resolv_cb)->active ? RESOLV_MAC : RESOLV_NONE);
|
||||
|
|
|
|||
Loading…
Reference in New Issue