From 67d9d9c4c83432d880f3b7fa0a2ed38f6164f38e Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandresavard@msavard.(none)>
Date: Thu, 9 Jun 2011 15:28:59 -0400
Subject: [PATCH] #6065: Fix "transfert" typo
---
sflphone-client-gnome/src/contacts/calltree.c | 4 ++--
sflphone-client-gnome/src/uimanager.c | 9 +++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/sflphone-client-gnome/src/contacts/calltree.c b/sflphone-client-gnome/src/contacts/calltree.c
index 47cda43ce9..3d34fc931a 100644
--- a/sflphone-client-gnome/src/contacts/calltree.c
+++ b/sflphone-client-gnome/src/contacts/calltree.c
@@ -430,10 +430,10 @@ void calltree_display_call_info (callable_obj_t * c, CallDisplayType display_typ
case DISPLAY_TYPE_CALL_TRANSFER:
if (g_strcmp0 ("",c->_peer_name) == 0) {
- description = g_markup_printf_escaped ("<b>%s</b><i>%s</i>\n<i>Transfert to:%s</i> ",
+ description = g_markup_printf_escaped ("<b>%s</b><i>%s</i>\n<i>Transfer to:%s</i> ",
display_number, c->_peer_name, c->_trsft_to);
} else {
- description = g_markup_printf_escaped ("<b>%s</b> <i>%s</i>\n<i>Transfert to:%s</i> ",
+ description = g_markup_printf_escaped ("<b>%s</b> <i>%s</i>\n<i>Transfer to:%s</i> ",
c->_peer_name, display_number, c->_trsft_to);
}
DEBUG ("CallTree: Display a call transfer, description: %s", description);
diff --git a/sflphone-client-gnome/src/uimanager.c b/sflphone-client-gnome/src/uimanager.c
index f2135f084f..270a154dd3 100644
--- a/sflphone-client-gnome/src/uimanager.c
+++ b/sflphone-client-gnome/src/uimanager.c
@@ -861,7 +861,7 @@ clear_history (void)
}
/**
- * Transfert the line
+ * Transfer the line
*/
static void
call_transfer_cb()
@@ -984,9 +984,11 @@ uimanager_new (GtkUIManager **_ui_manager)
gchar *path;
guint manager_id = 0;
GError *error = NULL;
- gint nb_entries;
+ gint nb_entries, nb_menu_entries;
nb_entries = abookfactory_is_addressbook_loaded() ? 7 : 6;
+ nb_menu_entries = abookfactory_is_addressbook_loaded() ? 7 : 6;
+
window = get_main_window();
ui_manager = gtk_ui_manager_new();
@@ -1020,6 +1022,7 @@ uimanager_new (GtkUIManager **_ui_manager)
}
if(abookfactory_is_addressbook_loaded()) {
+ // This action must be loaded dynamically and is not specified in the xml description
gtk_ui_manager_add_ui(ui_manager, manager_id, "/ToolbarActions",
"AddressbookToolbar",
"Addressbook",
@@ -1029,6 +1032,8 @@ 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