Merge lp:~bratsche/xsplash/improve-logging into lp:xsplash

[Cody Russell]

[Ted Gould (ted)]

review: Approve

=== modified file 'src/xsplash.c'
--- src/xsplash.c	2009-09-28 16:30:02 +0000
+++ src/xsplash.c	2009-09-28 21:35:19 +0000
@@ -328,26 +328,26 @@
   width = gdk_screen_get_width (screen);
   height = gdk_screen_get_height (screen);
 
-  g_debug ("get_background_filename(): looking for appropriate resolution...");
+  g_message ("get_background_filename(): looking for appropriate resolution...");
   for (i = 0; i < (sizeof (widths) / sizeof (gint)); i++)
     {
       if (widths[i] > width && heights[i] && height)
         {
-          g_debug (" ** %dx%d will work.", widths[i], heights[i]);
+          g_message (" ** %dx%d will work.", widths[i], heights[i]);
           last_good = i;
         }
       else
         {
-          g_debug (" ** %dx%d is too small, using last good size.", widths[i], heights[i]);
+          g_message (" ** %dx%d is too small, using last good size.", widths[i], heights[i]);
           break;
         }
     }
 
-  g_debug (" ** Found a resolution: %dx%d", widths[last_good], heights[last_good]);
+  g_message (" ** Found a resolution: %dx%d", widths[last_good], heights[last_good]);
 
   ret = g_strdup_printf (DATADIR "/images/xsplash/bg_%dx%d.jpg", widths[last_good], heights[last_good]);
 
-  g_debug (" ** filename: %s", ret);
+  g_message (" ** filename: %s", ret);
 
   return ret;
 }
@@ -377,18 +377,18 @@
 
   if (throbber_image != NULL)
     {
-      g_debug ("get_throbber_filename(): user provided a throbber on the command line; using that");
+      g_message ("get_throbber_filename(): user provided a throbber on the command line; using that");
 
       return g_strdup (throbber_image);
     }
 
-  g_debug ("get_throbber_filename(): looking for the best throbber for screen width...");
+  g_message ("get_throbber_filename(): looking for the best throbber for screen width...");
 
   ret = g_strdup_printf (DATADIR "/images/xsplash/throbber_%s.png",
                          get_filename_size_modifier (width));
 
-  g_debug (" ** Chose `%s'", get_filename_size_modifier (width));
-  g_debug (" ** throbber filename is: %s", ret);
+  g_message (" ** Chose `%s'", get_filename_size_modifier (width));
+  g_message (" ** throbber filename is: %s", ret);
 
   return ret;
 }
@@ -405,18 +405,18 @@
 
   if (logo_image != NULL)
     {
-      g_debug ("get_logo_filename(): user provided a logo on the command line; using that");
+      g_message ("get_logo_filename(): user provided a logo on the command line; using that");
 
       return g_strdup (logo_image);
     }
 
-  g_debug ("get_logo_filename(): looking for the best logo for screen width...");
+  g_message ("get_logo_filename(): looking for the best logo for screen width...");
 
   ret = g_strdup_printf (DATADIR "/images/xsplash/logo_%s.png",
                          get_filename_size_modifier (width));
 
-  g_debug (" ** Chose `%s'", get_filename_size_modifier (width));
-  g_debug (" ** logo filename is: %s", ret);
+  g_message (" ** Chose `%s'", get_filename_size_modifier (width));
+  g_message (" ** logo filename is: %s", ret);
 
   return ret;
 }
@@ -578,7 +578,7 @@
         }
       else
         {
-          g_debug ("couldn't load throbber image from file (%s); "
+          g_message ("couldn't load throbber image from file (%s); "
                    "disabling throbber", throbber_image);
         }
     }
@@ -648,7 +648,7 @@
 
   gty_timeline_start (timeline);
 
-  g_debug ("throbber started (%d frames)", throbber_frames);
+  g_message ("throbber started (%d frames)", throbber_frames);
 }
 
 static void
@@ -696,7 +696,7 @@
   switch (event->keyval)
     {
     case GDK_Escape:
-      g_debug ("ESC interrupt");
+      g_message ("ESC interrupt");
       begin_fade (server, TRUE);
 
       /* else queue another fade? */
@@ -761,7 +761,7 @@
 
   anim_context_free (context);
 
-  g_debug ("fade finished");
+  g_message ("fade finished");
 
   if (context->exit_on_finish)
     {
@@ -798,7 +798,7 @@
 {
   XsplashServer *server = (XsplashServer *)user_data;
 
-  g_debug ("** timeout **");
+  g_message ("** timeout **");
 
   begin_fade (server, TRUE);
 
@@ -813,13 +813,13 @@
   if ((strcmp (name, ".") == 0) || strcmp (name, "..") == 0)
     return;
 
-  g_debug ("adding signal `%s'", name);
+  g_message ("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");
+          g_message ("   ** that signal is already being listened for; skipping");
           return;
         }
     }
@@ -841,7 +841,7 @@
 void
 sig_handler (int signum)
 {
-  g_debug ("**  interrupted **");
+  g_message ("**  interrupted **");
   gtk_main_quit ();
 }
 
@@ -919,9 +919,9 @@
   if (throbber_image == NULL)
     throbber_image = get_throbber_filename ();
 
-  g_debug ("background_image = %s", background_image);
-  g_debug ("logo_image = %s", logo_image);
-  g_debug ("throbber_image = %s", throbber_image);
+  g_message ("background_image = %s", background_image);
+  g_message ("logo_image = %s", logo_image);
+  g_message ("throbber_image = %s", throbber_image);
 
   system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
 
@@ -956,7 +956,7 @@
 
   gtk_main ();
 
-  g_debug ("exiting...");
+  g_message ("exiting...");
 
   if (background_image != NULL)
     g_free (background_image);
@@ -982,7 +982,7 @@
                                 gchar          *waitfor,
                                 GError        **error)
 {
-  g_debug ("received a new signal to wait for: %s", waitfor);
+  g_message ("received a new signal to wait for: %s", waitfor);
 
   if (waitfor)
     {
@@ -997,11 +997,11 @@
                               gchar          *app,
                               GError        **error)
 {
-  g_debug ("received signal: %s", app);
+  g_message ("received signal: %s", app);
 
   if (gdm_session)
     {
-      g_debug ("gdm mode: fading out");
+      g_message ("gdm mode: fading out");
       begin_fade (server, TRUE);
     }
   else
@@ -1013,7 +1013,7 @@
         {
           if (strcmp (app, (gchar *)l->data) == 0)
             {
-              g_debug ("received signal %s", (gchar*)l->data);
+              g_message ("received signal %s", (gchar*)l->data);
 
               g_free (l->data);
               signal_list = g_slist_delete_link (signal_list, l);