jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

[#1976] Fix calltree switching from history

Browse Source
This commit is contained in:
Emmanuel Milou
2009-10-06 14:11:33 -04:00
parent a32f9e987c
commit 1a034f574a
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sflphone-client-gnome/src/contacts/calltree.c
View File

@ -1158,13 +1158,14 @@ void calltree_display (calltab_t *tab) {
DEBUG ("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 */
@ -1173,10 +1174,10 @@ void calltree_display (calltab_t *tab) {
DEBUG ("display history tab");
if (active_calltree==contacts) {
//gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)contactButton, FALSE);
gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)contactButton, FALSE);
}
//gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)historyButton, TRUE);
gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)historyButton, TRUE);
}
else if (tab==contacts) {
@ -1184,10 +1185,10 @@ void calltree_display (calltab_t *tab) {
DEBUG ("display contact tab");
if (active_calltree==history) {
//gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)historyButton, FALSE);
gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)historyButton, FALSE);
}
//gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)contactButton, TRUE);
gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)contactButton, TRUE);
}
else

6
sflphone-client-gnome/src/ui.xml
View File

@ -55,9 +55,9 @@
</toolbar>
<toolbar name="ToolbarWindows">
<toolitem action="CallWindow"/>
<toolitem action="History"/>
<toolitem action="Addressbook"/>
<toolitem name="CallWindowToolbar" action="CallWindow"/>
<toolitem name="HistoryToolbar" action="History"/>
<toolitem name="AddressbookToolbar" action="Addressbook"/>
</toolbar>
</ui>

4
sflphone-client-gnome/src/uimanager.c
View File

@ -1386,5 +1386,9 @@ GtkWidget* create_toolbar_windows (GtkUIManager *ui_manager)
toolbar = gtk_ui_manager_get_widget (ui_manager, "/ToolbarWindows");
active_calltree = current_calls;
historyButton = gtk_ui_manager_get_widget (ui_manager, "/ToolbarWindows/HistoryToolbar");
contactButton = gtk_ui_manager_get_widget (ui_manager, "/ToolbarWindows/AddressbookToolbar");
currentCallsButton = gtk_ui_manager_get_widget (ui_manager, "/ToolbarWindows/CallWindowToolbar");
return toolbar;
}

4
sflphone-client-gnome/src/uimanager.h
View File

@ -27,6 +27,10 @@ G_BEGIN_DECLS
guint transfertButtonConnId; //The button toggled signal connection ID
guint holdConnId; //The hold_menu signal connection ID
GtkWidget *historyButton;
GtkWidget *contactButton;
GtkWidget *currentCallsButton;
gboolean uimanager_new (GtkUIManager**);
G_END_DECLS