[wireshark/f17] fix flow graph crash

[Peter Hatina]

commit 74fea1dbd2bb8c2ee9d6ea846ea0a3b3e15da2bd
Author: Peter Hatina <phatina at redhat.com>
Date:   Mon Jun 17 16:20:46 2013 +0200

    fix flow graph crash

 wireshark-1.6.x-flow-graph-crash.patch |   42 ++++++++++++++++++++++++++++++++
 wireshark.spec                         |    7 ++++-
 2 files changed, 48 insertions(+), 1 deletions(-)
---
diff --git a/wireshark-1.6.x-flow-graph-crash.patch b/wireshark-1.6.x-flow-graph-crash.patch
new file mode 100644
index 0000000..dabc93e
--- /dev/null
+++ b/wireshark-1.6.x-flow-graph-crash.patch
@@ -0,0 +1,42 @@
+diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c
+index 73d7789..c10f381 100644
+--- a/gtk/flow_graph.c
++++ b/gtk/flow_graph.c
+@@ -464,6 +464,25 @@ flow_graph_on_ok                    (GtkButton       *button _U_,
+ 	}
+ }
+ 
++static void
++flow_graph_on_cancel(GtkButton       *button _U_,
++		     gpointer         user_data)
++{
++	if (graph_analysis_data->dlg.window) {
++		window_destroy(graph_analysis_data->dlg.window);
++	}
++	window_destroy(GTK_WIDGET(user_data));
++}
++
++static gboolean
++flow_graph_on_delete(GtkButton       *button _U_,
++		     gpointer         user_data _U_)
++{
++	if (graph_analysis_data->dlg.window) {
++		window_destroy(graph_analysis_data->dlg.window);
++	}
++	return FALSE;
++}
+ 
+ /****************************************************************************/
+ /* INTERFACE                                                                */
+@@ -618,9 +637,9 @@ flow_graph_dlg_create (void)
+ 	gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_cancel);
+ 	GTK_WIDGET_SET_FLAGS(bt_cancel, GTK_CAN_DEFAULT);
+ 	gtk_tooltips_set_tip (tooltips, bt_cancel, "Cancel this dialog", NULL);
+-	window_set_cancel_button(flow_graph_dlg_w, bt_cancel, window_cancel_button_cb);
++	g_signal_connect(bt_cancel, "clicked", G_CALLBACK(flow_graph_on_cancel), flow_graph_dlg_w);
+ 
+-	g_signal_connect(flow_graph_dlg_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
++	g_signal_connect(flow_graph_dlg_w, "delete_event", G_CALLBACK(flow_graph_on_delete), NULL);
+ 	g_signal_connect(flow_graph_dlg_w, "destroy", G_CALLBACK(flow_graph_on_destroy), NULL);
+ 
+ 	gtk_widget_show_all(flow_graph_dlg_w);
diff --git a/wireshark.spec b/wireshark.spec
index 955fc07..64c18a1 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -13,7 +13,7 @@
 Summary:	Network traffic analyzer
 Name:		wireshark
 Version:	1.6.16
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL+
 Group:		Applications/Internet
 Source0:	http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@ -35,6 +35,7 @@ Patch6:		wireshark-1.6.2-nfsv41-addstatus.patch
 Patch7:		wireshark-gnome3-msgbox.patch
 Patch8:		wireshark-import-crash.patch
 Patch9:		wireshark-netlogon-aes.patch
+Patch10:		wireshark-1.6.x-flow-graph-crash.patch
 
 Url:		http://www.wireshark.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -122,6 +123,7 @@ and plugins.
 %patch7 -p1 -b .gnome3
 %patch8 -p1 -b .import
 %patch9 -p1 -b .aes
+%patch10 -p1 -b .flow-graph-crash
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -349,6 +351,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_sbindir}/idl2wrs
 
 %changelog
+* Mon Jun 17 2013 Peter Hatina <phatina at redhat.com> - 1.6.16-2
+- fix flow graph crash
+
 * Mon Jun 17 2013 Peter Hatina <phatina at redhat.com> - 1.6.16-1
 - upgrade to 1.6.16
 - see http://www.wireshark.org/docs/relnotes/wireshark-1.6.16.html