diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2011-02-11 18:28:55 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2011-02-11 18:28:55 +0000 |
| commit | 1b2f2426e0534a86cc40c3583633b4c79debdec9 (patch) | |
| tree | f350a415a09d20d803716afd0d47bdf7e5c75c58 /gtk | |
| parent | ab15a35f659ae3a90afb9e84781788f01a61e3ac (diff) | |
| download | wireshark-1b2f2426e0534a86cc40c3583633b4c79debdec9.tar.gz | |
Remove #ifndef GSEAL_ENABLE hack to work-around the lack of an accessor
for a GSEALed variable since GTK 3.0 is out, which has the accessor.
svn path=/trunk/; revision=35917
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/new_packet_list.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c index 879bec95ea..89a81e9e5d 100644 --- a/gtk/new_packet_list.c +++ b/gtk/new_packet_list.c @@ -192,8 +192,6 @@ right_justify_column (gint col) return right_justify; } -#ifndef GSEAL_ENABLE -/* XXX - See comment at other places where "#ifndef GSEAL_ENABLE" is in this file */ static gboolean resolve_column (gint col) { @@ -222,7 +220,6 @@ resolve_column (gint col) return resolve; } -#endif /* !GSEAL_ENABLE */ static void col_title_change_ok (GtkWidget *w, gpointer parent_w) @@ -658,8 +655,6 @@ new_packet_list_column_menu_cb (GtkWidget *w, gpointer user_data _U_, COLUMN_SEL } } -#ifndef GSEAL_ENABLE -/* XXX - See comment where this is used as in G_CALLBACK() */ static gboolean new_packet_list_column_button_pressed_cb (GtkWidget *widget, GdkEvent *event, gpointer data) { @@ -673,7 +668,6 @@ new_packet_list_column_button_pressed_cb (GtkWidget *widget, GdkEvent *event, gp g_object_set_data(G_OBJECT(packetlist->view), E_MPACKET_LIST_COLUMN_KEY, col); return popup_menu_handler (widget, event, menu); } -#endif static void column_dnd_changed_cb(GtkTreeView *tree_view, gpointer data _U_) @@ -724,10 +718,7 @@ create_view_and_model(void) header_field_info *hfi; gint col_min_width; gchar *escaped_title; -#ifndef GSEAL_ENABLE - /* XXX - See comment below */ GtkTooltips *tooltips = gtk_tooltips_new (); -#endif packetlist = new_packet_list_new(); @@ -830,10 +821,7 @@ create_view_and_model(void) } gtk_tree_view_append_column(GTK_TREE_VIEW(packetlist->view), col); -#ifndef GSEAL_ENABLE - /* XXX See Gnome bug #641089 -- GtkTreeViewColumn's button variable is sealed, but - * the accessor function isn't available until GTK+ 3.0. */ - + /* XXX Breaks the GTK+ API, but this is the only way to attach a signal to * a GtkTreeView column header. See GTK bug #141937. */ @@ -841,7 +829,6 @@ create_view_and_model(void) g_free(tooltip_text); g_signal_connect(col->button, "button_press_event", G_CALLBACK(new_packet_list_column_button_pressed_cb), col); -#endif /* !GSEAL_ENABLE */ if (i == 0) { /* Default sort on first column */ g_object_set_data(G_OBJECT(packetlist->view), E_MPACKET_LIST_COLUMN_KEY, col); |