fixed display of error message boxes on startup in gnome3

Resolves: #752559
This commit is contained in:
Jan Safranek 2011-12-02 09:02:45 +01:00
parent 1104722bee
commit 9070e46b6b
2 changed files with 30 additions and 0 deletions

View File

@ -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;

View File

@ -331,6 +331,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_sbindir}/idl2wrs %{_sbindir}/idl2wrs
%changelog %changelog
* Fri Dec 2 2011 Jan Safranek <jsafrane@redhat.com> - 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 <jsafrane@redhat.com> - 1.6.3-2 * Mon Nov 14 2011 Jan Safranek <jsafrane@redhat.com> - 1.6.3-2
- added dependency on shadow-utils (#753293) - added dependency on shadow-utils (#753293)
- removed usermode support - removed usermode support