Attachment 125590 Details for Bug 183883 – patch for 0.9.3.1

[patch] patch for 0.9.3.1

rb-totem-plparser-fix.patch (text/plain), 2.22 KB, created by James "Doc" Livingston on 2006-03-03 12:46:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James "Doc" Livingston

Created: 2006-03-03 12:46:12 UTC

Size: 2.22 KB

patch

obsolete

>diff -ur rhythmbox-0.9.3.1/shell/rb-playlist-manager.c rhythmbox-0.9.3.1-fix/shell/rb-playlist-manager.c
>--- rhythmbox-0.9.3.1/shell/rb-playlist-manager.c	2006-01-14 15:07:02.000000000 +1100
>+++ rhythmbox-0.9.3.1-fix/shell/rb-playlist-manager.c	2006-03-03 23:40:39.000000000 +1100
>@@ -615,7 +615,9 @@
> 					 G_CALLBACK (playlist_load_end_cb),
> 					 mgr, 0);
> 		
>-		if (totem_pl_parser_parse (parser, uri, FALSE) != TOTEM_PL_PARSER_RESULT_SUCCESS) {
>+		if (g_object_class_find_property (G_OBJECT_GET_CLASS (parser), "recurse"))
>+			g_object_set (G_OBJECT (parser), "recurse", FALSE, NULL);
>+		if (totem_pl_parser_parse (parser, uri, TRUE) != TOTEM_PL_PARSER_RESULT_SUCCESS) {
> 			g_set_error (error,
> 				     RB_PLAYLIST_MANAGER_ERROR,
> 				     RB_PLAYLIST_MANAGER_ERROR_PARSE,
>diff -ur rhythmbox-0.9.3.1/shell/rb-shell.c rhythmbox-0.9.3.1-fix/shell/rb-shell.c
>--- rhythmbox-0.9.3.1/shell/rb-shell.c	2006-01-26 12:58:16.000000000 +1100
>+++ rhythmbox-0.9.3.1-fix/shell/rb-shell.c	2006-03-03 23:40:18.000000000 +1100
>@@ -2846,7 +2846,9 @@
> 		
> 		parser = totem_pl_parser_new ();
> 		totem_pl_parser_add_ignored_mimetype (parser, "x-directory/normal");
>-		result = totem_pl_parser_parse (parser, uri, FALSE);
>+		if (g_object_class_find_property (G_OBJECT_GET_CLASS (parser), "recurse"))
>+			g_object_set (G_OBJECT (parser), "recurse", FALSE, NULL);
>+		result = totem_pl_parser_parse (parser, uri, TRUE);
> 		g_object_unref (parser);
> 		
> 		if (result == TOTEM_PL_PARSER_RESULT_SUCCESS) {
>diff -ur rhythmbox-0.9.3.1/sources/rb-iradio-source.c rhythmbox-0.9.3.1-fix/sources/rb-iradio-source.c
>--- rhythmbox-0.9.3.1/sources/rb-iradio-source.c	2006-02-01 02:57:36.000000000 +1100
>+++ rhythmbox-0.9.3.1-fix/sources/rb-iradio-source.c	2006-03-03 23:41:08.000000000 +1100
>@@ -761,7 +761,9 @@
> 	g_signal_connect_object (G_OBJECT (parser), "entry",
> 				 G_CALLBACK (handle_playlist_entry_cb),
> 				 source, 0);
>-	switch (totem_pl_parser_parse (parser, uri, FALSE)) {
>+	if (g_object_class_find_property (G_OBJECT_GET_CLASS (parser), "recurse"))
>+		g_object_set (G_OBJECT (parser), "recurse", FALSE, NULL);
>+	switch (totem_pl_parser_parse (parser, uri, TRUE)) {
> 	case TOTEM_PL_PARSER_RESULT_UNHANDLED:
> 	case TOTEM_PL_PARSER_RESULT_IGNORED:
> 		/* maybe it's the actual stream URL, then */

Actions: View | Diff

Attachments on bug 183883: 125590