Merge lp:~eapache/update-manager/unity-urgency-hint into lp:update-manager

[Evan Huus]

Make sure the unity urgency hint is set and unset the same as the classic window-manager urgency hint.

Fixes bug #799173

[Michael Vogt (mvo)]

Thanks a bunch! merged into trunk now :)

review: Approve

=== modified file 'UpdateManager/UnitySupport.py'
--- UpdateManager/UnitySupport.py	2011-06-17 16:02:52 +0000
+++ UpdateManager/UnitySupport.py	2011-06-23 00:34:28 +0000
@@ -33,6 +33,7 @@
     """ interface for unity support """
     def __init__(self, parent): pass
     def set_updates_count(self, num_updates): pass
+    def set_urgency(self, urgent): pass
     def set_install_menuitem_visible(self, visible): pass
     def set_progress(self, progress): pass
 
@@ -80,13 +81,14 @@
 
     def set_updates_count(self, num_updates):
         self._unity.set_property("count", num_updates)
-        # FIXME: setup emblem as well(?) and add urgency only for security
+        # FIXME: setup emblem as well(?)
         if num_updates > 0:
             self._unity.set_property("count-visible", True)
-            self._unity.set_property("urgent", True)
         else:
             self._unity.set_property("count-visible", False)
-            self._unity.set_property("urgent", False)
+
+    def set_urgency(self, urgent):
+        self._unity.set_property("urgent", urgent)
 
     def set_install_menuitem_visible(self, visible):
         self.install_dbusmenuitem.property_set_bool(Dbusmenu.MENUITEM_PROP_VISIBLE, visible)
 
=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2011-06-10 13:43:24 +0000
+++ UpdateManager/UpdateManager.py	2011-06-23 00:34:28 +0000
@@ -283,12 +283,18 @@
     # get the install backend
     self.install_backend = backend.get_backend(self.window_main)
     self.install_backend.connect("action-done", self._on_backend_done)
+
+    # Create Unity launcher quicklist
+    # FIXME: instead of passing parent we really should just send signals
+    self.unity = UnitySupport(parent=self)
+
     # it can only the iconified *after* it is shown (even if the docs
     # claim otherwise)
     if options.no_focus_on_map:
         self.window_main.iconify()
         self.window_main.stick()
         self.window_main.set_urgency_hint(True)
+        self.unity.set_urgency(True)
         self.initial_focus_id = self.window_main.connect(
             "focus-in-event", self.on_initial_focus_in)
     
@@ -298,9 +304,6 @@
     self.alert_watcher.connect("battery-alert", self._on_battery_alert)
     self.alert_watcher.connect("network-3g-alert", self._on_network_3g_alert)
 
-    # Create Unity launcher quicklist
-    # FIXME: instead of passing parent we really should just send signals
-    self.unity = UnitySupport(parent=self)
 
   def install_all_updates (self, menu, menuitem, data):
     self.select_all_updgrades (None)
@@ -310,6 +313,7 @@
       """callback run on initial focus-in (if started unmapped)"""
       widget.unstick()
       widget.set_urgency_hint(False)
+      self.unity.set_urgency(False)
       self.window_main.disconnect(self.initial_focus_id)
       return False