fix flow graph crash
This commit is contained in:
parent
f670be3fc9
commit
1a225def10
42
wireshark-1.8.x-flow-graph-crash.patch
Normal file
42
wireshark-1.8.x-flow-graph-crash.patch
Normal file
@ -0,0 +1,42 @@
|
||||
diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c
|
||||
index f380e62..dd92027 100644
|
||||
--- a/ui/gtk/flow_graph.c
|
||||
+++ b/ui/gtk/flow_graph.c
|
||||
@@ -460,6 +460,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 */
|
||||
@@ -607,9 +626,9 @@ flow_graph_dlg_create(void)
|
||||
gtk_box_pack_start(GTK_BOX(hbuttonbox), bt_cancel, TRUE, TRUE, 0);
|
||||
gtk_widget_set_can_default(bt_cancel, TRUE);
|
||||
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);
|
@ -21,7 +21,7 @@
|
||||
Summary: Network traffic analyzer
|
||||
Name: wireshark
|
||||
Version: 1.10.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPL+
|
||||
Group: Applications/Internet
|
||||
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
|
||||
@ -40,6 +40,7 @@ Patch3: wireshark-libtool-pie.patch
|
||||
Patch4: wireshark-1.6.1-group-msg.patch
|
||||
Patch5: wireshark-1.6.0-soname.patch
|
||||
Patch6: wireshark-1.8.x-pod2man-encoding.patch
|
||||
Patch7: wireshark-1.8.x-flow-graph-crash.patch
|
||||
|
||||
Url: http://www.wireshark.org/
|
||||
BuildRequires: libpcap-devel >= 0.9
|
||||
@ -138,6 +139,7 @@ and plugins.
|
||||
%patch4 -p1 -b .group-msg
|
||||
%patch5 -p1 -b .soname
|
||||
%patch6 -p1 -b .pod2man
|
||||
%patch7 -p1 -b .flow-graph-crash
|
||||
|
||||
%build
|
||||
%ifarch s390 s390x sparcv9 sparc64
|
||||
@ -365,6 +367,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%{_datadir}/aclocal/*
|
||||
|
||||
%changelog
|
||||
* Mon Jun 17 2013 Peter Hatina <phatina@redhat.com> 1.10.0-2
|
||||
- fix flow graph crash
|
||||
|
||||
* Mon Jun 17 2013 Peter Hatina <phatina@redhat.com> 1.10.0-1
|
||||
- upgrade to 1.10.0
|
||||
- see http://www.wireshark.org/docs/relnotes/wireshark-1.10.0.html
|
||||
|
Loading…
Reference in New Issue
Block a user