rpms/totem/F-12 0001-Bug-600369-YouTube-plugin-does-not-work.patch, NONE, 1.1 totem.spec, 1.266, 1.267

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4421

Modified Files:
	totem.spec 
Added Files:
	0001-Bug-600369-YouTube-plugin-does-not-work.patch 
Log Message:
* Tue Nov 03 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-2
- Fix YouTube URLs regexp again


0001-Bug-600369-YouTube-plugin-does-not-work.patch:
 totem-youtube.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Bug-600369-YouTube-plugin-does-not-work.patch ---
>From 95b56216aee80c7e95d0e7d033ff8e1a63852813 Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip at tecnocode.co.uk>
Date: Tue, 3 Nov 2009 12:12:53 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20600369=20=E2=80=94=20YouTube=20plugin=20does=20not=20work?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed the regex to correctly extract the t param for YouTube video
queries again. Closes: bgo#600369
---
 src/plugins/youtube/totem-youtube.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/youtube/totem-youtube.c b/src/plugins/youtube/totem-youtube.c
index d2ff64b..9836749 100644
--- a/src/plugins/youtube/totem-youtube.c
+++ b/src/plugins/youtube/totem-youtube.c
@@ -726,7 +726,7 @@ query_progress_cb (GDataEntry *entry, guint entry_key, guint entry_count, QueryD
 	g_assert (self->cancellable[data->tree_view] != NULL);
 
 	/* Add the entry to the tree view */
-	title = gdata_youtube_video_get_title (GDATA_YOUTUBE_VIDEO (entry));
+	title = gdata_entry_get_title (entry);
 	id = gdata_youtube_video_get_video_id (GDATA_YOUTUBE_VIDEO (entry));
 
 	gtk_list_store_append (self->list_store[data->tree_view], &iter);
@@ -851,7 +851,7 @@ search_button_clicked_cb (GtkButton *button, TotemYouTubePlugin *self)
 		/* If this is the first query, compile the regex used to resolve the t param. Doing this here rather than when
 		 * activating the plugin means we don't waste cycles if the plugin's never used. It also means we don't waste
 		 * cycles repeatedly creating new regexes for each video whose t param we resolve. */
-		self->regex = g_regex_new ("swfArgs.*\"t\": \"([^\"]+)\"", G_REGEX_OPTIMIZE, 0, NULL);
+		self->regex = g_regex_new ("'SWF_ARGS'.*\"t\": \"([^\"]+)\"", G_REGEX_OPTIMIZE, 0, NULL);
 		g_assert (self->regex != NULL);
 
 		/* Set up the GData service (needed for the tree views' queries) */
-- 
1.6.5.1



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-12/totem.spec,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -p -r1.266 -r1.267
--- totem.spec	26 Oct 2009 11:59:42 -0000	1.266
+++ totem.spec	3 Nov 2009 13:14:36 -0000	1.267
@@ -6,7 +6,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.28.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -78,6 +78,9 @@ Obsoletes: totem-galago
 Obsoletes: totem-gstreamer < 2.27.1
 Obsoletes: totem-xine < 2.27.1
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=600369
+Patch0: 0001-Bug-600369-YouTube-plugin-does-not-work.patch
+
 %description
 Totem is simple movie player for the GNOME desktop. It features a
 simple playlist, a full-screen mode, seek and volume controls, as well as
@@ -185,6 +188,7 @@ audio and video files in the properties 
 
 %prep
 %setup -q
+%patch0 -p1 .youtube-urls
 
 %build
 
@@ -381,6 +385,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Tue Nov 03 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-2
+- Fix YouTube URLs regexp again
+
 * Mon Oct 26 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
 - Update to 2.28.2