Ticket #89: 89.patch

src/jarabe/journal/journalactivity.py

@@ -60 +60 @@
         dbus.service.Object.__init__(self, bus_name, J_DBUS_PATH)
 
     @dbus.service.method(J_DBUS_INTERFACE,
-        in_signature='', out_signature='')
-    def FocusSearch(self):
-        """Become visible and give focus to the search entry
-        """
-        self._parent.present()
-        self._parent.show_main_view()
-        self._parent.search_grab_focus()
-
-    @dbus.service.method(J_DBUS_INTERFACE,
         in_signature='s', out_signature='')
     def ShowObject(self, object_id):
         """Pop-up journal and show object with object_id"""
@@ -332 +323 @@
     def set_active_volume(self, mount):
         self._volumes_toolbar.set_active_volume(mount)
 
+    def focus_search(self):
+        """Become visible and give focus to the search entry
+        """
+        self.present()
+        self.show_main_view()
+        self.search_grab_focus()
+
 _journal = None
 
 def get_journal():

src/jarabe/view/keyhandler.py

@@ -33 +33 @@
 from jarabe.view.tabbinghandler import TabbingHandler
 from jarabe.model.shell import ShellModel
 from jarabe import config
+from jarabe.journal.journalactivity import get_journal
 
 _BRIGHTNESS_STEP = 2
 _VOLUME_STEP = sound.VOLUME_STEP
@@ -67 +68 @@
     '<alt><shift>s'  : 'say_text',
 }
 
-J_DBUS_SERVICE = 'org.laptop.Journal'
-J_DBUS_PATH = '/org/laptop/Journal'
-J_DBUS_INTERFACE = 'org.laptop.Journal'
-
 SPEECH_DBUS_SERVICE = 'org.laptop.Speech'
 SPEECH_DBUS_PATH = '/org/laptop/Speech'
 SPEECH_DBUS_INTERFACE = 'org.laptop.Speech'
@@ -248 +245 @@
             if e.errno != errno.EINTR:
                 raise
 
-
     def handle_quit_emulator(self):
         if os.environ.has_key('SUGAR_EMULATOR_PID'):
             pid = int(os.environ['SUGAR_EMULATOR_PID'])
             os.kill(pid, signal.SIGTERM)
 
-    def focus_journal_search(self):
-        bus = dbus.SessionBus()
-        obj = bus.get_object(J_DBUS_SERVICE, J_DBUS_PATH)
-        journal = dbus.Interface(obj, J_DBUS_INTERFACE)
-        journal.FocusSearch()
-
     def handle_open_search(self):
-        self.focus_journal_search()
+        get_journal().focus_search()
 
     def _key_pressed_cb(self, grabber, keycode, state):
         key = grabber.get_key(keycode, state)