Merge lp:~bratsche/xsplash/configurable-signals-backport-release-0.7 into lp:~bratsche/xsplash/release-0.7

[Cody Russell]

[David Barth (dbarth)]

Cool. This is is the signal branch merged on the right branch.

review: Approve

[lp:~bratsche/xsplash/configurable-signals-backport-release-0.7]

61. By Cody Russell on 2009-09-10

change timeout to 25s, add timer resetting when the waitfor signal adds somethign new

Unmerged revisions

=== modified file 'src/xsplash-dbus.xml'
--- src/xsplash-dbus.xml	2009-08-06 11:24:01 +0000
+++ src/xsplash-dbus.xml	2009-09-10 15:40:58 +0000
@@ -2,6 +2,9 @@
 
 <node name="/">
   <interface name="com.ubuntu.BootCurtain">
+    <method name="AddWaitSignal">
+      <arg type="s" name="wait" direction="in" />
+    </method>
     <method name="SignalLoaded">
       <arg type="s" name="app" direction="in" />
     </method>

=== modified file 'src/xsplash.c'
--- src/xsplash.c	2009-08-31 20:21:47 +0000
+++ src/xsplash.c	2009-09-10 15:40:58 +0000
@@ -61,9 +61,6 @@
 
   GdkWindow       *cow;
   GdkScreen       *screen;
-
-  gboolean         nautilus_done;
-  gboolean         panel_done;
 };
 
 enum {
@@ -73,29 +70,6 @@
   PROP_DBUS_PROXY
 };
 
-#define XSPLASH_DBUS_NAME   "com.ubuntu.BootCurtain"
-#define XSPLASH_DBUS_OBJECT "/com/ubuntu/BootCurtain"
-
-static gboolean  gdm_session      = FALSE;
-static gchar    *background_image = NULL;
-static gchar    *logo_image       = NULL;
-static gchar    *throbber_image   = NULL;
-static guint     throbber_frames  = 50;
-static gboolean  ping_pong        = FALSE;
-static gboolean  have_xcomposite  = FALSE;
-static gboolean  is_composited    = FALSE;
-static gboolean  redirected       = FALSE;
-
-static GOptionEntry entries[] = {
-  { "gdm-session", 'g', 0, G_OPTION_ARG_NONE, &gdm_session, "Run in gdm session", NULL },
-  { "background", 'b', 0, G_OPTION_ARG_FILENAME, &background_image, "Filename for background image", NULL },
-  { "logo", 'l', 0, G_OPTION_ARG_FILENAME, &logo_image, "Filename for logo image", NULL },
-  { "throbber", 't', 0, G_OPTION_ARG_FILENAME, &throbber_image, "Filename for throbber image", NULL },
-  { "frames", 'f', 0, G_OPTION_ARG_INT, &throbber_frames, "Number of frames for the throbber (default 50)", NULL },
-  { "pingpong", 'p', 0, G_OPTION_ARG_NONE, &ping_pong, "Whether to reverse throbber directions", NULL },
-  { NULL }
-};
-
 static AnimContext *      anim_context_new               (XsplashServer  *server,
                                                           GtyTimeline    *timeline,
                                                           gpointer        id);
@@ -122,6 +96,9 @@
                                                           gpointer        user_data);
 
 static void               xsplash_server_dispose         (GObject        *object);
+gboolean                  xsplash_server_add_wait_signal (XsplashServer  *server,
+                                                          gchar          *waitfor,
+                                                          GError        **error);
 
 gboolean                  xsplash_server_signal_loaded   (XsplashServer  *server,
                                                           gchar          *app,
@@ -131,6 +108,65 @@
                                                           gdouble         progress,
                                                           gpointer        user_data);
 
