Commit ea9dcf72 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Comment all searchbar creation function /added searchbar GtkWidget in the calltab_t struct

parent 9e242c12
......@@ -119,6 +119,8 @@ typedef struct {
GtkWidget* view;
GtkWidget* tree;
GtkWidget* searchbar;
// Calllist vars
GQueue* callQueue;
call_t* selectedCall;
......
......@@ -33,6 +33,7 @@ calltab_init()
ret->store = NULL;
ret->view = NULL;
ret->tree = NULL;
ret->searchbar = NULL;
ret->callQueue = NULL;
ret->selectedCall = NULL;
......
......@@ -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:
......
......@@ -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;
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment