[maemo-commits] [maemo-commits] r10460 - projects/haf/trunk/hildon-desktop/src

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-03-08 11:02:19 +0200 (Thu, 08 Mar 2007)
New Revision: 10460

Modified:
   projects/haf/trunk/hildon-desktop/src/hd-desktop.c
Log:
2007-03-08  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hd-desktop.c: added configuration monitoring code. Always use
	user configuration directory files when present. Fallback to
	system-wide configuration when no user configuration is present.
	* src/hd-plugin-loader-factory.c: removed useless debug messages.


Modified: projects/haf/trunk/hildon-desktop/src/hd-desktop.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-desktop.c	2007-03-08 08:48:41 UTC (rev 10459)
+++ projects/haf/trunk/hildon-desktop/src/hd-desktop.c	2007-03-08 09:02:19 UTC (rev 10460)
@@ -389,11 +389,9 @@
 
   if (!g_ascii_strcasecmp (filename, HD_DESKTOP_CONFIG_FILE))
   {
-    /*
     g_free (priv->config_file);
     priv->config_file = hd_desktop_get_conf_file_path (HD_DESKTOP_CONFIG_FILE);
     hd_desktop_load_containers (desktop);
-    */
   } else {
     HDDesktopContainerInfo *info;
     GList *plugin_list = NULL;
@@ -441,11 +439,9 @@
 
   if (!g_ascii_strcasecmp (filename, HD_DESKTOP_CONFIG_FILE))
   {
-    /*
     g_free (priv->config_file);
     priv->config_file = hd_desktop_get_conf_file_path (HD_DESKTOP_CONFIG_FILE);
     hd_desktop_load_containers (desktop);
-    */
   } else {
     HDDesktopContainerInfo *info;
     GList *plugin_list = NULL;
@@ -581,8 +577,8 @@
 
   if (error)
   {
-    g_error ("Error loading desktop configuration file: %s", 
-              error->message);
+    g_warning ("Error loading desktop configuration file: %s", 
+               error->message);
 
     g_error_free (error);