Merge lp:~om26er/ubuntu/maverick/rhythmbox/rhythmbox-bugfixes-maverick into lp:ubuntu/maverick-proposed/rhythmbox

[Omer Akram]

Backported fixes for three rhythmbox crashers two of which are common cases. all three patches contain very small changes.

[Artur Rona (ari-tczew)]

Please remove one star in debian/changelog:3

You have wrong URL in tag Bug-Ubuntu. It should be https://launchpad.net/bugs/XXXXXX

review: Needs Fixing

[lp:~om26er/ubuntu/maverick/rhythmbox/rhythmbox-bugfixes-maverick]

177. By Omer Akram on 2010-12-24

debian/patches/dont_crash_if_multiple_feeds_are_selected.patch:

[Omer Akram (om26er)]

> Please remove one star in debian/changelog:3
>
> You have wrong URL in tag Bug-Ubuntu. It should be
> https://launchpad.net/bugs/XXXXXX

fixed. thanks for the review

[Artur Rona (ari-tczew)]

OK now looks good and builds fine in maverick chroot. Please any core-dev upload.

review: Approve

[Jamie Strandboge (jdstrand)]

Patch applies and debdiff looks good. I didn't review the patches themselves since Artur ACKd the upload already.

review: Approve

[Jamie Strandboge (jdstrand)]

Somehow I forgot to upload this. Doing it now.

[Jamie Strandboge (jdstrand)]

Omer, I did notice while re-reviewing this that the series file had the patches at the top. This means that they will get applied before any other patches, which could mess up patches coming after it. I have moved them to be last in the series file and renamed them so they conform to the patch names used in the package.

Unmerged revisions

177. By Omer Akram on 2010-12-24

debian/patches/dont_crash_if_multiple_feeds_are_selected.patch:

176. By Omer Akram on 2010-12-13

* * debian/patches/dont_crash_if_multiple_feeds_are_selected.patch:
  - Don't crash if multiple podcast feeds are selected. (LP: #404255)
* debian/patches/dont_crash_when_trying_to_show_properties_if_ipod_db_load_fails.patch:
  - Don't crash when right clicking on ipod to get properties. (LP: #651261)
* debian/patches/specify_the_right_pointer_for_the_parser_entry-added_handler.patch:
  - Don't crash when opening .m3u file. (LP: #410510)

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-02 13:05:02 +0000
+++ debian/changelog	2010-12-24 12:23:28 +0000
@@ -1,3 +1,14 @@
+rhythmbox (0.13.1-0ubuntu6.1) maverick-proposed; urgency=low
+
+  * debian/patches/dont_crash_if_multiple_feeds_are_selected.patch:
+    - Don't crash if multiple podcast feeds are selected. (LP: #404255)
+  * debian/patches/dont_crash_when_trying_to_show_properties_if_ipod_db_load_fails.patch:
+    - Don't crash when right clicking on ipod to get properties. (LP: #651261)
+  * debian/patches/specify_the_right_pointer_for_the_parser_entry-added_handler.patch:
+    - Don't crash when opening .m3u file. (LP: #410510)
+
+ -- Omer Akram <[e-mail]>  Tue, 14 Dec 2010 00:16:52 +0500
+
 rhythmbox (0.13.1-0ubuntu6) maverick-proposed; urgency=low
 
   * debian/patches/92_git_add_hardcoded_extensions_for_common_media_types.patch:
 
