[wireshark/f18] fix flow graph crash
Peter Hatina
phatina at fedoraproject.org
Mon Jun 17 15:34:03 UTC 2013
commit 33680ae04cfe52313de1abf95566ffc1eb10ba69
Author: Peter Hatina <phatina at redhat.com>
Date: Mon Jun 17 16:37:19 2013 +0200
fix flow graph crash
wireshark-1.8.x-flow-graph-crash.patch | 42 ++++++++++++++++++++++++++++++++
wireshark.spec | 7 ++++-
2 files changed, 48 insertions(+), 1 deletions(-)
---
diff --git a/wireshark-1.8.x-flow-graph-crash.patch b/wireshark-1.8.x-flow-graph-crash.patch
new file mode 100644
index 0000000..0009671
--- /dev/null
+++ b/wireshark-1.8.x-flow-graph-crash.patch
@@ -0,0 +1,42 @@
+diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c
+index 0ae7b73..d458c04 100644
+--- a/ui/gtk/flow_graph.c
++++ b/ui/gtk/flow_graph.c
+@@ -462,6 +462,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 */
+@@ -613,9 +632,9 @@ flow_graph_dlg_create (void)
+ GTK_WIDGET_SET_FLAGS(bt_cancel, GTK_CAN_DEFAULT);
+ #endif
+ gtk_widget_set_tooltip_text (bt_cancel, "Cancel this dialog");
+- 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 1c34f31..2c6c4f9 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -14,7 +14,7 @@
Summary: Network traffic analyzer
Name: wireshark
Version: 1.8.8
-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 @@ Patch5: wireshark-1.6.0-soname.patch
Patch6: wireshark-1.8.2-python-symbols.patch
Patch7: wireshark-1.8.x-dns-cleanup.patch
Patch8: wireshark-1.8.x-capture-crash.patch
+Patch9: wireshark-1.8.x-flow-graph-crash.patch
Url: http://www.wireshark.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -137,6 +138,7 @@ and plugins.
%patch6 -p1 -b .python-symbols
%patch7 -p1 -b .dns-cleanup
%patch8 -p1 -b .capture-crash
+%patch9 -p1 -b .flow-graph-crash
%build
%ifarch s390 s390x sparcv9 sparc64
@@ -370,6 +372,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/aclocal/*
%changelog
+* Mon Jun 17 2013 Peter Hatina <phatina at redhat.com> 1.8.8-2
+- fix flow graph crash
+
* Mon Jun 17 2013 Peter Hatina <phatina at redhat.com> 1.8.8-1
- upgrade to 1.8.8
- see http://www.wireshark.org/docs/relnotes/wireshark-1.8.8.html
More information about the scm-commits
mailing list