[maemo-commits] [maemo-commits] r12539 - in projects/haf/branches/hildon-control-panel/refactoring: . src

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-06-29 13:02:59 +0300 (Fri, 29 Jun 2007)
New Revision: 12539

Modified:
   projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-list.c
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-view.c
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-config-keys.h
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c
Log:
2007-06-29  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hcp-config-keys.h, src/hcp-window.c
	(hcp_window_retrieve_configuration): changed the key to query if
	the device lock was activated or not.
	* src/hcp-app-list.c (hcp_app_list_read_desktop_entries): removed
	warnings (when applicable) when reading desktop entries.


Modified: projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-06-29 08:06:41 UTC (rev 12538)
+++ projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-06-29 10:02:59 UTC (rev 12539)
@@ -1,3 +1,11 @@
+2007-06-29  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hcp-config-keys.h, src/hcp-window.c
+	(hcp_window_retrieve_configuration): changed the key to query if
+	the device lock was activated or not.
+	* src/hcp-app-list.c (hcp_app_list_read_desktop_entries): removed
+	warnings (when applicable) when reading desktop entries.
+
 2007-06-26  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* configure.ac: added --enable-maemo-tools option to enable/disable

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-list.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-list.c	2007-06-29 08:06:41 UTC (rev 12538)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-list.c	2007-06-29 10:02:59 UTC (rev 12539)
@@ -443,7 +443,6 @@
 
     if (error)
     {
-      g_warning ("Error reading applet desktop file: %s", error->message);
       g_error_free (error);
       error = NULL;
     }
@@ -455,7 +454,6 @@
 
     if (error)
     {
-      g_warning ("Error reading applet desktop file: %s", error->message);
       g_error_free (error);
       error = NULL;
     }
@@ -467,7 +465,6 @@
 
     if (error)
     {
-      g_warning ("Error reading applet desktop file: %s", error->message);
       g_error_free (error);
       error = NULL;
     }

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-view.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-view.c	2007-06-29 08:06:41 UTC (rev 12538)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-view.c	2007-06-29 10:02:59 UTC (rev 12539)
@@ -201,8 +201,6 @@
 
   gtk_list_store_append (GTK_LIST_STORE (store), &iter);
 
-  g_debug ("ADDING APP: %s (%s)", name, text_domain);
-  
   gtk_list_store_set (GTK_LIST_STORE (store), &iter, 
                       HCP_STORE_LABEL, ((text_domain && *text_domain) ? 
 			                dgettext(text_domain, name) : _(name)),

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-config-keys.h
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-config-keys.h	2007-06-29 08:06:41 UTC (rev 12538)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-config-keys.h	2007-06-29 10:02:59 UTC (rev 12539)
@@ -25,4 +25,4 @@
 #define HCP_GCONF_GROUPS_KEY     "/apps/osso/apps/controlpanel/groups"
 #define HCP_GCONF_GROUP_IDS_KEY  "/apps/osso/apps/controlpanel/group_ids"
 #define HCP_GCONF_ICON_SIZE_KEY  "/apps/osso/apps/controlpanel/icon_size"
-#define HCP_GCONF_LOCK_STATE_KEY "/system/osso/dsm/locks/devicelock_failed"
+#define HCP_GCONF_LOCK_STATE_KEY "/system/systemui/devlock/devicelock_autolock_enabled"

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c	2007-06-29 08:06:41 UTC (rev 12538)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c	2007-06-29 10:02:59 UTC (rev 12539)
@@ -339,7 +339,6 @@
   GConfClient *client = NULL;
   GError *error = NULL;
   gboolean icon_size;
-  gint lock_state;
   
   g_return_if_fail (window);
   g_return_if_fail (HCP_IS_WINDOW (window));
@@ -364,15 +363,11 @@
     priv->icon_size = icon_size ? TRUE : FALSE;
   }
 
-  lock_state = gconf_client_get_int (client,
-                                     HCP_GCONF_LOCK_STATE_KEY,
-                                     &error);
+  priv->device_locked = 
+          gconf_client_get_bool (client,
+                                 HCP_GCONF_LOCK_STATE_KEY,
+                                 &error);
 
-  priv->device_locked = (lock_state > 0);
-
-  /* FIXME: Revert to always check lock code for now */
-  priv->device_locked = TRUE;
-  
   g_object_unref (client);
 }
 
@@ -685,6 +680,7 @@
 
   /* Update the view */
   hcp_app_view_populate (HCP_APP_VIEW (priv->view), al);
+
   gtk_widget_show_all (priv->view);
 
   app = g_hash_table_lookup (apps,