← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugins/notification/rb-notification-plugin.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/notification/rb-notification-plugin.c
485
485
                          RBNotificationPlugin *plugin)
486
486
{
487
487
        update_current_playing_data (plugin, entry);
 
488
        notify_playing_entry (plugin, FALSE);
 
489
}
488
490
 
489
 
        if (entry != NULL) {
490
 
                notify_playing_entry (plugin, FALSE);
491
 
        }
 
491
static void
 
492
playing_changed_cb (RBShellPlayer *player,
 
493
                    gboolean       playing,
 
494
                    RBNotificationPlugin *plugin)
 
495
{
 
496
        notify_playing_entry (plugin, FALSE);
492
497
}
493
498
 
494
499
static gboolean
540
545
        g_signal_connect_object (shell, "notify-custom", G_CALLBACK (shell_notify_custom_cb), plugin, 0);
541
546
 
542
547
        g_signal_connect_object (plugin->shell_player, "playing-song-changed", G_CALLBACK (playing_entry_changed_cb), plugin, 0);
 
548
        g_signal_connect_object (plugin->shell_player, "playing-changed", G_CALLBACK (playing_changed_cb), plugin, 0);
543
549
 
544
550
        g_signal_connect_object (plugin->db, "entry_extra_metadata_notify::" RHYTHMDB_PROP_STREAM_SONG_TITLE,
545
551
                                 G_CALLBACK (db_stream_metadata_cb), plugin, 0);