From 31a41c2b3db31eb56258154ea649446b778716e5 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 4 Oct 2009 19:27:58 +0200 Subject: [PATCH] Use gimp_display_shell_present() instead of gtk_window_present() --- app/actions/documents-commands.c | 3 ++- app/actions/images-commands.c | 8 ++------ app/actions/windows-commands.c | 4 +--- app/dialogs/quit-dialog.c | 3 ++- app/display/gimpdisplay.c | 5 +---- app/display/gimpdisplayshell-dnd.c | 5 +---- app/gui/gimpdbusservice.c | 10 ++-------- app/gui/gui-unique.c | 2 +- 8 files changed, 12 insertions(+), 28 deletions(-) diff --git a/app/actions/documents-commands.c b/app/actions/documents-commands.c index dba30bab51..09f7459c00 100644 --- a/app/actions/documents-commands.c +++ b/app/actions/documents-commands.c @@ -45,6 +45,7 @@ #include "display/gimpdisplay.h" #include "display/gimpdisplay-foreach.h" +#include "display/gimpdisplayshell.h" #include "documents-commands.h" #include "file-commands.h" @@ -356,6 +357,6 @@ documents_raise_display (GimpDisplay *display, if (uri && ! strcmp (closure->name, uri)) { closure->found = TRUE; - gtk_window_present (GTK_WINDOW (display->shell)); + gimp_display_shell_present (GIMP_DISPLAY_SHELL (display->shell)); } } diff --git a/app/actions/images-commands.c b/app/actions/images-commands.c index 9276d027a2..2efe98373f 100644 --- a/app/actions/images-commands.c +++ b/app/actions/images-commands.c @@ -31,6 +31,7 @@ #include "widgets/gimpimageview.h" #include "display/gimpdisplay.h" +#include "display/gimpdisplayshell.h" #include "images-commands.h" @@ -62,12 +63,7 @@ images_raise_views_cmd_callback (GtkAction *action, GimpDisplay *display = list->data; if (display->image == image) - { - GtkWidget *toplevel = gtk_widget_get_toplevel (display->shell); - - if (GTK_IS_WINDOW (toplevel)) - gtk_window_present (GTK_WINDOW (display->shell)); - } + gimp_display_shell_present (GIMP_DISPLAY_SHELL (display->shell)); } } } diff --git a/app/actions/windows-commands.c b/app/actions/windows-commands.c index 2f6630c804..7b5614727b 100644 --- a/app/actions/windows-commands.c +++ b/app/actions/windows-commands.c @@ -71,10 +71,8 @@ windows_show_display_cmd_callback (GtkAction *action, gpointer data) { GimpDisplay *display = g_object_get_data (G_OBJECT (action), "display"); - GtkWidget *toplevel = gtk_widget_get_toplevel (display->shell); - if (GTK_IS_WINDOW (toplevel)) - gtk_window_present (GTK_WINDOW (toplevel)); + gimp_display_shell_present (GIMP_DISPLAY_SHELL (display->shell)); } void diff --git a/app/dialogs/quit-dialog.c b/app/dialogs/quit-dialog.c index 454f3d33ec..863625a117 100644 --- a/app/dialogs/quit-dialog.c +++ b/app/dialogs/quit-dialog.c @@ -33,6 +33,7 @@ #include "display/gimpdisplay.h" #include "display/gimpdisplay-foreach.h" +#include "display/gimpdisplayshell.h" #include "widgets/gimpcontainertreeview.h" #include "widgets/gimpcontainerview.h" @@ -255,6 +256,6 @@ quit_close_all_dialog_image_activated (GimpContainerView *view, GimpDisplay *display = list->data; if (display->image == image) - gtk_window_present (GTK_WINDOW (display->shell)); + gimp_display_shell_present (GIMP_DISPLAY_SHELL (display->shell)); } } diff --git a/app/display/gimpdisplay.c b/app/display/gimpdisplay.c index 4952628934..3f123a329d 100644 --- a/app/display/gimpdisplay.c +++ b/app/display/gimpdisplay.c @@ -426,16 +426,13 @@ gimp_display_new (Gimp *gimp, gimp_image_window_add_shell (window, GIMP_DISPLAY_SHELL (display->shell)); - gimp_image_window_set_active_shell (window, - GIMP_DISPLAY_SHELL (display->shell)); + gimp_display_shell_present (GIMP_DISPLAY_SHELL (display->shell)); g_signal_connect (gimp_display_shell_get_statusbar (GIMP_DISPLAY_SHELL (display->shell)), "cancel", G_CALLBACK (gimp_display_progress_canceled), display); - gtk_window_present (GTK_WINDOW (window)); - /* add the display to the list */ gimp_container_add (gimp->displays, GIMP_OBJECT (display)); diff --git a/app/display/gimpdisplayshell-dnd.c b/app/display/gimpdisplayshell-dnd.c index ad7a768428..2ccf3c957c 100644 --- a/app/display/gimpdisplayshell-dnd.c +++ b/app/display/gimpdisplayshell-dnd.c @@ -182,10 +182,7 @@ static void gimp_display_shell_dnd_flush (GimpDisplayShell *shell, GimpImage *image) { - GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (shell)); - - if (GTK_IS_WINDOW (toplevel)) - gtk_window_present (GTK_WINDOW (toplevel)); + gimp_display_shell_present (shell); gimp_image_flush (image); diff --git a/app/gui/gimpdbusservice.c b/app/gui/gimpdbusservice.c index 9cb230d1da..47f343135d 100644 --- a/app/gui/gimpdbusservice.c +++ b/app/gui/gimpdbusservice.c @@ -33,6 +33,7 @@ #include "file/file-open.h" #include "display/gimpdisplay.h" +#include "display/gimpdisplayshell.h" #include "gimpdbusservice.h" #include "gimpdbusservice-glue.h" @@ -204,14 +205,7 @@ gimp_dbus_service_activate (GimpDBusService *service, display = gimp_container_get_first_child (service->gimp->displays); if (display) - { - GtkWidget *toplevel; - - toplevel = gtk_widget_get_toplevel (GIMP_DISPLAY (display)->shell); - - if (GTK_IS_WINDOW (toplevel)) - gtk_window_present (GTK_WINDOW (toplevel)); - } + gimp_display_shell_present (GIMP_DISPLAY_SHELL (GIMP_DISPLAY (display)->shell)); return TRUE; } diff --git a/app/gui/gui-unique.c b/app/gui/gui-unique.c index 6a26669e14..16203d9f1f 100644 --- a/app/gui/gui-unique.c +++ b/app/gui/gui-unique.c @@ -173,7 +173,7 @@ gui_unique_win32_idle_open (IdleOpenData *data) display = gimp_container_get_first_child (unique_gimp->displays); - gtk_window_present (GTK_WINDOW (GIMP_DISPLAY (display)->shell)); + gimp_display_shell_present (GIMP_DISPLAY_SHELL (GIMP_DISPLAY (display)->shell)); } return FALSE;