Merge lp:~yofel/software-properties/lp-944876 into lp:software-properties

[Philip Muškovac]

This works around the broken update policy behaviour in the KDE UI and should be backported to oneiric.

I know this isn't much of a proper fix, but works and shouldn't cause any regressions otherwise.
For 12.10 I'll see if we can find someone to rewrite the KDE ui to use the dbus interface.

[Colin Watson (cjwatson)]

This has effectively been merged into precise-proposed:

  http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/precise/software-properties/precise-proposed/revision/91

[Colin Watson (cjwatson)]

Possibly more usefully:

  http://bazaar.launchpad.net/~ubuntu-core-dev/software-properties/main/revision/752

=== modified file 'softwareproperties/kde/SoftwarePropertiesKDE.py'
--- softwareproperties/kde/SoftwarePropertiesKDE.py	2011-11-21 15:47:12 +0000
+++ softwareproperties/kde/SoftwarePropertiesKDE.py	2012-04-15 21:09:17 +0000
@@ -149,6 +149,10 @@
   def init_release_upgrades(self):
     " setup the widgets that allow configuring the release upgrades "
     i = self.get_release_upgrades_policy()
+
+    # FIXME: hack for LP: #944876
+    i = (i + 1) % 3
+
     self.userinterface.combobox_release_upgrades.setCurrentIndex(i)
     kapp.connect(self.userinterface.combobox_release_upgrades, SIGNAL("currentIndexChanged(int)"), self.on_combobox_release_upgrades_changed)
 
@@ -395,6 +399,10 @@
   def on_combobox_release_upgrades_changed(self, combobox):
     """ set the release upgrades policy """
     i = self.userinterface.combobox_release_upgrades.currentIndex()
+
+    # FIXME: hack for LP: #944876
+    i = (i - 1) % 3
+
     self.set_release_upgrades_policy(i)
 
   def on_combobox_server_changed(self, combobox):