=== added file 'debian/patches/dont_crash_if_multiple_feeds_are_selected.patch'
--- debian/patches/dont_crash_if_multiple_feeds_are_selected.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/dont_crash_if_multiple_feeds_are_selected.patch	2010-12-24 12:23:28 +0000
@@ -0,0 +1,23 @@
+From: Jonathan Matthew <[e-mail]>
+Subject: Don't crash if multiple feeds are selected.
+Origin: http://git.gnome.org/browse/rhythmbox/commit/?id=5d57ea19d2f5dc32e5cf9aab85beb4d782eaa250
+Bug: http://bugs.gnome.org/589886
+Bug-Ubuntu: https://launchpad.net/bugs/404255
+
+---
+diff --git a/sources/rb-podcast-source.c b/sources/rb-podcast-source.c
+index 4c5f241..77ae3ab 100644
+--- a/sources/rb-podcast-source.c
++++ b/sources/rb-podcast-source.c
+@@ -1171,7 +1171,8 @@ construct_query_from_selection (RBPodcastSource *source)
+ 					       RHYTHMDB_QUERY_END);
+ 			if (g_list_next (l))
+ 				rhythmdb_query_append (source->priv->db, subquery,
+-						       RHYTHMDB_QUERY_DISJUNCTION);
++						       RHYTHMDB_QUERY_DISJUNCTION,
++						       RHYTHMDB_QUERY_END);
+ 		}
+ 
+ 		rhythmdb_query_append (source->priv->db, query,
+--
+cgit v0.8.3.1
 
=== added file 'debian/patches/dont_crash_when_trying_to_show_properties_if_ipod_db_load_fails.patch'
--- debian/patches/dont_crash_when_trying_to_show_properties_if_ipod_db_load_fails.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/dont_crash_when_trying_to_show_properties_if_ipod_db_load_fails.patch	2010-12-24 12:23:28 +0000
@@ -0,0 +1,39 @@
+From: Jonathan Matthew <[e-mail]>
+Subject: Don't crash when trying to show properties if ipod db load fails.
+Origin: http://git.gnome.org/browse/rhythmbox/commit/?id=703fe04402dabea4d4b1e76d5ffc4101ee4264bb
+Bug: http://bugs.gnome.org/618619
+Bug-Ubuntu: https://launchpad.net/bugs/651261
+
+---
+diff --git a/plugins/ipod/rb-ipod-source.c b/plugins/ipod/rb-ipod-source.c
+index 47a405b..847551e 100644
+--- a/plugins/ipod/rb-ipod-source.c
++++ b/plugins/ipod/rb-ipod-source.c
+@@ -2036,13 +2036,23 @@ get_mount_point	(RBiPodSource *source)
+ static guint64
+ impl_get_capacity (RBMediaPlayerSource *source)
+ {
+-	return rb_ipod_helpers_get_capacity (get_mount_point (RB_IPOD_SOURCE (source)));
++	RBiPodSourcePrivate *priv = IPOD_SOURCE_GET_PRIVATE (source);
++	if (priv->ipod_db) {
++		return rb_ipod_helpers_get_capacity (get_mount_point (RB_IPOD_SOURCE (source)));
++	} else {
++		return 0;
++	}
+ }
+ 
+ static guint64
+ impl_get_free_space (RBMediaPlayerSource *source)
+ {
+-	return rb_ipod_helpers_get_free_space (get_mount_point (RB_IPOD_SOURCE (source)));
++	RBiPodSourcePrivate *priv = IPOD_SOURCE_GET_PRIVATE (source);
++	if (priv->ipod_db) {
++		return rb_ipod_helpers_get_free_space (get_mount_point (RB_IPOD_SOURCE (source)));
++	} else {
++		return 0;
++	}
+ }
+ 
+ static void
+--
+cgit v0.8.3.1
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-02 13:05:02 +0000
+++ debian/patches/series	2010-12-24 12:23:28 +0000
@@ -1,3 +1,6 @@
+dont_crash_if_multiple_feeds_are_selected.patch
+dont_crash_when_trying_to_show_properties_if_ipod_db_load_fails.patch
+specify_the_right_pointer_for_the_parser_entry-added_handler.patch
 01_dlna_vorbis.patch
 15_ubuntu_lpi.patch
 16_ubuntu_ayatana_register.patch
 
=== added file 'debian/patches/specify_the_right_pointer_for_the_parser_entry-added_handler.patch'
--- debian/patches/specify_the_right_pointer_for_the_parser_entry-added_handler.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/specify_the_right_pointer_for_the_parser_entry-added_handler.patch	2010-12-24 12:23:28 +0000
@@ -0,0 +1,22 @@
+From: Jonathan Matthew <[e-mail]>
+Subject: Specify the right pointer for the parser entry-added handler.
+Origin: http://git.gnome.org/browse/rhythmbox/commit/?id=75ae0dc122a8e9a78fb8d975c50a9d7781bd2030
+Bug: http://bugs.gnome.org/591841
+Bug-Ubuntu: https://launchpad.net/bugs/410510
+
+---
+diff --git a/shell/rb-shell.c b/shell/rb-shell.c
+index 4976349..c490a92 100644
+--- a/shell/rb-shell.c
++++ b/shell/rb-shell.c
+@@ -3405,7 +3405,7 @@ rb_shell_load_uri (RBShell *shell,
+ 
+ 		g_signal_connect_data (parser, "entry-parsed",
+ 				       G_CALLBACK (handle_playlist_entry_cb),
+-				       &data, NULL, 0);
++				       data, NULL, 0);
+ 
+ 		totem_pl_parser_add_ignored_mimetype (parser, "x-directory/normal");
+ 		totem_pl_parser_add_ignored_mimetype (parser, "inode/directory");
+--
+cgit v0.8.3.1