[rhythmbox/f15] Fix radio station crashers (#708613) Thanks to Claudio Saavedra for picking the patch

Bastien Nocera hadess at fedoraproject.org
Wed Aug 31 09:46:55 UTC 2011


commit 0b977de02a81d86abf07eb34190592dfe43cfce0
Author: Bastien Nocera <hadess at hadess.net>
Date:   Wed Aug 31 10:46:41 2011 +0100

    Fix radio station crashers (#708613)
    Thanks to Claudio Saavedra for picking the patch

 ...ster-the-station-properties-dialog-type-b.patch |   33 ++++++++++++++++++++
 rhythmbox.spec                                     |    8 ++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/0001-iradio-register-the-station-properties-dialog-type-b.patch b/0001-iradio-register-the-station-properties-dialog-type-b.patch
new file mode 100644
index 0000000..731c38a
--- /dev/null
+++ b/0001-iradio-register-the-station-properties-dialog-type-b.patch
@@ -0,0 +1,33 @@
+From c788b2f670c234ffed900c5d844bf4cdf83bb9a7 Mon Sep 17 00:00:00 2001
+From: Jonathan Matthew <jonathan at d14n.org>
+Date: Tue, 3 May 2011 18:59:51 +1000
+Subject: [PATCH] iradio: register the station properties dialog type (bug
+ #649231)
+
+---
+ plugins/iradio/rb-iradio-plugin.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/plugins/iradio/rb-iradio-plugin.c b/plugins/iradio/rb-iradio-plugin.c
+index da8caa8..552548a 100644
+--- a/plugins/iradio/rb-iradio-plugin.c
++++ b/plugins/iradio/rb-iradio-plugin.c
+@@ -44,6 +44,7 @@
+ #include "rb-dialog.h"
+ #include "rb-iradio-source.h"
+ #include "rb-iradio-source-search.h"
++#include "rb-station-properties-dialog.h"
+ #include "rb-file-helpers.h"
+ #include "rb-display-page-group.h"
+ 
+@@ -131,6 +132,7 @@ peas_register_types (PeasObjectModule *module)
+ 	rb_iradio_plugin_register_type (G_TYPE_MODULE (module));
+ 	_rb_iradio_source_register_type (G_TYPE_MODULE (module));
+ 	_rb_iradio_source_search_register_type (G_TYPE_MODULE (module));
++	_rb_station_properties_dialog_register_type (G_TYPE_MODULE (module));
+ 	peas_object_module_register_extension_type (module,
+ 						    PEAS_TYPE_ACTIVATABLE,
+ 						    RB_TYPE_IRADIO_PLUGIN);
+-- 
+1.7.6
+
diff --git a/rhythmbox.spec b/rhythmbox.spec
index 9d2d273..1dba53c 100644
--- a/rhythmbox.spec
+++ b/rhythmbox.spec
@@ -6,7 +6,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 2.90.1
-Release: 10%{snapshot}%{?dist}
+Release: 11%{snapshot}%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -15,6 +15,7 @@ URL: http://projects.gnome.org/rhythmbox/
 Source: %{name}-%{realversion}%{snapshot}.tar.bz2
 
 Patch0: rhythmbox-use-g-date-time-format.patch
+Patch1: 0001-iradio-register-the-station-properties-dialog-type-b.patch
 
 Requires: gtk3 >= 2.91.4
 Requires: gnome-icon-theme-legacy
@@ -107,6 +108,7 @@ a Rhythmbox plugin.
 %setup -q -c rhythmbox-%{realversion} -n rhythmbox-%{realversion}
 
 %patch0 -p1 -b .datetime
+%patch1 -p1 -b .radio-station
 
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
@@ -229,6 +231,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Wed Aug 31 2011 Bastien Nocera <bnocera at redhat.com> 2.90.1-11.git20110502
+- Fix radio station crashers (#708613)
+  Thanks to Claudio Saavedra for picking the patch
+
 * Wed May 25 2011 Dan Williams <dcbw at redhat.com> - 2.90.1-10.git20110502
 - Fix crash handling dates (rh #699290)
 


More information about the scm-commits mailing list