From c1eaa18bf060d5f86e49a72d57ec8441002eb53b Mon Sep 17 00:00:00 2001
From: C. Scott Ananian <cscott@laptop.org>
Date: Thu, 20 Dec 2007 16:28:45 +0000
Subject: Fix for #4909 landed different in sugar than in the patch attached to the bug.

Instead of a method of the Activity class, it's a function defined in the
sugar.activity.activity module, with a slightly different name.
---
(limited to 'activity.py')

diff --git a/activity.py b/activity.py
index 6f6c9d1..90b46c7 100644
--- a/activity.py
+++ b/activity.py
@@ -37,11 +37,13 @@ class ViewSourceActivity(activity.Activity):
             jobject.destroy()
         self.journal_show_object(self.__source_object_id)
     def journal_show_object(self, object_id):
-        """Invoke parent class' journal_show_object if it exists."""
-        s = super(ViewSourceActivity, self)
-        if hasattr(s, 'journal_show_object'):
-            s.journal_show_object(object_id)
-
+        """Invoke journal_show_object from sugar.activity.activity if it
+        exists."""
+        try:
+            from sugar.activity.activity import show_object_in_journal
+            show_object_in_journal(object_id)
+        except ImportError:
+            pass # no love from sugar.
 
 class VteActivity(ViewSourceActivity):
     def __init__(self, handle):
--
cgit v0.9.1