← Back to branch summary

~matttbe/ubuntu/raring/rhythmbox/lp1010619_RB_2.98

« back to all changes in this revision

Viewing changes to plugins/audioscrobbler/rb-audioscrobbler-profile-page.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-11-06 20:52:57 UTC
  • mfrom: (1.1.67) (214.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20121106205257-0btjh8jqley153el
Tags: 2.98-0ubuntu1
https://launchpad.net/bugs/1060601
* New upstream release (LP: #1060601)
* debian/control.in:
  - Bump minimum glib, gtk, totem-plparser, clutter, and clutter-gst
  - Drop no longer needed musicbrainz dependency
* Refreshed 09_keywords.patch
* Updated 11_fix_cd_pausing.patch with fix from git
* Dropped patches applied in new version:
  - 00git_musicbrainz5.patch
  - 08_CVE-2012-3355.patch
  - dont_free_consumed_floating_gvariant.patch
  - git_scale_click.patch
  - git_crash_during_monitor.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/audioscrobbler/rb-audioscrobbler-profile-page.c
42
42
#include <sources/rb-display-page-tree.h>
43
43
#include <sources/rb-display-page-group.h>
44
44
#include <widgets/eggwrapbox.h>
 
45
#include <widgets/rb-source-toolbar.h>
45
46
 
46
47
#include "rb-audioscrobbler-profile-page.h"
47
48
#include "rb-audioscrobbler.h"
68
69
        guint scrobbling_enabled_notification_id;
69
70
 
70
71
        GtkWidget *main_vbox;
 
72
        RBSourceToolbar *toolbar;
71
73
 
72
74
        /* Login related UI */
73
75
        GtkWidget *login_bar;
363
365
        gtk_box_pack_start (GTK_BOX (page), page->priv->main_vbox, TRUE, TRUE, 0);
364
366
        gtk_widget_show (page->priv->main_vbox);
365
367
 
 
368
        init_actions (page);
 
369
 
366
370
        init_login_ui (page);
367
371
        init_profile_ui (page);
368
 
        init_actions (page);
 
372
 
369
373
 
370
374
        /* create the user */
371
375
        page->priv->user = rb_audioscrobbler_user_new (page->priv->service);
642
646
        GtkUIManager *ui_manager;
643
647
        RhythmDBEntry *entry;
644
648
        char *group_name;
 
649
        char *toolbar_name;
645
650
 
646
651
        g_object_get (page, "shell", &shell, "plugin", &plugin, "ui-manager", &ui_manager, NULL);
647
652
        ui_file = rb_find_plugin_data_file (plugin, "audioscrobbler-profile-ui.xml");
693
698
        g_object_unref (player);
694
699
 
695
700
        /* set up toolbar */
 
701
        toolbar_name = g_strdup_printf ("%sSourceToolBar", rb_audioscrobbler_service_get_name (page->priv->service));
696
702
        page->priv->toolbar_path = g_strdup_printf ("/%sSourceToolBar", rb_audioscrobbler_service_get_name (page->priv->service));
697
 
        gtk_ui_manager_add_ui (ui_manager, page->priv->ui_merge_id, "/ui", "AudioscrobblerToolBar", NULL, GTK_UI_MANAGER_TOOLBAR, TRUE);
 
703
        gtk_ui_manager_add_ui (ui_manager, page->priv->ui_merge_id, "/", toolbar_name, NULL, GTK_UI_MANAGER_TOOLBAR, TRUE);
698
704
        gtk_ui_manager_add_ui (ui_manager, page->priv->ui_merge_id, page->priv->toolbar_path, "Love", page->priv->love_action_name, GTK_UI_MANAGER_TOOLITEM, FALSE);
699
705
        gtk_ui_manager_add_ui (ui_manager, page->priv->ui_merge_id, page->priv->toolbar_path, "Ban", page->priv->ban_action_name, GTK_UI_MANAGER_TOOLITEM, FALSE);
700
706
        gtk_ui_manager_add_ui (ui_manager, page->priv->ui_merge_id, page->priv->toolbar_path, "Download", page->priv->download_action_name, GTK_UI_MANAGER_TOOLITEM, FALSE);
701
707
 
 
708
        page->priv->toolbar = rb_source_toolbar_new (RB_DISPLAY_PAGE (page), ui_manager);
 
709
        gtk_box_pack_start (GTK_BOX (page->priv->main_vbox), GTK_WIDGET (page->priv->toolbar), FALSE, FALSE, 0);
 
710
        gtk_widget_show (GTK_WIDGET (page->priv->toolbar));
 
711
 
702
712
        g_free (ui_file);
 
713
        g_free (toolbar_name);
703
714
        g_object_unref (shell);
704
715
        g_object_unref (plugin);
705
716
        g_object_unref (ui_manager);