Ticket #1719: sugar-1719.patch

src/jarabe/model/shell.py

@@ -35 +35 @@
 _SERVICE_PATH = "/org/laptop/Activity"
 _SERVICE_INTERFACE = "org.laptop.Activity"
 
+LAUNCHED = 0
+LAUNCHING = 1
+ACTIVATED = 2
+
+
 class Activity(gobject.GObject):
     """Activity which appears in the "Home View" of the Sugar shell
 
@@ -47 +52 @@
     __gtype_name__ = 'SugarHomeActivity'
 
     __gproperties__ = {
-        'launching' : (bool, None, None, False,
+        'launching' : (int, None, None, LAUNCHED, ACTIVATED, LAUNCHED,
                        gobject.PARAM_READWRITE),
     }
 
@@ -477 +482 @@
 
             if not home_activity:
                 home_activity = Activity(activity_info, activity_id, window)
+                home_activity.props.launching = LAUNCHING
                 self._add_activity(home_activity)
             else:
                 home_activity.set_window(window)
 
             if wm.get_sugar_window_type(window) != 'launcher':
-                home_activity.props.launching = False
+                home_activity.props.launching = LAUNCHED
                 if not home_activity.is_journal():
                     self.emit('launch-completed', home_activity)
 
@@ -560 +566 @@
                              " was not found in the bundle registry."
                              % service_name)
         home_activity = Activity(activity_info, activity_id)
-        home_activity.props.launching = True
+        home_activity.props.launching = ACTIVATED
         self._add_activity(home_activity)
 
         self._set_active_activity(home_activity)
@@ -577 +583 @@
         if home_activity:
             logging.debug("Activity %s (%s) launch failed", activity_id,
                 home_activity.get_type())
-            if home_activity.props.launching:
+            if home_activity.props.launching != LAUNCHED:
                 self.emit('launch-failed', home_activity)
             else:
                 self._remove_activity(home_activity)

src/jarabe/view/service.py

@@ -83 +83 @@
 
         if activity is not None and activity.get_window() is not None:
             activity.get_window().activate(gtk.get_current_event_time())
-            return not activity.props.launching
+            if activity.props.launching == shell.LAUNCHING:
+                activity.props.launching = shell.ACTIVATED
+                return False
+            else:
+                return True
 
         return False