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
e6b846ed
Commit
e6b846ed
authored
May 17, 2012
by
Alexandre Savard
Browse files
#11206: Set sensitive gtkwidget, not gtkaction, for recording actions
parent
6c69c397
Changes
1
Hide whitespace changes
Inline
Side-by-side
gnome/src/uimanager.c
View file @
e6b846ed
...
...
@@ -230,6 +230,9 @@ update_toolbar_for_call(callable_obj_t *selectedCall, gboolean instant_messaging
case
CALL_STATE_CURRENT
:
{
DEBUG
(
"Call State Current"
);
g_signal_handler_block
(
transferToolbar_
,
transferButtonConnId_
);
g_signal_handler_block
(
recordWidget_
,
recordButtonConnId_
);
gtk_action_set_sensitive
(
hangUpAction_
,
TRUE
);
gtk_action_set_sensitive
(
recordAction_
,
TRUE
);
gtk_action_set_sensitive
(
muteAction_
,
TRUE
);
...
...
@@ -249,11 +252,10 @@ update_toolbar_for_call(callable_obj_t *selectedCall, gboolean instant_messaging
if
(
instant_messaging_enabled
)
{
add_to_toolbar
(
toolbar_
,
imToolbar_
,
pos
++
);
g_signal_handler_block
(
transferToolbar_
,
transferButtonConnId_
);
gtk_toggle_tool_button_set_active
(
GTK_TOGGLE_TOOL_BUTTON
(
transferToolbar_
),
FALSE
);
g_signal_handler_unblock
(
transferToolbar_
,
transferButtonConnId_
);
g_signal_handler_block
(
recordWidget_
,
recordButtonConnId_
);
gtk_toggle_tool_button_set_active
(
GTK_TOGGLE_TOOL_BUTTON
(
recordWidget_
),
FALSE
);
g_signal_handler_unblock
(
transferToolbar_
,
transferButtonConnId_
);
g_signal_handler_unblock
(
recordWidget_
,
recordButtonConnId_
);
break
;
}
...
...
@@ -261,6 +263,9 @@ update_toolbar_for_call(callable_obj_t *selectedCall, gboolean instant_messaging
case
CALL_STATE_RECORD
:
{
DEBUG
(
"Call State Record"
);
g_signal_handler_block
(
transferToolbar_
,
transferButtonConnId_
);
g_signal_handler_block
(
recordWidget_
,
recordButtonConnId_
);
gtk_action_set_sensitive
(
hangUpAction_
,
TRUE
);
gtk_action_set_sensitive
(
recordAction_
,
TRUE
);
gtk_action_set_sensitive
(
muteAction_
,
TRUE
);
...
...
@@ -280,11 +285,10 @@ update_toolbar_for_call(callable_obj_t *selectedCall, gboolean instant_messaging
if
(
instant_messaging_enabled
)
add_to_toolbar
(
toolbar_
,
imToolbar_
,
pos
++
);
g_signal_handler_block
(
transferToolbar_
,
transferButtonConnId_
);
gtk_toggle_tool_button_set_active
(
GTK_TOGGLE_TOOL_BUTTON
(
transferToolbar_
),
FALSE
);
g_signal_handler_unblock
(
transferToolbar_
,
transferButtonConnId_
);
g_signal_handler_block
(
recordWidget_
,
recordButtonConnId_
);
gtk_toggle_tool_button_set_active
(
GTK_TOGGLE_TOOL_BUTTON
(
recordWidget_
),
TRUE
);
g_signal_handler_unblock
(
transferToolbar_
,
transferButtonConnId_
);
g_signal_handler_unblock
(
recordWidget_
,
recordButtonConnId_
);
break
;
}
...
...
@@ -337,11 +341,11 @@ update_toolbar_for_conference(conference_obj_t * selectedConf, gboolean instant_
case
CONFERENCE_STATE_ACTIVE_ATTACHED
:
case
CONFERENCE_STATE_ACTIVE_DETACHED
:
DEBUG
(
"Conference State Active"
);
g_signal_handler_block
(
recordWidget_
,
recordButtonConnId_
);
if
(
active_calltree_tab
==
current_calls_tab
)
{
gtk_action_set_sensitive
(
hangUpAction_
,
TRUE
);
gtk_widget_set_sensitive
(
holdToolbar_
,
TRUE
);
gtk_
action
_set_sensitive
(
record
Action
_
,
TRUE
);
gtk_
widget
_set_sensitive
(
record
Widget
_
,
TRUE
);
pos
=
1
;
add_to_toolbar
(
toolbar_
,
hangUpWidget_
,
pos
++
);
add_to_toolbar
(
toolbar_
,
holdToolbar_
,
pos
++
);
...
...
@@ -360,15 +364,16 @@ update_toolbar_for_conference(conference_obj_t * selectedConf, gboolean instant_
add_to_toolbar
(
toolbar_
,
playRecordWidget_
,
pos
);
}
}
g_signal_handler_unblock
(
recordWidget_
,
recordButtonConnId_
);
break
;
case
CONFERENCE_STATE_ACTIVE_ATTACHED_RECORD
:
case
CONFERENCE_STATE_ACTIVE_DETACHED_RECORD
:
{
g_signal_handler_block
(
recordWidget_
,
recordButtonConnId_
);
pos
=
1
;
DEBUG
(
"Conference State Record"
);
gtk_action_set_sensitive
(
hangUpAction_
,
TRUE
);
gtk_widget_set_sensitive
(
holdToolbar_
,
TRUE
);
gtk_
action
_set_sensitive
(
record
Action
_
,
TRUE
);
gtk_
widget
_set_sensitive
(
record
Widget
_
,
TRUE
);
add_to_toolbar
(
toolbar_
,
hangUpWidget_
,
pos
++
);
add_to_toolbar
(
toolbar_
,
holdToolbar_
,
pos
++
);
add_to_toolbar
(
toolbar_
,
recordWidget_
,
pos
++
);
...
...
@@ -377,16 +382,17 @@ update_toolbar_for_conference(conference_obj_t * selectedConf, gboolean instant_
gtk_action_set_sensitive
(
imAction_
,
TRUE
);
add_to_toolbar
(
toolbar_
,
imToolbar_
,
pos
);
}
g_signal_handler_unblock
(
recordWidget_
,
recordButtonConnId_
);
break
;
}
case
CONFERENCE_STATE_HOLD
:
case
CONFERENCE_STATE_HOLD_RECORD
:
{
DEBUG
(
"Conference State Hold"
);
g_signal_handler_block
(
recordWidget_
,
recordButtonConnId_
);
pos
=
1
;
gtk_action_set_sensitive
(
hangUpAction_
,
TRUE
);
gtk_widget_set_sensitive
(
offHoldToolbar_
,
TRUE
);
gtk_
action
_set_sensitive
(
record
Action
_
,
TRUE
);
gtk_
widget
_set_sensitive
(
record
Widget
_
,
TRUE
);
add_to_toolbar
(
toolbar_
,
hangUpWidget_
,
pos
++
);
add_to_toolbar
(
toolbar_
,
offHoldToolbar_
,
pos
++
);
add_to_toolbar
(
toolbar_
,
recordWidget_
,
pos
++
);
...
...
@@ -395,6 +401,7 @@ update_toolbar_for_conference(conference_obj_t * selectedConf, gboolean instant_
gtk_action_set_sensitive
(
imAction_
,
TRUE
);
add_to_toolbar
(
toolbar_
,
imToolbar_
,
pos
);
}
g_signal_handler_unblock
(
recordWidget_
,
recordButtonConnId_
);
break
;
}
...
...
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