From 6651aabfdc5251eaf077c1c40f862fd4326e4e68 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandresavard@msavard.(none)>
Date: Wed, 29 Jun 2011 13:56:47 -0400
Subject: [PATCH] #6109: Fix icons when history is not activated
---
sflphone-client-gnome/src/contacts/calltree.c | 9 +--------
sflphone-client-gnome/src/uimanager.c | 9 ++++-----
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/sflphone-client-gnome/src/contacts/calltree.c b/sflphone-client-gnome/src/contacts/calltree.c
index 7e083d388d..d7174bfb52 100644
--- a/sflphone-client-gnome/src/contacts/calltree.c
+++ b/sflphone-client-gnome/src/contacts/calltree.c
@@ -1454,7 +1454,7 @@ void calltree_add_history_conference(conference_obj_t *conf)
ERROR("CallTree: Error conference is NULL");
}
- DEBUG("---------------------------------------------------------- CallTree: Add conference %s to history", conf->_confID);
+ DEBUG("CallTree: Add conference %s to history", conf->_confID);
gtk_tree_store_prepend(history->store, &iter, NULL);
@@ -1501,23 +1501,17 @@ void calltree_display (calltab_t *tab)
/* case 1: we want to display the main calltree */
if (tab==current_calls) {
-
DEBUG ("CallTree: Display main tab");
-
if (active_calltree==contacts) {
gtk_toggle_tool_button_set_active ( (GtkToggleToolButton*) contactButton, FALSE);
} else {
gtk_toggle_tool_button_set_active ( (GtkToggleToolButton*) historyButton, FALSE);
}
-
- // gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)currentCallsButton, TRUE);
-
}
/* case 2: we want to display the history */
else if (tab == history) {
-
DEBUG ("ConferenceList: Display history tab");
if (active_calltree==contacts) {
@@ -1528,7 +1522,6 @@ void calltree_display (calltab_t *tab)
}
else if (tab==contacts) {
-
DEBUG ("CallTree: Display contact tab");
if (active_calltree==history) {
diff --git a/sflphone-client-gnome/src/uimanager.c b/sflphone-client-gnome/src/uimanager.c
index 1d3a5be270..39b0baf7cf 100644
--- a/sflphone-client-gnome/src/uimanager.c
+++ b/sflphone-client-gnome/src/uimanager.c
@@ -180,15 +180,14 @@ update_actions()
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (newCallWidget), 0);
+ if(is_inserted(GTK_WIDGET (playRecordWidget), GTK_WIDGET(toolbar)))
+ gtk_container_remove(GTK_CONTAINER(toolbar), GTK_WIDGET(playRecordWidget));
+ if(is_inserted(GTK_WIDGET (stopRecordWidget), GTK_WIDGET(toolbar)))
+ gtk_container_remove(GTK_CONTAINER(toolbar), GTK_WIDGET(stopRecordWidget));
if (eel_gconf_get_integer (HISTORY_ENABLED)) {
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (historyButton), -1);
gtk_widget_set_sensitive (GTK_WIDGET (historyButton), TRUE);
-
- if(is_inserted(GTK_WIDGET (playRecordWidget), GTK_WIDGET(toolbar)))
- gtk_container_remove(GTK_CONTAINER(toolbar), GTK_WIDGET(playRecordWidget));
- if(is_inserted(GTK_WIDGET (stopRecordWidget), GTK_WIDGET(toolbar)))
- gtk_container_remove(GTK_CONTAINER(toolbar), GTK_WIDGET(stopRecordWidget));
}
// If addressbook support has been enabled and all addressbooks are loaded, display the icon
--
GitLab