gnome-session r5218 - in trunk: . splash

[vuntz svn gnome org]

Author: vuntz
Date: Fri Jan 23 02:32:48 2009
New Revision: 5218
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5218&view=rev

Log:
2009-01-23  Vincent Untz  <vuntz gnome org>

	* splash/splash-window.c: (layout_icon): fix a crash I had at some
	point.
	(gsm_splash_window_start): use 22x22 icons in the splash


Modified:
   trunk/ChangeLog
   trunk/splash/splash-window.c

Modified: trunk/splash/splash-window.c
==============================================================================
--- trunk/splash/splash-window.c	(original)
+++ trunk/splash/splash-window.c	Fri Jan 23 02:32:48 2009
@@ -41,7 +41,7 @@
 #define SPLASH_ICON_BORDER  26
 #define SPLASH_ICON_SPACING 4
 #define SPLASH_ICON_V_OFFSET 28
-#define SPLASH_BASE_ICON_SIZE 36
+#define SPLASH_BASE_ICON_SIZE 22
 #define SPLASH_BASE_ICON_ROWS 1
 
 static gboolean update_trans_effect (gpointer);
@@ -342,7 +342,7 @@
         if (!si->scaled) {
                 if (gdk_pixbuf_get_width (si->unscaled) == splash->icon_size &&
                     gdk_pixbuf_get_height (si->unscaled) == splash->icon_size) {
-                        si->scaled = g_object_ref (si->unscaled);
+                        si->scaled = gdk_pixbuf_copy (si->unscaled);
                 } else {
                         si->scaled = gdk_pixbuf_scale_simple (si->unscaled, splash->icon_size,
                                                               splash->icon_size,
@@ -471,7 +471,7 @@
 
         pb = gtk_icon_theme_load_icon (splash->icon_theme,
                                        icon_name,
-                                       48, /* icon size */
+                                       22, /* icon size */
                                        0 /* flags */,
                                        NULL);
         if (!pb) {