From 9c3ed7aef68e2c18a0bbe8ff92778038da89c00b Mon Sep 17 00:00:00 2001 From: jake Date: Fri, 22 Dec 2006 20:09:09 +0000 Subject: [PATCH] Make fix for bug 771 compatible with GTK1 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20201 f5534014-38df-0310-8fa8-9805f1628bb7 --- gtk/capture_dlg.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index 59b84cc7b6..831381d3f6 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -122,7 +122,7 @@ */ static GtkWidget *cap_open_w; static GtkWidget * dl_hdr_menu=NULL; -static gint linktype_history=-1; +static guint linktype_history=0; static void capture_prep_file_cb(GtkWidget *file_bt, GtkWidget *file_te); @@ -1414,7 +1414,10 @@ select_link_type_cb(GtkWidget *w, gpointer data) if (old_linktype != new_linktype) { OBJECT_SET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY, GINT_TO_POINTER(new_linktype)); capture_opts->linktype = GPOINTER_TO_INT(OBJECT_GET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY)); - linktype_history=gtk_option_menu_get_history(GTK_OPTION_MENU(linktype_om)); +#if GTK_MAJOR_VERSION >= 2 + linktype_history=MAX(gtk_option_menu_get_history(GTK_OPTION_MENU(linktype_om)), 0); +#endif + } } @@ -1705,7 +1708,7 @@ capture_prep_interface_changed_cb(GtkWidget *entry, gpointer argp) /* Default to "use the default" */ OBJECT_SET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY, GINT_TO_POINTER(-1)); capture_opts->linktype = GPOINTER_TO_INT(OBJECT_GET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY)); - linktype_history=-1; + linktype_history=0; } /* -- 2.34.1