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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-09-24 11:22:40 +0300 (Mon, 24 Sep 2007)
New Revision: 14024

Modified:
   projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
   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-09-20  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hcp-window.c, src/hcp-config-keys.h, src/hcp-rfs.[ch]: revert
	previous behavior and always request lock code from user despite the
	device autolock state. Fixes: NB#68866.


Modified: projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-09-24 08:19:00 UTC (rev 14023)
+++ projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-09-24 08:22:40 UTC (rev 14024)
@@ -1,5 +1,11 @@
 2007-09-20  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hcp-window.c, src/hcp-config-keys.h, src/hcp-rfs.[ch]: revert
+	previous behavior and always request lock code from user despite the
+	device autolock state. Fixes: NB#68866.
+
+2007-09-20  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* src/hcp-grid.c (hcp_grid_button_pressed): don't move focus from one
 	grid to another if there's no selectable item under the pointer.
 	Fixes: NB#70345.

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-09-24 08:19:00 UTC (rev 14023)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-config-keys.h	2007-09-24 08:22:40 UTC (rev 14024)
@@ -25,4 +25,3 @@
 #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/systemui/devlock/devicelock_autolock_enabled"

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c	2007-09-24 08:19:00 UTC (rev 14023)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c	2007-09-24 08:22:40 UTC (rev 14024)
@@ -265,8 +265,7 @@
 
 gboolean 
 hcp_rfs (const gchar *warning, const gchar *title,
-         const gchar *script, const gchar *help_topic,
-	 gboolean check_lock_code)
+         const gchar *script, const gchar *help_topic)
 {
   if (warning)
   {
@@ -278,8 +277,7 @@
     }
   }
           
-  if (!check_lock_code ||
-      hcp_rfs_check_lock_code_dialog (hcp_program_get_instance ()))
+  if (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-09-24 08:19:00 UTC (rev 14023)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.h	2007-09-24 08:22:40 UTC (rev 14024)
@@ -27,7 +27,6 @@
 gboolean hcp_rfs (const char *warning, 
                   const char *title, 
                   const char *script, 
-                  const char *help_topic,
-		  gboolean    check_lock_code);
+                  const char *help_topic);
 
 #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-09-24 08:19:00 UTC (rev 14023)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c	2007-09-24 08:22:40 UTC (rev 14024)
@@ -60,8 +60,6 @@
   GtkWidget      *large_icons_menu_item;
   GtkWidget      *small_icons_menu_item;
 
-  gboolean        device_locked;
-
   /* For state save data */
   gint            icon_size;
   gchar          *saved_focused_filename;
@@ -363,11 +361,6 @@
     priv->icon_size = icon_size ? TRUE : FALSE;
   }
 
-  priv->device_locked = 
-          gconf_client_get_bool (client,
-                                 HCP_GCONF_LOCK_STATE_KEY,
-                                 &error);
-
   g_object_unref (client);
 }
 
@@ -501,8 +494,7 @@
   hcp_rfs (HCP_CUD_WARNING,
            HCP_CUD_WARNING_TITLE,
            HCP_CUD_SCRIPT,
-           HCP_CUD_HELP_TOPIC,
-	   window->priv->device_locked);
+           HCP_CUD_HELP_TOPIC);
 
   return TRUE;
 }
@@ -513,8 +505,7 @@
   hcp_rfs (HCP_RFS_WARNING,
            HCP_RFS_WARNING_TITLE,
            HCP_RFS_SCRIPT,
-           HCP_RFS_HELP_TOPIC,
-	   window->priv->device_locked);
+           HCP_RFS_HELP_TOPIC);
 
   return TRUE;
 }