From 208a68e451635883d0c6f58e56c8308bafe8b16c Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Sun, 09 Jun 2013 22:06:54 +0000 Subject: refactoring based on lasted commits upstream --- (limited to 'src/jarabe/journal/journalactivity.py') diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py index 4bb68fd..d1afe12 100644 --- a/src/jarabe/journal/journalactivity.py +++ b/src/jarabe/journal/journalactivity.py @@ -26,7 +26,6 @@ import dbus import statvfs import os -from sugar3.graphics.window import Window from sugar3.graphics.alert import ErrorAlert from sugar3.bundle.bundle import ZipExtractException, RegistrationException @@ -63,12 +62,14 @@ class JournalActivityDBusService(dbus.service.Object): self._parent = parent session_bus = dbus.SessionBus() bus_name = dbus.service.BusName(J_DBUS_SERVICE, - bus=session_bus, replace_existing=False, allow_replacement=False) + bus=session_bus, + replace_existing=False, + allow_replacement=False) logging.debug('bus_name: %r', bus_name) dbus.service.Object.__init__(self, bus_name, J_DBUS_PATH) @dbus.service.method(J_DBUS_INTERFACE, - in_signature='s', out_signature='') + in_signature='s', out_signature='') def ShowObject(self, object_id): """Pop-up journal and show object with object_id""" @@ -93,7 +94,7 @@ class JournalActivityDBusService(dbus.service.Object): chooser_id = uuid.uuid4().hex if parent_xid > 0: display = Gdk.Display.get_default() - parent = GdkX11.X11Window.foreign_new_for_display( \ + parent = GdkX11.X11Window.foreign_new_for_display( display, parent_xid) else: parent = None @@ -324,7 +325,7 @@ class JournalActivity(JournalWindow): registry.install(bundle, metadata['uid']) except (ZipExtractException, RegistrationException): logging.exception('Could not install bundle %s', - bundle.get_path()) + bundle.get_path()) return try: -- cgit v0.9.1