diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-06-08 18:42:20 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-06-08 18:42:20 +0000 |
| commit | dd1de7cf831c1014c7864c2b504eee3843ae099f (patch) | |
| tree | e25178f31dcea87d23de00834d1240d60e0c23d1 /gtk/main_filter_toolbar.c | |
| parent | 1728c1e4afb543d5d04aa3f87d91908b120b007b (diff) | |
NEW_FILTER_COMBO_BOX: Make the Expression... button work again.
svn path=/trunk/; revision=33163
Diffstat (limited to 'gtk/main_filter_toolbar.c')
| -rw-r--r-- | gtk/main_filter_toolbar.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gtk/main_filter_toolbar.c b/gtk/main_filter_toolbar.c index 7a0cf10b95..2a26ca49c2 100644 --- a/gtk/main_filter_toolbar.c +++ b/gtk/main_filter_toolbar.c @@ -146,7 +146,7 @@ GtkWidget *filter_toolbar_new(void) g_signal_connect(filter_te, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL); g_signal_connect(filter_tb, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL); - gtk_widget_set_size_request(filter_cm, 400, -1); + gtk_widget_set_size_request(filter_cm, 400, -1); gtk_widget_show(filter_cm); item = gtk_tool_item_new (); gtk_container_add (GTK_CONTAINER (item), filter_cm); @@ -170,11 +170,8 @@ GtkWidget *filter_toolbar_new(void) /* Create the "Add Expression..." button, to pop up a dialog for constructing filter comparison expressions. */ filter_add_expr_bt = gtk_tool_button_new_from_stock(WIRESHARK_STOCK_ADD_EXPRESSION); -#ifdef NEW_FILTER_COMBO_BOX -#else g_object_set_data(G_OBJECT(filter_tb), E_FILT_FILTER_TE_KEY, filter_te); g_signal_connect(filter_add_expr_bt, "clicked", G_CALLBACK(filter_add_expr_bt_cb), filter_tb); -#endif gtk_widget_show(GTK_WIDGET(filter_add_expr_bt)); gtk_toolbar_insert(GTK_TOOLBAR(filter_tb), |