+static void               add_signal                     (gchar *name);
+static void               xsplash_add_signal             (const gchar    *option_name,
+                                                          const gchar    *value,
+                                                          gpointer        data,
+                                                          GError        **error);
+
+#define XSPLASH_DBUS_NAME   "com.ubuntu.BootCurtain"
+#define XSPLASH_DBUS_OBJECT "/com/ubuntu/BootCurtain"
+
+static gboolean  gdm_session      = FALSE;
+static gchar    *background_image = NULL;
+static gchar    *logo_image       = NULL;
+static gchar    *throbber_image   = NULL;
+static guint     throbber_frames  = 50;
+static gboolean  ping_pong        = FALSE;
+static gboolean  have_xcomposite  = FALSE;
+static gboolean  is_composited    = FALSE;
+static gboolean  redirected       = FALSE;
+static GSList   *signal_list      = NULL;
+
+static GOptionEntry entries[] = {
+  {
+    "gdm-session", 'g', 0,
+    G_OPTION_ARG_NONE, &gdm_session,
+    "Run in gdm session", NULL
+  },
+  {
+    "background", 'b', 0,
+    G_OPTION_ARG_FILENAME, &background_image,
+    "Filename for background image", NULL
+  },
+  {
+    "logo", 'l', 0,
+    G_OPTION_ARG_FILENAME, &logo_image,
+    "Filename for logo image", NULL
+  },
+  {
+    "throbber", 't', 0,
+    G_OPTION_ARG_FILENAME, &throbber_image,
+    "Filename for throbber image", NULL
+  },
+  {
+    "frames", 'f', 0,
+    G_OPTION_ARG_INT, &throbber_frames,
+    "Number of frames for the throbber (default 50)", NULL
+  },
+  {
+    "pingpong", 'p', 0,
+    G_OPTION_ARG_NONE, &ping_pong,
+    "Whether to reverse throbber directions", NULL
+  },
+  {
+    "add-signal", 's', 0,
+    G_OPTION_ARG_CALLBACK, (GOptionArgFunc) xsplash_add_signal,
+    "Add a signal to listen for.", NULL
+  },
+  { NULL }
+};
+
 #include "dbus-xsplash-server.h"
 
 G_DEFINE_TYPE (XsplashServer, xsplash_server, G_TYPE_OBJECT);
@@ -145,7 +181,7 @@
 
   g_type_class_add_private (class, sizeof (XsplashServerPrivate));
 
-  object_class->dispose = xsplash_server_dispose;
+  object_class->dispose      = xsplash_server_dispose;
   object_class->set_property = set_property;
   object_class->get_property = get_property;
 
@@ -219,8 +255,6 @@
     g_return_if_reached ();
     break;
   }
-
-  return;
 }
 
 static void
@@ -245,8 +279,6 @@
     g_return_if_reached ();
     break;
   }
-
-  return;
 }
 
 static GdkPixbuf *
@@ -622,6 +654,37 @@
   return FALSE;
 }
 
+static void
+add_signal (gchar *name)
+{
+  GSList *tmp = NULL;
+
+  if ((strcmp (name, ".") == 0) || strcmp (name, "..") == 0)
+    return;
+
+  g_debug ("adding signal `%s'", name);
+
+  for (tmp = signal_list; tmp != NULL; tmp = g_slist_next (signal_list))
+    {
+      if (strcmp (tmp->data, name) == 0)
+        {
+          g_debug ("   ** that signal is already being listened for; skipping");
+          return;
+        }
+    }
+
+  signal_list = g_slist_prepend (signal_list, g_strdup (name));
+}
+
+static void
+xsplash_add_signal (const gchar  *option_name,
+                    const gchar  *value,
+                    gpointer      data,
+                    GError      **error)
+{
+  add_signal (g_strdup (value));
+}
+
 void
 sig_handler (int signum)
 {
@@ -729,16 +792,36 @@
   if (throbber_image != NULL)
     g_free (throbber_image);
 
+  if (signal_list != NULL)
+    {
+      g_slist_foreach (signal_list, (GFunc)g_free, NULL);
+      g_slist_free (signal_list);
+      signal_list = NULL;
+    }
+
   return 0;
 }
 
 gboolean
+xsplash_server_add_wait_signal (XsplashServer  *server,
+                                gchar          *waitfor,
+                                GError        **error)
+{
+  g_debug ("received a new signal to wait for: %s", waitfor);
+
+  if (waitfor)
+    {
+      add_signal (waitfor);
+    }
+
+  return TRUE;
+}
+
+gboolean
 xsplash_server_signal_loaded (XsplashServer  *server,
                               gchar          *app,
                               GError        **error)
 {
-  XsplashServerPrivate *priv = XSPLASH_SERVER_GET_PRIVATE (server);
-
   g_debug ("received signal: %s", app);
 
   if (gdm_session)
@@ -748,19 +831,24 @@
     }
   else
     {
-      if (strcmp (app, "nautilus") == 0)
-        {
-          priv->nautilus_done = TRUE;
-        }
-      else if (strcmp (app, "gnome-panel") == 0)
-        {
-          priv->panel_done = TRUE;
-        }
-
-      if (priv->nautilus_done && priv->panel_done)
-        {
-	  g_debug ("received both \"nautilus\" and \"panel\" signals: fading out");
-          begin_fade (server, TRUE);
+      GSList *l = NULL;
+
+      /* Remove this signal if it's in our list; if the list is empty, begin fading */
+      for (l = signal_list; l != NULL; l = l->next)
+        {
+          if (strcmp (app, (gchar *)l->data) == 0)
+            {
+              g_debug ("received signal %s", (gchar*)l->data);
+
+              g_free (l->data);
+              signal_list = g_slist_delete_link (signal_list, l);
+
+              /* There are no more signals we are listening for */
+              if (signal_list == NULL)
+                {
+                  begin_fade (server, TRUE);
+                }
+            }
         }
     }