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

app: Cleanup gimp_dialog_factory_dialog_new_internal() a bit 

Cleanup gimp_dialog_factory_dialog_new_internal() a bit with regards
to how it presents toplevel windows.
This commit is contained in:
Martin Nordholts 2010-03-02 22:15:42 +01:00
parent 9a9d7489d1
commit e4dee4c559
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/widgets/gimpdialogfactory.c
View File

@ -372,8 +372,9 @@ gimp_dialog_factory_dialog_new_internal (GimpDialogFactory *factory,
gboolean return_existing,
gboolean present)
{
GimpDialogFactoryEntry *entry;
GtkWidget *dialog = NULL;
GimpDialogFactoryEntry *entry = NULL;
GtkWidget *dialog = NULL;
GtkWidget *toplevel = NULL;
g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
g_return_val_if_fail (identifier != NULL, NULL);
@ -511,8 +512,7 @@ gimp_dialog_factory_dialog_new_internal (GimpDialogFactory *factory,
{
gtk_window_set_screen (GTK_WINDOW (dialog), screen);
if (present)
gtk_window_present (GTK_WINDOW (dialog));
toplevel = dialog;
}
else if (GIMP_IS_DOCKABLE (dialog))
{
@ -532,15 +532,12 @@ gimp_dialog_factory_dialog_new_internal (GimpDialogFactory *factory,
}
}
if (present)
{
GtkWidget *toplevel = gtk_widget_get_toplevel (dialog);
if (GTK_IS_WINDOW (toplevel))
gtk_window_present (GTK_WINDOW (toplevel));
}
toplevel = gtk_widget_get_toplevel (dialog);
}
if (present && toplevel != NULL && GTK_IS_WINDOW (toplevel))
gtk_window_present (GTK_WINDOW (toplevel));
return dialog;
}