From 5a50199e3c24894f93dfed24ac3d0ad47d0e03ff Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Date: Wed, 24 Nov 2010 09:24:45 -0500
Subject: [PATCH] [#4616] Fix addressbook warnings
---
.../src/contacts/addressbook.c | 23 +++++++++----------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/sflphone-client-gnome/src/contacts/addressbook.c b/sflphone-client-gnome/src/contacts/addressbook.c
index 8b2b529809..37012d54b5 100644
--- a/sflphone-client-gnome/src/contacts/addressbook.c
+++ b/sflphone-client-gnome/src/contacts/addressbook.c
@@ -96,7 +96,6 @@ addressbook_is_active()
static void
addressbook_config_books()
{
-
gchar **config_book_uid;
book_data_t *book_data;
gchar **list;
@@ -104,23 +103,23 @@ addressbook_config_books()
// Retrieve list of books
list = (gchar **) dbus_get_addressbook_list();
- if (list) {
+ if (list == NULL)
+ return;
- for (config_book_uid = list; *config_book_uid; config_book_uid++) {
+ for (config_book_uid = list; *config_book_uid; config_book_uid++) {
- // Get corresponding book data
- book_data = books_get_book_data_by_uid (*config_book_uid);
+ // Get corresponding book data
+ book_data = books_get_book_data_by_uid (*config_book_uid);
- // If book_data exists
- if (!book_data) {
- ERROR ("Addressbook: Error: Could not open book (%s:%d)", __FILE__, __LINE__);
- book_data->active = TRUE;
- }
+ // If book_data exists
+ if (book_data == NULL) {
+ ERROR ("Addressbook: Error: Could not open book (%s:%d)", __FILE__, __LINE__);
+ } else {
+ book_data->active = TRUE;
}
-
- g_strfreev (list);
}
+ g_strfreev (list);
}
/**
--
GitLab