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
62c2ba01
Commit
62c2ba01
authored
17 years ago
by
Emmanuel Milou
Browse files
Options
Downloads
Patches
Plain Diff
GTK bug fix: ESC key hang up outgoing call when ringing
The bug was due to the fact that the dtmf info was send
parent
46c72c2d
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
+5
-5
5 additions, 5 deletions
sflphone-gtk/src/actions.c
sflphone-gtk/src/calltree.c
+0
-14
0 additions, 14 deletions
sflphone-gtk/src/calltree.c
with
5 additions
and
19 deletions
sflphone-gtk/src/actions.c
+
5
−
5
View file @
62c2ba01
...
@@ -413,7 +413,6 @@ call_t * sflphone_new_call()
...
@@ -413,7 +413,6 @@ call_t * sflphone_new_call()
void
void
sflphone_keypad
(
guint
keyval
,
gchar
*
key
)
sflphone_keypad
(
guint
keyval
,
gchar
*
key
)
{
{
dbus_play_dtmf
(
key
);
call_t
*
c
=
call_get_selected
();
call_t
*
c
=
call_get_selected
();
if
(
c
)
if
(
c
)
{
{
...
@@ -421,13 +420,14 @@ sflphone_keypad( guint keyval, gchar * key)
...
@@ -421,13 +420,14 @@ sflphone_keypad( guint keyval, gchar * key)
switch
(
c
->
state
)
switch
(
c
->
state
)
{
{
case
CALL_STATE_DIALING
:
// Currently dialing => edit number
case
CALL_STATE_DIALING
:
// Currently dialing => edit number
dbus_play_dtmf
(
key
);
process_dialing
(
c
,
keyval
,
key
);
process_dialing
(
c
,
keyval
,
key
);
break
;
break
;
case
CALL_STATE_CURRENT
:
case
CALL_STATE_CURRENT
:
switch
(
keyval
)
switch
(
keyval
)
{
{
case
65307
:
/* ESCAPE */
case
65307
:
/* ESCAPE */
sflphone
_hang_up
(
c
);
dbus
_hang_up
(
c
);
break
;
break
;
default:
// TODO should this be here?
default:
// TODO should this be here?
dbus_play_dtmf
(
key
);
dbus_play_dtmf
(
key
);
...
@@ -463,7 +463,7 @@ sflphone_keypad( guint keyval, gchar * key)
...
@@ -463,7 +463,7 @@ sflphone_keypad( guint keyval, gchar * key)
dbus_transfert
(
c
);
dbus_transfert
(
c
);
break
;
break
;
case
65307
:
/* ESCAPE */
case
65307
:
/* ESCAPE */
sflphone_
hang_up
(
c
);
sflphone_
unset_transfert
(
c
);
break
;
break
;
default:
// When a call is on transfert, typing new numbers will add it to c->to
default:
// When a call is on transfert, typing new numbers will add it to c->to
process_dialing
(
c
,
keyval
,
key
);
process_dialing
(
c
,
keyval
,
key
);
...
@@ -491,8 +491,7 @@ sflphone_keypad( guint keyval, gchar * key)
...
@@ -491,8 +491,7 @@ sflphone_keypad( guint keyval, gchar * key)
switch
(
keyval
)
switch
(
keyval
)
{
{
case
65307
:
/* ESCAPE */
case
65307
:
/* ESCAPE */
//dbus_hang_up(c);
dbus_hang_up
(
c
);
sflphone_hang_up
(
c
);
break
;
break
;
}
}
break
;
break
;
...
@@ -502,6 +501,7 @@ sflphone_keypad( guint keyval, gchar * key)
...
@@ -502,6 +501,7 @@ sflphone_keypad( guint keyval, gchar * key)
}
}
else
else
{
// Not in a call, not dialing, create a new call
{
// Not in a call, not dialing, create a new call
dbus_play_dtmf
(
key
);
switch
(
keyval
)
switch
(
keyval
)
{
{
case
65293
:
/* ENTER */
case
65293
:
/* ENTER */
...
...
This diff is collapsed.
Click to expand it.
sflphone-gtk/src/calltree.c
+
0
−
14
View file @
62c2ba01
...
@@ -72,15 +72,6 @@ call_button( GtkWidget *widget, gpointer data )
...
@@ -72,15 +72,6 @@ call_button( GtkWidget *widget, gpointer data )
sflphone_new_call
();
sflphone_new_call
();
}
}
/**
* Pick up
*/
/* static void
pick_up( GtkWidget *widget, gpointer data )
{
sflphone_pick_up();
}*/
/**
/**
* Hang up the line
* Hang up the line
*/
*/
...
@@ -177,7 +168,6 @@ toolbar_update_buttons ()
...
@@ -177,7 +168,6 @@ toolbar_update_buttons ()
break
;
break
;
case
CALL_STATE_DIALING
:
case
CALL_STATE_DIALING
:
gtk_widget_set_sensitive
(
GTK_WIDGET
(
hangupButton
),
TRUE
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
hangupButton
),
TRUE
);
//gtk_widget_set_sensitive( GTK_WIDGET(callButton), TRUE);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
pickupButton
),
TRUE
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
pickupButton
),
TRUE
);
g_object_ref
(
callButton
);
g_object_ref
(
callButton
);
gtk_container_remove
(
GTK_CONTAINER
(
toolbar
),
GTK_WIDGET
(
callButton
));
gtk_container_remove
(
GTK_CONTAINER
(
toolbar
),
GTK_WIDGET
(
callButton
));
...
@@ -520,8 +510,6 @@ update_call_tree (call_t * c)
...
@@ -520,8 +510,6 @@ update_call_tree (call_t * c)
}
}
toolbar_update_buttons
();
toolbar_update_buttons
();
//return row_ref;
}
}
void
void
...
@@ -572,9 +560,7 @@ update_call_tree_add (call_t * c)
...
@@ -572,9 +560,7 @@ update_call_tree_add (call_t * c)
if
(
pixbuf
!=
NULL
)
if
(
pixbuf
!=
NULL
)
g_object_unref
(
G_OBJECT
(
pixbuf
));
g_object_unref
(
G_OBJECT
(
pixbuf
));
//g_free(markup);
sel
=
gtk_tree_view_get_selection
(
GTK_TREE_VIEW
(
view
));
sel
=
gtk_tree_view_get_selection
(
GTK_TREE_VIEW
(
view
));
gtk_tree_selection_select_iter
(
GTK_TREE_SELECTION
(
sel
),
&
iter
);
gtk_tree_selection_select_iter
(
GTK_TREE_SELECTION
(
sel
),
&
iter
);
toolbar_update_buttons
();
toolbar_update_buttons
();
//return row_ref;
}
}
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