[maemo-commits] [maemo-commits] r11480 - in projects/haf/trunk/maemo-af-desktop: . hildon-navigator hildon-status-bar

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-05-07 13:32:47 +0300 (Mon, 07 May 2007)
New Revision: 11480

Modified:
   projects/haf/trunk/maemo-af-desktop/ChangeLog
   projects/haf/trunk/maemo-af-desktop/hildon-navigator/hildon-navigator-panel.c
   projects/haf/trunk/maemo-af-desktop/hildon-navigator/hildon-navigator-panel.h
   projects/haf/trunk/maemo-af-desktop/hildon-status-bar/hildon-status-bar-main.c
   projects/haf/trunk/maemo-af-desktop/hildon-status-bar/hildon-status-bar-main.h
   projects/haf/trunk/maemo-af-desktop/maemo-af-desktop-main.c
Log:

2007-05-07  Johan Bilien <johan.bilien at nokia.com>

	* hildon-status-bar/hildon-status-bar-main.[ch],
	  hildon-navigator/hildon-navigator-panel.[ch]:
	  do not use g_tmp_dir to get the log directory
	  as it doesn't return /tmp
	* maemo-af-desktop-main.c: Make sure /tmp/osso-appl-states
	  is there




Modified: projects/haf/trunk/maemo-af-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-af-desktop/ChangeLog	2007-05-07 10:25:39 UTC (rev 11479)
+++ projects/haf/trunk/maemo-af-desktop/ChangeLog	2007-05-07 10:32:47 UTC (rev 11480)
@@ -1,3 +1,13 @@
+2007-05-07  Johan Bilien <johan.bilien at nokia.com>
+
+	* hildon-status-bar/hildon-status-bar-main.[ch],
+	  hildon-navigator/hildon-navigator-panel.[ch]:
+	  do not use g_tmp_dir to get the log directory
+	  as it doesn't return /tmp
+	* maemo-af-desktop-main.c: Make sure /tmp/osso-appl-states
+	  is there
+
+
 2007-04-26  Johan Bilien <johan.bilien at nokia.com>
 
 	* configure.ac: 2.9.99.24

Modified: projects/haf/trunk/maemo-af-desktop/hildon-navigator/hildon-navigator-panel.c
===================================================================
--- projects/haf/trunk/maemo-af-desktop/hildon-navigator/hildon-navigator-panel.c	2007-05-07 10:25:39 UTC (rev 11479)
+++ projects/haf/trunk/maemo-af-desktop/hildon-navigator/hildon-navigator-panel.c	2007-05-07 10:32:47 UTC (rev 11480)
@@ -125,15 +125,13 @@
 {
   HildonNavigatorPanelPrivate *priv;
   gchar *path;
-  const gchar *tmp;
   gint i;
   
   g_return_if_fail (panel);
 
   priv = HILDON_NAVIGATOR_PANEL_GET_PRIVATE (panel);
 
-  tmp = g_get_tmp_dir ();
-  path = g_strdup_printf ("%s%s",tmp,HILDON_NAVIGATOR_LOG_FILE);
+  path = g_strdup(HILDON_NAVIGATOR_LOG_FILE);
   
   priv->log = hildon_log_new (path);
 

Modified: projects/haf/trunk/maemo-af-desktop/hildon-navigator/hildon-navigator-panel.h
===================================================================
--- projects/haf/trunk/maemo-af-desktop/hildon-navigator/hildon-navigator-panel.h	2007-05-07 10:25:39 UTC (rev 11479)
+++ projects/haf/trunk/maemo-af-desktop/hildon-navigator/hildon-navigator-panel.h	2007-05-07 10:32:47 UTC (rev 11480)
@@ -28,7 +28,7 @@
 #define LIBTN_MAIL_PLUGIN        "libtn_mail_plugin.so"
 #define LIBTN_BOOKMARK_PLUGIN    "libtn_bookmark_plugin.so"
 
-#define HILDON_NAVIGATOR_LOG_FILE "/osso-appl-states/maemo_af_desktop/navigator.log"
+#define HILDON_NAVIGATOR_LOG_FILE "/tmp/osso-appl-states/maemo_af_desktop/navigator.log"
 
 #include <gtk/gtkbox.h>
 #include "hildon-navigator-item.h"

Modified: projects/haf/trunk/maemo-af-desktop/hildon-status-bar/hildon-status-bar-main.c
===================================================================
--- projects/haf/trunk/maemo-af-desktop/hildon-status-bar/hildon-status-bar-main.c	2007-05-07 10:25:39 UTC (rev 11479)
+++ projects/haf/trunk/maemo-af-desktop/hildon-status-bar/hildon-status-bar-main.c	2007-05-07 10:32:47 UTC (rev 11480)
@@ -229,7 +229,7 @@
     g_signal_connect(panel->arrow_button, "toggled", 
 		     G_CALLBACK(arrow_button_toggled_cb), panel);
    
-    log_path = g_strdup_printf("%s%s",g_get_tmp_dir (),HSB_PLUGIN_LOG_FILE);
+    log_path = g_strdup(HSB_PLUGIN_LOG_FILE);
     
     panel->log = hildon_log_new (log_path);
 

Modified: projects/haf/trunk/maemo-af-desktop/hildon-status-bar/hildon-status-bar-main.h
===================================================================
--- projects/haf/trunk/maemo-af-desktop/hildon-status-bar/hildon-status-bar-main.h	2007-05-07 10:25:39 UTC (rev 11479)
+++ projects/haf/trunk/maemo-af-desktop/hildon-status-bar/hildon-status-bar-main.h	2007-05-07 10:32:47 UTC (rev 11480)
@@ -86,7 +86,7 @@
 #define HSB_PLUGIN_CATEGORY_CONDITIONAL "conditional"
 #define HSB_PLUGIN_CATEGORY_TEMPORAL    "temporal"
 
-#define HSB_PLUGIN_LOG_FILE             "/osso-appl-states/maemo_af_desktop/statusbar.log"
+#define HSB_PLUGIN_LOG_FILE             "/tmp/osso-appl-states/maemo_af_desktop/statusbar.log"
 #define HSB_PLUGIN_LOG_KEY_START	"Init"
 #define HSB_PLUGIN_LOG_KEY_END		"End"
 

Modified: projects/haf/trunk/maemo-af-desktop/maemo-af-desktop-main.c
===================================================================
--- projects/haf/trunk/maemo-af-desktop/maemo-af-desktop-main.c	2007-05-07 10:25:39 UTC (rev 11479)
+++ projects/haf/trunk/maemo-af-desktop/maemo-af-desktop-main.c	2007-05-07 10:32:47 UTC (rev 11480)
@@ -91,6 +91,7 @@
    of used stack -- Karoliina Salminen */
 
 
+#define STAMP_DIR                       "/tmp/osso-appl-states/"
 #define MAEMO_AF_DESKTOP_STAMP_DIR      "/tmp/osso-appl-states/maemo_af_desktop/"
 #define MAEMO_AF_DESKTOP_STAMP_FILE     MAEMO_AF_DESKTOP_STAMP_DIR"/stamp"
 
@@ -240,6 +241,7 @@
     else
     {
         int fd;
+        mkdir (STAMP_DIR, 0755);
         mkdir (MAEMO_AF_DESKTOP_STAMP_DIR, 0755);
         fd = creat(MAEMO_AF_DESKTOP_STAMP_FILE, S_IRUSR|S_IWUSR);
         if (fd >= 0)