Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
efdbe874
Commit
efdbe874
authored
14 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone
parents
95cd5905
b32c6f25
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
sflphone-client-gnome/src/ui.xml
+0
-2
0 additions, 2 deletions
sflphone-client-gnome/src/ui.xml
sflphone-client-gnome/src/uimanager.c
+5
-3
5 additions, 3 deletions
sflphone-client-gnome/src/uimanager.c
with
5 additions
and
5 deletions
sflphone-client-gnome/src/ui.xml
+
0
−
2
View file @
efdbe874
...
@@ -33,7 +33,6 @@
...
@@ -33,7 +33,6 @@
<menuitem
action=
"VolumeControls"
/>
<menuitem
action=
"VolumeControls"
/>
<separator/>
<separator/>
<menuitem
action=
"History"
/>
<menuitem
action=
"History"
/>
<menuitem
action=
"Addressbook"
/>
</menu>
</menu>
<menu
name=
"HelpMenu"
action=
"Help"
>
<menu
name=
"HelpMenu"
action=
"Help"
>
...
@@ -55,7 +54,6 @@
...
@@ -55,7 +54,6 @@
<separator/>
<separator/>
<toolitem
name=
"VoicemailToolbar"
action=
"Voicemail"
/>
<toolitem
name=
"VoicemailToolbar"
action=
"Voicemail"
/>
<toolitem
name=
"HistoryToolbar"
action=
"History"
/>
<toolitem
name=
"HistoryToolbar"
action=
"History"
/>
<!-- <toolitem name="AddressbookToolbar" action="Addressbook"/> -->
</toolbar>
</toolbar>
<popup
name=
"PopupMenu"
>
<popup
name=
"PopupMenu"
>
...
...
This diff is collapsed.
Click to expand it.
sflphone-client-gnome/src/uimanager.c
+
5
−
3
View file @
efdbe874
...
@@ -1022,7 +1022,11 @@ uimanager_new (GtkUIManager **_ui_manager)
...
@@ -1022,7 +1022,11 @@ uimanager_new (GtkUIManager **_ui_manager)
}
}
if
(
abookfactory_is_addressbook_loaded
())
{
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"
,
gtk_ui_manager_add_ui
(
ui_manager
,
manager_id
,
"/ToolbarActions"
,
"AddressbookToolbar"
,
"AddressbookToolbar"
,
"Addressbook"
,
"Addressbook"
,
...
@@ -1032,8 +1036,6 @@ uimanager_new (GtkUIManager **_ui_manager)
...
@@ -1032,8 +1036,6 @@ uimanager_new (GtkUIManager **_ui_manager)
action_group
=
gtk_action_group_new
(
"SFLphoneWindowActions"
);
action_group
=
gtk_action_group_new
(
"SFLphoneWindowActions"
);
// To translate label and tooltip entries
// To translate label and tooltip entries
gtk_action_group_set_translation_domain
(
action_group
,
"sflphone-client-gnome"
);
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_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_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);
//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);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment