Attachment 690247 Details for Bug 840308 – possible fix

[patch] possible fix

wireshark-1.8.5-block-tree_view_selection_changed_cb-when-clearing-tree-store.patch (text/plain), 2.21 KB, created by Edward Sheldrake on 2013-01-30 09:52:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Edward Sheldrake

Created: 2013-01-30 09:52:49 UTC

Size: 2.21 KB

patch

obsolete

>--- wireshark-1.8.5/ui/gtk/main.h.orig	2012-08-10 01:35:00.000000000 +0100
>+++ wireshark-1.8.5/ui/gtk/main.h	2013-01-30 09:16:13.981377961 +0000
>@@ -371,6 +371,8 @@ extern GtkWidget *pkt_scrollw;
> 
> void hide_interface(gchar* new_hide);
> 
>+void tree_view_selection_changed_cb(GtkTreeSelection *sel, gpointer user_data);
>+
> /*
>  * Fetch the list of local interfaces with capture_interface_list()
>  * and set the list of "all interfaces" in *capture_opts to include
>--- wireshark-1.8.5/ui/gtk/main.c.orig	2012-08-10 01:35:00.000000000 +0100
>+++ wireshark-1.8.5/ui/gtk/main.c	2013-01-30 09:16:47.994513004 +0000
>@@ -781,7 +781,7 @@ find_prev_mark_cb(GtkWidget *w _U_, gpoi
>     cf_find_packet_marked(&cfile, SD_BACKWARD);
> }
> 
>-static void
>+void
> tree_view_selection_changed_cb(GtkTreeSelection *sel, gpointer user_data _U_)
> {
>     field_info   *finfo;
>--- wireshark-1.8.5/ui/gtk/main_proto_draw.c.orig	2013-01-25 20:56:44.000000000 +0000
>+++ wireshark-1.8.5/ui/gtk/main_proto_draw.c	2013-01-30 09:18:23.343952529 +0000
>@@ -2160,7 +2160,13 @@ proto_tree_draw(proto_tree *protocol_tre
>      * tree, by removing all nodes from the tree.
>      * This is how it's done in testgtk.c in GTK+.
>      */
>+    g_signal_handlers_block_by_func(
>+        gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)),
>+        G_CALLBACK(tree_view_selection_changed_cb), NULL);
>     gtk_tree_store_clear(store);
>+    g_signal_handlers_unblock_by_func(
>+        gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)),
>+        G_CALLBACK(tree_view_selection_changed_cb), NULL);
> 
>     proto_tree_children_foreach(protocol_tree, proto_tree_draw_node, &info);
> }
>@@ -2257,7 +2263,13 @@ clear_tree_and_hex_views(void)
> 
>     /* Clear the protocol tree by removing all nodes in the ctree.
>        This is how it's done in testgtk.c in GTK+ */
>+    g_signal_handlers_block_by_func(
>+        gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view_gbl)),
>+        G_CALLBACK(tree_view_selection_changed_cb), NULL);
>     gtk_tree_store_clear(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(tree_view_gbl))));
>+    g_signal_handlers_unblock_by_func(
>+        gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view_gbl)),
>+        G_CALLBACK(tree_view_selection_changed_cb), NULL);
> }
> 
> void

Actions: View | Diff

Attachments on bug 840308: 598314 | 598315 | 598316 | 670868 | 690247