callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disable automatic startup notification. (gui_restore_after_callback):

Browse Source 
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.


svn path=/trunk/; revision=25254
This commit is contained in:
Sven Neumann
2008-03-27 06:58:29 +00:00
committed by Sven Neumann
parent 8c3ad7c288
commit 2df60469ba
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
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.
2008-03-26 Mukund Sivaraman <muks@mukund.org> 2008-03-26 Mukund Sivaraman <muks@mukund.org>
* plug-ins/common/dicom.c: Forget about negative values in signed * plug-ins/common/dicom.c: Forget about negative values in signed

9
app/gui/gui.c
View File

@ -214,6 +214,9 @@ gui_init (Gimp *gimp,
the_gui_gimp = gimp; the_gui_gimp = gimp;
/* disable automatic startup notification */
gtk_window_set_auto_startup_notification (FALSE);
gimp_dnd_init (gimp); gimp_dnd_init (gimp);
themes_init (gimp); themes_init (gimp);
@ -350,9 +353,8 @@ gui_initialize_after_callback (Gimp *gimp,
if (name) if (name)
{ {
gchar *display; gchar *display = gdk_get_display ();
display = gdk_get_display ();
gimp_environ_table_add (gimp->plug_in_manager->environ_table, gimp_environ_table_add (gimp->plug_in_manager->environ_table,
name, display, NULL); name, display, NULL);
g_free (display); g_free (display);
@ -543,6 +545,9 @@ gui_restore_after_callback (Gimp *gimp,
/* move keyboard focus to the display */ /* move keyboard focus to the display */
gtk_window_present (GTK_WINDOW (display->shell)); gtk_window_present (GTK_WINDOW (display->shell));
/* indicate that the application has finished loading */
gdk_notify_startup_complete ();
} }
static gboolean static gboolean

16
app/gui/splash.c
View File

@ -61,7 +61,6 @@ typedef struct
static GimpSplash *splash = NULL; static GimpSplash *splash = NULL;
static void splash_map (void);
static void splash_position_layouts (GimpSplash *splash, static void splash_position_layouts (GimpSplash *splash,
const gchar *text1, const gchar *text1,
const gchar *text2, const gchar *text2,
@ -124,12 +123,6 @@ splash_create (gboolean be_verbose)
G_CALLBACK (exit), G_CALLBACK (exit),
GINT_TO_POINTER (0)); 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); screen = gtk_widget_get_screen (splash->window);
splash->width = MIN (gdk_pixbuf_animation_get_width (pixbuf), splash->width = MIN (gdk_pixbuf_animation_get_width (pixbuf),
@ -289,15 +282,6 @@ splash_area_expose (GtkWidget *widget,
return FALSE; 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 */ /* area returns the union of the previous and new ink rectangles */
static void static void
splash_position_layouts (GimpSplash *splash, splash_position_layouts (GimpSplash *splash,