jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

[#1976] Remove warnings - need to fix the transfer

Browse Source
This commit is contained in:
Emmanuel Milou
2009-10-06 18:43:50 -04:00
parent 1a034f574a
commit d2be980526
6 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sflphone-client-gnome/src/contacts/calltree.c
View File

@ -325,14 +325,14 @@ calltree_reset (calltab_t* tab)
void
focus_on_calltree_out(){
DEBUG("set_focus_on_calltree_out");
//DEBUG("set_focus_on_calltree_out");
// gtk_widget_grab_focus(GTK_WIDGET(sw));
focus_is_on_calltree = FALSE;
}
void
focus_on_calltree_in(){
DEBUG("set_focus_on_calltree_in");
//DEBUG("set_focus_on_calltree_in");
// gtk_widget_grab_focus(GTK_WIDGET(sw));
focus_is_on_calltree = TRUE;
}

2
sflphone-client-gnome/src/mainwindow.c
View File

@ -129,14 +129,12 @@ on_key_released (GtkWidget *widget, GdkEventKey *event, gpointer user_data UNUSE
void
focus_on_mainwindow_out(){
DEBUG("focus_on_mainwindow_out");
// gtk_widget_grab_focus(GTK_WIDGET(window));
}
void
focus_on_mainwindow_in(){
DEBUG("focus_on_mainwindow_in");
// gtk_widget_grab_focus(GTK_WIDGET(window));
}

2
sflphone-client-gnome/src/mainwindow.h
View File

@ -24,7 +24,7 @@
#include <calltree.h>
#include <uimanager.h>
#define MAIN_WINDOW_WIDTH 300
#define MAIN_WINDOW_WIDTH 400
#define MAIN_WINDOW_HEIGHT 320
/** @file mainwindow.h

7
sflphone-client-gnome/src/toolbar.c
View File

@ -20,13 +20,6 @@
#include <toolbar.h>
#include <contacts/addressbook.h>
static gboolean
is_inserted( GtkWidget* button )
{
return ( GTK_WIDGET(button)->parent == GTK_WIDGET( toolbar ) );
}
static void
call_mailbox( GtkWidget* widget UNUSED, gpointer data UNUSED)

14
sflphone-client-gnome/src/uimanager.c
View File

@ -29,6 +29,8 @@
static GtkWidget *toolbar;
guint transfertButtonConnId; //The button toggled signal connection ID
GtkAction * pickUpAction;
GtkWidget * pickUpWidget;
GtkWidget * newCallAction;
@ -291,9 +293,9 @@ void update_actions()
gtk_action_set_sensitive( GTK_ACTION(hangUpAction), TRUE);
break;
case CALL_STATE_TRANSFERT:
//gtk_signal_handler_block (GTK_OBJECT (transferToolbar), transfertButtonConnId);
gtk_signal_handler_block (GTK_OBJECT (transferToolbar), transfertButtonConnId);
gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON(transferToolbar), TRUE);
//gtk_signal_handler_unblock (transferToolbar, transfertButtonConnId);
gtk_signal_handler_unblock (transferToolbar, transfertButtonConnId);
gtk_action_set_sensitive (GTK_ACTION (hangUpAction), TRUE);
gtk_widget_set_sensitive (GTK_WIDGET (holdMenu), TRUE);
gtk_widget_set_sensitive (GTK_WIDGET (holdToolbar), TRUE);
@ -723,9 +725,9 @@ static void calltree_switch_cb (GtkRadioAction *action, GtkRadioAction *current)
/**
* Transfert the line
*/
static void call_transfer_cb (GtkAction * action, gpointer data)
static void call_transfer_cb ()
{
gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(action))? sflphone_set_transfert() : sflphone_unset_transfert() ;
gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (transferToolbar))? sflphone_set_transfert() : sflphone_unset_transfert() ;
}
static void call_mailbox_cb (void)
@ -1376,6 +1378,10 @@ GtkWidget* create_toolbar_actions (GtkUIManager *ui_manager)
newCallWidget = gtk_ui_manager_get_widget (ui_manager, "/ToolbarActions/NewCallToolbar");
pickUpWidget = gtk_ui_manager_get_widget (ui_manager, "/ToolbarActions/PickUpToolbar");
// Set the handler ID for the transfer
transfertButtonConnId = g_signal_connect (G_OBJECT (transferToolbar), "toggled", G_CALLBACK (call_transfer_cb), NULL);
holdConnId = g_signal_connect (G_OBJECT (holdToolbar), "toggled", G_CALLBACK (call_hold), NULL);
return toolbar;
}

1
sflphone-client-gnome/src/uimanager.h
View File

@ -24,7 +24,6 @@
G_BEGIN_DECLS
guint transfertButtonConnId; //The button toggled signal connection ID
guint holdConnId; //The hold_menu signal connection ID
GtkWidget *historyButton;