From b32c6f2567b0ff0195d0d34fcd1186c482cd2d3a Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandresavard@msavard.(none)>
Date: Thu, 9 Jun 2011 15:59:26 -0400
Subject: [PATCH] #6065: Fix Addressbook runtime warnings
---
sflphone-client-gnome/src/ui.xml | 2 --
sflphone-client-gnome/src/uimanager.c | 8 +++++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sflphone-client-gnome/src/ui.xml b/sflphone-client-gnome/src/ui.xml
index f147736f67..9d61626d0a 100644
--- a/sflphone-client-gnome/src/ui.xml
+++ b/sflphone-client-gnome/src/ui.xml
@@ -33,7 +33,6 @@
<menuitem action="VolumeControls"/>
<separator/>
<menuitem action="History"/>
- <menuitem action="Addressbook"/>
</menu>
<menu name="HelpMenu" action="Help">
@@ -55,7 +54,6 @@
<separator/>
<toolitem name="VoicemailToolbar" action="Voicemail"/>
<toolitem name="HistoryToolbar" action="History"/>
- <!-- <toolitem name="AddressbookToolbar" action="Addressbook"/> -->
</toolbar>
<popup name="PopupMenu">
diff --git a/sflphone-client-gnome/src/uimanager.c b/sflphone-client-gnome/src/uimanager.c
index 270a154dd3..a1d7df1fb3 100644
--- a/sflphone-client-gnome/src/uimanager.c
+++ b/sflphone-client-gnome/src/uimanager.c
@@ -1022,7 +1022,11 @@ uimanager_new (GtkUIManager **_ui_manager)
}
if(abookfactory_is_addressbook_loaded()) {
- // This action must be loaded dynamically and is not specified in the xml description
+ // These actions must be loaded dynamically and is not specified in the xml description
+ gtk_ui_manager_add_ui(ui_manager, manager_id, "/ViewMenu",
+ NULL,
+ "Addressbook",
+ GTK_UI_MANAGER_MENUITEM, FALSE);
gtk_ui_manager_add_ui(ui_manager, manager_id, "/ToolbarActions",
"AddressbookToolbar",
"Addressbook",
@@ -1032,8 +1036,6 @@ uimanager_new (GtkUIManager **_ui_manager)
action_group = gtk_action_group_new ("SFLphoneWindowActions");
// To translate label and tooltip entries
gtk_action_group_set_translation_domain (action_group, "sflphone-client-gnome");
- // gtk_action_group_add_actions(action_group, menu_entries, 6, window);
- DEBUG("------------------------- menu nb element %d", G_N_ELEMENTS(menu_entries));
gtk_action_group_add_actions (action_group, menu_entries, G_N_ELEMENTS (menu_entries), window);
gtk_action_group_add_toggle_actions (action_group, toggle_menu_entries, nb_entries, window);
//gtk_action_group_add_radio_actions (action_group, radio_menu_entries, G_N_ELEMENTS (radio_menu_entries), CALLTREE_CALLS, G_CALLBACK (calltree_switch_cb), window);
--
GitLab