From ea9dcf7261693c1653c63cdd7c7c61feb56169b8 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.net>
Date: Thu, 19 Mar 2009 15:31:45 -0400
Subject: [PATCH] Comment all searchbar creation function /added searchbar
GtkWidget in the calltab_t struct
---
sflphone-gtk/src/calllist.h | 2 ++
sflphone-gtk/src/calltab.c | 1 +
sflphone-gtk/src/calltree.c | 5 +++--
sflphone-gtk/src/mainwindow.c | 24 +++++++++++++-----------
4 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/sflphone-gtk/src/calllist.h b/sflphone-gtk/src/calllist.h
index bfd773263b..a361c9bb94 100644
--- a/sflphone-gtk/src/calllist.h
+++ b/sflphone-gtk/src/calllist.h
@@ -119,6 +119,8 @@ typedef struct {
GtkWidget* view;
GtkWidget* tree;
+ GtkWidget* searchbar;
+
// Calllist vars
GQueue* callQueue;
call_t* selectedCall;
diff --git a/sflphone-gtk/src/calltab.c b/sflphone-gtk/src/calltab.c
index 1ec9a9a95d..d0ac6954d6 100644
--- a/sflphone-gtk/src/calltab.c
+++ b/sflphone-gtk/src/calltab.c
@@ -33,6 +33,7 @@ calltab_init()
ret->store = NULL;
ret->view = NULL;
ret->tree = NULL;
+ ret->searchbar = NULL;
ret->callQueue = NULL;
ret->selectedCall = NULL;
diff --git a/sflphone-gtk/src/calltree.c b/sflphone-gtk/src/calltree.c
index b9fbdab365..24d2001f29 100644
--- a/sflphone-gtk/src/calltree.c
+++ b/sflphone-gtk/src/calltree.c
@@ -407,19 +407,20 @@ void row_activated(GtkTreeView *tree_view UNUSED,
if (selectedCall)
{
+ g_print("is selected call? Current state: %i \n",selectedCall->state);
// Get the right event from the right calltree
if( active_calltree == current_calls )
{
switch(selectedCall->state)
{
- case CALL_STATE_INCOMING:
+ case CALL_STATE_INCOMING:
dbus_accept(selectedCall);
stop_notification();
break;
case CALL_STATE_HOLD:
dbus_unhold(selectedCall);
break;
- case CALL_STATE_RINGING:
+ case CALL_STATE_RINGING:
case CALL_STATE_CURRENT:
case CALL_STATE_BUSY:
case CALL_STATE_FAILURE:
diff --git a/sflphone-gtk/src/mainwindow.c b/sflphone-gtk/src/mainwindow.c
index 5eb0908471..25097dce2b 100644
--- a/sflphone-gtk/src/mainwindow.c
+++ b/sflphone-gtk/src/mainwindow.c
@@ -137,11 +137,13 @@ create_main_window ()
gtk_box_pack_start (GTK_BOX (vbox), subvbox, FALSE /*expand*/, FALSE /*fill*/, 0 /*padding*/);
- if( SHOW_SEARCHBAR ){
- filterEntry = create_filter_entry();
- gtk_box_pack_start (GTK_BOX (subvbox), filterEntry, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
- gtk_widget_show_all ( filterEntry );
- }
+
+ // if( SHOW_SEARCHBAR ){
+ // filterEntry = create_filter_entry();
+ // gtk_box_pack_start (GTK_BOX (subvbox), filterEntry, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
+ // gtk_widget_show_all ( filterEntry );
+ // }
+
if( SHOW_VOLUME ){
speaker_control = create_slider("speaker");
@@ -277,15 +279,15 @@ void
main_window_searchbar( gboolean *state ){
if( !SHOW_SEARCHBAR )
{
- filterEntry = create_filter_entry();
- gtk_box_pack_start (GTK_BOX (subvbox), filterEntry, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
- gtk_widget_show_all (filterEntry);
- *state = TRUE;
+ // filterEntry = create_filter_entry();
+ // gtk_box_pack_start (GTK_BOX (subvbox), filterEntry, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
+ // gtk_widget_show_all (filterEntry);
+ // *state = TRUE;
}
else
{
- gtk_container_remove( GTK_CONTAINER(subvbox) , filterEntry );
- *state = FALSE;
+ // gtk_container_remove( GTK_CONTAINER(subvbox) , filterEntry );
+ // *state = FALSE;
}
}
--
GitLab