r22251 - in /desktop/unstable/totem/debian: changelog patches/80_fix_youtube_regex.patch

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sat Nov  7 15:26:23 2009
New Revision: 22251

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22251
Log:
* debian/patches/80_fix_youtube_regex.patch:
  + Added. Update the regexp for parsing parameters from youtube (from
    upstream git)

Added:
    desktop/unstable/totem/debian/patches/80_fix_youtube_regex.patch
Modified:
    desktop/unstable/totem/debian/changelog

Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=22251&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog [utf-8] (original)
+++ desktop/unstable/totem/debian/changelog [utf-8] Sat Nov  7 15:26:23 2009
@@ -1,9 +1,15 @@
 totem (2.28.2-3) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * totem-plugins depends on python-coherence. Closes: #553058.
   * The section for totem-mozilla is video too.
 
- -- Josselin Mouette <joss at debian.org>  Tue, 03 Nov 2009 13:26:07 +0100
+  [ Sjoerd Simons ]
+  * debian/patches/80_fix_youtube_regex.patch:
+    + Added. Update the regexp for parsing parameters from youtube (from
+      upstream git)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 07 Nov 2009 15:23:27 +0000
 
 totem (2.28.2-2) unstable; urgency=low
 

Added: desktop/unstable/totem/debian/patches/80_fix_youtube_regex.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/80_fix_youtube_regex.patch?rev=22251&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/80_fix_youtube_regex.patch (added)
+++ desktop/unstable/totem/debian/patches/80_fix_youtube_regex.patch [utf-8] Sat Nov  7 15:26:23 2009
@@ -1,0 +1,31 @@
+commit 95b56216aee80c7e95d0e7d033ff8e1a63852813
+Author: Philip Withnall <philip at tecnocode.co.uk>
+Date:   Tue Nov 3 12:12:53 2009 +0000
+
+    Bug 600369 — YouTube plugin does not work
+    
+    Fixed the regex to correctly extract the t param for YouTube video
+    queries again. Closes: bgo#600369
+
+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) */