r19831 - gnucash/trunk/src/gnome-utils - Splash screen: minor code cleanup

[Geert Janssens]

Author: gjanssens
Date: 2010-11-18 15:39:57 -0500 (Thu, 18 Nov 2010)
New Revision: 19831
Trac: http://svn.gnucash.org/trac/changeset/19831

Modified:
   gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c
   gnucash/trunk/src/gnome-utils/gnc-gnome-utils.h
   gnucash/trunk/src/gnome-utils/gnc-splash.c
   gnucash/trunk/src/gnome-utils/gnc-splash.h
Log:
Splash screen: minor code cleanup

Modified: gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c	2010-11-18 18:55:38 UTC (rev 19830)
+++ gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c	2010-11-18 20:39:57 UTC (rev 19831)
@@ -622,8 +622,7 @@
 
     g_set_application_name(PACKAGE_NAME);
 
-    if (gnc_gconf_get_bool(GCONF_GENERAL, "show_splash_screen", NULL))
-        gnc_gui_init_splash();
+    gnc_show_splash_screen();
 
     gnome_is_initialized = TRUE;
 

Modified: gnucash/trunk/src/gnome-utils/gnc-gnome-utils.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-gnome-utils.h	2010-11-18 18:55:38 UTC (rev 19830)
+++ gnucash/trunk/src/gnome-utils/gnc-gnome-utils.h	2010-11-18 20:39:57 UTC (rev 19831)
@@ -143,7 +143,6 @@
  */
 void gnc_shutdown (int exit_status);
 
-void gnc_gui_init_splash (void);
 GncMainWindow *gnc_gui_init (void);
 int gnc_ui_start_event_loop (void);
 gboolean gnucash_ui_is_running (void);

Modified: gnucash/trunk/src/gnome-utils/gnc-splash.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-splash.c	2010-11-18 18:55:38 UTC (rev 19830)
+++ gnucash/trunk/src/gnome-utils/gnc-splash.c	2010-11-18 20:39:57 UTC (rev 19831)
@@ -28,13 +28,13 @@
 #include "gnc-gnome-utils.h"
 #include "gnc-splash.h"
 #include "gnc-version.h"
+#include "gnc-gconf-utils.h"
 
 #define MARKUP_STRING "<span size='small'>%s</span>"
 
 static GtkWidget * splash = NULL;
 static GtkWidget * progress = NULL;
 static GtkWidget * progress_bar = NULL;
-static int splash_is_initialized = FALSE;
 
 static void
 splash_destroy_cb (GtkObject *object, gpointer user_data)
@@ -42,16 +42,6 @@
     splash = NULL;
 }
 
-void
-gnc_gui_init_splash (void)
-{
-    if (!splash_is_initialized)
-    {
-        splash_is_initialized = TRUE;
-        gnc_show_splash_screen ();
-    }
-}
-
 static gboolean
 button_press_cb(GtkWidget *widget, GdkEventButton *event, gpointer unused)
 {
@@ -71,6 +61,7 @@
     gchar *ver_string, *markup;
 
     if (splash) return;
+    if (!gnc_gconf_get_bool(GCONF_GENERAL, "show_splash_screen", NULL)) return;
 
     splash = gtk_window_new (GTK_WINDOW_TOPLEVEL);
     gtk_window_set_type_hint (GTK_WINDOW (splash), GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);

Modified: gnucash/trunk/src/gnome-utils/gnc-splash.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-splash.h	2010-11-18 18:55:38 UTC (rev 19830)
+++ gnucash/trunk/src/gnome-utils/gnc-splash.h	2010-11-18 20:39:57 UTC (rev 19831)
@@ -26,7 +26,6 @@
 void gnc_show_splash_screen (void);
 void gnc_destroy_splash_screen (void);
 void gnc_update_splash_screen (const gchar *string, double percentage);
-void gnc_gui_init_splash (void);
 
 #define GNC_SPLASH_PERCENTAGE_UNKNOWN 101