diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 7 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-migrate.c | 7 |
3 files changed, 18 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index c6eaca88f4..040ac32723 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2007-05-25 Matthew Barnes <mbarnes@redhat.com> + + * gui/component/addressbook-component.c (ensure_sources): + * gui/component/addressbook-migrate.c (ensure_sources): + Don't assume the relative URI is non-NULL (#427232). + 2007-05-14 Srinivasa Ragavan <sragavan@novell.com> ** Fix for bug #424055 from Øystein Gisnås diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index af65240d83..3f20c5f6d8 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -118,7 +118,12 @@ ensure_sources (AddressbookComponent *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/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index 70518239ed..18a58a032a 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -472,7 +472,12 @@ create_groups (MigrationContext *context, 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; } |