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
9ce08e07
Commit
9ce08e07
authored
16 years ago
by
Emmanuel Milou
Browse files
Options
Downloads
Patches
Plain Diff
Allow user to make IP call without any accounts configured
parent
849f00de
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
sflphone-gtk/src/actions.c
+58
-48
58 additions, 48 deletions
sflphone-gtk/src/actions.c
with
58 additions
and
48 deletions
sflphone-gtk/src/actions.c
+
58
−
48
View file @
9ce08e07
...
@@ -670,13 +670,20 @@ sflphone_keypad( guint keyval, gchar * key)
...
@@ -670,13 +670,20 @@ sflphone_keypad( guint keyval, gchar * key)
* Place a call with the current account.
* Place a call with the current account.
* If there is no default account selected, place a call with the first
* If there is no default account selected, place a call with the first
* registered account of the account list
* registered account of the account list
* Else, popup an error message
* Else,
check if it an IP call. if not,
popup an error message
*/
*/
void
void
sflphone_place_call
(
call_t
*
c
)
sflphone_place_call
(
call_t
*
c
)
{
{
if
(
c
->
state
==
CALL_STATE_DIALING
&&
g_str_has_prefix
(
c
->
to
,
"ip:"
))
{
dbus_place_call
(
c
);
}
else
{
if
(
c
->
state
==
CALL_STATE_DIALING
&&
strcmp
(
c
->
to
,
""
)
!=
0
)
if
(
c
->
state
==
CALL_STATE_DIALING
&&
strcmp
(
c
->
to
,
""
)
!=
0
)
{
{
...
@@ -697,7 +704,6 @@ sflphone_place_call ( call_t * c )
...
@@ -697,7 +704,6 @@ sflphone_place_call ( call_t * c )
else
else
{
{
account_t
*
current
;
account_t
*
current
;
if
(
g_strcasecmp
(
c
->
accountID
,
""
)
!=
0
)
{
if
(
g_strcasecmp
(
c
->
accountID
,
""
)
!=
0
)
{
...
@@ -746,11 +752,10 @@ sflphone_place_call ( call_t * c )
...
@@ -746,11 +752,10 @@ sflphone_place_call ( call_t * c )
}
}
// Update history
// Update history
c
->
history_state
=
OUTGOING
;
c
->
history_state
=
OUTGOING
;
g_print
(
"add in history
\n
"
);
calllist_add
(
history
,
c
);
calllist_add
(
history
,
c
);
}
}
}
}
}
void
void
sflphone_display_selected_codec
(
const
gchar
*
codecName
)
sflphone_display_selected_codec
(
const
gchar
*
codecName
)
...
@@ -761,10 +766,15 @@ sflphone_display_selected_codec (const gchar* codecName)
...
@@ -761,10 +766,15 @@ sflphone_display_selected_codec (const gchar* codecName)
account_t
*
acc
;
account_t
*
acc
;
if
(
selectedCall
->
accountID
!=
NULL
){
if
(
selectedCall
->
accountID
!=
NULL
){
acc
=
account_list_get_by_id
(
selectedCall
->
accountID
);
acc
=
account_list_get_by_id
(
selectedCall
->
accountID
);
if
(
!
acc
)
{
msg
=
g_markup_printf_escaped
(
_
(
"IP call - %s"
),
codecName
);
}
else
{
msg
=
g_markup_printf_escaped
(
_
(
"%s account- %s %s"
)
,
msg
=
g_markup_printf_escaped
(
_
(
"%s account- %s %s"
)
,
(
gchar
*
)
g_hash_table_lookup
(
acc
->
properties
,
ACCOUNT_TYPE
),
(
gchar
*
)
g_hash_table_lookup
(
acc
->
properties
,
ACCOUNT_TYPE
),
(
gchar
*
)
g_hash_table_lookup
(
acc
->
properties
,
ACCOUNT_ALIAS
),
(
gchar
*
)
g_hash_table_lookup
(
acc
->
properties
,
ACCOUNT_ALIAS
),
codecName
);
codecName
);
}
statusbar_push_message
(
msg
,
__MSG_ACCOUNT_DEFAULT
);
statusbar_push_message
(
msg
,
__MSG_ACCOUNT_DEFAULT
);
g_free
(
msg
);
g_free
(
msg
);
}
}
...
...
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