← Back to branch summary

~ubuntu-branches/ubuntu/natty/rhythmbox/natty-updates

« back to all changes in this revision

Viewing changes to plugins/generic-player/rb-generic-player-plugin.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-01-20 18:41:16 UTC
  • mfrom: (1.1.56 upstream)
  • Revision ID: james.westby@ubuntu.com-20110120184116-gs8yr7px9cf2bfql
Tags: 0.13.3-0ubuntu1
* New upstream version
* debian/patches/01_dlna_vorbis.patch:
  - dropped, the fix is in the new version
* debian/patches/16_ubuntu_ayatana_register.patch,
  debian/rules:
  - dropped, the sound indicator registration relies only on mpris now
* debian/control.in,
  debian/patches/19_build_vala.patch,
  debian/rules:
  - drop vala build, it's not really useful and still on vala 0.10
* debian/patches/21_update_louie_imports.patch:
  - dropped, the fix is in the new version
* Updated the .installs

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/generic-player/rb-generic-player-plugin.c
48
48
#include "rb-generic-player-playlist-source.h"
49
49
#include "rb-file-helpers.h"
50
50
#include "rb-stock-icons.h"
51
 
#include "rb-sourcelist.h"
52
51
#include "rb-nokia770-source.h"
53
52
#include "rb-psp-source.h"
 
53
#include "rb-display-page-tree.h"
54
54
 
55
55
 
56
56
#define RB_TYPE_GENERIC_PLAYER_PLUGIN           (rb_generic_player_plugin_get_type ())
147
147
rb_generic_player_plugin_new_playlist (GtkAction *action, RBSource *source)
148
148
{
149
149
        RBShell *shell;
150
 
        RBSourceList *sourcelist;
151
150
        RBSource *playlist;
 
151
        RBDisplayPageTree *page_tree;
152
152
        RhythmDBEntryType *entry_type;
153
153
 
154
154
        g_return_if_fail (RB_IS_GENERIC_PLAYER_SOURCE (source));
164
164
                                               shell,
165
165
                                               playlist);
166
166
 
167
 
        g_object_get (shell, "sourcelist", &sourcelist, NULL);
168
 
        rb_sourcelist_edit_source_name (sourcelist, playlist);
169
 
        g_object_unref (sourcelist);
 
167
        g_object_get (shell, "display-page-tree", &page_tree, NULL);
 
168
        rb_display_page_tree_edit_source_name (page_tree, playlist);
 
169
        g_object_unref (page_tree);
170
170
 
171
171
        g_object_unref (shell);
172
172
}
177
177
        g_return_if_fail (RB_IS_GENERIC_PLAYER_PLAYLIST_SOURCE (source));
178
178
 
179
179
        rb_generic_player_playlist_delete_from_player (RB_GENERIC_PLAYER_PLAYLIST_SOURCE (source));
180
 
        rb_source_delete_thyself (source);
 
180
        rb_display_page_delete_thyself (RB_DISPLAY_PAGE (source));
181
181
}
182
182
 
183
183
static RBSource *
196
196
                plugin->actions = gtk_action_group_new ("GenericPlayerActions");
197
197
                gtk_action_group_set_translation_domain (plugin->actions, GETTEXT_PACKAGE);
198
198
 
199
 
                _rb_action_group_add_source_actions (plugin->actions,
200
 
                                                     G_OBJECT (plugin->shell),
201
 
                                                     rb_generic_player_plugin_actions,
202
 
                                                     G_N_ELEMENTS (rb_generic_player_plugin_actions));
 
199
                _rb_action_group_add_display_page_actions (plugin->actions,
 
200
                                                           G_OBJECT (plugin->shell),
 
201
                                                           rb_generic_player_plugin_actions,
 
202
                                                           G_N_ELEMENTS (rb_generic_player_plugin_actions));
203
203
        }
204
204
 
205
205
        if (source) {
273
273
 
274
274
        g_signal_handlers_disconnect_by_func (G_OBJECT (rmm), create_source_cb, plugin);
275
275
 
276
 
        g_list_foreach (plugin->player_sources, (GFunc)rb_source_delete_thyself, NULL);
 
276
        g_list_foreach (plugin->player_sources, (GFunc)rb_display_page_delete_thyself, NULL);
277
277
        g_list_free (plugin->player_sources);
278
278
        plugin->player_sources = NULL;
279
279