diff options
Diffstat (limited to 'rpms/sugar/0003-Yum-updater-notifications-integration.patch')
| -rw-r--r-- | rpms/sugar/0003-Yum-updater-notifications-integration.patch | 51 |
1 files changed, 33 insertions, 18 deletions
diff --git a/rpms/sugar/0003-Yum-updater-notifications-integration.patch b/rpms/sugar/0003-Yum-updater-notifications-integration.patch index 61d7b80..8e2418d 100644 --- a/rpms/sugar/0003-Yum-updater-notifications-integration.patch +++ b/rpms/sugar/0003-Yum-updater-notifications-integration.patch @@ -1,17 +1,31 @@ -From 73ea63c05b786dffa97639091f0187cb663a0809 Mon Sep 17 00:00:00 2001 +From patchwork Wed Feb 16 21:16:59 2011 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [Sugar] Yum-updater notifications integration +Date: Thu, 17 Feb 2011 02:16:59 -0000 +From: Martin Abente <martin.abente.lahaye@gmail.com> +X-Patchwork-Id: 675 +Message-Id: <1297891019-18618-1-git-send-email-martin.abente.lahaye@gmail.com> +To: dextrose@lists.sugarlabs.org, + anish@sugarlabs.org +Cc: Aleksey Lim <alsroot@member.fsf.org> + From: Aleksey Lim <alsroot@member.fsf.org> -Date: Mon, 20 Dec 2010 16:36:05 -0300 -Subject: [PATCH] Yum-updater notifications integration Original-code: http://wiki.sugarlabs.org/go/Dextrose/Updater dextrose-port-by: Martin Abente <martin.abente.lahaye@gmail.com> +VERSION 2 Including silbe's robustness suggestions. + +PLEASE REPLACE OLD PATCH WITH THIS ONE + --- - src/jarabe/desktop/homewindow.py | 32 ++++++++++++++++++++++++++++++++ - 1 files changed, 32 insertions(+), 0 deletions(-) +src/jarabe/desktop/homewindow.py | 36 ++++++++++++++++++++++++++++++++++++ + 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/jarabe/desktop/homewindow.py b/src/jarabe/desktop/homewindow.py -index d830ed0..bd5daf7 100644 +index d830ed0..34184a2 100644 --- a/src/jarabe/desktop/homewindow.py +++ b/src/jarabe/desktop/homewindow.py @@ -17,6 +17,8 @@ @@ -43,15 +57,20 @@ index d830ed0..bd5daf7 100644 class HomeWindow(gtk.Window): def __init__(self): logging.debug('STARTUP: Loading the desktop window') -@@ -72,6 +81,29 @@ class HomeWindow(gtk.Window): +@@ -71,6 +80,33 @@ class HomeWindow(gtk.Window): + shell.get_model().zoom_level_changed.connect( self.__zoom_level_changed_cb) - -+ systembus = dbus.SystemBus() -+ systembus.add_signal_receiver(self.__reboot_cb, 'Reboot', -+ _DBUS_SYSTEM_IFACE) -+ systembus.add_signal_receiver(self.__relogin_cb, 'Relogin', -+ _DBUS_SYSTEM_IFACE) ++ ++ try: ++ systembus = dbus.SystemBus() ++ except dbus.DBusException: ++ logging.error('DBus SystemBus is not available') ++ else: ++ systembus.add_signal_receiver(self.__reboot_cb, 'Reboot', ++ _DBUS_SYSTEM_IFACE) ++ systembus.add_signal_receiver(self.__relogin_cb, 'Relogin', ++ _DBUS_SYSTEM_IFACE) + + def _system_alert(self, replaces_id, app_icon, message): + service = notifications.get_service() @@ -69,10 +88,6 @@ index d830ed0..bd5daf7 100644 + self._system_alert(_SYSTEM_RELOGIN_ID, 'system-logout', + _('Please, restart Sugar to take into account ' \ + 'new updates')) -+ + def _deactivate_view(self, level): group = palettegroup.get_group("default") - group.popdown() --- -1.7.1 - |