← Back to branch summary

~ubuntu-branches/ubuntu/saucy/evolution-data-server/saucy

« back to all changes in this revision

Viewing changes to camel/camel-url.c

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-10-08 12:58:16 UTC
  • mfrom: (181.1.7 quantal)
  • Revision ID: package-import@ubuntu.com-20121008125816-i3n76e8c0m64e7xp
Tags: 3.6.0-0ubuntu2
https://launchpad.net/bugs/1038047
https://launchpad.net/bugs/1038047
* Fix LP: #1038047 part 1 - Don't abort in e_source_registry_new* when a
  problem occurs connecting to the Dbus service
  - add debian/patches/dont-abort-in-e_source_registry_new.patch
  - update debian/patches/series
* Fix LP: #1038047 part 2 - libedataserver depends on
  evolution-data-server-common to ensure that the GSettings schemas are
  present
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
camel/camel-url.c
114
114
                return url;
115
115
 
116
116
#ifdef G_OS_WIN32
117
 
        if (url->protocol && !strcmp(url->protocol, "file")) {
 
117
        if (url->protocol && !strcmp (url->protocol, "file")) {
118
118
                url->path = g_filename_from_uri (start, &url->host, NULL);
119
119
                return url;
120
120
        }
138
138
                        semi = strchr (url_string, ';');
139
139
                        if (semi && semi < colon &&
140
140
                            !g_ascii_strncasecmp (semi, ";auth=", 6)) {
141
 
                                url->authmech = g_strndup (semi + 6,
142
 
                                                           colon - semi - 6);
 
141
                                url->authmech = g_strndup (
 
142
                                        semi + 6, colon - semi - 6);
143
143
                                camel_url_decode (url->authmech);
144
144
                        } else {
145
145
                                url->authmech = NULL;
170
170
        question = memchr (url_string, '?', end - url_string);
171
171
        if (question) {
172
172
                if (question[1]) {
173
 
                        url->query = g_strndup (question + 1,
174
 
                                                end - (question + 1));
 
173
                        url->query = g_strndup (
 
174
                                question + 1, end - (question + 1));
175
175
                        camel_url_decode (url->query);
176
176
                }
177
177
                end = question;
198
198
                                        value = g_strdup ("");
199
199
                                }
200
200
                                camel_url_decode (name);
201
 
                                g_datalist_set_data_full (&url->params, name,
202
 
                                                          value, g_free);
 
201
                                g_datalist_set_data_full (
 
202
                                        &url->params, name, value, g_free);
203
203
                                g_free (name);
204
204
                        }
205
205
                }
241
241
                         * i.e. like "http://example.com" (this expected only "http://example.com/") */
242
242
                        last = base->path ? strrchr (base->path, '/') : NULL;
243
243
                        if (last) {
244
 
                                newpath = g_strdup_printf ("%.*s/%s",
245
 
                                                           (gint)(last - base->path),
246
 
                                                           base->path,
247
 
                                                           url->path);
 
244
                                newpath = g_strdup_printf (
 
245
                                        "%.*s/%s",
 
246
                                        (gint)(last - base->path),
 
247
                                        base->path,
 
248
                                        url->path);
248
249
                        } else
249
250
                                newpath = g_strdup_printf ("/%s", url->path);
250
251
 
356
357
         */
357
358
 
358
359
#ifdef G_OS_WIN32
359
 
        if (url->protocol && !strcmp(url->protocol, "file"))
 
360
        if (url->protocol && !strcmp (url->protocol, "file"))
360
361
                return g_filename_to_uri (url->path, url->host, NULL);
361
362
#endif /* G_OS_WIN32 */
362
363
 
647
648
        while (*s) {
648
649
                if (url_encoded_char[*s] ||
649
650
                    (extra_enc_chars && strchr (extra_enc_chars, *s)))
650
 
                        g_string_append_printf (str, "%%%02x", (gint)*s++);
 
651
                        g_string_append_printf (str, "%%%02x", (gint) * s++);
651
652
                else
652
653
                        g_string_append_c (str, *s++);
653
654
        }