← Back to branch summary

~ubuntu-branches/ubuntu/quantal/rhythmbox/quantal

« back to all changes in this revision

Viewing changes to rhythmdb/rhythmdb.c

  • Committer: Package Import Robot
  • Author(s): Michael Biebl
  • Date: 2012-06-10 16:19:59 UTC
  • mfrom: (1.3.7)
  • mto: This revision was merged to the branch mainline in revision 215.
  • Revision ID: package-import@ubuntu.com-20120610161959-x1tju93su2c0yv7c
Tags: 2.97-1
http://bugs.debian.org/660483
http://bugs.debian.org/658717
* New upstream release.
  - New more compact header layout, including album art.
    Closes: #660483, #658717
* debian/watch: Also track odd version numbers since rhythmbox does not seem
  to follow the typical GNOME versioning scheme.
* Remove patches which have been applied upstream.
* Update librhythmbox-core5 → librhythmbox-core6 for the soname bump.
* Add explicit Build-Depends on libxml2-dev (>= 2.7.8).
* Drop artdisplay plugin. It has been removed upstream as it is no longer
  needed now that the playing track display includes album art.
* Drop Build-Depends on python-gst0.10-dev and replace Depends on
  python-gst0.10 with gir1.2-gstreamer-0.10 (required by the replaygain
  plugin).
* Drop Recommends on nautilus-sendto. The sendto plugin is for sending
  selected tracks by email or instant message from within rhythmbox. It is
  not a nautilus-sendto plugin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
rhythmdb/rhythmdb.c
3359
3359
 
3360
3360
        if (!handled) {
3361
3361
                if (entry->type == RHYTHMDB_ENTRY_TYPE_PODCAST_FEED ||
3362
 
                    entry->type == RHYTHMDB_ENTRY_TYPE_PODCAST_POST)
 
3362
                    entry->type == RHYTHMDB_ENTRY_TYPE_PODCAST_POST ||
 
3363
                    entry->type == RHYTHMDB_ENTRY_TYPE_PODCAST_SEARCH)
3363
3364
                        podcast = RHYTHMDB_ENTRY_GET_TYPE_DATA (entry, RhythmDBPodcastFields);
3364
3365
 
3365
3366
                switch (propid) {
4697
4698
                rhythmdb_stop_monitoring (db);
4698
4699
 
4699
4700
                g_strfreev (db->priv->library_locations);
 
4701
                db->priv->library_locations = NULL;
4700
4702
        }
4701
4703
 
4702
4704
        if (g_settings_get_boolean (db->priv->settings, "monitor-library")) {
4750
4752
        g_return_val_if_fail (entry->refcount > 0, NULL);
4751
4753
 
4752
4754
        if (entry->type == RHYTHMDB_ENTRY_TYPE_PODCAST_FEED ||
4753
 
            entry->type == RHYTHMDB_ENTRY_TYPE_PODCAST_POST)
 
4755
            entry->type == RHYTHMDB_ENTRY_TYPE_PODCAST_POST ||
 
4756
            entry->type == RHYTHMDB_ENTRY_TYPE_PODCAST_SEARCH)
4754
4757
                podcast = RHYTHMDB_ENTRY_GET_TYPE_DATA (entry, RhythmDBPodcastFields);
4755
4758
 
4756
4759
        rhythmdb_entry_sync_mirrored (entry, propid);
5046
5049
        g_return_val_if_fail (entry != NULL, 0);
5047
5050
 
5048
5051
        if (entry->type == RHYTHMDB_ENTRY_TYPE_PODCAST_FEED ||
5049
 
            entry->type == RHYTHMDB_ENTRY_TYPE_PODCAST_POST)
 
5052
            entry->type == RHYTHMDB_ENTRY_TYPE_PODCAST_POST ||
 
5053
            entry->type == RHYTHMDB_ENTRY_TYPE_PODCAST_SEARCH)
5050
5054
                podcast = RHYTHMDB_ENTRY_GET_TYPE_DATA (entry, RhythmDBPodcastFields);
5051
5055
 
5052
5056
        switch (propid) {