← Back to branch summary

~ubuntu-branches/ubuntu/maverick/xmms2/maverick

« back to all changes in this revision

Viewing changes to src/plugins/gvfs/gvfs.c

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-03-07 04:11:24 UTC
  • mfrom: (1.1.7 upstream) (6.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20100307041124-df7p8f9yejg1u1qn
Tags: 0.7DrNo-3ubuntu1
https://launchpad.net/bugs/532278
* Merge from Debian unstable (LP: #532278), remaining changes:
  - Use PulseAudio as default output plugin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/gvfs/gvfs.c
38
38
        const gchar *scheme;
39
39
        const gint priority;
40
40
} scheme_priorities[] = {
41
 
        { "http", 40 },
42
 
        { "https", 40 },
43
 
        { "file", 40 },
44
 
        { "cdda", 40 }
45
41
};
46
42
 
47
43
static const gchar *query_attributes = G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE ","
101
97
        schemes = g_vfs_get_supported_uri_schemes (vfs);
102
98
        for (i = schemes; *i; i++) {
103
99
                gchar *tmp = g_strconcat (*i, "://*", NULL);
104
 
                gint priority = XMMS_STREAM_TYPE_PRIORITY_DEFAULT;
 
100
                gint priority = XMMS_STREAM_TYPE_PRIORITY_FALLBACK;
105
101
 
106
102
                for (j = 0; j < G_N_ELEMENTS (scheme_priorities); j++) {
107
103
                        if (g_ascii_strcasecmp (scheme_priorities[j].scheme, *i) == 0) {
288
284
                                                NULL,
289
285
                                                &err);
290
286
 
 
287
        g_object_unref (file);
 
288
 
291
289
        if (!enumerator) {
292
290
                xmms_error_set (error, XMMS_ERROR_GENERIC, err->message);
293
291
                return FALSE;
320
318
                g_object_unref (info);
321
319
        }
322
320
 
323
 
        g_object_unref (file);
324
321
        g_file_enumerator_close (enumerator, NULL, NULL);
325
322
 
326
323
        return TRUE;