gimp r25418 - in branches/weskaggs: . app/gui

[weskaggs svn gnome org]

Author: weskaggs
Date: Tue Apr  8 21:46:00 2008
New Revision: 25418
URL: http://svn.gnome.org/viewvc/gimp?rev=25418&view=rev

Log:
Bill Skaggs  <weskaggs primate ucdavis edu>

	* app/gui/gui-message.c (gui_message_error_dialog):
	handle possibility that widget might not have a toplevel
	ancestor.


Modified:
   branches/weskaggs/ChangeLog
   branches/weskaggs/app/gui/gui-message.c

Modified: branches/weskaggs/app/gui/gui-message.c
==============================================================================
--- branches/weskaggs/app/gui/gui-message.c	(original)
+++ branches/weskaggs/app/gui/gui-message.c	Tue Apr  8 21:46:00 2008
@@ -199,8 +199,9 @@
     }
   else if (GTK_IS_WIDGET (handler))
     {
-      GtkWidget      *parent = GTK_WIDGET (handler);
-      GtkMessageType  type   = GTK_MESSAGE_ERROR;
+      GtkWidget      *parent    = GTK_WIDGET (handler);
+      GtkMessageType  type      = GTK_MESSAGE_ERROR;
+      GtkWidget      *toplevel;
 
       switch (severity)
         {
@@ -209,11 +210,17 @@
         case GIMP_MESSAGE_ERROR:   type = GTK_MESSAGE_ERROR;   break;
         }
 
-      dialog =
-        gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (parent)),
-                                GTK_DIALOG_DESTROY_WITH_PARENT,
-                                type, GTK_BUTTONS_OK,
-                                message);
+      toplevel = gtk_widget_get_toplevel (parent);
+
+      if (GTK_WIDGET_TOPLEVEL (toplevel))
+        dialog = gtk_message_dialog_new (GTK_WINDOW (toplevel),
+                                         GTK_DIALOG_DESTROY_WITH_PARENT,
+                                         type, GTK_BUTTONS_OK,
+                                         message);
+      else
+        dialog = gtk_message_dialog_new (NULL, 0,
+                                         type, GTK_BUTTONS_OK,
+                                         message);
 
       g_signal_connect (dialog, "response",
                         G_CALLBACK (gtk_widget_destroy),