diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-06-19 10:04:43 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-06-19 10:04:43 +0800 |
| commit | 67b64140d5f429cc9bb4e8645ce9e6f9f2553162 (patch) | |
| tree | 96c3c651d168c45f84311d18ad7068dc9eb0e03d /plugins/publish-calendar/publish-calendar.c | |
| parent | 731122a46ec53fb5e470e5852e3a634da30bdfe1 (diff) | |
| download | gsoc2013-evolution-67b64140d5f429cc9bb4e8645ce9e6f9f2553162.tar gsoc2013-evolution-67b64140d5f429cc9bb4e8645ce9e6f9f2553162.tar.gz gsoc2013-evolution-67b64140d5f429cc9bb4e8645ce9e6f9f2553162.tar.bz2 gsoc2013-evolution-67b64140d5f429cc9bb4e8645ce9e6f9f2553162.tar.lz gsoc2013-evolution-67b64140d5f429cc9bb4e8645ce9e6f9f2553162.tar.xz gsoc2013-evolution-67b64140d5f429cc9bb4e8645ce9e6f9f2553162.tar.zst gsoc2013-evolution-67b64140d5f429cc9bb4e8645ce9e6f9f2553162.zip | |
Use SoupURI instead of EUri.
EUri is now deprecated.
Diffstat (limited to 'plugins/publish-calendar/publish-calendar.c')
| -rw-r--r-- | plugins/publish-calendar/publish-calendar.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index ff9814f795..681b1fbe7a 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -310,9 +310,10 @@ ask_password (GMountOperation *op, gpointer user_data) { struct mnt_struct *ms = (struct mnt_struct *) user_data; - gchar *username, *password; + const gchar *username; + gchar *password; gboolean req_pass = FALSE; - EUri *euri; + SoupURI *soup_uri; g_return_if_fail (ms != NULL); @@ -320,8 +321,10 @@ ask_password (GMountOperation *op, if ((flags & G_ASK_PASSWORD_NEED_PASSWORD) == 0) return; - euri = e_uri_new (ms->uri->location); - username = euri->user; + soup_uri = soup_uri_new (ms->uri->location); + g_return_if_fail (soup_uri != NULL); + + username = soup_uri_get_user (soup_uri); password = e_passwords_get_password (NULL, ms->uri->location); req_pass = ((username && *username) && !(ms->uri->service_type == TYPE_ANON_FTP && !strcmp (username, "anonymous"))) ? TRUE:FALSE; @@ -337,7 +340,7 @@ ask_password (GMountOperation *op, if (!password) { /* user canceled password dialog */ g_mount_operation_reply (op, G_MOUNT_OPERATION_ABORTED); - e_uri_free (euri); + soup_uri_free (soup_uri); return; } @@ -353,7 +356,7 @@ ask_password (GMountOperation *op, g_mount_operation_reply (op, G_MOUNT_OPERATION_HANDLED); - e_uri_free (euri); + soup_uri_free (soup_uri); } static void |