← Back to branch summary

~ubuntu-branches/ubuntu/vivid/rhythmbox/vivid-proposed

« back to all changes in this revision

Viewing changes to .pc/05_hide_on_quit.patch/shell/rb-shell.c

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2014-06-09 11:07:52 UTC
  • mfrom: (1.3.6) (32.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20140609110752-7qynmf435dp2outv
Tags: 3.0.3-1ubuntu1
* Merge with Debian unstable, remaining changes:
  + Split magnatune, visualizer and cdrecorder plugins out and Recommend
    these from rhythmbox instead of all of the plugins.
  + Build the visualized plugin.
  + Suggest gst-plugins-ugly instead of Recommending.
  + Add Ubuntu encoding presets and use them by default.
  + debian/patches/02_use_escaped_podcast_uri.patch
    - Handle podcasts that have sound files with the same basename
  + debian/patches/03_magnatune_partner.patch:
    - Change magnatune partner ID to 'ubuntu'.
  + debian/patches/05_hide_on_quit.patch
    - Hide (not quit) if RB is playing when closed.
  + debian/patches/07_quicklists.patch
    - Add quicklists.
  + debian/patches/make-shuffle-repeat-proper-toggle-actions.patch,
    debian/patches/restore-traditional-menubar.patch: Add a traditional
    menubar back when we want it, and fix the shuffle/repeat actions so they
    work corerctly there.
  + debian/source_rhythmbox.py: Add an apport hook.
  + debian/control.in: Update rhythmbox-plugins description to reflect
    plugins shipped.
  + Build with dh-autoreconf for new ports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/05_hide_on_quit.patch/shell/rb-shell.c
2652
2652
        if (source == NULL)
2653
2653
                return;
2654
2654
 
2655
 
        if (select_page) {
2656
 
                rb_shell_select_page (shell, RB_DISPLAY_PAGE (source));
 
2655
        if (source == RB_SOURCE (shell->priv->queue_source) &&
 
2656
            g_settings_get_boolean (shell->priv->settings, "queue-as-sidebar")) {
 
2657
                gtk_widget_grab_focus (shell->priv->queue_sidebar);
 
2658
                songs = RB_ENTRY_VIEW (shell->priv->queue_sidebar);
 
2659
        } else {
 
2660
                if (select_page) {
 
2661
                        rb_shell_select_page (shell, RB_DISPLAY_PAGE (source));
 
2662
                }
 
2663
                songs = rb_source_get_entry_view (source);
2657
2664
        }
2658
2665
 
2659
 
        songs = rb_source_get_entry_view (source);
2660
2666
        if (songs != NULL) {
2661
2667
                entry = rb_shell_player_get_playing_entry (shell->priv->player_shell);
2662
2668
                if (entry != NULL) {