From 7bfaf9650bf3fbdbca552ed15aec005c27df753f Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Fri, 2 Dec 2011 09:02:45 +0100 Subject: [PATCH] fixed display of error message boxes on startup in gnome3 Resolves: #752559 --- wireshark-gnome3-msgbox.patch | 24 ++++++++++++++++++++++++ wireshark.spec | 6 ++++++ 2 files changed, 30 insertions(+) create mode 100644 wireshark-gnome3-msgbox.patch diff --git a/wireshark-gnome3-msgbox.patch b/wireshark-gnome3-msgbox.patch new file mode 100644 index 0000000..e16370e --- /dev/null +++ b/wireshark-gnome3-msgbox.patch @@ -0,0 +1,24 @@ +bz#752559 - Disable the dialog on start + +Reported ans accepted upstream as https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6559 + +diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c +index ff7d283..8ee40cf 100644 +--- a/gtk/simple_dialog.c ++++ b/gtk/simple_dialog.c +@@ -316,10 +316,11 @@ vsimple_dialog(ESD_TYPE_E type, gint btn_mask, const gchar *msg_format, va_list + state = gdk_window_get_state(top_level->window); + } + +- /* If we don't yet have a main window or it's iconified, don't show the +- dialog. If showing up a dialog, while main window is iconified, program +- will become unresponsive! */ +- if (top_level == NULL || state & GDK_WINDOW_STATE_ICONIFIED) { ++ /* If we don't yet have a main window or it's iconified or hidden (i.e. not ++ yet ready, don't show the dialog. If showing up a dialog, while main ++ window is iconified, program will become unresponsive! */ ++ if (top_level == NULL || state & GDK_WINDOW_STATE_ICONIFIED ++ || state & GDK_WINDOW_STATE_WITHDRAWN) { + + queued_message = g_malloc(sizeof (queued_message_t)); + queued_message->type = type; diff --git a/wireshark.spec b/wireshark.spec index cc0d768..8534c83 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -331,6 +331,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_sbindir}/idl2wrs %changelog +* Fri Dec 2 2011 Jan Safranek - 1.6.4-1 +- upgrade to 1.6.4 +- see http://www.wireshark.org/docs/relnotes/wireshark-1.6.4.html +- build with c-ares and libpcap (#759305) +- fixed display of error message boxes on startup in gnome3 (#752559) + * Mon Nov 14 2011 Jan Safranek - 1.6.3-2 - added dependency on shadow-utils (#753293) - removed usermode support