gimp r25254 - in trunk: . app/gui

[neo svn gnome org]

Author: neo
Date: Thu Mar 27 06:58:29 2008
New Revision: 25254
URL: http://svn.gnome.org/viewvc/gimp?rev=25254&view=rev

Log:
2008-03-27  Sven Neumann  <sven gimp org>

	* app/gui/gui.c (gui_init): disable automatic startup 
notification.
	(gui_restore_after_callback): notify the display enviroment that
	the application has finished loading.

	* app/gui/splash.c: no need to deal with startup notification 
here
	any longer.



Modified:
   trunk/ChangeLog
   trunk/app/gui/gui.c
   trunk/app/gui/splash.c

Modified: trunk/app/gui/gui.c
==============================================================================
--- trunk/app/gui/gui.c	(original)
+++ trunk/app/gui/gui.c	Thu Mar 27 06:58:29 2008
@@ -214,6 +214,9 @@
 
   the_gui_gimp = gimp;
 
+  /*  disable automatic startup notification  */
+  gtk_window_set_auto_startup_notification (FALSE);
+
   gimp_dnd_init (gimp);
 
   themes_init (gimp);
@@ -350,9 +353,8 @@
 
   if (name)
     {
-      gchar *display;
+      gchar *display = gdk_get_display ();
 
-      display = gdk_get_display ();
       gimp_environ_table_add (gimp->plug_in_manager->environ_table,
                               name, display, NULL);
       g_free (display);
@@ -543,6 +545,9 @@
 
   /*  move keyboard focus to the display  */
   gtk_window_present (GTK_WINDOW (display->shell));
+
+  /*  indicate that the application has finished loading  */
+  gdk_notify_startup_complete ();
 }
 
 static gboolean

Modified: trunk/app/gui/splash.c
==============================================================================
--- trunk/app/gui/splash.c	(original)
+++ trunk/app/gui/splash.c	Thu Mar 27 06:58:29 2008
@@ -61,7 +61,6 @@
 static GimpSplash *splash = NULL;
 
 
-static void        splash_map                 (void);
 static void        splash_position_layouts    (GimpSplash     *splash,
                                                const gchar    *text1,
                                                const gchar    *text2,
@@ -124,12 +123,6 @@
                             G_CALLBACK (exit),
                             GINT_TO_POINTER (0));
 
-  /* we don't want the splash screen to send the startup notification */
-  gtk_window_set_auto_startup_notification (FALSE);
-  g_signal_connect (splash->window, "map",
-                    G_CALLBACK (splash_map),
-                    NULL);
-
   screen = gtk_widget_get_screen (splash->window);
 
   splash->width  = MIN (gdk_pixbuf_animation_get_width (pixbuf),
@@ -289,15 +282,6 @@
   return FALSE;
 }
 
-static void
-splash_map (void)
-{
-  /*  Reenable startup notification after the splash has been shown
-   *  so that the next window that is mapped sends the notification.
-   */
-   gtk_window_set_auto_startup_notification (TRUE);
-}
-
 /* area returns the union of the previous and new ink rectangles */
 static void
 splash_position_layouts (GimpSplash   *splash,