diff options
| -rw-r--r-- | gtk/color_dlg.c | 21 | ||||
| -rw-r--r-- | gtk/new_packet_list.c | 8 | ||||
| -rw-r--r-- | gtk/new_packet_list.h | 2 |
3 files changed, 18 insertions, 13 deletions
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c index 6f6b212529..33a1d21f7c 100644 --- a/gtk/color_dlg.c +++ b/gtk/color_dlg.c @@ -51,6 +51,9 @@ #include "gtk/gtkglobals.h" #include "gtk/help_dlg.h" #include "gtk/color_edit_dlg.h" +#ifdef NEW_PACKET_LIST +#include "gtk/new_packet_list.h" +#endif /* NEW_PACKET_LIST */ #define BUTTON_SIZE_X -1 @@ -64,10 +67,8 @@ static void color_filter_down_cb(GtkButton *button, gpointer user_data); static void remember_selected_row(GtkTreeSelection *sel, gpointer list); static void color_destroy_cb(GtkButton *button, gpointer user_data); static void destroy_edit_dialog_cb(gpointer filter_arg, gpointer dummy); -#ifndef NEW_PACKET_LIST static void create_new_color_filter(GtkButton *button, const char *filter); static void color_new_cb(GtkButton *button, gpointer user_data); -#endif static void color_edit_cb(GtkButton *button, gpointer user_data); static gint color_filters_button_cb(GtkWidget *, GdkEventButton *, gpointer); static void color_disable_cb(GtkWidget *widget, gboolean user_data); @@ -402,9 +403,7 @@ colorize_dialog_new (char *filter) g_object_set_data(G_OBJECT(color_filters), COLOR_DISABLE_LB, color_disable); g_object_set_data(G_OBJECT(color_filters), COLOR_DELETE_LB, color_delete); g_object_set_data(G_OBJECT(color_new), COLOR_FILTERS_CL, color_filters); -#ifndef NEW_PACKET_LIST g_signal_connect(color_new, "clicked", G_CALLBACK(color_new_cb), NULL); -#endif g_object_set_data(G_OBJECT(color_edit), COLOR_FILTERS_CL, color_filters); g_signal_connect(color_edit, "clicked", G_CALLBACK(color_edit_cb), NULL); g_object_set_data(G_OBJECT(color_enable), COLOR_FILTERS_CL, color_filters); @@ -443,9 +442,7 @@ colorize_dialog_new (char *filter) if(filter){ /* if we specified a preset filter string, open the new dialog and set the filter */ -#ifndef NEW_PACKET_LIST create_new_color_filter(GTK_BUTTON(color_new), filter); -#endif } return color_win; @@ -704,7 +701,6 @@ color_destroy_cb (GtkButton *button _U_, } -#ifndef NEW_PACKET_LIST static void select_row(GtkWidget *color_filters, int row) { @@ -720,7 +716,6 @@ select_row(GtkWidget *color_filters, int row) sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(color_filters)); gtk_tree_selection_select_iter(sel, &iter); } -#endif /* add a single color filter to the list */ @@ -767,7 +762,6 @@ color_filter_add_cb(color_filter_t *colorf, gpointer user_data) gtk_widget_grab_focus(color_filters); } -#ifndef NEW_PACKET_LIST /* Create a new filter, add it to the list, and pop up an "Edit color filter" dialog box to edit it. */ static void @@ -786,7 +780,11 @@ create_new_color_filter(GtkButton *button, const char *filter) gtk_tree_selection_unselect_all (sel); /* Use the default background and foreground colors as the colors. */ - style = gtk_widget_get_style(packet_list); +#ifdef NEW_PACKET_LIST + style = gtk_widget_get_style(new_packet_list_get_widget()); +#else + style = gtk_widget_get_style(packet_list); +#endif /* NEW_PACKET_LIST */ gdkcolor_to_color_t(&bg_color, &style->base[GTK_STATE_NORMAL]); gdkcolor_to_color_t(&fg_color, &style->text[GTK_STATE_NORMAL]); @@ -799,9 +797,7 @@ create_new_color_filter(GtkButton *button, const char *filter) gtk_widget_grab_focus(color_filters); } -#endif /* NEW_PACKET_LIST */ -#ifndef NEW_PACKET_LIST /* User pressed the "New" button: Create a new filter in the list, and pop up an "Edit color filter" dialog box to edit it. */ static void @@ -809,7 +805,6 @@ color_new_cb(GtkButton *button, gpointer user_data _U_) { create_new_color_filter(button, "filter"); } -#endif /* User pressed the "Edit" button: Pop up an "Edit color filter" dialog box * to edit an existing filter. */ diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c index 1e6d3acd45..92f8203a22 100644 --- a/gtk/new_packet_list.c +++ b/gtk/new_packet_list.c @@ -783,5 +783,13 @@ new_packet_list_recent_write_all(FILE *rf) fprintf (rf, "\n"); } +GtkWidget * +new_packet_list_get_widget(void) +{ + g_assert(packetlist); + g_assert(packetlist->view); + return packetlist->view; +} + #endif /* NEW_PACKET_LIST */ diff --git a/gtk/new_packet_list.h b/gtk/new_packet_list.h index c9d229ecd9..5cf335879b 100644 --- a/gtk/new_packet_list.h +++ b/gtk/new_packet_list.h @@ -70,6 +70,8 @@ void new_packet_list_copy_summary_cb(GtkWidget * w _U_, gpointer data _U_, copy_ */ extern void new_packet_list_recent_write_all(FILE *rf); +GtkWidget * new_packet_list_get_widget(void); + #endif /* NEW_PACKET_LIST */ #endif /* __NEW_PACKET_LIST_H__ */ |