Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
savoirfairelinux
jami-daemon
Commits
201aeb15
Commit
201aeb15
authored
Nov 18, 2009
by
Alexandre Savard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[#2447] Bind offHold/onHold actions to button in gtk client
parent
9a290fc9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
0 deletions
+38
-0
sflphone-client-gnome/src/actions.c
sflphone-client-gnome/src/actions.c
+15
-0
sflphone-client-gnome/src/uimanager.c
sflphone-client-gnome/src/uimanager.c
+23
-0
No files found.
sflphone-client-gnome/src/actions.c
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");
}
*/
}
...
...
sflphone-client-gnome/src/uimanager.c
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment