diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-25 05:19:18 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-25 05:19:18 +0000 |
| commit | 09a8ebaf72c45343733abc2bd89c7de1a4364d9d (patch) | |
| tree | 505037215aa1091dd9538420931c8bc594b3fdd6 /gtk/main_filter_toolbar.c | |
| parent | cffc712c120922b8a4fa6935c0d8dbc0ebfcfc22 (diff) | |
Make the filter toolbar style a preference.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30136 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/main_filter_toolbar.c')
| -rw-r--r-- | gtk/main_filter_toolbar.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gtk/main_filter_toolbar.c b/gtk/main_filter_toolbar.c index db614c81db..a7e7b04561 100644 --- a/gtk/main_filter_toolbar.c +++ b/gtk/main_filter_toolbar.c @@ -50,7 +50,6 @@ #include "main_toolbar.h" #include "main_filter_toolbar.h" - GtkWidget *main_display_filter_widget=NULL; /* Run the current display filter on the current packet set, and @@ -80,7 +79,7 @@ filter_reset_cb(GtkWidget *w, gpointer data _U_) GtkWidget *filter_toolbar_new() { - GtkWidget *filter_cm, *filter_te; + GtkWidget *filter_cm, *filter_te; GtkWidget *filter_tb; GList *dfilter_list = NULL; GtkTooltips *tooltips; @@ -104,9 +103,11 @@ GtkWidget *filter_toolbar_new() filter_tb = gtk_toolbar_new(); gtk_toolbar_set_orientation(GTK_TOOLBAR(filter_tb), GTK_ORIENTATION_HORIZONTAL); - /* XXX make this a preference? */ - gtk_toolbar_set_style(GTK_TOOLBAR(filter_tb), - GTK_TOOLBAR_TEXT); + + //gtk_toolbar_set_style(GTK_TOOLBAR(filter_tb), + // GTK_TOOLBAR_TEXT); + + g_object_set_data(G_OBJECT(top_level), E_TB_FILTER_KEY, filter_tb); gtk_widget_show(filter_tb); /* Create the "Filter:" button */ @@ -249,6 +250,9 @@ GtkWidget *filter_toolbar_new() set_toolbar_object_data(E_DFILTER_TE_KEY, filter_te); g_object_set_data(G_OBJECT(popup_menu_object), E_DFILTER_TE_KEY, filter_te); + /* make current preferences effective */ + toolbar_redraw_all(); + return filter_tb; } |