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;
 }