[maemo-commits] [maemo-commits] r14185 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-09-28 16:05:17 +0300 (Fri, 28 Sep 2007)
New Revision: 14185

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-home-window.c
Log:

2007-09-28 Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-home-window.c: kill the startup wizard in an idle loop,
	to make sure we are all setup.
	Fixes: NB#68956



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-28 13:04:54 UTC (rev 14184)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-28 13:05:17 UTC (rev 14185)
@@ -1,3 +1,9 @@
+2007-09-28 Johan Bilien  <johan.bilien at nokia.com>
+
+	* src/hd-home-window.c: kill the startup wizard in an idle loop,
+	to make sure we are all setup.
+	Fixes: NB#68956
+
 2007-09-28  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-applications-menu.c (hd_applications_menu_dir_changed):

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-09-28 13:04:54 UTC (rev 14184)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-09-28 13:05:17 UTC (rev 14185)
@@ -122,6 +122,8 @@
   GtkWidget                    *cancel_note;
   guint                         background_loading_timeout;
   guint                         cancel_note_update_timeout;
+
+  guint                         kill_greeting_idle;
 };
 
 /* Properties */
@@ -592,6 +594,19 @@
   g_free (conffile);
 }
 
+static gboolean
+kill_greeting (void)
+{
+  guint greeting_pid;
+
+  greeting_pid = pid_from_exec_name ("osso_startup_greeting");
+
+  if (greeting_pid > 0)
+    kill (greeting_pid, SIGUSR1);
+
+  return FALSE;
+}
+
 static void
 background_apply_callback (HildonDesktopBackground     *background,
                            Picture                      picture,
@@ -599,7 +614,6 @@
                            HDHomeWindow                *window)
 {
   HDHomeWindowPrivate  *priv;
-  guint greeting_pid;
 
 #ifdef DEBUG
   g_debug ("Background applied!");
@@ -683,10 +697,8 @@
     }
 
   /* If there's a process osso_startup_greeting, kill it with SIGUSR1. */
-  greeting_pid = pid_from_exec_name ("osso_startup_greeting"); 
-
-  if (greeting_pid > 0)
-    kill (greeting_pid, SIGUSR1);
+  if (!priv->kill_greeting_idle)
+    priv->kill_greeting_idle = g_idle_add ((GSourceFunc)kill_greeting, NULL);
 }
 
 static void