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
201aeb15
Commit
201aeb15
authored
15 years ago
by
Alexandre Savard
Browse files
Options
Downloads
Patches
Plain Diff
[#2447] Bind offHold/onHold actions to button in gtk client
parent
9a290fc9
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
sflphone-client-gnome/src/actions.c
+15
-0
15 additions, 0 deletions
sflphone-client-gnome/src/actions.c
sflphone-client-gnome/src/uimanager.c
+23
-0
23 additions, 0 deletions
sflphone-client-gnome/src/uimanager.c
with
38 additions
and
0 deletions
sflphone-client-gnome/src/actions.c
+
15
−
0
View file @
201aeb15
...
...
@@ -442,6 +442,9 @@ sflphone_pick_up()
sflphone_on_hold
()
{
callable_obj_t
*
selectedCall
=
calltab_get_selected_call
(
current_calls
);
conference_obj_t
*
selectedConf
=
calltab_get_selected_conf
(
active_calltree
);
DEBUG
(
"sflphone_on_hold"
);
if
(
selectedCall
)
{
switch
(
selectedCall
->
_state
)
...
...
@@ -458,12 +461,18 @@ sflphone_on_hold ()
break
;
}
}
else
if
(
selectedConf
)
{
dbus_hold_conference
(
selectedConf
);
}
}
void
sflphone_off_hold
()
{
DEBUG
(
"sflphone_off_hold"
);
callable_obj_t
*
selectedCall
=
calltab_get_selected_call
(
current_calls
);
conference_obj_t
*
selectedConf
=
calltab_get_selected_conf
(
active_calltree
);
if
(
selectedCall
)
{
switch
(
selectedCall
->
_state
)
...
...
@@ -476,7 +485,12 @@ sflphone_off_hold ()
break
;
}
}
else
if
(
selectedConf
)
{
dbus_unhold_conference
(
selectedConf
);
}
/*
if(dbus_get_is_recording(selectedCall))
{
DEBUG("Currently recording!");
...
...
@@ -485,6 +499,7 @@ sflphone_off_hold ()
{
DEBUG("Not recording currently");
}
*/
}
...
...
This diff is collapsed.
Click to expand it.
sflphone-client-gnome/src/uimanager.c
+
23
−
0
View file @
201aeb15
...
...
@@ -385,6 +385,7 @@ switch_account( GtkWidget* item , gpointer data UNUSED)
call_hold
(
void
*
foo
UNUSED
)
{
callable_obj_t
*
selectedCall
=
calltab_get_selected_call
(
current_calls
);
conference_obj_t
*
selectedConf
=
calltab_get_selected_conf
();
if
(
selectedCall
)
{
...
...
@@ -397,6 +398,28 @@ call_hold (void* foo UNUSED)
sflphone_on_hold
();
}
}
else
if
(
selectedConf
)
{
switch
(
selectedConf
->
_state
)
{
case
CONFERENCE_STATE_HOLD
:
{
selectedConf
->
_state
=
CONFERENCE_STATE_ACTIVE_ATACHED
;
sflphone_conference_off_hold
(
selectedConf
);
}
break
;
case
CONFERENCE_STATE_ACTIVE_ATACHED
:
case
CONFERENCE_STATE_ACTIVE_DETACHED
:
{
selectedConf
->
_state
=
CONFERENCE_STATE_HOLD
;
sflphone_conference_on_hold
(
selectedConf
);
}
break
;
default:
break
;
}
}
}
static
void
...
...
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