aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-06-19 10:04:43 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-06-19 10:04:43 +0800
commit67b64140d5f429cc9bb4e8645ce9e6f9f2553162 (patch)
tree96c3c651d168c45f84311d18ad7068dc9eb0e03d /modules
parent731122a46ec53fb5e470e5852e3a634da30bdfe1 (diff)
downloadgsoc2013-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 'modules')
-rw-r--r--modules/addressbook/e-book-shell-backend.c14
-rw-r--r--modules/calendar/e-cal-shell-backend.c12
-rw-r--r--modules/calendar/e-memo-shell-backend.c12
-rw-r--r--modules/calendar/e-task-shell-backend.c12
4 files changed, 33 insertions, 17 deletions
diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c
index b2da5b9072..2475312832 100644
--- a/modules/addressbook/e-book-shell-backend.c
+++ b/modules/addressbook/e-book-shell-backend.c
@@ -321,7 +321,7 @@ static gboolean
book_shell_backend_handle_uri_cb (EShellBackend *shell_backend,
const gchar *uri)
{
- EUri *euri;
+ SoupURI *soup_uri;
const gchar *cp;
gchar *source_uid = NULL;
gchar *contact_uid = NULL;
@@ -329,11 +329,15 @@ book_shell_backend_handle_uri_cb (EShellBackend *shell_backend,
if (!g_str_has_prefix (uri, "contacts:"))
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) {
- e_uri_free (euri);
+ soup_uri_free (soup_uri);
return FALSE;
}
@@ -378,7 +382,7 @@ book_shell_backend_handle_uri_cb (EShellBackend *shell_backend,
g_free (source_uid);
g_free (contact_uid);
- e_uri_free (euri);
+ soup_uri_free (soup_uri);
return TRUE;
}
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;
}