diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-03-17 05:56:59 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-03-17 05:56:59 +0000 |
| commit | 5a7b5889f6d61e163311b262888fa54a2d37889d (patch) | |
| tree | f194ca71e2dde348d17e8eaf3359ed6d4c6bc9a4 /gtk/decode_as_dlg.c | |
| parent | 1321c9981b92dc969ab8f36d316fff7336a31c14 (diff) | |
Commited by mistake, reverting.
svn path=/trunk/; revision=27752
Diffstat (limited to 'gtk/decode_as_dlg.c')
| -rw-r--r-- | gtk/decode_as_dlg.c | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c index 8645b74748..0c016d6dec 100644 --- a/gtk/decode_as_dlg.c +++ b/gtk/decode_as_dlg.c @@ -1048,42 +1048,11 @@ decode_add_pack_menu (GtkWidget *optmenu) * which we've packed the newly created option menu. */ static GtkWidget * -decode_add_srcdst_menu (GtkWidget *page _U_) +decode_add_srcdst_menu (GtkWidget *page) { - GtkWidget *optmenu, *alignment=NULL; + GtkWidget *optmenu, *menu, *menuitem, *alignment; gchar tmp[100]; -#if GTK_CHECK_VERSION(2,6,0) -#else - GList *glist = NULL; -#endif - -#if GTK_CHECK_VERSION(2,6,0) - optmenu = gtk_combo_box_new_text(); - - g_snprintf(tmp, 100, "source (%u)", cfile.edt->pi.srcport); - gtk_combo_box_append_text(GTK_COMBO_BOX(optmenu), tmp); - g_snprintf(tmp, 100, "destination (%u)", cfile.edt->pi.destport); - gtk_combo_box_append_text(GTK_COMBO_BOX(optmenu), tmp); - gtk_combo_box_append_text(GTK_COMBO_BOX(optmenu), "both"); - - gtk_combo_box_set_active(GTK_COMBO_BOX(optmenu),0); -#else - optmenu = gtk_combo_new(); - g_snprintf(tmp, 100, "source (%u)", cfile.edt->pi.srcport); - glist = g_list_append(glist, tmp); - g_snprintf(tmp, 100, "destination (%u)", cfile.edt->pi.destport); - glist = g_list_append(glist, tmp); - glist = g_list_append(glist, "both"); - - gtk_combo_set_popdown_strings(GTK_COMBO(optmenu), glist); - g_list_free(glist); - /* You only get to choose from the options we offer */ - gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(optmenu)->entry), FALSE); - -#endif - gtk_widget_show(optmenu); -#if 0 optmenu = gtk_option_menu_new(); menu = gtk_menu_new(); g_snprintf(tmp, 100, "source (%u)", cfile.edt->pi.srcport); @@ -1109,9 +1078,6 @@ decode_add_srcdst_menu (GtkWidget *page _U_) g_object_set_data(G_OBJECT(page), E_PAGE_DPORT, GINT_TO_POINTER(cfile.edt->pi.destport)); alignment = decode_add_pack_menu(optmenu); -#endif - - alignment = decode_add_pack_menu(optmenu); return(alignment); } |