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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-06-21 16:00:26 +0300 (Thu, 21 Jun 2007)
New Revision: 12423

Modified:
   projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c
Log:
2007-06-21  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hcp-window.c: always ask lock code until finding the correct
	gconf key for locking.


Modified: projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-06-21 11:52:11 UTC (rev 12422)
+++ projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-06-21 13:00:26 UTC (rev 12423)
@@ -1,3 +1,8 @@
+2007-06-21  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hcp-window.c: always ask lock code until finding the correct
+	gconf key for locking.
+
 2007-06-19  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* configure.ac: release 1.9.4

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-21 11:52:11 UTC (rev 12422)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c	2007-06-21 13:00:26 UTC (rev 12423)
@@ -274,7 +274,7 @@
     }
   }
           
-  if (check_lock_code &&
+  if (!check_lock_code ||
       hcp_rfs_check_lock_code_dialog (hcp_program_get_instance ()))
   {
     /* Password is correct, proceed */

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-21 11:52:11 UTC (rev 12422)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c	2007-06-21 13:00:26 UTC (rev 12423)
@@ -362,7 +362,10 @@
                                      &error);
 
   priv->device_locked = (lock_state > 0);
- 
+
+  /* Revert to always check lock code for now */
+  priv->device_locked = TRUE;
+  
   g_object_unref (client);
 }