Here you go, tomeu.
diff --git a/NEWS b/NEWS
index 398ed2c..06c5a53 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+84
+
+* #6639 Journal can't resume activity bundles using another activity (homunq)
+
+80
+
* #5017 Correctly expose some strings to gettext. (tomeu)
* #6190 Don't crash when an activity has its icon missing. (tomeu)
* #6029 Don't fail when the mount point is already occupied. (tomeu)
diff --git a/activity/activity.info b/activity/activity.info
old mode 100755
new mode 100644
index 9d65a95..6f39a2a
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = Journal
-activity_version = 79
+activity_version = 84
service_name = org.laptop.JournalActivity
icon = activity-journal
class = journalactivity.JournalActivity
diff --git a/journaltoolbox.py b/journaltoolbox.py
index 630d245..164a0f6 100644
--- a/journaltoolbox.py
+++ b/journaltoolbox.py
@@ -408,7 +408,10 @@ class EntryToolbar(gtk.Toolbar):
def _resume_menu_item_activate_cb(self, menu_item, service_name):
if self._jobject:
- self._jobject.resume(service_name)
+ if not service_name:
+ self._jobject.resume()
+ else:
+ self._jobject.resume(service_name)
def _copy_menu_item_activate_cb(self, menu_item, volume):
if self._jobject:
@@ -447,12 +450,18 @@ class EntryToolbar(gtk.Toolbar):
for menu_item in palette.menu.get_children():
palette.menu.remove(menu_item)
menu_item.destroy()
-
- if not self._jobject.is_activity_bundle():
- for activity in self._jobject.get_activities():
- menu_item = MenuItem(activity.name)
- menu_item.set_image(Icon(file=activity.icon, icon_size=gtk.ICON_SIZE_MENU))
- menu_item.connect('activate', self._resume_menu_item_activate_cb,
- activity.bundle_id)
- palette.menu.append(menu_item)
- menu_item.show()
+
+ if self._jobject.is_activity_bundle():
+ menu_item = MenuItem(_('Start'))
+ menu_item.connect('activate', self._resume_menu_item_activate_cb,
+ None)
+ palette.menu.append(menu_item)
+ menu_item.show()
+ activities = self._jobject.get_activities()
+ for activity in activities:
+ menu_item = MenuItem(activity.name)
+ menu_item.set_image(Icon(file=activity.icon, icon_size=gtk.ICON_SIZE_MENU))
+ menu_item.connect('activate', self._resume_menu_item_activate_cb,
+ activity.bundle_id)
+ palette.menu.append(menu_item)
+ menu_item.show()
diff --git a/setup.py b/setup.py
old mode 100755
new mode 100644
_______________________________________________
Sugar mailing list
[email protected]
http://lists.laptop.org/listinfo/sugar
