From 200f061f1aa5cd5384cf3c0820db2b8f51b5b49b Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Wed, 9 May 2012 18:10:04 -0400
Subject: [PATCH] * #10725: addressbook-config: avoid segfault if addressbook
is not found
---
gnome/src/config/addressbook-config.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/gnome/src/config/addressbook-config.c b/gnome/src/config/addressbook-config.c
index 1832d38e81..14476e0330 100644
--- a/gnome/src/config/addressbook-config.c
+++ b/gnome/src/config/addressbook-config.c
@@ -219,7 +219,7 @@ addressbook_config_book_active_toggled(
treePath = gtk_tree_path_new_from_string(path);
if (!(model = gtk_tree_view_get_model(GTK_TREE_VIEW(data)))) {
- DEBUG("Addressbook: No valid model (%s:%d)", __FILE__, __LINE__);
+ DEBUG("No valid model (%s:%d)", __FILE__, __LINE__);
return;
}
@@ -241,7 +241,8 @@ addressbook_config_book_active_toggled(
book_data = addrbook->get_book_data_by_uid(uid);
if (book_data == NULL) {
- ERROR("Addressbook: Error: Could not find addressbook %s", uid);
+ ERROR("Could not find addressbook %s", uid);
+ return;
}
book_data->active = active;
@@ -299,12 +300,12 @@ addressbook_config_fill_book_list()
GSList *books_data = addrbook->get_books_data(book_list);
if (!books_data) {
- DEBUG("Addressbook: No valid books data (%s:%d)", __FILE__, __LINE__);
+ DEBUG("No valid books data (%s:%d)", __FILE__, __LINE__);
}
// Get model of view and clear it
if (!(store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(book_tree_view))))) {
- DEBUG("Addressbook: Could not find model from treeview (%s:%d)", __FILE__, __LINE__);
+ DEBUG("Could not find model from treeview (%s:%d)", __FILE__, __LINE__);
return;
}
--
GitLab