Merge commit 'refs/top-bases/t/bug-1673' into t/bug-1673

* commit 'refs/top-bases/t/bug-1673': (87 commits)
  Fix up style issues introduced by commit 3f8a1e1
  Don't set default timezone
  Restore setting a language with the command line OLPC #10681
  battery frame device: replace HAL with UPower
  use ConsoleKit instead of HAL for shutdown/reboot
  fix recognition of JEBs outside of data store
  Adjust the year in the licence visible in the control panel
  Handle activities that cycle through windows dlo#10695
  Speaker frame device: pop up palette on left-click instead of toggling mute
  recognise translations using pgettext
  Remove last few pieces of buddy-icon.jpg handling
  fix whitespace error introduced by 4b6a534 (revert of 4a3416b)
  Commit from Sugar Labs: Translation System by user RafaelOrtiz.: 374 of 374 messages translated (0 fuzzy).
  Intro: Fall back to user name if GECOS real name field is empty
  Sugar Ad-hoc icons show in search results when connect/disconnect to AP OLPC #10412
  Show busy cursor during session shutdown
  Show free space for the Journal in the Journal volumes toolbar (SL#2318)
  Fix incorrect logging level for warning about missing GSM configuration
  simplify extension loading exception error
  Revert "Add cpu and memory resource indicator to frame" as agreed on with erikos. Scheduling for inclusion in 0.94 after potential artwork changes based on feedback from the Design Team.
  ...

Conflicts:
	extensions/cpsection/network/model.py

1 files changed, 18 insertions, 16 deletions

diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py
index 44cc018..a33038a 100644
--- a/src/jarabe/journal/journalactivity.py
+++ b/src/jarabe/journal/journalactivity.py
@@ -17,8 +17,6 @@
 
 import logging
 from gettext import gettext as _
-import sys
-import traceback
 import uuid
 
 import gtk
@@ -44,6 +42,8 @@ from jarabe.journal.journalentrybundle import JournalEntryBundle
 from jarabe.journal.objectchooser import ObjectChooser
 from jarabe.journal.modalalert import ModalAlert
 from jarabe.journal import model
+from jarabe.journal.journalwindow import JournalWindow
+
 
 J_DBUS_SERVICE = 'org.laptop.Journal'
 J_DBUS_INTERFACE = 'org.laptop.Journal'
@@ -52,6 +52,9 @@ J_DBUS_PATH = '/org/laptop/Journal'
 _SPACE_TRESHOLD = 52428800
 _BUNDLE_ID = 'org.laptop.JournalActivity'
 
+_journal = None
+
+
 class JournalActivityDBusService(dbus.service.Object):
     def __init__(self, parent):
         self._parent = parent
@@ -81,7 +84,8 @@ class JournalActivityDBusService(dbus.service.Object):
         chooser.destroy()
         del chooser
 
-    @dbus.service.method(J_DBUS_INTERFACE, in_signature='is', out_signature='s')
+    @dbus.service.method(J_DBUS_INTERFACE, in_signature='is',
+                         out_signature='s')
     def ChooseObject(self, parent_xid, what_filter=''):
         chooser_id = uuid.uuid4().hex
         if parent_xid > 0:
@@ -94,18 +98,19 @@ class JournalActivityDBusService(dbus.service.Object):
 
         return chooser_id
 
-    @dbus.service.signal(J_DBUS_INTERFACE, signature="ss")
+    @dbus.service.signal(J_DBUS_INTERFACE, signature='ss')
     def ObjectChooserResponse(self, chooser_id, object_id):
         pass
 
-    @dbus.service.signal(J_DBUS_INTERFACE, signature="s")
+    @dbus.service.signal(J_DBUS_INTERFACE, signature='s')
     def ObjectChooserCancelled(self, chooser_id):
         pass
 
-class JournalActivity(Window):
+
+class JournalActivity(JournalWindow):
     def __init__(self):
-        logging.debug("STARTUP: Loading the journal")
-        Window.__init__(self)
+        logging.debug('STARTUP: Loading the journal')
+        JournalWindow.__init__(self)
 
         self.set_title(_('Journal'))
 
@@ -223,8 +228,7 @@ class JournalActivity(Window):
         try:
             self._detail_toolbox.entry_toolbar.set_metadata(metadata)
         except Exception:
-            logging.error('Exception while displaying entry:\n' + \
-                ''.join(traceback.format_exception(*sys.exc_info())))
+            logging.exception('Exception while displaying entry:')
 
         self.set_toolbar_box(self._detail_toolbox)
         self._detail_toolbox.show()
@@ -232,8 +236,7 @@ class JournalActivity(Window):
         try:
             self._detail_view.props.metadata = metadata
         except Exception:
-            logging.error('Exception while displaying entry:\n' + \
-                ''.join(traceback.format_exception(*sys.exc_info())))
+            logging.exception('Exception while displaying entry:')
 
         self.set_canvas(self._secondary_view)
         self._secondary_view.show()
@@ -327,11 +330,11 @@ class JournalActivity(Window):
         self._list_view.set_is_visible(visible)
 
     def _check_available_space(self):
-        ''' Check available space on device
+        """Check available space on device
 
             If the available space is below 50MB an alert will be
             shown which encourages to delete old journal entries.
-        '''
+        """
 
         if self._critical_space_alert:
             return
@@ -358,7 +361,6 @@ class JournalActivity(Window):
         self.show_main_view()
         self.search_grab_focus()
 
-_journal = None
 
 def get_journal():
     global _journal
@@ -367,6 +369,6 @@ def get_journal():
         _journal.show()
     return _journal
 
+
 def start():
     get_journal()
-