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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-06-19 14:41:24 +0300 (Tue, 19 Jun 2007)
New Revision: 12378

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-config-keys.h
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.h
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c
Log:
2007-06-19  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hcp-rfs.[ch], src/hcp-config-keys.h, src/hcp-window.c: only ask 
	for lock code for clearing and restoring user data when the device 
	is locked.


Modified: projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-06-19 11:35:27 UTC (rev 12377)
+++ projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-06-19 11:41:24 UTC (rev 12378)
@@ -1,5 +1,11 @@
 2007-06-19  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hcp-rfs.[ch], src/hcp-config-keys.h, src/hcp-window.c: only ask 
+	for lock code for clearing and restoring user data when the device 
+	is locked.
+
+2007-06-19  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* configure.ac: release 1.9.3
 
 2007-06-19  Lucas Rocha  <lucas.rocha at nokia.com>

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-19 11:35:27 UTC (rev 12377)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-list.c	2007-06-19 11:41:24 UTC (rev 12378)
@@ -461,8 +461,6 @@
                                          HCP_DESKTOP_KEY_TEXT_DOMAIN,
                                          &error);
 
-    g_debug ("TEM DOMAIN!!! %s", text_domain); 
-
     if (error)
     {
       g_warning ("Error reading applet desktop file: %s", error->message);

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-19 11:35:27 UTC (rev 12377)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-config-keys.h	2007-06-19 11:41:24 UTC (rev 12378)
@@ -25,3 +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"

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c	2007-06-19 11:35:27 UTC (rev 12377)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c	2007-06-19 11:41:24 UTC (rev 12378)
@@ -261,7 +261,8 @@
 
 gboolean 
 hcp_rfs (const gchar *warning, const gchar *title,
-         const gchar *script, const gchar *help_topic)
+         const gchar *script, const gchar *help_topic,
+	 gboolean check_lock_code)
 {
   if (warning)
   {
@@ -273,7 +274,8 @@
     }
   }
           
-  if (hcp_rfs_check_lock_code_dialog (hcp_program_get_instance ()))
+  if (check_lock_code &&
+      hcp_rfs_check_lock_code_dialog (hcp_program_get_instance ()))
   {
     /* Password is correct, proceed */
     hcp_rfs_launch_script (script);

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.h
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.h	2007-06-19 11:35:27 UTC (rev 12377)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.h	2007-06-19 11:41:24 UTC (rev 12378)
@@ -27,6 +27,7 @@
 gboolean hcp_rfs (const char *warning, 
                   const char *title, 
                   const char *script, 
-                  const char *help_topic);
+                  const char *help_topic,
+		  gboolean    check_lock_code);
 
 #endif

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-19 11:35:27 UTC (rev 12377)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c	2007-06-19 11:41:24 UTC (rev 12378)
@@ -53,6 +53,8 @@
   GtkWidget      *large_icons_menu_item;
   GtkWidget      *small_icons_menu_item;
 
+  gboolean        device_locked;
+
   /* For state save data */
   gint            icon_size;
   gchar          *saved_focused_filename;
@@ -330,7 +332,8 @@
   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));
 
@@ -354,6 +357,12 @@
     priv->icon_size = icon_size ? TRUE : FALSE;
   }
 
+  lock_state = gconf_client_get_int (client,
+                                     HCP_GCONF_LOCK_STATE_KEY,
+                                     &error);
+
+  priv->device_locked = (lock_state > 0);
+ 
   g_object_unref (client);
 }
 
@@ -486,7 +495,8 @@
   hcp_rfs (HCP_CUD_WARNING,
            HCP_CUD_WARNING_TITLE,
            HCP_CUD_SCRIPT,
-           HCP_CUD_HELP_TOPIC);
+           HCP_CUD_HELP_TOPIC,
+	   window->priv->device_locked);
 
   return TRUE;
 }
@@ -497,7 +507,8 @@
   hcp_rfs (HCP_RFS_WARNING,
            HCP_RFS_WARNING_TITLE,
            HCP_RFS_SCRIPT,
-           HCP_RFS_HELP_TOPIC);
+           HCP_RFS_HELP_TOPIC,
+	   window->priv->device_locked);
 
   return TRUE;
 }