Skip to content
Snippets Groups Projects
Commit 200f061f authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #10725: addressbook-config: avoid segfault if addressbook is not found

parent 525e789d
No related branches found
No related tags found
No related merge requests found
...@@ -219,7 +219,7 @@ addressbook_config_book_active_toggled( ...@@ -219,7 +219,7 @@ addressbook_config_book_active_toggled(
treePath = gtk_tree_path_new_from_string(path); treePath = gtk_tree_path_new_from_string(path);
if (!(model = gtk_tree_view_get_model(GTK_TREE_VIEW(data)))) { 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; return;
} }
...@@ -241,7 +241,8 @@ addressbook_config_book_active_toggled( ...@@ -241,7 +241,8 @@ addressbook_config_book_active_toggled(
book_data = addrbook->get_book_data_by_uid(uid); book_data = addrbook->get_book_data_by_uid(uid);
if (book_data == NULL) { 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; book_data->active = active;
...@@ -299,12 +300,12 @@ addressbook_config_fill_book_list() ...@@ -299,12 +300,12 @@ addressbook_config_fill_book_list()
GSList *books_data = addrbook->get_books_data(book_list); GSList *books_data = addrbook->get_books_data(book_list);
if (!books_data) { 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 // Get model of view and clear it
if (!(store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(book_tree_view))))) { 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; return;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment