[gnumeric] Splash: simplify code.



commit 61af1e3535e72baa37fd3ffe0c3882c57bb826d0
Author: Morten Welinder <terra gnome org>
Date:   Wed Feb 22 17:01:27 2012 -0500

    Splash: simplify code.

 ChangeLog            |    3 +++
 src/io-context-gtk.c |   15 ++-------------
 2 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1c76178..b0431cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-02-22  Morten Welinder  <terra gnome org>
 
+	* src/io-context-gtk.c (icg_show_gui): Don't pass the splash
+	throught the icon manager for no good reason.
+
 	* src/io-context-gtk.h: Fix namespace issues.
 
 2012-02-22  Andreas J. Guelzow <aguelzow pyrshep ca>
diff --git a/src/io-context-gtk.c b/src/io-context-gtk.c
index fa0d04e..ce77f06 100644
--- a/src/io-context-gtk.c
+++ b/src/io-context-gtk.c
@@ -122,24 +122,13 @@ cb_realize (GtkWindow *window, void *dummy)
 static void
 icg_show_gui (GnmIOContextGtk *icg)
 {
-	static gboolean init_splash = TRUE;
 	GtkBox *box;
 	GtkWidget *frame;
 
-	if (init_splash && icg->show_splash) {
-		GdkPixbuf *pixbuf = gdk_pixbuf_new_from_inline
-			(-1, gnumeric_splash, FALSE, NULL);
-		gtk_icon_theme_add_builtin_icon ("GnmSplash",
-			gdk_pixbuf_get_width (pixbuf), pixbuf);
-		g_object_unref (pixbuf);
-		init_splash = FALSE;
-	}
-
 	box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 0));
 	if (icg->show_splash) {
-		GdkPixbuf *pixbuf =
-			gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
-						  "GnmSplash", 360, 220, NULL);
+		GdkPixbuf *pixbuf = gdk_pixbuf_new_from_inline
+			(-1, gnumeric_splash, FALSE, NULL);
 		gtk_box_pack_start (box, gtk_image_new_from_pixbuf (pixbuf),
 				    TRUE, FALSE, 0);
 		g_object_unref (pixbuf);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]