From d2be9805265b50d13bcba7997bc08058e680073a Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Tue, 6 Oct 2009 18:43:50 -0400
Subject: [PATCH] [#1976] Remove warnings - need to fix the transfer
---
sflphone-client-gnome/src/contacts/calltree.c | 4 ++--
sflphone-client-gnome/src/mainwindow.c | 2 --
sflphone-client-gnome/src/mainwindow.h | 2 +-
sflphone-client-gnome/src/toolbar.c | 7 -------
sflphone-client-gnome/src/uimanager.c | 14 ++++++++++----
sflphone-client-gnome/src/uimanager.h | 1 -
6 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/sflphone-client-gnome/src/contacts/calltree.c b/sflphone-client-gnome/src/contacts/calltree.c
index 3df5724228..daf3a69a79 100644
--- a/sflphone-client-gnome/src/contacts/calltree.c
+++ b/sflphone-client-gnome/src/contacts/calltree.c
@@ -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;
}
diff --git a/sflphone-client-gnome/src/mainwindow.c b/sflphone-client-gnome/src/mainwindow.c
index d81c3d1363..742276a52d 100644
--- a/sflphone-client-gnome/src/mainwindow.c
+++ b/sflphone-client-gnome/src/mainwindow.c
@@ -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));
}
diff --git a/sflphone-client-gnome/src/mainwindow.h b/sflphone-client-gnome/src/mainwindow.h
index 4eba713c89..aea6763bcf 100644
--- a/sflphone-client-gnome/src/mainwindow.h
+++ b/sflphone-client-gnome/src/mainwindow.h
@@ -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
diff --git a/sflphone-client-gnome/src/toolbar.c b/sflphone-client-gnome/src/toolbar.c
index 42efae6e09..bf71aa1e8c 100644
--- a/sflphone-client-gnome/src/toolbar.c
+++ b/sflphone-client-gnome/src/toolbar.c
@@ -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)
diff --git a/sflphone-client-gnome/src/uimanager.c b/sflphone-client-gnome/src/uimanager.c
index a0a41c7912..255e340d93 100644
--- a/sflphone-client-gnome/src/uimanager.c
+++ b/sflphone-client-gnome/src/uimanager.c
@@ -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;
}
diff --git a/sflphone-client-gnome/src/uimanager.h b/sflphone-client-gnome/src/uimanager.h
index 09c8394b66..3eeb42820a 100644
--- a/sflphone-client-gnome/src/uimanager.h
+++ b/sflphone-client-gnome/src/uimanager.h
@@ -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;
--
GitLab