Merge lp:~mvo/software-properties/fix-policykit-prompt-on-startup into lp:software-properties

[Michael Vogt]

This fixes a policykit prompt on startup if the default policy is set to something other than "daily" for Check for updates.

To reproduce:
1. open software-properties-gtk
2. go to the updates tab
3. select "never" in "automatic check for updates"
4. close software-properties-gtk
5. open software-properties-gtk again and see that it prompts for a policykit prompt with that branch this is fixed

=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
--- softwareproperties/gtk/SoftwarePropertiesGtk.py	2012-03-07 09:13:48 +0000
+++ softwareproperties/gtk/SoftwarePropertiesGtk.py	2012-05-04 00:28:18 +0000
@@ -230,15 +230,6 @@
          self.combobox_update_interval.connect("changed", 
                                      self.on_combobox_update_interval_changed)))
     
-    self.handlers.append(
-        (self.combobox_security_updates,
-         self.combobox_security_updates.connect("changed",
-                                     self.set_sec_update_automation_level)))
-    
-    self.handlers.append(
-        (self.combobox_security_updates,
-         self.combobox_other_updates.connect("changed",
-                                     self.set_other_update_automation_level)))
   
   def show_auto_update_level(self):
     """Represent the level of update automation in the user interface"""
@@ -268,6 +259,16 @@
                 self.combobox_other_updates.set_active(i)
                 break
 
+    self.handlers.append(
+        (self.combobox_security_updates,
+         self.combobox_security_updates.connect("changed",
+                                     self.set_sec_update_automation_level)))
+    
+    self.handlers.append(
+        (self.combobox_other_updates,
+         self.combobox_other_updates.connect("changed",
+                                     self.set_other_update_automation_level)))
+
   def init_distro(self):
     """Setup the user interface elements to represent the distro"""