dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

svn path=/branches/weskaggs/; revision=25418
This commit is contained in:
William Skaggs 2008-04-08 20:46:00 +00:00
parent 4f09d2ce6f
commit c3c315b73d
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-04-08 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.
2008-04-08 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* libgimpwidgets/Makefile.am: add gimpscalecontrol.h

21
app/gui/gui-message.c
View File

@ -199,8 +199,9 @@ gui_message_error_dialog (Gimp *gimp,
}
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 @@ gui_message_error_dialog (Gimp *gimp,
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),