diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index 2f57ee5679ffc532d29cbae67a2c48bdce079e8d..44c4a783e90c8f628870b707c7c00843b7005e44 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -521,16 +521,6 @@ sflphone_off_hold ()
dbus_unhold_conference(selectedConf);
}
- /*
- if(dbus_get_is_recording(selectedCall))
- {
- DEBUG("Currently recording!");
- }
- else
- {
- DEBUG("Not recording currently");
- }
- */
}
@@ -565,7 +555,7 @@ sflphone_current( callable_obj_t * c )
sflphone_record( callable_obj_t * c )
{
if( c->_state != CALL_STATE_HOLD )
- set_timestamp (&c->_time_start);
+ set_timestamp (&c->_time_start);
c->_state = CALL_STATE_RECORD;
calltree_update_call(current_calls, c, NULL);
update_actions();
@@ -1076,10 +1066,10 @@ sflphone_rec_call()
switch(selectedConf->_state)
{
case CONFERENCE_STATE_ACTIVE_ATACHED:
- selectedCall->_state = CONFERENCE_STATE_RECORD;
+ selectedConf->_state = CONFERENCE_STATE_RECORD;
break;
case CONFERENCE_STATE_RECORD:
- selectedCall->_state = CONFERENCE_STATE_ACTIVE_ATACHED;
+ selectedConf->_state = CONFERENCE_STATE_ACTIVE_ATACHED;
break;
default:
WARN("Should not happen in sflphone_off_hold ()!");
@@ -1088,9 +1078,6 @@ sflphone_rec_call()
}
calltree_update_call(current_calls, selectedCall, NULL);
update_actions();
-
- // gchar* codname = sflphone_get_current_codec_name();
- // DEBUG("sflphone_get_current_codec_name: %s",codname);
}
void sflphone_fill_codec_list () {
@@ -1112,14 +1099,6 @@ void sflphone_fill_codec_list () {
}
}
- /*
- if (codec_list_get_size() == 0) {
-
- // Error message
- ERROR ("No audio codecs found");
- dbus_unregister(getpid());
- exit(0);
- }*/
}
void sflphone_fill_codec_list_per_account (account_t **account) {
diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c
index 9a3cc87deaf57092fa7f631d8616ac389abba999..9265e1f53db302a6ac4ef971d70be4eeee5f0f13 100644
--- a/sflphone-client-gnome/src/dbus/dbus.c
+++ b/sflphone-client-gnome/src/dbus/dbus.c
@@ -1810,7 +1810,7 @@ dbus_join_conference(const gchar* sel_confID, const gchar* drag_confID)
void
dbus_set_record(const gchar* id)
{
- DEBUG("dbus_set_record %s\n", id);
+ DEBUG("dbus_set_record %s", id);
GError* error = NULL;
org_sflphone_SFLphone_CallManager_set_recording(callManagerProxy, id, &error);
@@ -1823,7 +1823,7 @@ dbus_set_record(const gchar* id)
gboolean
dbus_get_is_recording(const callable_obj_t * c)
{
- DEBUG("dbus_get_is_recording %s\n", c->_callID);
+ DEBUG("dbus_get_is_recording %s", c->_callID);
GError* error = NULL;
gboolean isRecording;
org_sflphone_SFLphone_CallManager_get_is_recording(callManagerProxy,
diff --git a/sflphone-client-gnome/src/uimanager.c b/sflphone-client-gnome/src/uimanager.c
index 8f3a41ca1ef14a4b8dc0bce3dab4cdc750edda5a..44099f19435d968dd5a4f1aa736901d95815df2a 100644
--- a/sflphone-client-gnome/src/uimanager.c
+++ b/sflphone-client-gnome/src/uimanager.c
@@ -217,52 +217,39 @@ update_actions()
case CALL_STATE_DIALING:
gtk_action_set_sensitive(GTK_ACTION(pickUpAction), TRUE);
if (active_calltree == current_calls)
- gtk_action_set_sensitive(GTK_ACTION(hangUpAction), TRUE);
+ gtk_action_set_sensitive(GTK_ACTION(hangUpAction), TRUE);
//gtk_action_set_sensitive( GTK_ACTION(newCallMenu),TRUE);
g_object_ref(newCallWidget);
- gtk_container_remove(GTK_CONTAINER (toolbar),
- GTK_WIDGET (newCallWidget));
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (pickUpWidget),
- 0);
+ gtk_container_remove(GTK_CONTAINER (toolbar), GTK_WIDGET (newCallWidget));
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (pickUpWidget), 0);
if (active_calltree == current_calls)
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar),
- GTK_TOOL_ITEM (hangUpWidget), 1);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget), 1);
break;
case CALL_STATE_CURRENT:
case CALL_STATE_RECORD:
gtk_action_set_sensitive(GTK_ACTION (hangUpAction), TRUE);
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget),
- 1);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget), 1);
gtk_widget_set_sensitive(GTK_WIDGET (holdMenu), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET (holdToolbar), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET (transferToolbar), TRUE);
gtk_action_set_sensitive(GTK_ACTION (recordAction), TRUE);
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (holdToolbar),
- 2);
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar),
- GTK_TOOL_ITEM (transferToolbar), 3);
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (recordWidget),
- 4);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (holdToolbar), 2);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (transferToolbar), 3);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (recordWidget), 4);
gtk_signal_handler_block (GTK_OBJECT (transferToolbar), transfertButtonConnId);
- gtk_toggle_tool_button_set_active(
- GTK_TOGGLE_TOOL_BUTTON (transferToolbar), FALSE);
+ gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON (transferToolbar), FALSE);
gtk_signal_handler_unblock (transferToolbar, transfertButtonConnId);
-
break;
case CALL_STATE_BUSY:
case CALL_STATE_FAILURE:
gtk_action_set_sensitive(GTK_ACTION(hangUpAction), TRUE);
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget),
- 1);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget), 1);
break;
case CALL_STATE_TRANSFERT:
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget),
- 1);
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar),
- GTK_TOOL_ITEM (transferToolbar), 2);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget), 1);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (transferToolbar), 2);
gtk_signal_handler_block (GTK_OBJECT (transferToolbar), transfertButtonConnId);
- gtk_toggle_tool_button_set_active(
- GTK_TOGGLE_TOOL_BUTTON (transferToolbar), TRUE);
+ gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON (transferToolbar), TRUE);
gtk_signal_handler_unblock (transferToolbar, transfertButtonConnId);
gtk_action_set_sensitive(GTK_ACTION (hangUpAction), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET (holdMenu), TRUE);
@@ -270,8 +257,7 @@ update_actions()
gtk_widget_set_sensitive(GTK_WIDGET (transferToolbar), TRUE);
break;
default:
- WARN("Should not happen in update_actions()!")
- ;
+ WARN("Should not happen in update_actions()!");
break;
}
}
@@ -281,48 +267,46 @@ update_actions()
// update icon in systray
show_status_hangup_icon();
- switch (selectedConf->_state)
- {
+ switch (selectedConf->_state) {
case CONFERENCE_STATE_ACTIVE_ATACHED:
gtk_action_set_sensitive(GTK_ACTION (hangUpAction), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET (holdToolbar), TRUE);
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget),
- 1);
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (holdToolbar),
- 2);
+ gtk_action_set_sensitive(GTK_ACTION (recordAction), TRUE);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget), 1);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (holdToolbar), 2);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (recordWidget), 3);
break;
case CONFERENCE_STATE_ACTIVE_DETACHED:
gtk_action_set_sensitive(GTK_ACTION (hangUpAction), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET (holdToolbar), TRUE);
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget),
- 1);
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (holdToolbar),
- 2);
+ gtk_action_set_sensitive(GTK_ACTION (recordAction), TRUE);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget), 1);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (holdToolbar), 2);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (recordWidget), 3);
break;
case CONFERENCE_STATE_RECORD:
gtk_action_set_sensitive(GTK_ACTION (hangUpAction), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET (holdToolbar), TRUE);
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget),
- 1);
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (holdToolbar),
- 2);
+ gtk_action_set_sensitive(GTK_ACTION (recordAction), TRUE);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget), 1);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (holdToolbar), 2);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (recordWidget), 3);
break;
case CONFERENCE_STATE_HOLD:
gtk_action_set_sensitive(GTK_ACTION (hangUpAction), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET (offHoldToolbar), TRUE);
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget),
- 1);
- gtk_toolbar_insert(GTK_TOOLBAR (toolbar),
- GTK_TOOL_ITEM (offHoldToolbar), 2);
+ gtk_widget_set_sensitive(GTK_ACTION (recordAction), TRUE);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget), 1);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (offHoldToolbar), 2);
+ gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (recordWidget), 3);
break;
default:
- WARN("Should not happen in update_action()!")
- ;
+ WARN("Should not happen in update_action()!");
break;
}