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 /modules/calendar | |
| parent | 731122a46ec53fb5e470e5852e3a634da30bdfe1 (diff) | |
| download | gsoc2013-evolution-67b64140d5f429cc9bb4e8645ce9e6f9f2553162.tar.gz gsoc2013-evolution-67b64140d5f429cc9bb4e8645ce9e6f9f2553162.tar.zst gsoc2013-evolution-67b64140d5f429cc9bb4e8645ce9e6f9f2553162.zip | |
Use SoupURI instead of EUri.
EUri is now deprecated.
Diffstat (limited to 'modules/calendar')
| -rw-r--r-- | modules/calendar/e-cal-shell-backend.c | 12 | ||||
| -rw-r--r-- | modules/calendar/e-memo-shell-backend.c | 12 | ||||
| -rw-r--r-- | modules/calendar/e-task-shell-backend.c | 12 |
3 files changed, 24 insertions, 12 deletions
diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index 0cfe9b89fd..44179dc934 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -356,7 +356,7 @@ cal_shell_backend_handle_uri_cb (EShellBackend *shell_backend, ESource *source; ESourceRegistry *registry; ECalClientSourceType source_type; - EUri *euri; + SoupURI *soup_uri; icalcomponent *icalcomp; icalproperty *icalprop; const gchar *cp; @@ -378,8 +378,12 @@ cal_shell_backend_handle_uri_cb (EShellBackend *shell_backend, if (strncmp (uri, "calendar:", 9) != 0) return FALSE; - euri = e_uri_new (uri); - cp = euri->query; + soup_uri = soup_uri_new (uri); + + if (soup_uri == NULL) + return FALSE; + + cp = soup_uri_get_query (soup_uri); if (cp == NULL) goto exit; @@ -534,7 +538,7 @@ exit: g_free (comp_uid); g_free (comp_rid); - e_uri_free (euri); + soup_uri_free (soup_uri); return handled; } diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c index db042cb88b..fa4884bfc6 100644 --- a/modules/calendar/e-memo-shell-backend.c +++ b/modules/calendar/e-memo-shell-backend.c @@ -234,7 +234,7 @@ memo_shell_backend_handle_uri_cb (EShellBackend *shell_backend, ESource *source; ESourceRegistry *registry; ECalClientSourceType source_type; - EUri *euri; + SoupURI *soup_uri; icalcomponent *icalcomp; const gchar *cp; gchar *source_uid = NULL; @@ -249,8 +249,12 @@ memo_shell_backend_handle_uri_cb (EShellBackend *shell_backend, if (strncmp (uri, "memo:", 5) != 0) return FALSE; - euri = e_uri_new (uri); - cp = euri->query; + soup_uri = soup_uri_new (uri); + + if (soup_uri == NULL) + return FALSE; + + cp = soup_uri_get_query (soup_uri); if (cp == NULL) goto exit; @@ -370,7 +374,7 @@ exit: g_free (comp_uid); g_free (comp_rid); - e_uri_free (euri); + soup_uri_free (soup_uri); return handled; } diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c index dd6acb04b1..4d76e50b8b 100644 --- a/modules/calendar/e-task-shell-backend.c +++ b/modules/calendar/e-task-shell-backend.c @@ -231,7 +231,7 @@ task_shell_backend_handle_uri_cb (EShellBackend *shell_backend, ESource *source; ESourceRegistry *registry; ECalClientSourceType source_type; - EUri *euri; + SoupURI *soup_uri; icalcomponent *icalcomp; icalproperty *icalprop; const gchar *cp; @@ -247,8 +247,12 @@ task_shell_backend_handle_uri_cb (EShellBackend *shell_backend, if (strncmp (uri, "task:", 5) != 0) return FALSE; - euri = e_uri_new (uri); - cp = euri->query; + soup_uri = soup_uri_new (uri); + + if (soup_uri == NULL) + return FALSE; + + cp = soup_uri_get_query (soup_uri); if (cp == NULL) goto exit; @@ -373,7 +377,7 @@ exit: g_free (comp_uid); g_free (comp_rid); - e_uri_free (euri); + soup_uri_free (soup_uri); return handled; } |