gnome-session r4947 - in trunk: . gnome-session

[mccann svn gnome org]

Author: mccann
Date: Wed Aug 13 20:01:28 2008
New Revision: 4947
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4947&view=rev

Log:
2008-08-13  William Jon McCann  <jmccann redhat com>

	* gnome-session/gsm-autostart-app.c (is_conditionally_disabled):
	* gnome-session/gsm-manager.c (_debug_app_for_phase),
	(debug_app_summary), (gsm_manager_start):
	Add a debugging summary of all apps before starting.



Modified:
   trunk/ChangeLog
   trunk/gnome-session/gsm-autostart-app.c
   trunk/gnome-session/gsm-manager.c

Modified: trunk/gnome-session/gsm-autostart-app.c
==============================================================================
--- trunk/gnome-session/gsm-autostart-app.c	(original)
+++ trunk/gnome-session/gsm-autostart-app.c	Wed Aug 13 20:01:28 2008
@@ -641,11 +641,6 @@
         /* Set initial condition */
         priv->condition = !disabled;
 
-        if (disabled) {
-                g_debug ("app %s is disabled by AutostartCondition",
-                         gsm_app_peek_id (app));
-        }
-
         return disabled;
 }
 

Modified: trunk/gnome-session/gsm-manager.c
==============================================================================
--- trunk/gnome-session/gsm-manager.c	(original)
+++ trunk/gnome-session/gsm-manager.c	Wed Aug 13 20:01:28 2008
@@ -1001,6 +1001,42 @@
         }
 }
 
+static gboolean
+_debug_app_for_phase (const char *id,
+                      GsmApp     *app,
+                      gpointer    data)
+{
+        guint phase;
+
+        phase = GPOINTER_TO_UINT (data);
+
+        if (gsm_app_peek_phase (app) != phase) {
+                return FALSE;
+        }
+
+        g_debug ("GsmManager:\tID: %s\tapp-id:%s\tis-disabled:%d\tis-conditionally-disabled:%d",
+                 gsm_app_peek_id (app),
+                 gsm_app_peek_app_id (app),
+                 gsm_app_peek_is_disabled (app),
+                 gsm_app_peek_is_conditionally_disabled (app));
+
+        return FALSE;
+}
+
+static void
+debug_app_summary (GsmManager *manager)
+{
+        guint phase;
+
+        g_debug ("GsmManager: App startup summary");
+        for (phase = GSM_MANAGER_PHASE_INITIALIZATION; phase < GSM_MANAGER_PHASE_RUNNING; phase++) {
+                g_debug ("GsmManager: Phase %s", phase_num_to_name (phase));
+                gsm_store_foreach (manager->priv->apps,
+                                   (GsmStoreFunc)_debug_app_for_phase,
+                                   GUINT_TO_POINTER (phase));
+        }
+}
+
 void
 gsm_manager_start (GsmManager *manager)
 {
@@ -1009,7 +1045,7 @@
         g_return_if_fail (GSM_IS_MANAGER (manager));
 
         manager->priv->phase = GSM_MANAGER_PHASE_INITIALIZATION;
-
+        debug_app_summary (manager);
         start_phase (manager);
 }