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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
e99b4bed
Commit
e99b4bed
authored
16 years ago
by
Julien Bonjean
Browse files
Options
Downloads
Patches
Plain Diff
Fix keypad use when in history or contact
parent
a9036eb2
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-gtk/src/actions.c
+19
-19
19 additions, 19 deletions
sflphone-gtk/src/actions.c
sflphone-gtk/src/calltree.c
+1
-0
1 addition, 0 deletions
sflphone-gtk/src/calltree.c
with
20 additions
and
19 deletions
sflphone-gtk/src/actions.c
+
19
−
19
View file @
e99b4bed
...
...
@@ -555,10 +555,27 @@ sflphone_new_call()
void
sflphone_keypad
(
guint
keyval
,
gchar
*
key
)
{
call_t
*
c
=
call_get_selected
(
current_calls
);
if
(
c
)
if
((
active_calltree
!=
current_calls
)
||
(
active_calltree
==
current_calls
&&
!
c
))
{
// Not in a call, not dialing, create a new call
//dbus_play_dtmf(key);
switch
(
keyval
)
{
case
65293
:
/* ENTER */
case
65421
:
/* ENTER numpad */
case
65307
:
/* ESCAPE */
break
;
default:
switch_tab
(
current_calls
);
process_dialing
(
sflphone_new_call
(),
keyval
,
key
);
break
;
}
}
else
if
(
c
)
{
printf
(
"call
\n
"
);
switch
(
c
->
state
)
{
case
CALL_STATE_DIALING
:
// Currently dialing => edit number
...
...
@@ -652,23 +669,6 @@ sflphone_keypad( guint keyval, gchar * key)
break
;
}
}
else
{
// Not in a call, not dialing, create a new call
//dbus_play_dtmf(key);
switch
(
keyval
)
{
case
65293
:
/* ENTER */
case
65421
:
/* ENTER numpad */
case
65307
:
/* ESCAPE */
break
;
default:
switch_tab
(
current_calls
);
process_dialing
(
sflphone_new_call
(),
keyval
,
key
);
break
;
}
}
}
/*
...
...
This diff is collapsed.
Click to expand it.
sflphone-gtk/src/calltree.c
+
1
−
0
View file @
e99b4bed
...
...
@@ -175,6 +175,7 @@ toggle_current_calls(GtkToggleToolButton *toggle_tool_button UNUSED,
gtk_widget_hide
(
history
->
tree
);
gtk_widget_hide
(
contacts
->
tree
);
gtk_widget_show
(
current_calls
->
tree
);
printf
(
"current calls toggle
\n
"
);
sel
=
gtk_tree_view_get_selection
(
GTK_TREE_VIEW
(
active_calltree
->
view
));
g_signal_emit_by_name
(
sel
,
"changed"
);
...
...
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