problem with "no words found" banner has been solved.

git-svn-id: file:///svnroot/mdictionary/trunk@158 5bde0345-f819-0410-ac75-e5045f9217cc

diff --git a/src/gui/src/ws_gui_callbacks.c b/src/gui/src/ws_gui_callbacks.c
index df01d91..4cd95fc 100644 (file)
--- a/src/gui/src/ws_gui_callbacks.c
+++ b/src/gui/src/ws_gui_callbacks.c
@@ -472,7 +472,7 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
        ws_gui_app->loading = FALSE;
        ws_gui_set_toolbar_avail(ws_gui_app);
 
-       ws_gui_app->ws_gui_banner_flag = FALSE;
+       //ws_gui_app->ws_gui_banner_flag = FALSE;
 
        //ws_gui_clear_list(ws_gui_app->ws_gui_w_list->ws_gui_store);
 
@@ -558,13 +558,17 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
        }
        
        
-        if (tmp->len == 0 && ws_gui_app->stop_clicked != TRUE)
+       g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "Dlugosc tempa to: %d", tmp->len);
+       g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "w tempie mamy: %s", tmp_word);
+        //if (&& ws_gui_app->stop_clicked != TRUE )
+       
+       if ((tmp->len == 0 || tmp_word == NULL) && ws_gui_app->stop_clicked != TRUE )
         {
                 gtk_infoprint(GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
                               _("ws_ni_no_words_found"));
                
                //ws_gui_fill_html(" ", ws_gui_app);
-               ws_gui_app->html_flag = FALSE;
+               //ws_gui_app->html_flag = FALSE;
                g_free(ws_gui_app->last_word);
                ws_gui_app->last_word = NULL;
         }
@@ -1453,8 +1457,8 @@ void ws_gui_search(GtkWidget * widget, gpointer user_data)
        
        ws_gui_app->stop_clicked = FALSE;
 
-        if (ws_gui_app->ws_gui_banner_flag == FALSE) 
-       {
+       // if (ws_gui_app->ws_gui_banner_flag == FALSE) 
+       //{
        gchar* ws_gui_text = NULL;
         g_object_get(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
                      "prefix",
@@ -1482,9 +1486,9 @@ void ws_gui_search(GtkWidget * widget, gpointer user_data)
                 ws_gui_app->loading = TRUE;
                ws_gui_set_toolbar_avail(ws_gui_app);
 
-                ws_gui_app->ws_gui_banner_flag = TRUE;
+              //  ws_gui_app->ws_gui_banner_flag = TRUE;
                 //ws_gui_fill_html(" ", ws_gui_app);
-               ws_gui_app->html_flag = FALSE;
+               //ws_gui_app->html_flag = FALSE;
                 ws_dbus_client_find_word (ws_gui_app->dbus_data, ws_gui_text);
                gtk_widget_hide(GTK_WIDGET(ws_gui_app->ws_gui_list_hbox));
                g_free(ws_gui_text);
@@ -1497,7 +1501,7 @@ void ws_gui_search(GtkWidget * widget, gpointer user_data)
         }
        g_free(ws_gui_app->last_word);
        ws_gui_app->last_word=NULL;
-       }
+       //}
 }
 
 /** stop search process
@@ -1510,14 +1514,15 @@ void ws_gui_search_stop(GtkButton *button, gpointer user_data)
 {
         WSGuiApp* ws_gui_app = (WSGuiApp *)user_data;
        ws_gui_app->stop_clicked = TRUE;
-        if (ws_gui_app->ws_gui_banner_flag == TRUE || ws_gui_app->loading == TRUE) 
+       // if (ws_gui_app->ws_gui_banner_flag == TRUE || ws_gui_app->loading == TRUE) 
+       if (ws_gui_app->loading == TRUE) 
         {
                 //gtk_widget_hide(GTK_WIDGET(ws_gui_app->ws_gui_banner_list_searching));
 
                ws_gui_app->loading = FALSE;
                ws_gui_set_toolbar_avail(ws_gui_app);           
 
-               ws_gui_app->ws_gui_banner_flag = FALSE;
+               //ws_gui_app->ws_gui_banner_flag = FALSE;
                
                 ws_dbus_notify(ws_gui_app->dbus_data, WS_DBUS_INFO_STOP_SEARCH);
                 gtk_infoprint(GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),

diff --git a/src/gui/src/ws_gui_layout.c b/src/gui/src/ws_gui_layout.c
index 1e25e88..54e29ce 100644 (file)
--- a/src/gui/src/ws_gui_layout.c
+++ b/src/gui/src/ws_gui_layout.c
@@ -1771,7 +1771,7 @@ void ws_gui_remove_bookmark_dialog(gpointer user_data)
 void ws_gui_list_full_dialog(GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
        
        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
-       g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "blabla");
+       
        ws_gui_app->ws_message_dialog =  gtk_message_dialog_new(
                                  GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
                                   GTK_DIALOG_DESTROY_WITH_PARENT,

diff --git a/src/manager/src/ws_mng_searching_threads.c b/src/manager/src/ws_mng_searching_threads.c
index 1d82dc9..51c5a0a 100644 (file)
--- a/src/manager/src/ws_mng_searching_threads.c
+++ b/src/manager/src/ws_mng_searching_threads.c
@@ -130,6 +130,7 @@ void ws_mng_on_found_word(GArray* list,
        {
                /* copy word found by search engine */
                gchar* new_word = g_strdup(g_array_index(list, gchar*, i));
+               //g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "new_word: %s", new_word);
                g_array_append_val(search_atom->word_list, new_word); 
                
         }