Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
3c9dea6a
Commit
3c9dea6a
authored
Apr 23, 2012
by
Alexandre Savard
Browse files
#9902: Get rid of place_direct_call and place_registered_call in gnome client
parent
90cc0a5e
Changes
2
Hide whitespace changes
Inline
Side-by-side
gnome/src/actions.c
View file @
3c9dea6a
...
...
@@ -744,38 +744,19 @@ sflphone_keypad(guint keyval, gchar * key)
sflphone_new_call
();
}
static
void
place_direct_call
(
const
callable_obj_t
*
c
)
{
g_assert
(
c
->
_state
==
CALL_STATE_DIALING
);
dbus_place_call
(
c
);
}
static
int
place_registered_call
(
callable_obj_t
*
c
)
int
sflphone_place_call
(
callable_obj_t
*
c
)
{
account_t
*
account
=
NULL
;
DEBUG
(
"Actions: Placing call with %s @ %s and accountid %s"
,
c
->
_display_name
,
c
->
_peer_number
,
c
->
_accountID
);
if
(
c
->
_state
!=
CALL_STATE_DIALING
)
return
-
1
;
if
(
!*
c
->
_peer_number
)
return
-
1
;
// No longer usefull
/*
if (account_list_get_size() == 0) {
notify_no_accounts();
sflphone_fail(c);
return -1;
}
*/
/*
if (account_list_get_by_state(ACCOUNT_STATE_REGISTERED) == NULL) {
DEBUG("Actions: No registered account, cannot make a call");
notify_no_registered_accounts();
sflphone_fail(c);
return -1;
}
*/
DEBUG
(
"Actions: Get account for this call"
);
if
(
strlen
(
c
->
_accountID
)
!=
0
)
{
...
...
@@ -815,26 +796,6 @@ static int place_registered_call(callable_obj_t * c)
return
0
;
}
void
sflphone_place_call
(
callable_obj_t
*
c
)
{
DEBUG
(
"Actions: Placing call with %s @ %s and accountid %s"
,
c
->
_display_name
,
c
->
_peer_number
,
c
->
_accountID
);
if
(
place_registered_call
(
c
)
<
0
)
DEBUG
(
"An error occured while placing registered call in %s at %d"
,
__FILE__
,
__LINE__
);
/*
if (is_direct_call(c)) {
gchar *msg = g_markup_printf_escaped(_("Direct SIP call"));
statusbar_pop_message(__MSG_ACCOUNT_DEFAULT);
statusbar_push_message(msg , NULL, __MSG_ACCOUNT_DEFAULT);
g_free(msg);
place_direct_call(c);
} else if (place_registered_call(c) < 0)
DEBUG("An error occured while placing registered call in %s at %d", __FILE__, __LINE__);
*/
}
void
sflphone_detach_participant
(
const
gchar
*
callID
)
{
...
...
gnome/src/actions.h
View file @
3c9dea6a
...
...
@@ -157,7 +157,7 @@ void sflphone_keypad(guint keyval, gchar * key);
* Place a call with a filled callable_obj_t.to
* @param c A call in CALL_STATE_DIALING state
*/
void
sflphone_place_call
(
callable_obj_t
*
c
);
int
sflphone_place_call
(
callable_obj_t
*
c
);
/**
* Fetch the ip2ip profile through dbus and fill
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment