[maemo-commits] [maemo-commits] r10283 - in projects/haf/trunk/hildon-desktop: . background-manager src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-03-01 14:19:47 +0200 (Thu, 01 Mar 2007)
New Revision: 10283

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/background-manager/background-manager.c
   projects/haf/trunk/hildon-desktop/src/hd-home-window.c
Log:

2007-03-01  Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-home-window.c: osso_cp_plugin_path takes relative path
	* background-manager/background-manager.c: Uncommented setting
	the title bar



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-01 12:09:53 UTC (rev 10282)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-01 12:19:47 UTC (rev 10283)
@@ -1,5 +1,11 @@
 2007-03-01  Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-home-window.c: osso_cp_plugin_path takes relative path
+	* background-manager/background-manager.c: Uncommented setting
+	the title bar
+
+2007-03-01  Johan Bilien  <johan.bilien at nokia.com>
+
 	* src/hd-home-background.[ch]:
 	- added _equal() method
 	* hd_home_window.c:

Modified: projects/haf/trunk/hildon-desktop/background-manager/background-manager.c
===================================================================
--- projects/haf/trunk/hildon-desktop/background-manager/background-manager.c	2007-03-01 12:09:53 UTC (rev 10282)
+++ projects/haf/trunk/hildon-desktop/background-manager/background-manager.c	2007-03-01 12:19:47 UTC (rev 10283)
@@ -616,7 +616,6 @@
       return NULL;
     }
 
-#if 0
   if (titlebar_path && *titlebar_path)
     {
       compose = load_image_from_file (titlebar_path, cancellable, &bg_error);
@@ -661,7 +660,6 @@
           compose = NULL;
         }
     }
-#endif
 
   if (sidebar_path && *sidebar_path)
     {

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-03-01 12:09:53 UTC (rev 10282)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-03-01 12:19:47 UTC (rev 10283)
@@ -52,10 +52,8 @@
 #include "hd-home-background.h"
 #include "hd-home-background-dialog.h"
 
-/* FIXME */
-#define HCP_LIBRARY_PATH                "/usr/lib/hildon-control-panel"
-#define HCP_PLUGIN_PATH_PERSONALISATION HCP_LIBRARY_PATH"/libpersonalisation.so"
-#define HCP_PLUGIN_PATH_CALIBRATION     HCP_LIBRARY_PATH"/tscalib.so"
+#define HCP_PLUGIN_PATH_PERSONALISATION "libpersonalisation.so"
+#define HCP_PLUGIN_PATH_CALIBRATION     "tscalib.so"
 
 #define HD_HOME_BACKGROUND_CONF_FILE        "home-background.conf"
 #define HD_DESKTOP_USER_PATH                ".osso/hildon-desktop/"
@@ -789,6 +787,7 @@
   if (!priv->osso_context)
     return;
 
+  g_debug ("Launching controlpanel applet %s", applet_path);
   res = osso_cp_plugin_execute (priv->osso_context,
                                 applet_path,
                                 NULL,