r32150 - in /desktop/unstable/totem/debian: changelog patches/03_gdata_0.9.patch patches/series patches/youtube-api-gdata9.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Dec 16 20:34:59 UTC 2011
Author: joss
Date: Fri Dec 16 20:34:59 2011
New Revision: 32150
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32150
Log:
03_gdata_0.9.patch: stolen from upstream git. Port totem to libgdata
0.9.
Added:
desktop/unstable/totem/debian/patches/03_gdata_0.9.patch
Removed:
desktop/unstable/totem/debian/patches/youtube-api-gdata9.patch
Modified:
desktop/unstable/totem/debian/changelog
desktop/unstable/totem/debian/patches/series
Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=32150&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog [utf-8] (original)
+++ desktop/unstable/totem/debian/changelog [utf-8] Fri Dec 16 20:34:59 2011
@@ -1,8 +1,13 @@
-totem (3.0.1-6) UNRELEASED; urgency=low
-
+totem (3.0.1-6) unstable; urgency=low
+
+ [ Michael Biebl ]
* Remove coherence plugin leftovers. This plugin is gone for good.
- -- Michael Biebl <biebl at debian.org> Thu, 08 Dec 2011 09:43:32 +0100
+ [ Josselin Mouette ]
+ * 03_gdata_0.9.patch: stolen from upstream git. Port totem to libgdata
+ 0.9.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 16 Dec 2011 21:34:28 +0100
totem (3.0.1-5) unstable; urgency=low
Added: desktop/unstable/totem/debian/patches/03_gdata_0.9.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/03_gdata_0.9.patch?rev=32150&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/03_gdata_0.9.patch (added)
+++ desktop/unstable/totem/debian/patches/03_gdata_0.9.patch [utf-8] Fri Dec 16 20:34:59 2011
@@ -1,0 +1,70 @@
+From 05ba9e12ddcfb12bc2af695726e24712a2767ea0 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <philip at tecnocode.co.uk>
+Date: Mon, 20 Jun 2011 17:23:30 +0000
+Subject: youtube: Add optional support for compiling against libgdata 0.9.x
+
+This migrates Totem to the API changes in libgdata 0.9.0 and (unreleased)
+0.9.1 if they're available.
+---
+diff --git a/configure.in b/configure.in
+index 178976d..ec81d4a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -481,6 +481,13 @@ for plugin in ${used_plugins}; do
+ AC_DEFINE([HAVE_LIBGDATA_0_7],[1],[Define if libgdata >= 0.7.0 is available])
+ fi
+
++ # For the API breaks in libgdata 0.9. Remove this once we depend on libgdata >= 0.9.1
++ PKG_CHECK_MODULES(LIBGDATA_0_9, libgdata >= 0.9.1,
++ [HAVE_LIBGDATA_0_9=yes], [HAVE_LIBGDATA_0_9=no])
++ if test "${HAVE_LIBGDATA_0_9}" = "yes" ; then
++ AC_DEFINE([HAVE_LIBGDATA_0_9],[1],[Define if libgdata >= 0.9.1 is available])
++ fi
++
+ PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4,
+ [HAVE_LIBSOUP=yes], [HAVE_LIBSOUP=no])
+ if test "${HAVE_LIBSOUP}" != "yes" ; then
+diff --git a/src/plugins/youtube/totem-youtube.c b/src/plugins/youtube/totem-youtube.c
+index 710ce75..bc19a2a 100644
+--- a/src/plugins/youtube/totem-youtube.c
++++ b/src/plugins/youtube/totem-youtube.c
+@@ -591,6 +591,17 @@ execute_query (TotemYouTubePlugin *self, guint tree_view, gboolean clear_tree_vi
+ if (clear_tree_view == TRUE)
+ gtk_list_store_clear (self->priv->list_store[tree_view]);
+
++#ifdef HAVE_LIBGDATA_0_9
++ if (tree_view == SEARCH_TREE_VIEW) {
++ gdata_youtube_service_query_videos_async (self->priv->service, self->priv->query[tree_view], data->query_cancellable,
++ (GDataQueryProgressCallback) query_progress_cb, data, NULL,
++ (GAsyncReadyCallback) query_finished_cb, data);
++ } else {
++ gdata_youtube_service_query_related_async (self->priv->service, self->priv->playing_video, self->priv->query[tree_view],
++ data->query_cancellable, (GDataQueryProgressCallback) query_progress_cb, data, NULL,
++ (GAsyncReadyCallback) query_finished_cb, data);
++ }
++#else
+ if (tree_view == SEARCH_TREE_VIEW) {
+ gdata_youtube_service_query_videos_async (self->priv->service, self->priv->query[tree_view], data->query_cancellable,
+ (GDataQueryProgressCallback) query_progress_cb, data,
+@@ -600,6 +611,7 @@ execute_query (TotemYouTubePlugin *self, guint tree_view, gboolean clear_tree_vi
+ data->query_cancellable, (GDataQueryProgressCallback) query_progress_cb, data,
+ (GAsyncReadyCallback) query_finished_cb, data);
+ }
++#endif /* !HAVE_LIBGDATA_0_9 */
+ }
+
+ void
+@@ -634,7 +646,11 @@ search_button_clicked_cb (GtkButton *button, TotemYouTubePlugin *self)
+ g_assert (priv->regex != NULL);
+
+ /* Set up the GData service (needed for the tree views' queries) */
++#ifdef HAVE_LIBGDATA_0_9
++ priv->service = gdata_youtube_service_new (DEVELOPER_KEY, NULL);
++#else
+ priv->service = gdata_youtube_service_new (DEVELOPER_KEY, CLIENT_ID);
++#endif /* !HAVE_LIBGDATA_0_9 */
+
+ /* Set up network timeouts, if they're supported by our version of libgdata.
+ * This will return from queries with %GDATA_SERVICE_ERROR_NETWORK_ERROR if network operations take longer than 30 seconds. */
+--
+cgit v0.9.0.2
Modified: desktop/unstable/totem/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/series?rev=32150&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/series [utf-8] (original)
+++ desktop/unstable/totem/debian/patches/series [utf-8] Fri Dec 16 20:34:59 2011
@@ -1,6 +1,6 @@
01_fake_keypresses.patch
02_tracker_0.12.patch
+03_gdata_0.9.patch
#70_bbc_plugin.patch
-#youtube-api-gdata9.patch
04_port_to_gobject.patch
90_fix_save_playlist.patch
More information about the pkg-gnome-commits
mailing list