Don't assume the relative URI is non-NULL (#427232).

2007-05-25  Matthew Barnes  <mbarnes@redhat.com>

	* addressbook/gui/component/addressbook-component.c (ensure_sources):
	* addressbook/gui/component/addressbook-migrate.c (ensure_sources):
	* calendar/gui/migration.c (create_calendar_sources),
        (create_task_sources), (create_memo_sources):
	* calendar/gui/tasks-component.c (ensure_sources):
	* calendar/gui/calendar-component.c (ensure_sources):
	* calendar/gui/memos-component.c (ensure_sources):
	* plugins/hula-account-setup/camel-hula-listener.c
        (remove_esource), (modify_esource):
	* plugins/groupwise-account-setup/camel-gw-listener.c
        (remove_esource), (modify_esource):
	Don't assume the relative URI is non-NULL (#427232).

	* plugins/exchange-operations/exchange-config-listener.c
        (exchange_add_autocompletion_folders):
	Don't assume the absolute URI is non-NULL (#427232).


svn path=/trunk/; revision=33577

5 files changed, 45 insertions, 6 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index cc5741e111..b96ecdce71 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-25  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/migration.c (create_calendar_sources), (create_task_sources),
+	(create_memo_sources):
+	* gui/tasks-component.c (ensure_sources):
+	* gui/calendar-component.c (ensure_sources):
+	* gui/memos-component.c (ensure_sources):
+	Don't assume the relative URI is non-NULL (#427232).
+
 2007-05-24  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #424562
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 08ecfb09f3..2eaf22fd88 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -210,7 +210,12 @@ ensure_sources (CalendarComponent *component)
 		GSList *s;
 		for (s = sources; s; s = s->next) {
 			ESource *source = E_SOURCE (s->data);
-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+			const gchar *relative_uri;
+
+			relative_uri = e_source_peek_relative_uri (source);
+			if (relative_uri == NULL)
+				continue;
+			if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
 				personal_source = source;
 				break;
 			}
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index aef826507c..d718f6b4be 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -174,7 +174,12 @@ ensure_sources (MemosComponent *component)
 		GSList *s;
 		for (s = sources; s; s = s->next) {
 			ESource *source = E_SOURCE (s->data);
-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+			const gchar *relative_uri;
+
+			relative_uri = e_source_peek_relative_uri (source);
+			if (relative_uri == NULL)
+				continue;
+			if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
 				personal_source = source;
 				break;
 			}
diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c
index 65c759ce40..8a95bc3a6a 100644
--- a/calendar/gui/migration.c
+++ b/calendar/gui/migration.c
@@ -466,7 +466,12 @@ create_calendar_sources (CalendarComponent *component,
 		GSList *s;
 		for (s = sources; s; s = s->next) {
 			ESource *source = E_SOURCE (s->data);
-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+			const gchar *relative_uri;
+
+			relative_uri = e_source_peek_relative_uri (source);
+			if (relative_uri == NULL)
+				continue;
+			if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
 				*personal_source = g_object_ref (source);
 				break;
 			}
@@ -562,7 +567,12 @@ create_task_sources (TasksComponent *component,
 		GSList *s;
 		for (s = sources; s; s = s->next) {
 			ESource *source = E_SOURCE (s->data);
-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+			const gchar *relative_uri;
+
+			relative_uri = e_source_peek_relative_uri (source);
+			if (relative_uri == NULL)
+				continue;
+			if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
 				*personal_source = g_object_ref (source);
 				break;
 			}
@@ -1070,7 +1080,12 @@ create_memo_sources (MemosComponent *component,
 		GSList *s;
 		for (s = sources; s; s = s->next) {
 			ESource *source = E_SOURCE (s->data);
-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+			const gchar *relative_uri;
+
+			relative_uri = e_source_peek_relative_uri (source);
+			if (relative_uri == NULL)
+				continue;
+			if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
 				*personal_source = g_object_ref (source);
 				break;
 			}
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 0bae3c7c48..723c19d8a7 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -170,7 +170,12 @@ ensure_sources (TasksComponent *component)
 		GSList *s;
 		for (s = sources; s; s = s->next) {
 			ESource *source = E_SOURCE (s->data);
-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+			const gchar *relative_uri;
+
+			relative_uri = e_source_peek_relative_uri (source);
+			if (relative_uri == NULL)
+				continue;
+			if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
 				personal_source = source;
 				break;
 			}