Merge lp:~nataliabidart/ubuntu/natty/ubuntuone-control-panel/ubuntuone-control-panel-1.0.0 into lp:ubuntu/natty/ubuntuone-control-panel

[Natalia Bidart]

  * New upstream release:
  [ Natalia B. Bidart <email address hidden> ]
      - Hide and show replications boxes when replication list is ready and the
      user clicked on Services tab (hack to solve LP: #750309).

[Sebastien Bacher (seb128)]

thanks for your work there, uploaded

=== modified file 'PKG-INFO'
--- PKG-INFO	2011-04-15 21:23:44 +0000
+++ PKG-INFO	2011-04-19 21:27:29 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ubuntuone-control-panel
-Version: 0.10.0
+Version: 1.0.0
 Summary: Ubuntu One Control Panel
 Home-page: https://launchpad.net/ubuntuone-control-panel
 Author: Natalia Bidart
@@ -8,22 +8,4 @@
 License: GPL v3
 Description: Application to manage a Ubuntu One account. Provides aDBus service to query/modify all the Ubuntu One bits.
 Platform: UNKNOWN
-Requires: apt
-Requires: aptdaemon
-Requires: dbus
-Requires: defer
-Requires: desktopcouch.application.replication_services
-Requires: gi.repository
-Requires: gobject
-Requires: gtk
-Requires: mocker
-Requires: oauth
-Requires: pango
-Requires: simplejson
-Requires: twisted.application
-Requires: twisted.internet
-Requires: twisted.python.failure
-Requires: twisted.trial.unittest
-Requires: twisted.web
-Requires: ubuntu_sso
 Provides: ubuntuone

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-15 21:24:34 +0000
+++ debian/changelog	2011-04-19 21:27:29 +0000
@@ -1,3 +1,13 @@
+ubuntuone-control-panel (1.0.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release:
+
+  [ Natalia B. Bidart <[e-mail]> ]
+      - Hide and show replications boxes when replication list is ready and the
+      user clicked on Services tab (hack to solve LP: #750309).
+
+ -- Natalia Bidart (nessita) <[e-mail]>  Tue, 19 Apr 2011 18:10:20 -0300
+
 ubuntuone-control-panel (0.10.0-0ubuntu1) natty; urgency=low
 
   * New upstream release.

=== modified file 'setup.py'
--- setup.py	2011-04-15 21:23:44 +0000
+++ setup.py	2011-04-19 21:27:29 +0000
@@ -79,7 +79,7 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntuone-control-panel',
-    version='0.10.0',
+    version='1.0.0',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-04-15 21:23:44 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-04-19 21:27:29 +0000
@@ -1213,6 +1213,7 @@
         self.package_manager = package_manager.PackageManager()
         self.install_box = None
 
+        self._replications_ready = False  # hack to solve LP: #750309
         self.backend.connect_to_signal('ReplicationsInfoReady',
                                        self.on_replications_info_ready)
         self.backend.connect_to_signal('ReplicationsInfoError',
@@ -1278,6 +1279,7 @@
     @log_call(logger.debug)
     def load_replications(self, *args):
         """Load replications info."""
+        self._replications_ready = False  # hack to solve LP: #750309
         # ask replications to the backend
         self.message.start()
         self.backend.replications_info(reply_handler=NO_OP,
@@ -1308,6 +1310,7 @@
                 check_button=check_button,
                 dependency=pkg, dependency_name=name)
             setattr(self, '%s_service' % sid, child)
+            self._replications_ready = True  # hack to solve LP: #750309
 
     @log_call(logger.error)
     def on_replications_info_error(self, error_dict=None):
@@ -1318,6 +1321,12 @@
         else:
             self.on_error(error_dict=error_dict)
 
+    def refresh(self):
+        """If replication list has been loaded, hide and show them."""
+        if self._replications_ready:  # hack to solve LP: #750309
+            self.replications.hide()
+            self.replications.show()
+
 
 class FileSyncStatus(gtk.HBox, ControlPanelMixin):
     """A file sync status widget."""
@@ -1576,6 +1585,8 @@
 
         self.services_button.set_name(self.SERVICES_BUTTON_NAME)
         self.services_button.set_tooltip_text(self.SERVICES_BUTTON_TOOLTIP)
+        self.services_button.connect('clicked',
+                                     lambda b: self.services.refresh())
 
         self.enable_volumes = lambda: self.volumes_button.set_sensitive(True)
         self.disable_volumes = lambda: self.volumes_button.set_sensitive(False)