[Xfce4-commits] r29993 - in xfce4-session/branches/xfce_4_6: . xfce4-session

[Brian Tarricone]

Author: kelnos
Date: 2009-06-04 09:34:55 +0000 (Thu, 04 Jun 2009)
New Revision: 29993

Modified:
   xfce4-session/branches/xfce_4_6/ChangeLog
   xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-global.c
   xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-manager.c
   xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-startup.c
Log:
	* xfce4-session/xfsm-global.c: Add timing information to verbose
	  log printouts.
	* xfce4-session/xfsm-{manager,startup}.c: Fix a couple warnings.

Modified: xfce4-session/branches/xfce_4_6/ChangeLog
===================================================================
--- xfce4-session/branches/xfce_4_6/ChangeLog	2009-06-04 09:20:20 UTC (rev 29992)
+++ xfce4-session/branches/xfce_4_6/ChangeLog	2009-06-04 09:34:55 UTC (rev 29993)
@@ -1,3 +1,9 @@
+2009-06-04	Brian Tarricone <bjt23 at cornell.edu>
+
+	* xfce4-session/xfsm-global.c: Add timing information to verbose
+	  log printouts.
+	* xfce4-session/xfsm-{manager,startup}.c: Fix a couple warnings.
+
 2009-04-15  Stephan Arts <stephan at xfce.org>
 
 	* == Released 4.6.1 ===

Modified: xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-global.c
===================================================================
--- xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-global.c	2009-06-04 09:20:20 UTC (rev 29992)
+++ xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-global.c	2009-06-04 09:34:55 UTC (rev 29993)
@@ -79,6 +79,7 @@
   static FILE *fp = NULL;
   gchar       *logfile;
   va_list      valist;
+  GTimeVal     tv;
   
   if (G_UNLIKELY (fp == NULL))
     {
@@ -86,6 +87,9 @@
       fp = fopen (logfile, "w");
       g_free (logfile);
     }
+
+  g_get_current_time(&tv);
+  fprintf(fp, "[%10lu] ", tv.tv_sec);
   
   va_start (valist, format);
   vfprintf (fp, format, valist);

Modified: xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-manager.c
===================================================================
--- xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-manager.c	2009-06-04 09:20:20 UTC (rev 29992)
+++ xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-manager.c	2009-06-04 09:34:55 UTC (rev 29993)
@@ -1625,7 +1625,8 @@
     {
       backup = g_strconcat (manager->session_file, ".bak", NULL);
       unlink (backup);
-      link (manager->session_file, backup);
+      if (link (manager->session_file, backup))
+          g_warning ("Failed to create session file backup");
       g_free (backup);
     }
 

Modified: xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-startup.c
===================================================================
--- xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-startup.c	2009-06-04 09:20:20 UTC (rev 29992)
+++ xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-startup.c	2009-06-04 09:34:55 UTC (rev 29993)
@@ -388,6 +388,7 @@
           terminal = xfce_rc_read_bool_entry (rc, "Terminal", FALSE);
 
           /* try to launch the command */
+          xfsm_verbose ("Autostart: running command \"%s\"\n", exec);
           if (!xfce_exec (exec, terminal, startup_notify, &error))
             {
               g_warning ("Unable to launch \"%s\" (specified by %s): %s", exec, files[n], error->message);
@@ -519,7 +520,10 @@
     {
       /* execute the application here */
       if (properties->current_directory)
-        chdir (properties->current_directory);
+        {
+          if (chdir (properties->current_directory))
+            g_warning ("Unable to chdir to \"%s\": %s", properties->current_directory, strerror (errno));
+        }
       execvp (argv[0], argv);
       _exit (127);
     }