← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libedataserver/e-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:
libedataserver/e-url.c
265
265
                                        value = g_strdup ("");
266
266
                                }
267
267
                                uri_decode (name);
268
 
                                g_datalist_set_data_full (&uri->params, name,
269
 
                                                          value, g_free);
 
268
                                g_datalist_set_data_full (
 
269
                                        &uri->params, name,
 
270
                                        value, g_free);
270
271
                                g_free (name);
271
272
                        }
272
273
                }
400
401
                        uri->query ? uri->query : "");
401
402
        else
402
403
                str_uri = g_strdup_printf (
403
 
                        "%s://%s%s%s%s%s%s%s%s%s%s",
 
404
                        "%s://%s%s%s%s%s%s%s%s%s%s",
404
405
                        uri->protocol,
405
 
                        uri->user ? uri->user : "",
406
 
                        uri->authmech ? ";auth=" : "",
407
 
                        uri->authmech ? uri->authmech : "",
408
 
                        uri->passwd && show_password ? ":" : "",
409
 
                        uri->passwd && show_password ? uri->passwd : "",
410
 
                        uri->user ? "@" : "",
411
 
                        uri->host ? uri->host : "",
412
 
                        uri->path ? uri->path : "",
413
 
                        uri->query ? "?" : "",
414
 
                        uri->query ? uri->query : "");
 
406
                        uri->user ? uri->user : "",
 
407
                        uri->authmech ? ";auth=" : "",
 
408
                        uri->authmech ? uri->authmech : "",
 
409
                        uri->passwd && show_password ? ":" : "",
 
410
                        uri->passwd && show_password ? uri->passwd : "",
 
411
                        uri->user ? "@" : "",
 
412
                        uri->host ? uri->host : "",
 
413
                        uri->path ? uri->path : "",
 
414
                        uri->query ? "?" : "",
 
415
                        uri->query ? uri->query : "");
415
416
 
416
417
        return str_uri;
417
418
}