Hello community, here is the log from the commit of package gnome-music for openSUSE:Factory checked in at 2013-12-30 09:53:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-music (Old) and /work/SRC/openSUSE:Factory/.gnome-music.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-music" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-music/gnome-music.changes 2013-10-15 10:40:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-music.new/gnome-music.changes 2013-12-30 09:53:59.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 28 18:16:07 UTC 2013 - dims...@opensuse.org + +- Add gnome-music-without-gsd.patch: allow to launch gnome-music + without gnome-settings-daemon, so outside of a gnome session + (bnc#852362, bgo#709234). + +------------------------------------------------------------------- New: ---- gnome-music-without-gsd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-music.spec ++++++ --- /var/tmp/diff_new_pack.YzAvTS/_old 2013-12-30 09:54:00.000000000 +0100 +++ /var/tmp/diff_new_pack.YzAvTS/_new 2013-12-30 09:54:00.000000000 +0100 @@ -24,6 +24,8 @@ Group: Productivity/Multimedia/Sound/Players Url: http://www.gnome.org Source: http://download.gnome.org/sources/gnome-music/3.10/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gnome-music-without-gsd.patch bnc#852362 bgo#709234 dims...@opensuse.org -- Allow launching gnome-music outside of a gnome-session +Patch0: gnome-music-without-gsd.patch BuildRequires: fdupes BuildRequires: intltool >= 0.26 BuildRequires: itstool @@ -53,6 +55,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %configure ++++++ gnome-music-without-gsd.patch ++++++ >From 0cac582edb437b1473a2451b0003f54c302907f7 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky <vrutk...@redhat.com> Date: Thu, 28 Nov 2013 10:51:28 +0000 Subject: Bug 709234 - don't crash if we can't connect to settings daemon --- 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() -- cgit v0.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
