From 1aed04cbcf7cc8e76f090b87a6686c3407a40935 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <asavard@asavard.(none)>
Date: Tue, 7 Jun 2011 16:54:51 -0400
Subject: [PATCH] #6027: Fix addressbook enabled test from configuration
---
sflphone-client-gnome/src/uimanager.c | 7 +++++--
sflphone-plugins/plugin/addressbook/addressbook.c | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/sflphone-client-gnome/src/uimanager.c b/sflphone-client-gnome/src/uimanager.c
index 0d821e1588..8b5e63f1f1 100644
--- a/sflphone-client-gnome/src/uimanager.c
+++ b/sflphone-client-gnome/src/uimanager.c
@@ -48,6 +48,7 @@
#include "statusicon.h"
#include "contacts/addrbookfactory.h"
+#include "config/addressbook-config.h"
#include "accountlist.h"
#include "config/accountlistconfigdialog.h"
@@ -186,8 +187,10 @@ update_actions()
if(abookfactory_is_addressbook_loaded()) {
AddrBookFactory *bookFactory = abookfactory_get_factory();
-
- if (bookFactory->addrbook->is_enabled() && bookFactory->addrbook->is_ready()) {
+ AddressBook_Config *addressbook_config;
+ addressbook_config_load_parameters(&addressbook_config);
+
+ if (addressbook_config->enable && bookFactory->addrbook->is_ready()) {
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (contactButton), -1);
// Make the icon clickable only if at least one address book is active
diff --git a/sflphone-plugins/plugin/addressbook/addressbook.c b/sflphone-plugins/plugin/addressbook/addressbook.c
index 57556e5fe4..5056d5d7f9 100644
--- a/sflphone-plugins/plugin/addressbook/addressbook.c
+++ b/sflphone-plugins/plugin/addressbook/addressbook.c
@@ -72,7 +72,7 @@ addressbook_is_enabled()
// Load the address book parameters
// addressbook_config_load_parameters (&addressbook_config);
- return (guint) addressbook_config->enable;
+ return (gboolean) addressbook_config->enable;
}
/**
--
GitLab