[meego-commits] 24894: Changes to MeeGo:1.2.0:oss:Update:Testing/gnome-control-center-netbook

[shock]

Hi,
I have made the following changes to gnome-control-center-netbook in project MeeGo:1.2.0:oss:Update:Testing. Please review and accept ASAP.

Thank You,
shock

[This message was auto-generated]

---

Request #24894:

  submit:   home:shock:branches:MeeGo:1.2.0:oss:Update:Testing/gnome-control-center-netbook(r4)(update) -> MeeGo:1.2.0:oss:Update:Testing/gnome-control-center-netbook


Message:
    Fix bug[24264]: "Security and password" switcher does not work

State:   new          2012-05-24T03:19:37 shock
Comment: None



changes files:
--------------

new:
----
  fix_security_password_switcher_ineffectual.patch

spec files:
-----------
--- gnome-control-center-netbook.spec
+++ gnome-control-center-netbook.spec
@@ -41,6 +41,7 @@
 Patch18:     0001-Enable-only-when-external-monitors-are-available-BMO.patch
 Patch19:     0016-capplets-display-rework-display-icon.patch
 Patch20:     0001-Add-network-setup-dummy-capplet-to-bring-in-carrick.patch
+Patch21:     fix_security_password_switcher_ineffectual.patch
 Requires:   gnome-settings-daemon
 Requires:   gnome-icon-theme
 Requires:   gnome-menus
@@ -152,6 +153,8 @@
 %patch19 -p1
 # 0001-Add-network-setup-dummy-capplet-to-bring-in-carrick.patch
 %patch20 -p1
+# fix_security_password_switcher_ineffectual.patch
+%patch21 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ fix_security_password_switcher_ineffectual.patch (new)
--- fix_security_password_switcher_ineffectual.patch
+++ fix_security_password_switcher_ineffectual.patch
+diff -Nuar gnome-control-center-2.30.1/capplets/security/cc-security-panel.c gnome-control-center-2.30.1-new/capplets/security/cc-security-panel.c
+--- gnome-control-center-2.30.1/capplets/security/cc-security-panel.c	2012-05-24 11:21:58.258871384 +0800
++++ gnome-control-center-2.30.1-new/capplets/security/cc-security-panel.c	2012-05-24 11:25:38.073867079 +0800
+@@ -390,6 +390,7 @@
+         GtkWidget *main_window, *box, *toggle_box, *c_area, *label;
+         GtkBuilder *builder;
+         GError *error = NULL;
++        gboolean lock;
+ 
+         builder = gtk_builder_new ();
+         gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
+@@ -422,6 +423,11 @@
+         gtk_box_pack_start (GTK_BOX (toggle_box), priv->password_toggle,
+                             FALSE, FALSE, 0);
+         cc_security_panel_update_password_toggle (panel);
++        g_object_get (priv->password_toggle, "active", &lock, NULL);
++        gconf_client_set_bool (panel->priv->gconf,
++                               SCREEN_LOCK_KEY, lock,
++                               NULL);
++
+         priv->toggle_id = g_signal_connect (priv->password_toggle,
+                                             "notify::active",
+                                             G_CALLBACK (password_toggle_notify_active),

++++++ gnome-control-center-netbook.yaml
--- gnome-control-center-netbook.yaml
+++ gnome-control-center-netbook.yaml
@@ -35,6 +35,7 @@
     - 0001-Enable-only-when-external-monitors-are-available-BMO.patch
     - 0016-capplets-display-rework-display-icon.patch
     - 0001-Add-network-setup-dummy-capplet-to-bring-in-carrick.patch
+    - fix_security_password_switcher_ineffectual.patch
 Description: |
     The GNOME control-center provides a number of extension points
     for applications. This package contains directories where applications