diff options
Diffstat (limited to 'calendar/gui')
| -rw-r--r-- | calendar/gui/calendar-component.c | 7 | ||||
| -rw-r--r-- | calendar/gui/memos-component.c | 7 | ||||
| -rw-r--r-- | calendar/gui/migration.c | 21 | ||||
| -rw-r--r-- | calendar/gui/tasks-component.c | 7 |
4 files changed, 36 insertions, 6 deletions
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; } |