[gnome-music/gnome-3-10] Bug 709234 - don't crash if we can't connect to settings daemon



commit 0cac582edb437b1473a2451b0003f54c302907f7
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Thu Nov 28 11:51:28 2013 +0100

    Bug 709234 - don't crash if we can't connect to settings daemon

 gnomemusic/window.py |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/gnomemusic/window.py b/gnomemusic/window.py
index 79e69a8..daa27f0 100644
--- a/gnomemusic/window.py
+++ b/gnomemusic/window.py
@@ -82,7 +82,11 @@ class Window(Gtk.ApplicationWindow):
                                             'org.gnome.SettingsDaemon.MediaKeys',
                                             None)
         self._grab_media_player_keys()
-        self.proxy.connect('g-signal', self._handle_media_keys)
+        try:
+            self.proxy.connect('g-signal', self._handle_media_keys)
+        except GLib.GError:
+            # We cannot grab media keys if no settings daemon is running
+            pass
 
     def on_configure_event(self, widget, event):
         size = widget.get_size()
@@ -95,11 +99,15 @@ class Window(Gtk.ApplicationWindow):
         self.settings.set_boolean('window-maximized', 'GDK_WINDOW_STATE_MAXIMIZED' in 
event.new_window_state.value_names)
 
     def _grab_media_player_keys(self):
-        self.proxy.call_sync('GrabMediaPlayerKeys',
-                             GLib.Variant('(su)', ('Music', 0)),
-                             Gio.DBusCallFlags.NONE,
-                             -1,
-                             None)
+        try:
+            self.proxy.call_sync('GrabMediaPlayerKeys',
+                                 GLib.Variant('(su)', ('Music', 0)),
+                                 Gio.DBusCallFlags.NONE,
+                                 -1,
+                                 None)
+        except GLib.GError:
+            # We cannot grab media keys if no settings daemon is running
+            pass
 
     def _windows_focus_cb(self, window, event):
         self._grab_media_player_keys()


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]