← Back to branch summary

~swem/totem/assignment

« back to all changes in this revision

Viewing changes to src/plugins/youtube/totem-youtube.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2010-01-27 09:40:18 UTC
  • mfrom: (1.4.2 upstream) (5.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20100127094018-q6rzt7va0y8ketwt
Tags: 2.29.4-1
* New upstream development release:
  + debian/patches/90_autotools.patch:
    - Refreshed for the new version.
  + debian/control.in:
    - Update build dependencies and dependencies.
    - Drop tracker plugin, it needs tracker 0.7.
  + debian/totem-mozilla.links:
    - Drop the complex plugin, it doesn't exist anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/youtube/totem-youtube.c
673
673
        g_debug ("Search finished!");
674
674
 
675
675
        feed = gdata_service_query_finish (GDATA_SERVICE (self->service), result, &error);
 
676
 
 
677
        /* Stop the progress bar; a little hacky, but it works */
 
678
        self->progress_bar_increment[data->tree_view] = 1.0;
 
679
        increment_progress_bar_fraction (self, data->tree_view);
 
680
 
676
681
        if (feed == NULL) {
677
682
                GtkWindow *window;
678
683
 
679
 
                /* Stop the progress bar; a little hacky, but it works */
680
 
                self->progress_bar_increment[data->tree_view] = 1.0;
681
 
                increment_progress_bar_fraction (self, data->tree_view);
682
 
 
683
684
                /* Bail out if the operation was cancelled */
684
685
                if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) == TRUE) {
685
686
                        g_error_free (error);
726
727
        g_assert (self->cancellable[data->tree_view] != NULL);
727
728
 
728
729
        /* Add the entry to the tree view */
729
 
        title = gdata_youtube_video_get_title (GDATA_YOUTUBE_VIDEO (entry));
 
730
        title = gdata_entry_get_title (entry);
730
731
        id = gdata_youtube_video_get_video_id (GDATA_YOUTUBE_VIDEO (entry));
731
732
 
732
733
        gtk_list_store_append (self->list_store[data->tree_view], &iter);
851
852
                /* If this is the first query, compile the regex used to resolve the t param. Doing this here rather than when
852
853
                 * activating the plugin means we don't waste cycles if the plugin's never used. It also means we don't waste
853
854
                 * cycles repeatedly creating new regexes for each video whose t param we resolve. */
854
 
                self->regex = g_regex_new ("swfArgs.*\"t\": \"([^\"]+)\"", G_REGEX_OPTIMIZE, 0, NULL);
 
855
                self->regex = g_regex_new ("'SWF_ARGS'.*\"t\": \"([^\"]+)\"", G_REGEX_OPTIMIZE, 0, NULL);
855
856
                g_assert (self->regex != NULL);
856
857
 
857
858
                /* Set up the GData service (needed for the tree views' queries) */