Gui code review
authorkrzsas <krzsas@gmail.com>
Fri, 4 Jan 2008 13:54:08 +0000 (13:54 +0000)
committerkrzsas <krzsas@gmail.com>
Fri, 4 Jan 2008 13:54:08 +0000 (13:54 +0000)
git-svn-id: file:///svnroot/mdictionary/trunk@226 5bde0345-f819-0410-ac75-e5045f9217cc

src/gui/src/ws_gui.c
src/gui/src/ws_gui_callbacks.c
src/gui/src/ws_gui_layout.c

index 6adcfd6..b5ecb1a 100644 (file)
@@ -26,162 +26,162 @@ int main(int argc, char *argv[])
 {
        
        
-        gtk_init(&argc, &argv);
+       gtk_init(&argc, &argv);
 
        //localization
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        bind_textdomain_codeset(PACKAGE, "UTF-8");
-        textdomain(PACKAGE);
+       textdomain(PACKAGE);
 
        if (strcmp(_("ws_check"), "ws_check") == 0)
        {
                setlocale(LC_ALL, "en_GB");
                bindtextdomain(PACKAGE, LOCALEDIR);
                bind_textdomain_codeset(PACKAGE, "UTF-8");
-               textdomain(PACKAGE);
+               textdomain(PACKAGE);
        }
 
 
-        WSGuiApp *ws_gui_app;
-        ws_gui_app = (WSGuiApp*)g_malloc(sizeof(WSGuiApp)); 
+       WSGuiApp *ws_gui_app;
+       ws_gui_app = (WSGuiApp*)g_malloc(sizeof(WSGuiApp)); 
 
-        //memory allocation
-        ws_gui_app->ws_gui_w_list = 
-                (struct WSGuiList*)g_malloc(sizeof(struct WSGuiList));
-        ws_gui_app->ws_gui_menu = 
-                (struct WSGuiMenu*)g_malloc(sizeof(struct WSGuiMenu));
+       //memory allocation
+       ws_gui_app->ws_gui_w_list = 
+               (struct WSGuiList*)g_malloc(sizeof(struct WSGuiList));
+       ws_gui_app->ws_gui_menu = 
+               (struct WSGuiMenu*)g_malloc(sizeof(struct WSGuiMenu));
 
-        //gconf
-        ws_gui_app->client = gconf_client_get_default();
+       //gconf
+       ws_gui_app->client = gconf_client_get_default();
 
        ws_gui_create_window(ws_gui_app);
-        ws_gui_read_adjustment(ws_gui_app);
-
-
-        //dbus wrapper 
-        ws_gui_app->dbus_data = ws_dbus_create ("mdictionaryGui", "v1.0");
-
-        //dbus wrapper configuration
-        ws_dbus_config (ws_gui_app->dbus_data, 
-                        WS_DBUS_CONFIG_SERVICE,
-                        GUI_SERVICE);
-        ws_dbus_config (ws_gui_app->dbus_data,
-                        WS_DBUS_CONFIG_OBJECT,
-                        GUI_OBJECT);
-        ws_dbus_config (ws_gui_app->dbus_data,
-                        WS_DBUS_CONFIG_IFACE,
-                        GUI_IFACE);
-        ws_dbus_config (ws_gui_app->dbus_data,
-                        WS_DBUS_CONFIG_REMOTE_SERVICE,
-                        MANAGER_SERVICE);
-        ws_dbus_config (ws_gui_app->dbus_data,
-                        WS_DBUS_CONFIG_REMOTE_OBJECT,
-                        MANAGER_OBJECT);
-        ws_dbus_config (ws_gui_app->dbus_data,
-                        WS_DBUS_CONFIG_REMOTE_IFACE,
-                        MANAGER_IFACE);
+       ws_gui_read_adjustment(ws_gui_app);
+
+
+       //dbus wrapper 
+       ws_gui_app->dbus_data = ws_dbus_create ("mdictionaryGui", "v1.0");
+
+       //dbus wrapper configuration
+       ws_dbus_config (ws_gui_app->dbus_data, 
+                       WS_DBUS_CONFIG_SERVICE,
+                       GUI_SERVICE);
+       ws_dbus_config (ws_gui_app->dbus_data,
+                       WS_DBUS_CONFIG_OBJECT,
+                       GUI_OBJECT);
+       ws_dbus_config (ws_gui_app->dbus_data,
+                       WS_DBUS_CONFIG_IFACE,
+                       GUI_IFACE);
+       ws_dbus_config (ws_gui_app->dbus_data,
+                       WS_DBUS_CONFIG_REMOTE_SERVICE,
+                       MANAGER_SERVICE);
+       ws_dbus_config (ws_gui_app->dbus_data,
+                       WS_DBUS_CONFIG_REMOTE_OBJECT,
+                       MANAGER_OBJECT);
+       ws_dbus_config (ws_gui_app->dbus_data,
+                       WS_DBUS_CONFIG_REMOTE_IFACE,
+                       MANAGER_IFACE);
 
        //Add a list of remote methods available
        ws_dbus_add_method (ws_gui_app->dbus_data,
-                        "return_words",
+                       "return_words",
                        WS_DBUS_TYPE_GARRAY,
                        WS_DBUS_TYPE_INVALID);
-                        
+                       
        ws_dbus_add_method (ws_gui_app->dbus_data,
-                        "return_translations",
+                       "return_translations",
                        WS_DBUS_TYPE_STRING,
                        WS_DBUS_TYPE_INVALID);
 
        ws_dbus_add_method (ws_gui_app->dbus_data,
-                        "return_extracted_dict",
+                       "return_extracted_dict",
                        WS_DBUS_TYPE_STRING,
                        WS_DBUS_TYPE_INVALID);
 
        ws_dbus_add_method (ws_gui_app->dbus_data,
-                        "update_progressbar",
+                       "update_progressbar",
                        WS_DBUS_TYPE_DOUBLE,
                        WS_DBUS_TYPE_INVALID);
 
        ws_dbus_add_method (ws_gui_app->dbus_data,
-                        "signal",
+                       "signal",
                        WS_DBUS_TYPE_SIGNAL,
                        WS_DBUS_TYPE_INVALID);
 
-        ws_dbus_add_method (ws_gui_app->dbus_data,
-                        "search_home_applet",
+       ws_dbus_add_method (ws_gui_app->dbus_data,
+                       "search_home_applet",
                        WS_DBUS_TYPE_STRING,
                        WS_DBUS_TYPE_INVALID);
 
-        //setting callbacks for local methods
+       //setting callbacks for local methods
+       ws_dbus_set_cb (ws_gui_app->dbus_data,
+                       "return_words",
+                       ws_gui_dbus_return_words,
+                       ws_gui_app);
+
+       ws_dbus_set_cb (ws_gui_app->dbus_data,
+                       "return_translations",
+                       ws_gui_dbus_return_translation,
+                       ws_gui_app);
+       ws_dbus_set_cb (ws_gui_app->dbus_data,
+                       "return_extracted_dict",
+                       ws_dbus_server_return_extracted_bzip,
+                       ws_gui_app);
        ws_dbus_set_cb (ws_gui_app->dbus_data,
-                        "return_words",
-                        ws_gui_dbus_return_words,
-                        ws_gui_app);
-
-        ws_dbus_set_cb (ws_gui_app->dbus_data,
-                        "return_translations",
-                        ws_gui_dbus_return_translation,
-                        ws_gui_app);
+                       "update_progressbar",
+                       ws_dbus_progress_bar,
+                       ws_gui_app);
        ws_dbus_set_cb (ws_gui_app->dbus_data,
-                        "return_extracted_dict",
-                        ws_dbus_server_return_extracted_bzip,
-                        ws_gui_app);
-        ws_dbus_set_cb (ws_gui_app->dbus_data,
-                        "update_progressbar",
-                        ws_dbus_progress_bar,
-                        ws_gui_app);
-        ws_dbus_set_cb (ws_gui_app->dbus_data,
-                        "signal",
-                        ws_gui_signal_hander,
-                        ws_gui_app);
+                       "signal",
+                       ws_gui_signal_hander,
+                       ws_gui_app);
        //hisa
        ws_dbus_set_cb (ws_gui_app->dbus_data,
-                        "search_home_applet",
-                        ws_gui_search_home_handler,
-                        ws_gui_app);
+                       "search_home_applet",
+                       ws_gui_search_home_handler,
+                       ws_gui_app);
 
-        ws_dbus_connect (ws_gui_app->dbus_data);
+       ws_dbus_connect (ws_gui_app->dbus_data);
 
-        //setting the clipboard
-        ws_gui_app->ws_gui_clipboard = 
-                gtk_widget_get_clipboard (GTK_WIDGET(ws_gui_app->ws_gui_html),
-                                          GDK_SELECTION_CLIPBOARD);
+       //setting the clipboard
+       ws_gui_app->ws_gui_clipboard = 
+               gtk_widget_get_clipboard (GTK_WIDGET(ws_gui_app->ws_gui_html),
+                                       GDK_SELECTION_CLIPBOARD);
 
-        //connecting the signals
+       //connecting the signals
        g_signal_connect(G_OBJECT (ws_gui_app->ws_gui_w_list->ws_gui_view),
-                         "cursor-changed",
-                         G_CALLBACK (ws_gui_view_cursor_changed), 
-                        ws_gui_app);
-
-
-        g_signal_connect(G_OBJECT(ws_gui_app->ws_gui_hildon_window),
-                        "key-press-event",
-                         G_CALLBACK(hildon_key_press_listener),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT(ws_gui_app->ws_gui_html),
-                         "button-press-event",
-                         G_CALLBACK(ws_gui_button_press),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT(ws_gui_app->ws_gui_html),
-                         "button-release-event",
-                         G_CALLBACK(ws_gui_button_release),
-                         ws_gui_app);
+                       "cursor-changed",
+                       G_CALLBACK (ws_gui_view_cursor_changed), 
+                       ws_gui_app);
+
+
+       g_signal_connect(G_OBJECT(ws_gui_app->ws_gui_hildon_window),
+                       "key-press-event",
+                       G_CALLBACK(hildon_key_press_listener),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT(ws_gui_app->ws_gui_html),
+                       "button-press-event",
+                       G_CALLBACK(ws_gui_button_press),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT(ws_gui_app->ws_gui_html),
+                       "button-release-event",
+                       G_CALLBACK(ws_gui_button_release),
+                       ws_gui_app);
        
        g_signal_connect(G_OBJECT(ws_gui_app->ws_gui_list_eventbox),
-                         "button-press-event",
-                         G_CALLBACK(ws_gui_list_full_dialog),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT(ws_gui_app->ws_gui_hildon_window),
-                         "delete-event",
-                         G_CALLBACK(ws_gui_on_exit),
-                         ws_gui_app);
-
-        ws_dbus_notify(ws_gui_app->dbus_data,
-                       WS_DBUS_ERROR_UNKNOWN);
-
-        gtk_main();
+                       "button-press-event",
+                       G_CALLBACK(ws_gui_list_full_dialog),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT(ws_gui_app->ws_gui_hildon_window),
+                       "delete-event",
+                       G_CALLBACK(ws_gui_on_exit),
+                       ws_gui_app);
+
+       ws_dbus_notify(ws_gui_app->dbus_data,
+               WS_DBUS_ERROR_UNKNOWN);
+
+       gtk_main();
        
-        return 0;
+       return 0;
 }
 
index 0437e11..f8bb8bf 100644 (file)
@@ -23,231 +23,231 @@ Copyright 2006 ComArch S.A.
 #include <ws_dbus.h>
 
 /** \brief show how much time did take a callback of another function
- *
- */
+*
+*/
 static double timer(gboolean start, gchar* message)
 {
-        static GArray* stack = NULL;
-        static gboolean first_run = TRUE;
-        static struct timeval actual_time;
-        static struct timeval last_time;
-        static struct timeval result;
-        static double seconds = 0.0;
-        if(first_run)
-        {
-                first_run = FALSE;
-                stack = g_array_new(TRUE, TRUE, sizeof(struct timeval));
-        };
-        // things to do on the beggining of function's work
-        if (start)
-        {
-                g_debug("XDXF->%s() start counting time for function '%s()'.\n",
-                        __FUNCTION__,message);
-                g_array_prepend_val(stack, actual_time);
-                gettimeofday(&g_array_index(stack, struct timeval, 0),NULL);
-                return -1.0;
-        }
-        // we just want to end some timer - print some information 
-        //about working time;
-        else {
-                gettimeofday(&actual_time,NULL);
-                last_time = g_array_index(stack, struct timeval, 0);
-                g_array_remove_index(stack, 0);
-
-                if (actual_time.tv_usec < last_time.tv_usec) {
-                        int nsec = (last_time.tv_usec - 
-                                             actual_time.tv_usec) / 1000000 + 1;
-                        last_time.tv_usec -= 1000000 * nsec;
-                        last_time.tv_sec += nsec;
-                }
-                if (actual_time.tv_usec - last_time.tv_usec > 1000000) {
-                        int nsec = (last_time.tv_usec -
-                                                 actual_time.tv_usec) / 1000000;
-                        last_time.tv_usec += 1000000 * nsec;
-                        last_time.tv_sec -= nsec;
-                }
-                result.tv_sec = actual_time.tv_sec - last_time.tv_sec;
-                result.tv_usec = actual_time.tv_usec - last_time.tv_usec;
-                seconds = (((double)(result.tv_usec)) / 1e6) + 
-                                                      ((double)(result.tv_sec));
-
-                g_debug("XDXF->%s() function \'%s()\' was working for: %g [s] "
+       static GArray* stack = NULL;
+       static gboolean first_run = TRUE;
+       static struct timeval actual_time;
+       static struct timeval last_time;
+       static struct timeval result;
+       static double seconds = 0.0;
+       if(first_run)
+       {
+               first_run = FALSE;
+               stack = g_array_new(TRUE, TRUE, sizeof(struct timeval));
+       };
+       // things to do on the beggining of function's work
+       if (start)
+       {
+               g_debug("XDXF->%s() start counting time for function '%s()'.\n",
+                       __FUNCTION__,message);
+               g_array_prepend_val(stack, actual_time);
+               gettimeofday(&g_array_index(stack, struct timeval, 0),NULL);
+               return -1.0;
+       }
+       // we just want to end some timer - print some information 
+       //about working time;
+       else {
+               gettimeofday(&actual_time,NULL);
+               last_time = g_array_index(stack, struct timeval, 0);
+               g_array_remove_index(stack, 0);
+
+               if (actual_time.tv_usec < last_time.tv_usec) {
+                       int nsec = (last_time.tv_usec - 
+                                       actual_time.tv_usec) / 1000000 + 1;
+                       last_time.tv_usec -= 1000000 * nsec;
+                       last_time.tv_sec += nsec;
+               }
+               if (actual_time.tv_usec - last_time.tv_usec > 1000000) {
+                       int nsec = (last_time.tv_usec -
+                                               actual_time.tv_usec) / 1000000;
+                       last_time.tv_usec += 1000000 * nsec;
+                       last_time.tv_sec -= nsec;
+               }
+               result.tv_sec = actual_time.tv_sec - last_time.tv_sec;
+               result.tv_usec = actual_time.tv_usec - last_time.tv_usec;
+               seconds = (((double)(result.tv_usec)) / 1e6) + 
+                                               ((double)(result.tv_sec));
+
+               g_debug("XDXF->%s() function \'%s()\' was working for: %g [s] "
                        "or %ld [us].\n",
-                        __FUNCTION__,
-                        message,seconds,
-                        ((long)(result.tv_sec*1e6)+(result.tv_usec)));
-               // stack is empty so we delete everything
-               if(stack->len == 0) 
-               {
-                        g_array_free(stack, TRUE);
-                        first_run = TRUE;
-               }
-               return seconds;
-        }
-        return -2.0;
+                       __FUNCTION__,
+                       message,seconds,
+                       ((long)(result.tv_sec*1e6)+(result.tv_usec)));
+       // stack is empty so we delete everything
+       if(stack->len == 0) 
+       {
+                       g_array_free(stack, TRUE);
+                       first_run = TRUE;
+       }
+       return seconds;
+       }
+       return -2.0;
 }
 
 
 /**  this function handles signals from dbus; it is called 
 when there are any messages from other modules
- *
- * @param error - error message recived from DBUS
- * @param words - array with recived data structure
- * @param user_data - pointer to data structure
- * @return
- */
+*
+* @param error - error message recived from DBUS
+* @param words - array with recived data structure
+* @param user_data - pointer to data structure
+* @return
+*/
 void ws_gui_signal_hander (GError *error, GArray *words, gpointer user_data)
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
-        osso_rpc_t osss_data;
-        osss_data = g_array_index (words, osso_rpc_t, 0);
-        switch(osss_data.value.i)
-        {
-                case WS_DBUS_ERROR_ENGINE_NOT_FOUND:
-                {
-                        ws_gui_app->ws_message_dialog = 
-                        gtk_message_dialog_new(
-                                   GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_ERROR,
-                                   GTK_BUTTONS_OK,
-                                   _("ws_ni_error_occured"));
-                        gtk_widget_show_all(ws_gui_app->ws_message_dialog);
-
-                        g_signal_connect_swapped(
-                                     GTK_OBJECT (ws_gui_app->ws_message_dialog),
-                                     "response",
-                                     G_CALLBACK (gtk_main_quit),
-                                     ws_gui_app);
-                        break;
-                }
-
-                case WS_DBUS_ERROR_FILE_NOT_FOUND:
-                {
-                        ws_gui_app->ws_message_dialog = 
-                                gtk_message_dialog_new(
-                                   GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_ERROR,
-                                   GTK_BUTTONS_OK,
-                                   _("ws_ni_no_dictionary_available"));
-
-                        gtk_widget_show_all(ws_gui_app->ws_message_dialog);
-
-                        GArray *tmp;
-                        tmp = g_array_new(TRUE, TRUE, sizeof(gchar*));
-                        gtk_list_store_clear(
-                                       ws_gui_app->ws_gui_w_list->ws_gui_store);
-                        ws_gui_app->ws_gui_w_list->ws_gui_model = 
-                                create_and_fill_model(tmp, ws_gui_app);
-                        ws_gui_fill_html(" ", ws_gui_app);
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+       osso_rpc_t osss_data;
+       osss_data = g_array_index (words, osso_rpc_t, 0);
+       switch(osss_data.value.i)
+       {
+               case WS_DBUS_ERROR_ENGINE_NOT_FOUND:
+               {
+                       ws_gui_app->ws_message_dialog = 
+                       gtk_message_dialog_new(
+                               GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
+                               GTK_DIALOG_DESTROY_WITH_PARENT,
+                               GTK_MESSAGE_ERROR,
+                               GTK_BUTTONS_OK,
+                               _("ws_ni_error_occured"));
+                       gtk_widget_show_all(ws_gui_app->ws_message_dialog);
+
+                       g_signal_connect_swapped(
+                               GTK_OBJECT (ws_gui_app->ws_message_dialog),
+                               "response",
+                               G_CALLBACK (gtk_main_quit),
+                               ws_gui_app);
+                       break;
+               }
+
+               case WS_DBUS_ERROR_FILE_NOT_FOUND:
+               {
+                       ws_gui_app->ws_message_dialog = 
+                               gtk_message_dialog_new(
+                               GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
+                               GTK_DIALOG_DESTROY_WITH_PARENT,
+                               GTK_MESSAGE_ERROR,
+                               GTK_BUTTONS_OK,
+                               _("ws_ni_no_dictionary_available"));
+
+                       gtk_widget_show_all(ws_gui_app->ws_message_dialog);
+
+                       GArray *tmp;
+                       tmp = g_array_new(TRUE, TRUE, sizeof(gchar*));
+                       gtk_list_store_clear(
+                               ws_gui_app->ws_gui_w_list->ws_gui_store);
+                       ws_gui_app->ws_gui_w_list->ws_gui_model = 
+                               create_and_fill_model(tmp, ws_gui_app);
+                       ws_gui_fill_html(" ", ws_gui_app);
                        ws_gui_app->html_flag = FALSE;
 
-                        gtk_widget_set_sensitive(
-                             GTK_WIDGET(ws_gui_app->ws_gui_hildon_find_toolbar),
-                             FALSE);
-                        gtk_widget_set_sensitive(
-                        GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
-                        FALSE);
-
-                        if (gtk_dialog_run(
-                                GTK_DIALOG(ws_gui_app->ws_message_dialog)) 
-                                                            == GTK_RESPONSE_OK)
-                        {
-                                gtk_widget_destroy(
-                                                 ws_gui_app->ws_message_dialog);
-                        }
-                        break;
-                }
-
-                case WS_DBUS_INFO_CACHING:
-                {
-                        ws_gui_app->ws_gui_banner_caching =
-                                hildon_banner_show_progress(
-                                   GTK_WIDGET(ws_gui_app->ws_gui_hildon_window),
-                                   NULL,
-                                   _("ws_pb_caching"));
-                       ws_gui_app->caching_flag = TRUE;
-                       hildon_banner_set_fraction(
-                               HILDON_BANNER(ws_gui_app->ws_gui_banner_caching),
-                               0.0);
-                       gtk_widget_set_sensitive(
-                             GTK_WIDGET(ws_gui_app->ws_gui_hildon_find_toolbar),
-                             FALSE);
-                       gtk_widget_set_sensitive(
-                        GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
-                        FALSE);
-                        gtk_widget_set_sensitive(
-                        GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_bookmarks),
-                        FALSE);
-                      gtk_widget_set_sensitive(
-                       GTK_WIDGET(ws_gui_app->ws_gui_w_list->ws_gui_view),
-                       FALSE);
-
-                       break;
-                }
-
-                case WS_DBUS_INFO_CACHING_FINISHED:
-                {
-                      gtk_widget_destroy(
-                      GTK_WIDGET(ws_gui_app->ws_gui_banner_caching));
-                      ws_gui_app->caching_flag = FALSE;
-                      gtk_widget_set_sensitive(
-                      GTK_WIDGET(ws_gui_app->ws_gui_hildon_find_toolbar),
-                      TRUE);
-                      gtk_widget_set_sensitive(
-                      GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
-                      TRUE);
-                     gtk_widget_set_sensitive(
-                      GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_bookmarks),
-                      TRUE);
-                     gtk_widget_set_sensitive(
-                      GTK_WIDGET(ws_gui_app->ws_gui_w_list->ws_gui_view),
-                      TRUE);
-
-                      break;
-                }
-
-                case WS_DBUS_ERROR_DICTIONARY_NOT_LOAD:
-                {
-                        if (ws_gui_app->ws_gui_history_cur_pos >= 0 &&
-                               ws_gui_app->ws_gui_history_cur_pos <=HISTORY_LEN)
-                        { 
-                                g_array_remove_index(ws_gui_app->ws_gui_history,
-                                            ws_gui_app->ws_gui_history_cur_pos);
-                        }
-
-                        ws_gui_app->ws_message_dialog = gtk_message_dialog_new(
-                                   GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_ERROR,
-                                   GTK_BUTTONS_OK,
-                                  _("ws_ni_dictionary_unavailable"));
-                       gtk_widget_show_all(ws_gui_app->ws_message_dialog);
-                       if (gtk_dialog_run(
-                       GTK_DIALOG(ws_gui_app->ws_message_dialog)) 
-                                                            == GTK_RESPONSE_OK)
-                       {
-                              gtk_widget_destroy(ws_gui_app->ws_message_dialog);
-                       }
-                       break;
-                }
+                       gtk_widget_set_sensitive(
+                       GTK_WIDGET(ws_gui_app->ws_gui_hildon_find_toolbar),
+                       FALSE);
+                       gtk_widget_set_sensitive(
+                       GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
+                       FALSE);
+
+                       if (gtk_dialog_run(
+                               GTK_DIALOG(ws_gui_app->ws_message_dialog)) 
+                                                       == GTK_RESPONSE_OK)
+                       {
+                               gtk_widget_destroy(
+                                               ws_gui_app->ws_message_dialog);
+                       }
+                       break;
+               }
+
+               case WS_DBUS_INFO_CACHING:
+               {
+                       ws_gui_app->ws_gui_banner_caching =
+                               hildon_banner_show_progress(
+                               GTK_WIDGET(ws_gui_app->ws_gui_hildon_window),
+                               NULL,
+                               _("ws_pb_caching"));
+               ws_gui_app->caching_flag = TRUE;
+               hildon_banner_set_fraction(
+                       HILDON_BANNER(ws_gui_app->ws_gui_banner_caching),
+                       0.0);
+               gtk_widget_set_sensitive(
+                       GTK_WIDGET(ws_gui_app->ws_gui_hildon_find_toolbar),
+                       FALSE);
+               gtk_widget_set_sensitive(
+                       GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
+                       FALSE);
+                       gtk_widget_set_sensitive(
+                       GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_bookmarks),
+                       FALSE);
+               gtk_widget_set_sensitive(
+               GTK_WIDGET(ws_gui_app->ws_gui_w_list->ws_gui_view),
+               FALSE);
+
+               break;
+               }
+
+               case WS_DBUS_INFO_CACHING_FINISHED:
+               {
+               gtk_widget_destroy(
+               GTK_WIDGET(ws_gui_app->ws_gui_banner_caching));
+               ws_gui_app->caching_flag = FALSE;
+               gtk_widget_set_sensitive(
+               GTK_WIDGET(ws_gui_app->ws_gui_hildon_find_toolbar),
+               TRUE);
+               gtk_widget_set_sensitive(
+               GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
+               TRUE);
+               gtk_widget_set_sensitive(
+               GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_bookmarks),
+               TRUE);
+               gtk_widget_set_sensitive(
+               GTK_WIDGET(ws_gui_app->ws_gui_w_list->ws_gui_view),
+               TRUE);
+
+               break;
+               }
+
+               case WS_DBUS_ERROR_DICTIONARY_NOT_LOAD:
+               {
+                       if (ws_gui_app->ws_gui_history_cur_pos >= 0 &&
+                       ws_gui_app->ws_gui_history_cur_pos <=HISTORY_LEN)
+                       { 
+                               g_array_remove_index(ws_gui_app->ws_gui_history,
+                                       ws_gui_app->ws_gui_history_cur_pos);
+                       }
+
+                       ws_gui_app->ws_message_dialog = gtk_message_dialog_new(
+                               GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
+                               GTK_DIALOG_DESTROY_WITH_PARENT,
+                               GTK_MESSAGE_ERROR,
+                               GTK_BUTTONS_OK,
+                               _("ws_ni_dictionary_unavailable"));
+               gtk_widget_show_all(ws_gui_app->ws_message_dialog);
+               if (gtk_dialog_run(
+               GTK_DIALOG(ws_gui_app->ws_message_dialog)) 
+                                                       == GTK_RESPONSE_OK)
+               {
+                       gtk_widget_destroy(ws_gui_app->ws_message_dialog);
+               }
+               break;
+               }
                
                case  WS_DBUS_BOOKMARKS_ADDED_OK:
                {
                        hildon_banner_show_information(GTK_WIDGET(
                                        ws_gui_app->ws_gui_hildon_window),
                                        NULL,
-                                        _("ws_ni_bookmark_added"));
+                                       _("ws_ni_bookmark_added"));
                break;
                }
 
-               case WS_DBUS_BOOKMARKS_REMOVED_OK:
+               case WS_DBUS_BOOKMARKS_REMOVED_OK:
                {
                        hildon_banner_show_information(GTK_WIDGET(
                                        ws_gui_app->ws_gui_hildon_window),
                                        NULL,
-                                        _("ws_ni_bookmark_removed"));
+                                       _("ws_ni_bookmark_removed"));
                break;
                }
        
@@ -256,7 +256,7 @@ void ws_gui_signal_hander (GError *error, GArray *words, gpointer user_data)
                        hildon_banner_show_information(GTK_WIDGET(
                                        ws_gui_app->ws_gui_hildon_window),
                                        NULL,
-                                        _("ws_ni_bookmark_not_added"));
+                                       _("ws_ni_bookmark_not_added"));
                break;
                }
 
@@ -265,58 +265,58 @@ void ws_gui_signal_hander (GError *error, GArray *words, gpointer user_data)
                        hildon_banner_show_information(GTK_WIDGET(
                                        ws_gui_app->ws_gui_hildon_window),
                                        NULL,
-                                        _("ws_ni_bookmark_not_removed"));
+                                       _("ws_ni_bookmark_not_removed"));
                break;
                }
 
                case WS_DBUS_LOAD_BOOKMARK_FAILED:
                {
-                    gtk_widget_set_sensitive(
-                     GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_bookmarks),
-                     FALSE);
-                    ws_gui_app->bookmark_avail = FALSE;
+               gtk_widget_set_sensitive(
+               GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_bookmarks),
+               FALSE);
+               ws_gui_app->bookmark_avail = FALSE;
                                
                        ws_gui_app->ws_message_dialog = 
-                        gtk_message_dialog_new(
-                                  GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_ERROR,
-                                   GTK_BUTTONS_OK,
-                                   _("ws_ni_bookmarks_unavailable"));
+                       gtk_message_dialog_new(
+                               GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
+                               GTK_DIALOG_DESTROY_WITH_PARENT,
+                               GTK_MESSAGE_ERROR,
+                               GTK_BUTTONS_OK,
+                               _("ws_ni_bookmarks_unavailable"));
 
                        if (gtk_dialog_run(
-                                GTK_DIALOG(ws_gui_app->ws_message_dialog)) 
-                                                            == GTK_RESPONSE_OK)
-                        {
-                                gtk_widget_destroy(
-                                                 ws_gui_app->ws_message_dialog);
-                        }
+                               GTK_DIALOG(ws_gui_app->ws_message_dialog)) 
+                                                       == GTK_RESPONSE_OK)
+                       {
+                               gtk_widget_destroy(
+                                               ws_gui_app->ws_message_dialog);
+                       }
 
                        
-                        break; 
+                       break;  
                }
                case WS_DBUS_EXTRACT_FILE:
-                {
-                        ws_gui_app->ws_gui_banner_extracting =
-                               hildon_banner_show_animation(
-                                   GTK_WIDGET(ws_gui_app->ws_gui_hildon_window),
-                                   NULL,
-                                   _("ws_pb_extracting"));
+               {
+                       ws_gui_app->ws_gui_banner_extracting =
+                       hildon_banner_show_animation(
+                               GTK_WIDGET(ws_gui_app->ws_gui_hildon_window),
+                               NULL,
+                               _("ws_pb_extracting"));
 
                        ws_gui_app->caching_flag = TRUE;
                        
                        gtk_widget_set_sensitive(
-                          GTK_WIDGET(ws_gui_app->ws_gui_hildon_find_toolbar),
-                          FALSE);
+                       GTK_WIDGET(ws_gui_app->ws_gui_hildon_find_toolbar),
+                       FALSE);
                        gtk_widget_set_sensitive(
                        GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
-                        FALSE);
+                       FALSE);
 
-                       break;
-                }
+               break;
+               }
 
-                case WS_DBUS_EXTRACT_FILE_FINISHED:
-                {
+               case WS_DBUS_EXTRACT_FILE_FINISHED:
+               {
                        gtk_widget_destroy(
                        GTK_WIDGET(ws_gui_app->ws_gui_banner_extracting));
                        
@@ -325,7 +325,7 @@ void ws_gui_signal_hander (GError *error, GArray *words, gpointer user_data)
                        hildon_banner_show_information(GTK_WIDGET(
                                        ws_gui_app->ws_gui_hildon_window),
                                        NULL,
-                                      _("ws_ni_dictionary_added"));
+                               _("ws_ni_dictionary_added"));
                        
                        gtk_widget_set_sensitive(
                        GTK_WIDGET(ws_gui_app->ws_gui_hildon_find_toolbar),
@@ -334,8 +334,8 @@ void ws_gui_signal_hander (GError *error, GArray *words, gpointer user_data)
                        GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
                        TRUE);
 
-                        break;
-                }
+                       break;
+               }
 
                case  WS_DBUS_WORDS_LIST_FULL:
                {
@@ -355,8 +355,8 @@ void ws_gui_signal_hander (GError *error, GArray *words, gpointer user_data)
                {
                        gtk_widget_set_sensitive(
                        GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_bookmarks),
-                       TRUE);
-                       gtk_widget_hide(GTK_WIDGET(ws_gui_app->ws_gui_banner_list_searching));
+                       TRUE);
+                       gtk_widget_hide(GTK_WIDGET(ws_gui_app->ws_gui_banner_list_searching));
                break;
                }
 
@@ -370,8 +370,8 @@ void ws_gui_signal_hander (GError *error, GArray *words, gpointer user_data)
                {
                        gtk_widget_set_sensitive(
                        GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_bookmarks),
-                       FALSE);
-                       gtk_widget_show(GTK_WIDGET(ws_gui_app->ws_gui_banner_list_searching));
+                       FALSE);
+                       gtk_widget_show(GTK_WIDGET(ws_gui_app->ws_gui_banner_list_searching));
                break;
                }
 
@@ -381,58 +381,58 @@ void ws_gui_signal_hander (GError *error, GArray *words, gpointer user_data)
                break;
                }
 
-        }
+       }
 }
 
 
 /* added by Dariusz Wiechecki - HISA */
 void ws_gui_search_home_handler(GError *error, GArray *word, gpointer user_data)
 {
-        g_debug("->%s", __FUNCTION__);
-        WSGuiApp *data = (WSGuiApp*) user_data;
-        osso_rpc_t* osso_data = NULL;
+       g_debug("->%s", __FUNCTION__);
+       WSGuiApp *data = (WSGuiApp*) user_data;
+       osso_rpc_t* osso_data = NULL;
 
-        //get the word passed by dbus 
-        osso_data = &g_array_index (word, osso_rpc_t, 0); 
+       //get the word passed by dbus 
+       osso_data = &g_array_index (word, osso_rpc_t, 0); 
 
-        //free memory used by last searched word
-        gchar* tmp = NULL;
-        tmp = g_strdup(osso_data->value.s + 11);
+       //free memory used by last searched word
+       gchar* tmp = NULL;
+       tmp = g_strdup(osso_data->value.s + 11);
        
        g_object_set(G_OBJECT(data->ws_gui_hildon_find_toolbar),
-                    "prefix",
-                    tmp,
-                    NULL);
+               "prefix",
+               tmp,
+               NULL);
        ws_gui_search(NULL, data);
 }
 
 /**  this function handles signals from dbus; it is called when progress bar
- status has been changed
- *
- * @param error - error message recived from DBUS
- * @param words - array with recived data structure
- * @param user_data - pointer to data structure
- * @return
- */
+status has been changed
+*
+* @param error - error message recived from DBUS
+* @param words - array with recived data structure
+* @param user_data - pointer to data structure
+* @return
+*/
 void ws_dbus_progress_bar(GError *error, GArray *words, gpointer user_data)
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
-        osso_rpc_t osss_data;
-        osss_data = g_array_index (words, osso_rpc_t, 0);
-        double progress = osss_data.value.d;
-        if (ws_gui_app->caching_flag == TRUE)
-        {
-                hildon_banner_set_fraction(
-                               HILDON_BANNER(ws_gui_app->ws_gui_banner_caching),
-                               progress);
-        }
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+       osso_rpc_t osss_data;
+       osss_data = g_array_index (words, osso_rpc_t, 0);
+       double progress = osss_data.value.d;
+       if (ws_gui_app->caching_flag == TRUE)
+       {
+               hildon_banner_set_fraction(
+                       HILDON_BANNER(ws_gui_app->ws_gui_banner_caching),
+                       progress);
+       }
 }
 
 /** this function clean GtkListStore row by row
- *
- * @param list - GtkListStore to be remoeved
- * @return
- */
+*
+* @param list - GtkListStore to be remoeved
+* @return
+*/
 void ws_gui_clear_list (GtkListStore* list, gpointer user_data) 
 {
        //WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
@@ -441,8 +441,8 @@ void ws_gui_clear_list (GtkListStore* list, gpointer user_data)
        
        //g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "\n\nws_gui_clear_list\n\n");   
        tmp = gtk_tree_model_get_iter_first(
-                        GTK_TREE_MODEL(list),
-                        &iter);        
+                       GTK_TREE_MODEL(list),
+                       &iter); 
 
        while (tmp == TRUE)
        {
@@ -455,40 +455,40 @@ void ws_gui_clear_list (GtkListStore* list, gpointer user_data)
 
 /** this function handles signal from dbus and transfer recived 
 (found in a dictionary) words to the words list
- *
- * @param error - error message recived from DBUS
- * @param words - array with recived data structure
- * @param user_data - pointer to data structure
- * @return
- */
+*
+* @param error - error message recived from DBUS
+* @param words - array with recived data structure
+* @param user_data - pointer to data structure
+* @return
+*/
 void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
 {
-        timer(TIMER_START, (gchar*)__FUNCTION__);
-        guint i;
-        osso_rpc_t data;
+       timer(TIMER_START, (gchar*)__FUNCTION__);
+       guint i;
+       osso_rpc_t data;
 
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
        ws_gui_app->no_words_found = FALSE;
        
        g_signal_handlers_block_by_func(G_OBJECT 
                        (ws_gui_app->ws_gui_w_list->ws_gui_view),
-                        G_CALLBACK (ws_gui_view_cursor_changed), 
+                       G_CALLBACK (ws_gui_view_cursor_changed), 
                        ws_gui_app);    
 
 
-        GArray *tmp;
-        tmp = g_array_new(TRUE, TRUE, sizeof(gchar*));
-        gchar *tmp_word;
+       GArray *tmp;
+       tmp = g_array_new(TRUE, TRUE, sizeof(gchar*));
+       gchar *tmp_word;
 
-        for (i=0;i<words->len;++i)
-        {
-                data = g_array_index (words, osso_rpc_t, i);
-                tmp_word = g_strdup(data.value.s);
-                g_array_append_val(tmp, tmp_word);
-        }
+       for (i=0;i<words->len;++i)
+       {
+               data = g_array_index (words, osso_rpc_t, i);
+               tmp_word = g_strdup(data.value.s);
+               g_array_append_val(tmp, tmp_word);
+       }
        
        //g_assert(ws_gui_app->ws_gui_banner_list_searching);
-        //gtk_widget_hide(GTK_WIDGET(ws_gui_app->ws_gui_banner_list_searching));
+       //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);
@@ -498,24 +498,24 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
        //ws_gui_clear_list(ws_gui_app->ws_gui_w_list->ws_gui_store);
 
 
-        ws_gui_app->ws_gui_w_list->ws_gui_model = 
-                                        create_and_fill_model(tmp, ws_gui_app);
+       ws_gui_app->ws_gui_w_list->ws_gui_model = 
+                                       create_and_fill_model(tmp, ws_gui_app);
        
        if (ws_gui_app->history_flag == TRUE)
        {
 
-       GValue value = { 0, };
-       GtkTreeIter tmp_iter;
+       GValue value = { 0, };
+       GtkTreeIter tmp_iter;
        gchar *pattern;
        gboolean keep_searching = TRUE;
 
        if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(
-           ws_gui_app->ws_gui_w_list->ws_gui_model), &tmp_iter) == TRUE)
+       ws_gui_app->ws_gui_w_list->ws_gui_model), &tmp_iter) == TRUE)
        {
 
                pattern = strdup(g_array_index(ws_gui_app->ws_gui_history,
-                                       gchar*, 
-                                       ws_gui_app->ws_gui_history_cur_pos));
+                                       gchar*, 
+                                       ws_gui_app->ws_gui_history_cur_pos));
                
                gtk_tree_model_get_value(GTK_TREE_MODEL(
                                ws_gui_app->ws_gui_w_list->ws_gui_model), 
@@ -525,7 +525,7 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
 
                if ((g_value_get_string (&value) != NULL) &&
                                (strcmp(((gchar *)g_value_get_string (&value)), 
-                                pattern) == 0))
+                               pattern) == 0))
                {
                        gtk_tree_selection_select_iter(
                                ws_gui_app->ws_gui_w_list->ws_gui_selection,
@@ -535,8 +535,8 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
                else
                {
                while (gtk_tree_model_iter_next(GTK_TREE_MODEL
-                     (ws_gui_app->ws_gui_w_list->ws_gui_model), 
-                     &tmp_iter) == TRUE && keep_searching == TRUE)
+               (ws_gui_app->ws_gui_w_list->ws_gui_model), 
+               &tmp_iter) == TRUE && keep_searching == TRUE)
                {
                        gtk_tree_model_get_value(GTK_TREE_MODEL(
                                ws_gui_app->ws_gui_w_list->ws_gui_model), 
@@ -551,11 +551,11 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
                                gtk_tree_model_get_iter_from_string (
                                GTK_TREE_MODEL(
                                ws_gui_app->ws_gui_w_list->ws_gui_model),
-                                &tmp_iter,
-                                g_array_index(
+                               &tmp_iter,
+                               g_array_index(
                                ws_gui_app->ws_gui_history_iter,
-                               gchar*, 
-                               ws_gui_app->ws_gui_history_cur_pos));
+                               gchar*, 
+                               ws_gui_app->ws_gui_history_cur_pos));
 
                                gtk_tree_selection_select_iter(
                                ws_gui_app->ws_gui_w_list->ws_gui_selection,
@@ -565,14 +565,14 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
                                }
                        }
                }
-       }
+       }
        g_free(pattern);
 
        ws_gui_app->history_flag = FALSE;
        ws_dbus_client_find_translation(ws_gui_app->dbus_data, 
                                g_array_index(ws_gui_app->ws_gui_history,
-                               gchar*, 
-                               ws_gui_app->ws_gui_history_cur_pos));
+                               gchar*, 
+                               ws_gui_app->ws_gui_history_cur_pos));
        
        ws_gui_app->html_flag = TRUE;
        g_value_unset (&value);
@@ -581,53 +581,53 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
        
 /*     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 (&& ws_gui_app->stop_clicked != TRUE )
        
        if ((tmp->len == 0 || tmp_word == NULL) && ws_gui_app->stop_clicked != TRUE )
-        {
+       {
                        hildon_banner_show_information(GTK_WIDGET(
                                        ws_gui_app->ws_gui_hildon_window),
                                        NULL,
-                              _("ws_ni_no_words_found"));
+                       _("ws_ni_no_words_found"));
                
                //ws_gui_fill_html(" ", ws_gui_app);
                //ws_gui_app->html_flag = FALSE;
                g_free(ws_gui_app->last_word);
                ws_gui_app->last_word = NULL;
                ws_gui_app->no_words_found = TRUE;
-        }
+       }
 
        g_signal_handlers_unblock_by_func(G_OBJECT(
                                        ws_gui_app->ws_gui_w_list->ws_gui_view),
-                                        G_CALLBACK (ws_gui_view_cursor_changed), 
-                                       ws_gui_app);    
+                                       G_CALLBACK (ws_gui_view_cursor_changed), 
+                                       ws_gui_app);    
        
        for (i=0;i<tmp->len;++i)
-        {
-                g_free(g_array_index(tmp, gchar* , i));
-        }
+       {
+               g_free(g_array_index(tmp, gchar* , i));
+       }
        g_array_free(tmp, TRUE);
 
-        timer(TIMER_STOP, (gchar*)__FUNCTION__);
+       timer(TIMER_STOP, (gchar*)__FUNCTION__);
 }
 
 /** this function handles signal from dbus and send recived data to 
 the translation area
- *
- * @param error - error message recived from DBUS
- * @param words - array with recived data structure
- * @param user_data - pointer to data structure
- * @return
- */
+*
+* @param error - error message recived from DBUS
+* @param words - array with recived data structure
+* @param user_data - pointer to data structure
+* @return
+*/
 void ws_gui_dbus_return_translation (GError *error,
-                                     GArray *words,
-                                     gpointer user_data)
+                               GArray *words,
+                               gpointer user_data)
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
        gchar *html_content = NULL;
-        osso_rpc_t data;
+       osso_rpc_t data;
 
-        data = g_array_index (words, osso_rpc_t, 0);
+       data = g_array_index (words, osso_rpc_t, 0);
 
        html_content = format_html(data.value.s, ws_gui_app);
        ws_gui_fill_html(html_content, ws_gui_app);
@@ -636,34 +636,34 @@ void ws_gui_dbus_return_translation (GError *error,
        
        //gtk_widget_hide(ws_gui_app->ws_gui_banner_translation_loading);
        ws_gui_app->loading = FALSE;
-       ws_gui_set_toolbar_avail(ws_gui_app);
+       ws_gui_set_toolbar_avail(ws_gui_app);
 
 }
 
 /** this function handles signal from dbus and send recived data to 
 the translation area
- *
- * @param error - error message recived from DBUS
- * @param words - array with recived data structure
- * @param user_data - pointer to data structure
- * @return
- */
+*
+* @param error - error message recived from DBUS
+* @param words - array with recived data structure
+* @param user_data - pointer to data structure
+* @return
+*/
 void ws_dbus_server_return_extracted_bzip(GError *error,
-                                     GArray *words,
-                                     gpointer user_data)
+                               GArray *words,
+                               gpointer user_data)
 {
        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
 
-        osso_rpc_t data;
+       osso_rpc_t data;
 
-        data = g_array_index (words, osso_rpc_t, 0);
+       data = g_array_index (words, osso_rpc_t, 0);
 
        if (data.value.s[0] == '\0')
        {
                        hildon_banner_show_information(GTK_WIDGET(
                                        ws_gui_app->ws_gui_hildon_window),
                                        NULL,
-                                _("ws_ni_dictionary_not_added"));
+                               _("ws_ni_dictionary_not_added"));
        }
        else
        {
@@ -681,13 +681,13 @@ void ws_dbus_server_return_extracted_bzip(GError *error,
 */
 void ws_gui_free_memory(gpointer user_data)
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
        guint i = 0;
        for (i = 0; i<ws_gui_app->ws_gui_history->len; ++i)
        {
                g_free(g_array_index(ws_gui_app->ws_gui_history, gchar *, i));
        }
-        g_array_free(ws_gui_app->ws_gui_history, TRUE);
+       g_array_free(ws_gui_app->ws_gui_history, TRUE);
 
        for (i = 0; i<ws_gui_app->ws_gui_history_list->len; ++i)
        {
@@ -702,222 +702,222 @@ void ws_gui_free_memory(gpointer user_data)
        g_array_free(ws_gui_app->ws_gui_history_iter, TRUE);
 
 
-        pango_font_description_free(ws_gui_app->p);
+       pango_font_description_free(ws_gui_app->p);
 
        g_free(ws_gui_app->welcome_note);
        ws_gui_app->welcome_note = NULL;
 
-       g_string_free(ws_gui_app->raw_translation, TRUE);
-        g_free(ws_gui_app->last_word);
+       g_string_free(ws_gui_app->raw_translation, TRUE);
+       g_free(ws_gui_app->last_word);
        g_free(ws_gui_app->ws_gui_w_list);
-        g_free(ws_gui_app->ws_gui_menu);
-        g_free(ws_gui_app);
+       g_free(ws_gui_app->ws_gui_menu);
+       g_free(ws_gui_app);
 }
 
 /** this function handle press signals (keyboard)
- * 
- * @param widget
- * @param keyevent
- * @param user_data - ponter to data structure
- * @return TRUE to stop other handlers from being invoked for the event. 
- FALSE to propagate the event further.
- */
+* 
+* @param widget
+* @param keyevent
+* @param user_data - ponter to data structure
+* @return TRUE to stop other handlers from being invoked for the event. 
+FALSE to propagate the event further.
+*/
 gboolean hildon_key_press_listener (GtkWidget * widget,
-                                    GdkEventKey * keyevent,
-                                    gpointer user_data)
+                               GdkEventKey * keyevent,
+                               gpointer user_data)
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
-
-        switch ((guint)(keyevent->keyval)) {
-                case HILDON_HARDKEY_UP: 
-                {
-                        gtk_container_set_focus_vadjustment(
-                          GTK_CONTAINER(ws_gui_app->ws_gui_scrolledwindow_left),
-                          gtk_scrolled_window_get_vadjustment(
-                          GTK_SCROLLED_WINDOW(
-                                      ws_gui_app->ws_gui_scrolledwindow_left)));
-                      ws_gui_app->v_new_value =
-                         gtk_adjustment_get_value(
-                           GTK_ADJUSTMENT(
-                                ws_gui_app->ws_gui_vadj)) - ws_gui_app->v_delta;
-                      if (ws_gui_app->v_new_value > 
-                         ws_gui_app->ws_gui_vadj->lower) 
-                      {
-                              gtk_adjustment_set_value(
-                                        GTK_ADJUSTMENT(ws_gui_app->ws_gui_vadj),
-                                        ws_gui_app->v_new_value);
-                      }
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+
+       switch ((guint)(keyevent->keyval)) {
+               case HILDON_HARDKEY_UP: 
+               {
+                       gtk_container_set_focus_vadjustment(
+                       GTK_CONTAINER(ws_gui_app->ws_gui_scrolledwindow_left),
+                       gtk_scrolled_window_get_vadjustment(
+                       GTK_SCROLLED_WINDOW(
+                               ws_gui_app->ws_gui_scrolledwindow_left)));
+               ws_gui_app->v_new_value =
+                       gtk_adjustment_get_value(
+                       GTK_ADJUSTMENT(
+                               ws_gui_app->ws_gui_vadj)) - ws_gui_app->v_delta;
+               if (ws_gui_app->v_new_value > 
+                       ws_gui_app->ws_gui_vadj->lower) 
+               {
+                       gtk_adjustment_set_value(
+                                       GTK_ADJUSTMENT(ws_gui_app->ws_gui_vadj),
+                                       ws_gui_app->v_new_value);
+               }
                        
-                       break;
-                }
-
-                case HILDON_HARDKEY_DOWN: 
-                {
-                      gtk_container_set_focus_vadjustment(
-                          GTK_CONTAINER(ws_gui_app->ws_gui_scrolledwindow_left),
-                          gtk_scrolled_window_get_vadjustment(
-                          GTK_SCROLLED_WINDOW(
-                                      ws_gui_app->ws_gui_scrolledwindow_left)));
-                      ws_gui_app->v_new_value = gtk_adjustment_get_value(
-                                        GTK_ADJUSTMENT(ws_gui_app->ws_gui_vadj))
-                                        + ws_gui_app->v_delta;
-
-                      if (ws_gui_app->v_new_value < 
-                                     (ws_gui_app->ws_gui_vadj->upper - 
-                                            ws_gui_app->ws_gui_vadj->page_size)) 
-                      {
-                                gtk_adjustment_set_value(
-                                        GTK_ADJUSTMENT(ws_gui_app->ws_gui_vadj),
-                                        ws_gui_app->v_new_value);
-                      }
-                      break;
-                }
-
-                case HILDON_HARDKEY_LEFT:
-                {
-                      gtk_container_set_focus_hadjustment(
-                      GTK_CONTAINER(ws_gui_app->ws_gui_scrolledwindow_left),
-                      gtk_scrolled_window_get_hadjustment(
-                      GTK_SCROLLED_WINDOW(
-                                     ws_gui_app->ws_gui_scrolledwindow_left)));
-
-                      ws_gui_app->h_new_value = gtk_adjustment_get_value(
-                      GTK_ADJUSTMENT(ws_gui_app->ws_gui_hadj)) 
-                     - ws_gui_app->h_delta;
-
-                      if (ws_gui_app->h_new_value > 
-                         ws_gui_app->ws_gui_hadj->lower) 
-                      {
-                                gtk_adjustment_set_value(
-                                        GTK_ADJUSTMENT(ws_gui_app->ws_gui_hadj),
-                                        ws_gui_app->h_new_value);
-                      }
-                }
-                break;
-
-                case HILDON_HARDKEY_RIGHT: 
-                {
-                      gtk_container_set_focus_hadjustment(
-                       GTK_CONTAINER(ws_gui_app->ws_gui_scrolledwindow_left),
-                       gtk_scrolled_window_get_hadjustment(
-                       GTK_SCROLLED_WINDOW(
-                      ws_gui_app->ws_gui_scrolledwindow_left)));
-
-                      ws_gui_app->h_new_value = gtk_adjustment_get_value(
-                      GTK_ADJUSTMENT(ws_gui_app->ws_gui_hadj)) 
-                     + ws_gui_app->h_delta;
-
-                      if (ws_gui_app->h_new_value < 
-                                (ws_gui_app->ws_gui_hadj->upper - 
-                                        ws_gui_app->ws_gui_hadj->page_size)) 
-                      {
-                      gtk_adjustment_set_value(
-                                        GTK_ADJUSTMENT(ws_gui_app->ws_gui_hadj),
-                                        ws_gui_app->h_new_value);
-                      }
-                 }
-                 break;
-
-                 case HILDON_HARDKEY_SELECT: 
-                        ws_gui_search(NULL, ws_gui_app);
-                 break;
-
-                 case HILDON_HARDKEY_FULLSCREEN: 
-                      ws_gui_full_screen(NULL, ws_gui_app);
-                 break;
-
-                 case HILDON_HARDKEY_INCREASE: 
-                      ws_gui_html_zoom_in(NULL, ws_gui_app);
-                 break;
-
-                 case HILDON_HARDKEY_DECREASE:
-                      ws_gui_html_zoom_out(NULL, ws_gui_app);
-                 break;
-
-                 case HILDON_HARDKEY_ESC: 
-                      ws_gui_search_stop(NULL, ws_gui_app);
-                 break;
-
-                 default:
-                      return FALSE;
-                 break;
-        }
-        return TRUE;
+                       break;
+               }
+
+               case HILDON_HARDKEY_DOWN: 
+               {
+               gtk_container_set_focus_vadjustment(
+                       GTK_CONTAINER(ws_gui_app->ws_gui_scrolledwindow_left),
+                       gtk_scrolled_window_get_vadjustment(
+                       GTK_SCROLLED_WINDOW(
+                               ws_gui_app->ws_gui_scrolledwindow_left)));
+               ws_gui_app->v_new_value = gtk_adjustment_get_value(
+                                       GTK_ADJUSTMENT(ws_gui_app->ws_gui_vadj))
+                                       + ws_gui_app->v_delta;
+
+               if (ws_gui_app->v_new_value < 
+                               (ws_gui_app->ws_gui_vadj->upper - 
+                                       ws_gui_app->ws_gui_vadj->page_size)) 
+               {
+                               gtk_adjustment_set_value(
+                                       GTK_ADJUSTMENT(ws_gui_app->ws_gui_vadj),
+                                       ws_gui_app->v_new_value);
+               }
+               break;
+               }
+
+               case HILDON_HARDKEY_LEFT:
+               {
+               gtk_container_set_focus_hadjustment(
+               GTK_CONTAINER(ws_gui_app->ws_gui_scrolledwindow_left),
+               gtk_scrolled_window_get_hadjustment(
+               GTK_SCROLLED_WINDOW(
+                               ws_gui_app->ws_gui_scrolledwindow_left)));
+
+               ws_gui_app->h_new_value = gtk_adjustment_get_value(
+               GTK_ADJUSTMENT(ws_gui_app->ws_gui_hadj)) 
+               - ws_gui_app->h_delta;
+
+               if (ws_gui_app->h_new_value > 
+                       ws_gui_app->ws_gui_hadj->lower) 
+               {
+                               gtk_adjustment_set_value(
+                                       GTK_ADJUSTMENT(ws_gui_app->ws_gui_hadj),
+                                       ws_gui_app->h_new_value);
+               }
+               }
+               break;
+
+               case HILDON_HARDKEY_RIGHT: 
+               {
+               gtk_container_set_focus_hadjustment(
+               GTK_CONTAINER(ws_gui_app->ws_gui_scrolledwindow_left),
+               gtk_scrolled_window_get_hadjustment(
+               GTK_SCROLLED_WINDOW(
+               ws_gui_app->ws_gui_scrolledwindow_left)));
+
+               ws_gui_app->h_new_value = gtk_adjustment_get_value(
+               GTK_ADJUSTMENT(ws_gui_app->ws_gui_hadj)) 
+               + ws_gui_app->h_delta;
+
+               if (ws_gui_app->h_new_value < 
+                               (ws_gui_app->ws_gui_hadj->upper - 
+                                       ws_gui_app->ws_gui_hadj->page_size)) 
+               {
+               gtk_adjustment_set_value(
+                                       GTK_ADJUSTMENT(ws_gui_app->ws_gui_hadj),
+                                       ws_gui_app->h_new_value);
+               }
+               }
+               break;
+
+               case HILDON_HARDKEY_SELECT: 
+                       ws_gui_search(NULL, ws_gui_app);
+               break;
+
+               case HILDON_HARDKEY_FULLSCREEN: 
+               ws_gui_full_screen(NULL, ws_gui_app);
+               break;
+
+               case HILDON_HARDKEY_INCREASE: 
+               ws_gui_html_zoom_in(NULL, ws_gui_app);
+               break;
+
+               case HILDON_HARDKEY_DECREASE:
+               ws_gui_html_zoom_out(NULL, ws_gui_app);
+               break;
+
+               case HILDON_HARDKEY_ESC: 
+               ws_gui_search_stop(NULL, ws_gui_app);
+               break;
+
+               default:
+               return FALSE;
+               break;
+       }
+       return TRUE;
 }
 
 /** this function allow to hide words list using menu item from application menu
- *
- * @param checkmenuitem - the object which received the signal
- * @param user_data - user data set when the signal handler was connected
- * @return
- */
+*
+* @param checkmenuitem - the object which received the signal
+* @param user_data - user data set when the signal handler was connected
+* @return
+*/
 void ws_gui_words_list_hide_from_menu(GtkCheckMenuItem *checkmenuitem,
-                                      gpointer user_data)
+                               gpointer user_data)
 {
-        WSGuiApp* ws_gui_app = (WSGuiApp *)user_data;
-        if (gtk_check_menu_item_get_active(
-           GTK_CHECK_MENU_ITEM(ws_gui_app->ws_gui_menu->ws_gui_menu_hide_list)))
-        {
-                gtk_widget_hide(ws_gui_app->ws_gui_list_vbox);
-                gtk_toggle_tool_button_set_active(
-                  GTK_TOGGLE_TOOL_BUTTON(ws_gui_app->ws_gui_toobar_button_hide),
-                  TRUE);
-                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
-                                ws_gui_app->ws_gui_menu->ws_gui_menu_hide_list),
-                                TRUE);
-        }
-        else 
-        {
-                gtk_widget_show(ws_gui_app->ws_gui_list_vbox);
-                gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(
-                                         ws_gui_app->ws_gui_toobar_button_hide),
-                                         FALSE);
-                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
-                                ws_gui_app->ws_gui_menu->ws_gui_menu_hide_list),
-                                FALSE);
-        }
+       WSGuiApp* ws_gui_app = (WSGuiApp *)user_data;
+       if (gtk_check_menu_item_get_active(
+       GTK_CHECK_MENU_ITEM(ws_gui_app->ws_gui_menu->ws_gui_menu_hide_list)))
+       {
+               gtk_widget_hide(ws_gui_app->ws_gui_list_vbox);
+               gtk_toggle_tool_button_set_active(
+               GTK_TOGGLE_TOOL_BUTTON(ws_gui_app->ws_gui_toobar_button_hide),
+               TRUE);
+               gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
+                               ws_gui_app->ws_gui_menu->ws_gui_menu_hide_list),
+                               TRUE);
+       }
+       else 
+       {
+               gtk_widget_show(ws_gui_app->ws_gui_list_vbox);
+               gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(
+                                       ws_gui_app->ws_gui_toobar_button_hide),
+                                       FALSE);
+               gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
+                               ws_gui_app->ws_gui_menu->ws_gui_menu_hide_list),
+                               FALSE);
+       }
 }
 
 /** this function allow to hide words list using toggle button placed in 
 the find toolbar
- *
- * @param toolbar - the object which received the signal
- * @param user_data - user data set when the signal handler was connected
- * @return
- */
+*
+* @param toolbar - the object which received the signal
+* @param user_data - user data set when the signal handler was connected
+* @return
+*/
 void ws_gui_words_list_hide(GtkToggleButton *togglebutton, gpointer user_data)
 {
-        WSGuiApp* ws_gui_app = (WSGuiApp *)user_data;
-
-        if (gtk_toggle_tool_button_get_active(
-                 GTK_TOGGLE_TOOL_BUTTON(ws_gui_app->ws_gui_toobar_button_hide)))
-        {
-                gtk_widget_hide(ws_gui_app->ws_gui_list_vbox);
-                gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(
-                                         ws_gui_app->ws_gui_toobar_button_hide),
-                                         TRUE);
-                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
-                                ws_gui_app->ws_gui_menu->ws_gui_menu_hide_list),
-                                TRUE);
-        }
-        else 
-        {
-                gtk_widget_show(ws_gui_app->ws_gui_list_vbox);
-                gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(
-                                         ws_gui_app->ws_gui_toobar_button_hide),
-                                         FALSE);
-                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
-                                ws_gui_app->ws_gui_menu->ws_gui_menu_hide_list),
-                                FALSE);
-        }
+       WSGuiApp* ws_gui_app = (WSGuiApp *)user_data;
+
+       if (gtk_toggle_tool_button_get_active(
+               GTK_TOGGLE_TOOL_BUTTON(ws_gui_app->ws_gui_toobar_button_hide)))
+       {
+               gtk_widget_hide(ws_gui_app->ws_gui_list_vbox);
+               gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(
+                                       ws_gui_app->ws_gui_toobar_button_hide),
+                                       TRUE);
+               gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
+                               ws_gui_app->ws_gui_menu->ws_gui_menu_hide_list),
+                               TRUE);
+       }
+       else 
+       {
+               gtk_widget_show(ws_gui_app->ws_gui_list_vbox);
+               gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(
+                                       ws_gui_app->ws_gui_toobar_button_hide),
+                                       FALSE);
+               gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
+                               ws_gui_app->ws_gui_menu->ws_gui_menu_hide_list),
+                               FALSE);
+       }
 }
 
 /** add word to the history
- *
- * @param new_word - word which is going to be append to the history array
- * @param user_data - user data set when the signal handler was connected
- * @return
- */
+*
+* @param new_word - word which is going to be append to the history array
+* @param user_data - user data set when the signal handler was connected
+* @return
+*/
 void ws_gui_history_add(char *new_word, gpointer user_data)
 {
        WSGuiApp* ws_gui_app = (WSGuiApp *)user_data;
@@ -932,9 +932,9 @@ void ws_gui_history_add(char *new_word, gpointer user_data)
                gchar *previous_word = " ";
        
                if (ws_gui_app->ws_gui_history_cur_pos > -1 &&
-                   g_array_index(ws_gui_app->ws_gui_history, 
-                                 gchar*, 
-                                 ws_gui_app->ws_gui_history_cur_pos) != NULL)
+               g_array_index(ws_gui_app->ws_gui_history, 
+                               gchar*, 
+                               ws_gui_app->ws_gui_history_cur_pos) != NULL)
                {
                        previous_word = NULL;
                        previous_word = g_array_index(
@@ -945,12 +945,12 @@ void ws_gui_history_add(char *new_word, gpointer user_data)
        
                i = ws_gui_app->ws_gui_history_cur_pos + 1;
                gchar *tmp = g_array_index(ws_gui_app->ws_gui_history, 
-                                          gchar*, 
-                                          i);
+                                       gchar*, 
+                                       i);
                //tmp_iter = gtk_tree_model_get_string_from_iter (GTK_TREE_MODEL(ws_gui_app->ws_gui_w_list->ws_gui_model), &ws_gui_app->ws_gui_w_list->ws_gui_iter);
        
                if (previous_word != NULL && 
-                   strcmp(previous_word, new_word) != 0)
+               strcmp(previous_word, new_word) != 0)
                {
                        while (tmp != NULL) 
                        {
@@ -967,9 +967,9 @@ void ws_gui_history_add(char *new_word, gpointer user_data)
                                i);
                                
                                tmp = g_array_index(
-                                     ws_gui_app->ws_gui_history, 
-                                     gchar*, 
-                                     i);
+                               ws_gui_app->ws_gui_history, 
+                               gchar*, 
+                               i);
                        }
        
                i = 0;
@@ -985,7 +985,7 @@ void ws_gui_history_add(char *new_word, gpointer user_data)
                }
 
                g_array_append_val(ws_gui_app->ws_gui_history_list, 
-                                  tmp_last_searched);
+                               tmp_last_searched);
                                
                tmp_word = g_strdup(new_word);
                
@@ -1011,197 +1011,197 @@ void ws_gui_history_add(char *new_word, gpointer user_data)
                
        }
 
-        ws_gui_check_history(ws_gui_app);
+       ws_gui_check_history(ws_gui_app);
 }
 
 /** display previously choosen word (previous from the history array)
-     if avaible, sets current position in the history array
- *
- * @param button - button which recived a signal
- * @param user_data - user data set when the signal handler was connected
- * @return 
- */
+if avaible, sets current position in the history array
+*
+* @param button - button which recived a signal
+* @param user_data - user data set when the signal handler was connected
+* @return 
+*/
 void ws_gui_history_back(GtkButton *button, gpointer user_data) 
 {
        WSGuiApp* ws_gui_app = (WSGuiApp *)user_data;
        
        ws_gui_app->history_flag = TRUE;
 
-        if (ws_gui_app->ws_gui_history_cur_pos > -1) 
+       if (ws_gui_app->ws_gui_history_cur_pos > -1) 
        {
                ws_gui_app->ws_gui_history_cur_pos = 
-                                       ws_gui_app->ws_gui_history_cur_pos - 1;
+                                       ws_gui_app->ws_gui_history_cur_pos - 1;
 
                //set object's property
-               g_object_set(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
-                            "prefix",
-                            (g_array_index(ws_gui_app->ws_gui_history_list,
-                             gchar*, 
-                             ws_gui_app->ws_gui_history_cur_pos)),
-                            NULL);
+               g_object_set(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
+                       "prefix",
+                       (g_array_index(ws_gui_app->ws_gui_history_list,
+                       gchar*, 
+                       ws_gui_app->ws_gui_history_cur_pos)),
+                       NULL);
        
                ws_dbus_client_find_word (ws_gui_app->dbus_data, 
                                        g_strstrip(g_array_index(ws_gui_app->ws_gui_history_list,
-                                               gchar*, 
-                                       ws_gui_app->ws_gui_history_cur_pos))
+                                       gchar*, 
+                                       ws_gui_app->ws_gui_history_cur_pos))
                                        );
                //gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
                //gtk_widget_show(ws_gui_app->ws_gui_banner_translation_loading);
                ws_gui_app->loading = TRUE;
                ws_gui_set_toolbar_avail(ws_gui_app);
-        }
-        else 
-        {
-               ws_gui_app->loading = FALSE;
+       }
+       else 
+       {
+               ws_gui_app->loading = FALSE;
                ws_gui_set_toolbar_avail(ws_gui_app);
-        }
+       }
 
-        ws_gui_check_history(ws_gui_app);
+       ws_gui_check_history(ws_gui_app);
 }
 
 /** display choosen word, next in the history array (if avaible), 
 sets current position in the history array
- *
- * @param button - button which recived a signal
- * @param user_data - user data set when the signal handler was connected
- * @return 
- */
+*
+* @param button - button which recived a signal
+* @param user_data - user data set when the signal handler was connected
+* @return 
+*/
 void ws_gui_history_next(GtkButton *button, gpointer user_data) 
 {
-        WSGuiApp* ws_gui_app = (WSGuiApp *)user_data;
+       WSGuiApp* ws_gui_app = (WSGuiApp *)user_data;
        
        ws_gui_app->history_flag = TRUE;
 
-        gchar *tmp = g_array_index(ws_gui_app->ws_gui_history,
-                                   gchar*,
-                                   ws_gui_app->ws_gui_history_cur_pos+1);
+       gchar *tmp = g_array_index(ws_gui_app->ws_gui_history,
+                               gchar*,
+                               ws_gui_app->ws_gui_history_cur_pos+1);
 
-        if ((ws_gui_app->ws_gui_history_cur_pos < HISTORY_LEN-1) 
-            && (tmp != NULL)) 
-        {
-                ws_gui_app->ws_gui_history_cur_pos =
-                         ws_gui_app->ws_gui_history_cur_pos + 1;
+       if ((ws_gui_app->ws_gui_history_cur_pos < HISTORY_LEN-1) 
+       && (tmp != NULL)) 
+       {
+               ws_gui_app->ws_gui_history_cur_pos =
+                       ws_gui_app->ws_gui_history_cur_pos + 1;
 
 
                //set object's property
                g_object_set(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
-                              "prefix",
-                              (g_array_index(ws_gui_app->ws_gui_history_list,
-                               gchar*, 
-                               ws_gui_app->ws_gui_history_cur_pos)),
-                              NULL);
+                       "prefix",
+                       (g_array_index(ws_gui_app->ws_gui_history_list,
+                       gchar*, 
+                       ws_gui_app->ws_gui_history_cur_pos)),
+                       NULL);
        
                
                ws_dbus_client_find_word(ws_gui_app->dbus_data, 
-                                        g_strstrip(g_array_index(ws_gui_app->ws_gui_history_list,
-                                        gchar*, 
-                                        ws_gui_app->ws_gui_history_cur_pos))
-                                        );
+                                       g_strstrip(g_array_index(ws_gui_app->ws_gui_history_list,
+                                       gchar*, 
+                                       ws_gui_app->ws_gui_history_cur_pos))
+                                       );
                
                //gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
                //gtk_widget_show(ws_gui_app->ws_gui_banner_translation_loading);
                ws_gui_app->loading = TRUE;
                ws_gui_set_toolbar_avail(ws_gui_app);
-        }
-        else 
-        {
+       }
+       else 
+       {
                //make forward button inactive
-                gtk_widget_set_sensitive(
-                           GTK_WIDGET(ws_gui_app->ws_gui_toobar_button_forward),
-                           FALSE);
+               gtk_widget_set_sensitive(
+                       GTK_WIDGET(ws_gui_app->ws_gui_toobar_button_forward),
+                       FALSE);
 
                //make find next button inactive
-                gtk_widget_set_sensitive(
-                     GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_find_next),
-                     FALSE);
-        }
+               gtk_widget_set_sensitive(
+               GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_find_next),
+               FALSE);
+       }
 
-        ws_gui_check_history(ws_gui_app);
+       ws_gui_check_history(ws_gui_app);
 }
 
 /** check current position in the history array and sets sensitivity of buttons 
 / menu items, depends on availablity of words in the history
- *
- * @param user_data - user data set when the signal handler was connected
- * @return 
- */
+*
+* @param user_data - user data set when the signal handler was connected
+* @return 
+*/
 void ws_gui_check_history(gpointer user_data) 
 {
-        WSGuiApp* ws_gui_app = (WSGuiApp *)user_data;
+       WSGuiApp* ws_gui_app = (WSGuiApp *)user_data;
 
-        gchar *tmp = g_array_index(ws_gui_app->ws_gui_history,
-                                   gchar*,
-                                   ws_gui_app->ws_gui_history_cur_pos+1);
+       gchar *tmp = g_array_index(ws_gui_app->ws_gui_history,
+                               gchar*,
+                               ws_gui_app->ws_gui_history_cur_pos+1);
 
-        if ((ws_gui_app->ws_gui_history_cur_pos+1 < HISTORY_LEN) 
-            && (tmp != NULL))
-        {
+       if ((ws_gui_app->ws_gui_history_cur_pos+1 < HISTORY_LEN) 
+       && (tmp != NULL))
+       {
                /*make forward button active*/
-                gtk_widget_set_sensitive(
-                           GTK_WIDGET(ws_gui_app->ws_gui_toobar_button_forward),
-                           TRUE);
+               gtk_widget_set_sensitive(
+                       GTK_WIDGET(ws_gui_app->ws_gui_toobar_button_forward),
+                       TRUE);
 
                /*make find next button active*/
-                gtk_widget_set_sensitive(
-                     GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_find_next),
-                     TRUE);
-        }
-        else 
-        {
+               gtk_widget_set_sensitive(
+               GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_find_next),
+               TRUE);
+       }
+       else 
+       {
                /*make forward button inactive*/
-                gtk_widget_set_sensitive(
-                           GTK_WIDGET(ws_gui_app->ws_gui_toobar_button_forward),
-                           FALSE);
+               gtk_widget_set_sensitive(
+                       GTK_WIDGET(ws_gui_app->ws_gui_toobar_button_forward),
+                       FALSE);
 
                /*make find next button inactive*/
-                gtk_widget_set_sensitive(
-                     GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_find_next),
-                     FALSE);
-        }
-
-        tmp = g_array_index(ws_gui_app->ws_gui_history,
-                            gchar*,
-                            ws_gui_app->ws_gui_history_cur_pos-1);
-        if ((ws_gui_app->ws_gui_history_cur_pos > 0) && (tmp != NULL))
-        {
+               gtk_widget_set_sensitive(
+               GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_find_next),
+               FALSE);
+       }
+
+       tmp = g_array_index(ws_gui_app->ws_gui_history,
+                       gchar*,
+                       ws_gui_app->ws_gui_history_cur_pos-1);
+       if ((ws_gui_app->ws_gui_history_cur_pos > 0) && (tmp != NULL))
+       {
                /*make back button active*/
-                gtk_widget_set_sensitive(
-                              GTK_WIDGET(ws_gui_app->ws_gui_toobar_button_back),
-                              TRUE);
+               gtk_widget_set_sensitive(
+                       GTK_WIDGET(ws_gui_app->ws_gui_toobar_button_back),
+                       TRUE);
 
                /*make find previous button active*/
-                gtk_widget_set_sensitive(
-                     GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_find_prev),
-                     TRUE);
-       }
-       else
-       {
-                gtk_widget_set_sensitive (
-                        GTK_WIDGET(ws_gui_app->ws_gui_toobar_button_back),
-                        FALSE);
-                gtk_widget_set_sensitive(
-                     GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_find_prev),
-                     FALSE);
-       }
+               gtk_widget_set_sensitive(
+               GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_find_prev),
+               TRUE);
+}
+else
+{
+               gtk_widget_set_sensitive (
+                       GTK_WIDGET(ws_gui_app->ws_gui_toobar_button_back),
+                       FALSE);
+               gtk_widget_set_sensitive(
+               GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_find_prev),
+               FALSE);
+}
 }
 
 /** create TreeView Model, which allows to display words list
- *
- * @param words_list - array with words(found in a dictionary), recived from 
- * DBUS;
- * @param user_data - user data set when the signal handler was connected
- * @return 
- */
+*
+* @param words_list - array with words(found in a dictionary), recived from 
+* DBUS;
+* @param user_data - user data set when the signal handler was connected
+* @return 
+*/
 GtkTreeModel * create_and_fill_model (GArray *words_list, gpointer user_data)
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
 
        g_signal_handlers_block_by_func(G_OBJECT (ws_gui_app->ws_gui_w_list->ws_gui_view),
-                                        G_CALLBACK (ws_gui_view_cursor_changed), 
-                                       ws_gui_app);    
+                                       G_CALLBACK (ws_gui_view_cursor_changed), 
+                                       ws_gui_app);    
 
-        guint i = 0;
-        gchar *tmp = g_strdup(g_array_index(words_list, gchar*, i));
+       guint i = 0;
+       gchar *tmp = g_strdup(g_array_index(words_list, gchar*, i));
 
        if (tmp != NULL)
        {
@@ -1209,25 +1209,25 @@ GtkTreeModel * create_and_fill_model (GArray *words_list, gpointer user_data)
        }
 
        gboolean valid;
-        valid = gtk_tree_model_get_iter_first(
-                        GTK_TREE_MODEL(ws_gui_app->ws_gui_w_list->ws_gui_store),
-                        &ws_gui_app->ws_gui_w_list->ws_gui_iter);
-
-        /* Append a row and fill in some data */
-        while (tmp != NULL)
-        {
-                gtk_list_store_append (ws_gui_app->ws_gui_w_list->ws_gui_store,
-                                       &ws_gui_app->ws_gui_w_list->ws_gui_iter);
-
-                gtk_list_store_set (ws_gui_app->ws_gui_w_list->ws_gui_store,
-                              &ws_gui_app->ws_gui_w_list->ws_gui_iter, 
-                             COL_WORD, tmp,
-                              -1);
-                i=i+1;
+       valid = gtk_tree_model_get_iter_first(
+                       GTK_TREE_MODEL(ws_gui_app->ws_gui_w_list->ws_gui_store),
+                       &ws_gui_app->ws_gui_w_list->ws_gui_iter);
+
+       /* Append a row and fill in some data */
+       while (tmp != NULL)
+       {
+               gtk_list_store_append (ws_gui_app->ws_gui_w_list->ws_gui_store,
+                               &ws_gui_app->ws_gui_w_list->ws_gui_iter);
+
+               gtk_list_store_set (ws_gui_app->ws_gui_w_list->ws_gui_store,
+                       &ws_gui_app->ws_gui_w_list->ws_gui_iter, 
+                       COL_WORD, tmp,
+                       -1);
+               i=i+1;
                g_free(tmp);
                tmp = NULL;
-                tmp = g_strdup(g_array_index(words_list, gchar*, i));
-        };
+               tmp = g_strdup(g_array_index(words_list, gchar*, i));
+       };
 
        g_free(tmp);
        tmp = NULL;
@@ -1246,182 +1246,182 @@ GtkTreeModel * create_and_fill_model (GArray *words_list, gpointer user_data)
                ws_gui_app->history_flag = FALSE;
        }
 
-       g_signal_handlers_unblock_by_func(G_OBJECT(
+       g_signal_handlers_unblock_by_func(G_OBJECT(
                                        ws_gui_app->ws_gui_w_list->ws_gui_view),
-                                        G_CALLBACK (ws_gui_view_cursor_changed), 
-                                       ws_gui_app);
+                                       G_CALLBACK (ws_gui_view_cursor_changed), 
+                                       ws_gui_app);
 
        g_free(tmp);
-        return GTK_TREE_MODEL(ws_gui_app->ws_gui_w_list->ws_gui_store);
+       return GTK_TREE_MODEL(ws_gui_app->ws_gui_w_list->ws_gui_store);
        
 }
 
 /** create TreeView and TreeModel using create_and_fill_model() function;
- it is necessary to display found words in a words list;
- *
- * @param words_list - array with words(found in a dictionary), 
- * recived from DBUS;
- * @param user_data - user data set when the signal handler was connected
- * @return 
- */
+it is necessary to display found words in a words list;
+*
+* @param words_list - array with words(found in a dictionary), 
+* recived from DBUS;
+* @param user_data - user data set when the signal handler was connected
+* @return 
+*/
 GtkWidget * create_view_and_model (GArray *words_list, gpointer user_data)
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
-
-        ws_gui_app->ws_gui_w_list->ws_gui_view = gtk_tree_view_new ();
-
-        ws_gui_app->ws_gui_w_list->ws_gui_renderer=gtk_cell_renderer_text_new();
-        gtk_tree_view_insert_column_with_attributes(
-                         GTK_TREE_VIEW (ws_gui_app->ws_gui_w_list->ws_gui_view),
-                         -1,
-                         "Name",
-                         ws_gui_app->ws_gui_w_list->ws_gui_renderer,
-                         "text",
-                         COL_WORD,
-                         NULL);
-        ws_gui_app->ws_gui_w_list->ws_gui_model = 
-                                create_and_fill_model(words_list, ws_gui_app);
-
-        gtk_tree_view_set_model(
-                         GTK_TREE_VIEW (ws_gui_app->ws_gui_w_list->ws_gui_view),
-                         ws_gui_app->ws_gui_w_list->ws_gui_model);
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+
+       ws_gui_app->ws_gui_w_list->ws_gui_view = gtk_tree_view_new ();
+
+       ws_gui_app->ws_gui_w_list->ws_gui_renderer=gtk_cell_renderer_text_new();
+       gtk_tree_view_insert_column_with_attributes(
+                       GTK_TREE_VIEW (ws_gui_app->ws_gui_w_list->ws_gui_view),
+                       -1,
+                       "Name",
+                       ws_gui_app->ws_gui_w_list->ws_gui_renderer,
+                       "text",
+                       COL_WORD,
+                       NULL);
+       ws_gui_app->ws_gui_w_list->ws_gui_model = 
+                               create_and_fill_model(words_list, ws_gui_app);
+
+       gtk_tree_view_set_model(
+                       GTK_TREE_VIEW (ws_gui_app->ws_gui_w_list->ws_gui_view),
+                       ws_gui_app->ws_gui_w_list->ws_gui_model);
        g_object_unref (ws_gui_app->ws_gui_w_list->ws_gui_model);
        
-        return ws_gui_app->ws_gui_w_list->ws_gui_view;
+       return ws_gui_app->ws_gui_w_list->ws_gui_view;
 }
 
 /** switch application between full screen and normal mode
- *
- * @param menuitem - object which recived the signal
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+*
+* @param menuitem - object which recived the signal
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_full_screen(GtkMenuItem *menuitem, gpointer user_data)
 {
 
-        WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
-        if (ws_gui_app->ws_gui_full_screen_flag == FALSE) {
+       WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
+       if (ws_gui_app->ws_gui_full_screen_flag == FALSE) {
 
-                gtk_window_fullscreen(
-                                  GTK_WINDOW(ws_gui_app->ws_gui_hildon_window));
-                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
-                              ws_gui_app->ws_gui_menu->ws_gui_menu_full_screen),
-                              TRUE);
-                ws_gui_app->ws_gui_full_screen_flag = TRUE;
+               gtk_window_fullscreen(
+                               GTK_WINDOW(ws_gui_app->ws_gui_hildon_window));
+               gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
+                       ws_gui_app->ws_gui_menu->ws_gui_menu_full_screen),
+                       TRUE);
+               ws_gui_app->ws_gui_full_screen_flag = TRUE;
                hildon_banner_show_information(GTK_WIDGET(
                                ws_gui_app->ws_gui_hildon_window),
                                NULL,
-                                 _("ws_ib_fullscreen_on"));
-        }
-        else 
-        {
-                gtk_window_unfullscreen(
-                                  GTK_WINDOW(ws_gui_app->ws_gui_hildon_window));
-                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
-                              ws_gui_app->ws_gui_menu->ws_gui_menu_full_screen),
-                              FALSE);
-                ws_gui_app->ws_gui_full_screen_flag = FALSE;
+                               _("ws_ib_fullscreen_on"));
+       }
+       else 
+       {
+               gtk_window_unfullscreen(
+                               GTK_WINDOW(ws_gui_app->ws_gui_hildon_window));
+               gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
+                       ws_gui_app->ws_gui_menu->ws_gui_menu_full_screen),
+                       FALSE);
+               ws_gui_app->ws_gui_full_screen_flag = FALSE;
                        hildon_banner_show_information(GTK_WIDGET(
                                        ws_gui_app->ws_gui_hildon_window),
                                        NULL,
-                                 _("ws_ib_fullscreen_off"));
-        }
+                               _("ws_ib_fullscreen_off"));
+       }
 }
 
 /** search for selected text in a dictionary
- *
- * @param menuitem - object which recived the signal
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+*
+* @param menuitem - object which recived the signal
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_popup_search(GtkMenuItem *menuitem, gpointer user_data)
 {
-        WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
-        gchar *temp;
-        ws_gui_app->ws_gui_clipboard_primary = 
-                gtk_widget_get_clipboard(ws_gui_app->ws_gui_html,
-                                         GDK_SELECTION_PRIMARY);
-        temp = gtk_clipboard_wait_for_text(
-                                         ws_gui_app->ws_gui_clipboard_primary);
+       WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
+       gchar *temp;
+       ws_gui_app->ws_gui_clipboard_primary = 
+               gtk_widget_get_clipboard(ws_gui_app->ws_gui_html,
+                                       GDK_SELECTION_PRIMARY);
+       temp = gtk_clipboard_wait_for_text(
+                                       ws_gui_app->ws_gui_clipboard_primary);
        /*strip leading and trailing spaces*/
        g_strstrip(temp);
-        if (temp != NULL || strcmp(temp, " "))
-        {
+       if (temp != NULL || strcmp(temp, " "))
+       {
                //set object's property
-                g_object_set(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
-                                      "prefix",
-                                      temp,
-                                      NULL);
-                ws_dbus_client_find_word (ws_gui_app->dbus_data, temp);
+               g_object_set(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
+                               "prefix",
+                               temp,
+                               NULL);
+               ws_dbus_client_find_word (ws_gui_app->dbus_data, temp);
                //gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
        }
-        else
-        {
-                hildon_banner_show_information(
-                                   GTK_WIDGET(ws_gui_app->ws_gui_hildon_window),
-                                   NULL,
-                                   _("ws_ni_no_text_selected"));
-        }
+       else
+       {
+               hildon_banner_show_information(
+                               GTK_WIDGET(ws_gui_app->ws_gui_hildon_window),
+                               NULL,
+                               _("ws_ni_no_text_selected"));
+       }
 }
 
 /** select whole text in the translation (html) area
- *
- * @param menuitem - object which recived the signal
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+*
+* @param menuitem - object which recived the signal
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_html_select_all(GtkMenuItem *menuitem, gpointer user_data) 
 {
-        WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
-        gtk_html_select_all(GTK_HTML(ws_gui_app->ws_gui_html));
+       WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
+       gtk_html_select_all(GTK_HTML(ws_gui_app->ws_gui_html));
 }
 
 /** copy selected text to the clipoard from context popup menu
- *
- * @param menuitem - object which recived the signal
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+*
+* @param menuitem - object which recived the signal
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_html_copy(GtkMenuItem *menuitem, gpointer user_data) 
 {
-        WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
+       WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
        gtk_html_copy(GTK_HTML(ws_gui_app->ws_gui_html));
        hildon_banner_show_information(GTK_WIDGET(
                                ws_gui_app->ws_gui_hildon_window),
                                NULL,
-                                 _("ws_ib_copied"));
+                               _("ws_ib_copied"));
 }
 
 /** paste copied text into toolbar entry
- *
- * @param menuitem - object which recived the signal
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+*
+* @param menuitem - object which recived the signal
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_html_paste(GtkMenuItem *menuitem, gpointer user_data)
 {
-        WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
+       WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
 
-        gchar *temp;
-        gchar *temp2;
-        temp = gtk_clipboard_wait_for_text(ws_gui_app->ws_gui_clipboard);
+       gchar *temp;
+       gchar *temp2;
+       temp = gtk_clipboard_wait_for_text(ws_gui_app->ws_gui_clipboard);
 
        /*get object's property value*/
-        g_object_get(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
-                     "prefix",
-                     &temp2,
-                     NULL);
+       g_object_get(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
+               "prefix",
+               &temp2,
+               NULL);
 
        /*concatenate two strings*/
-        temp = g_strconcat(temp2, temp, NULL);
+       temp = g_strconcat(temp2, temp, NULL);
        /*replace old delimiter with a new delimiter*/
-        temp = g_strdelimit(temp, "\n", ' ');
+       temp = g_strdelimit(temp, "\n", ' ');
 
        /*set object's property*/
-        g_object_set(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
-                     "prefix",
-                     temp,
-                     NULL);
+       g_object_set(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
+               "prefix",
+               temp,
+               NULL);
        hildon_banner_show_information(GTK_WIDGET(
                        ws_gui_app->ws_gui_hildon_window),
                        NULL,
@@ -1429,14 +1429,14 @@ void ws_gui_html_paste(GtkMenuItem *menuitem, gpointer user_data)
 }
 
 /** zoom in text in translation (html) area
- *
- * @param menuitem - object which recived the signal
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+*
+* @param menuitem - object which recived the signal
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_html_zoom_in(GtkMenuItem *menuitem, gpointer user_data)
 {
-        WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
+       WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
        ws_gui_app->zoom = ws_gui_app->zoom + ZOOM_STEP;
        if (ws_gui_app->zoom > ZOOM_MAX)
        {
@@ -1469,22 +1469,22 @@ void ws_gui_html_zoom_in(GtkMenuItem *menuitem, gpointer user_data)
 }
 
 /** zoom out text in translation (html) area
- *
- * @param menuitem - object which recived the signal
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+*
+* @param menuitem - object which recived the signal
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_html_zoom_out(GtkMenuItem *menuitem, gpointer user_data)
 {
        WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
-        ws_gui_app->zoom = ws_gui_app->zoom - ZOOM_STEP;
+       ws_gui_app->zoom = ws_gui_app->zoom - ZOOM_STEP;
        if (ws_gui_app->zoom < ZOOM_MIN)
        {
                ws_gui_app->zoom = ws_gui_app->zoom + ZOOM_STEP;
                        hildon_banner_show_information(GTK_WIDGET(
                                        ws_gui_app->ws_gui_hildon_window),
                                        NULL,
-                                      _("ws_ib_min_zoom"));
+                               _("ws_ib_min_zoom"));
        }
        else
        {
@@ -1509,24 +1509,24 @@ void ws_gui_html_zoom_out(GtkMenuItem *menuitem, gpointer user_data)
 }
 
 /** start searching, send typed word to DBUS and query for words
- *
- * @param widget - object which recived the signal
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+*
+* @param widget - object which recived the signal
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_search(GtkWidget * widget, gpointer user_data) 
 {
-        WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
+       WSGuiApp* ws_gui_app = (WSGuiApp*)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",
-                     &ws_gui_text,
-                     NULL);
+       g_object_get(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
+               "prefix",
+               &ws_gui_text,
+               NULL);
 
        if (ws_gui_app->bookmark_mode == FALSE) 
        {
@@ -1547,108 +1547,108 @@ void ws_gui_search(GtkWidget * widget, gpointer user_data)
        }
        
        g_strstrip(ws_gui_text);
-               if (strlen(ws_gui_text) != 0) 
-               {
+       if (strlen(ws_gui_text) != 0) 
+       {
                //gtk_widget_show(ws_gui_app->ws_gui_banner_list_searching);
                
-                ws_gui_app->loading = TRUE;
+               ws_gui_app->loading = TRUE;
                ws_gui_set_toolbar_avail(ws_gui_app);
 
-               //ws_gui_app->ws_gui_banner_flag = TRUE;
-                //ws_gui_fill_html(" ", ws_gui_app);
+               //ws_gui_app->ws_gui_banner_flag = TRUE;
+               //ws_gui_fill_html(" ", ws_gui_app);
                //ws_gui_app->html_flag = FALSE;
-                ws_dbus_client_find_word (ws_gui_app->dbus_data, ws_gui_text);
+               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);
-               }
-               else 
-               {
+       }
+       else 
+       {
                hildon_banner_show_information(GTK_WIDGET(
                                ws_gui_app->ws_gui_hildon_window),
                                NULL,
-                              _("ws_ni_no_word_typed"));
-        }
+                       _("ws_ni_no_word_typed"));
+       }
        g_free(ws_gui_app->last_word);
        ws_gui_app->last_word=NULL;
        //}
 }
 
 /** stop search process
- *
- * @param button - object which recived the signal
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+*
+* @param button - object which recived the signal
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_search_stop(GtkButton *button, gpointer user_data) 
 {
-        WSGuiApp* ws_gui_app = (WSGuiApp *)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));
+       {
+               //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_dbus_notify(ws_gui_app->dbus_data, WS_DBUS_INFO_STOP_SEARCH);
+               ws_dbus_notify(ws_gui_app->dbus_data, WS_DBUS_INFO_STOP_SEARCH);
                hildon_banner_show_information(GTK_WIDGET(
                                ws_gui_app->ws_gui_hildon_window),
                                NULL,
-                              _("ws_ni_search_aborted"));
-        }
+                       _("ws_ni_search_aborted"));
+       }
 }
 
 /** this function is called just before closing application; 
 it sends signal to DBUS and destroys it; 
- *
- * @param widget - object which recived the signal
- * @param event - 
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+*
+* @param widget - object which recived the signal
+* @param event - 
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_on_exit (GtkWidget *widget, GdkEvent *event, gpointer user_data) 
 {
-        WSGuiApp* ws_gui_app = (WSGuiApp *)user_data;
+       WSGuiApp* ws_gui_app = (WSGuiApp *)user_data;
        ws_gui_app->bookmark_mode = FALSE;
        ws_gui_set_bookmarks_sensitivity(ws_gui_app);
        g_timer_destroy(ws_gui_app->timer);
-        ws_dbus_notify(ws_gui_app->dbus_data, WS_DBUS_INFO_TERMINATE);
-        ws_dbus_destroy (ws_gui_app->dbus_data);
-        ws_gui_free_memory(ws_gui_app);
-        gtk_main_quit();
-        exit (0);
+       ws_dbus_notify(ws_gui_app->dbus_data, WS_DBUS_INFO_TERMINATE);
+       ws_dbus_destroy (ws_gui_app->dbus_data);
+       ws_gui_free_memory(ws_gui_app);
+       gtk_main_quit();
+       exit (0);
 }
 
 /** this function is called just before closing application, 
 from application menu; it sends signal to DBUS and destroys it;
- *
- * @param menuitem - object which recived the signal
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+*
+* @param menuitem - object which recived the signal
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_menu_quit(GtkMenuItem *menuitem, gpointer user_data)
 {
-        WSGuiApp* ws_gui_app = (WSGuiApp *)user_data;
+       WSGuiApp* ws_gui_app = (WSGuiApp *)user_data;
        ws_gui_app->bookmark_mode = FALSE;
        ws_gui_set_bookmarks_sensitivity(ws_gui_app);
-        g_timer_destroy(ws_gui_app->timer);
-        ws_dbus_notify(ws_gui_app->dbus_data, WS_DBUS_INFO_TERMINATE);
-        ws_dbus_destroy (ws_gui_app->dbus_data);
-        ws_gui_free_memory(ws_gui_app);
-        gtk_main_quit();
-        exit (0);
+       g_timer_destroy(ws_gui_app->timer);
+       ws_dbus_notify(ws_gui_app->dbus_data, WS_DBUS_INFO_TERMINATE);
+       ws_dbus_destroy (ws_gui_app->dbus_data);
+       ws_gui_free_memory(ws_gui_app);
+       gtk_main_quit();
+       exit (0);
 }
 
 /** fill translation area with text (html) recived from DBUS
- *
- * @param html_context - text which is going to be displayed; it should be html
- * @param user_data - user data set when the function was called
- * @return
- */
+*
+* @param html_context - text which is going to be displayed; it should be html
+* @param user_data - user data set when the function was called
+* @return
+*/
 void ws_gui_fill_html(char *html_context, gpointer user_data) 
 {
        WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
@@ -1659,202 +1659,202 @@ void ws_gui_fill_html(char *html_context, gpointer user_data)
        if (ws_gui_app->first_run == TRUE && ws_gui_app->bookmark_mode==FALSE)
        {
        gtk_html_load_from_string(GTK_HTML(ws_gui_app->ws_gui_html),
-                                  ws_gui_app->welcome_note,
-                                  -1);
+                               ws_gui_app->welcome_note,
+                               -1);
        g_object_set(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
-                                     "prefix",
-                                      "",
-                                      NULL);
+                               "prefix",
+                               "",
+                               NULL);
        }
        else
        {
-        gtk_html_load_from_string(GTK_HTML(ws_gui_app->ws_gui_html),
-                                  html_context,
-                                  -1);
+       gtk_html_load_from_string(GTK_HTML(ws_gui_app->ws_gui_html),
+                               html_context,
+                               -1);
        }
 }
 
 /** read adjustment of left scrollwindow, which is necessary to navigate with 
 arrow keys inside words list
- *
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+*
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_read_adjustment(gpointer user_data)
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
 
        ws_gui_app->ws_gui_hadj = 
-                gtk_scrolled_window_get_hadjustment(
-                GTK_SCROLLED_WINDOW(
+               gtk_scrolled_window_get_hadjustment(
+               GTK_SCROLLED_WINDOW(
                ws_gui_app->ws_gui_scrolledwindow_left));
 
-        ws_gui_app->h_delta = (ws_gui_app->ws_gui_hadj->upper -
-                                  ws_gui_app->ws_gui_hadj->lower)/SCROLL_STEP_H;
+       ws_gui_app->h_delta = (ws_gui_app->ws_gui_hadj->upper -
+                               ws_gui_app->ws_gui_hadj->lower)/SCROLL_STEP_H;
 
-        ws_gui_app->ws_gui_vadj = gtk_scrolled_window_get_vadjustment(
-        GTK_SCROLLED_WINDOW(ws_gui_app->ws_gui_scrolledwindow_left));
+       ws_gui_app->ws_gui_vadj = gtk_scrolled_window_get_vadjustment(
+       GTK_SCROLLED_WINDOW(ws_gui_app->ws_gui_scrolledwindow_left));
 
-        ws_gui_app->v_delta = (ws_gui_app->ws_gui_vadj->upper -
-                                  ws_gui_app->ws_gui_vadj->lower)/SCROLL_STEP_V;
-        ws_gui_app->v_new_value =
-           gtk_adjustment_get_value(GTK_ADJUSTMENT(ws_gui_app->ws_gui_vadj)) +
-                                                            ws_gui_app->v_delta;
+       ws_gui_app->v_delta = (ws_gui_app->ws_gui_vadj->upper -
+                               ws_gui_app->ws_gui_vadj->lower)/SCROLL_STEP_V;
+       ws_gui_app->v_new_value =
+       gtk_adjustment_get_value(GTK_ADJUSTMENT(ws_gui_app->ws_gui_vadj)) +
+                                                       ws_gui_app->v_delta;
 
-        gtk_container_set_focus_vadjustment(
-               GTK_CONTAINER(ws_gui_app->ws_gui_scrolledwindow_left), 
-               gtk_scrolled_window_get_vadjustment(
-                  GTK_SCROLLED_WINDOW(ws_gui_app->ws_gui_scrolledwindow_left)));
+       gtk_container_set_focus_vadjustment(
+       GTK_CONTAINER(ws_gui_app->ws_gui_scrolledwindow_left), 
+       gtk_scrolled_window_get_vadjustment(
+               GTK_SCROLLED_WINDOW(ws_gui_app->ws_gui_scrolledwindow_left)));
 
 }
 
 /** allows to display image in html area
- *
- * @param html - object which received a signal 
- * @param url - url to the image
- * @param stream - html stream 
- * @return
- */
+*
+* @param html - object which received a signal 
+* @param url - url to the image
+* @param stream - html stream 
+* @return
+*/
 void ws_gui_url_requested (
-                         GtkHTML *html, 
-                         const char *url, 
-                         GtkHTMLStream *stream)
+                       GtkHTML *html, 
+                       const char *url, 
+                       GtkHTMLStream *stream)
 {
-        int fd;
-
-        if (url && !strncmp (url, "file:", 5)) {
-                url += 5;
-                fd = open (url, O_RDONLY);
-                if (fd != -1) {
-                        gchar *buf;
-                        size_t size;
-                        buf = alloca (8192);
-                        while ((size = read (fd, buf, 8192)) > 0) {
-                                gtk_html_stream_write (stream, buf, size);
-                        }
-                       gtk_html_stream_close(stream, size == -1
-                                         ? GTK_HTML_STREAM_ERROR
-                                         : GTK_HTML_STREAM_OK);
-                       close (fd);
-
-                      return;
-                }
-        }
-
-        gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);
+       int fd;
+
+       if (url && !strncmp (url, "file:", 5)) {
+               url += 5;
+               fd = open (url, O_RDONLY);
+               if (fd != -1) {
+                       gchar *buf;
+                       size_t size;
+                       buf = alloca (8192);
+                       while ((size = read (fd, buf, 8192)) > 0) {
+                               gtk_html_stream_write (stream, buf, size);
+                       }
+               gtk_html_stream_close(stream, size == -1
+                                       ? GTK_HTML_STREAM_ERROR
+                                       : GTK_HTML_STREAM_OK);
+               close (fd);
+
+               return;
+               }
+       }
+
+       gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);
 }
 
 /** handles button press event and examines what kind of event was it 
-        suppose to be
- *
- * @param widget - object which received a signal
- * @param event - type of event which has been performed
- * @param user_data - user data set when the signal handler was connected 
- * @return TRUE to stop other handlers from being invoked for the event. 
- FALSE to propagate the event further
- */
+       suppose to be
+*
+* @param widget - object which received a signal
+* @param event - type of event which has been performed
+* @param user_data - user data set when the signal handler was connected 
+* @return TRUE to stop other handlers from being invoked for the event. 
+FALSE to propagate the event further
+*/
 gboolean ws_gui_button_press(GtkWidget *widget,
-                             GdkEventButton *event,
-                             gpointer user_data)
+                       GdkEventButton *event,
+                       gpointer user_data)
 {
        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
-        if (ws_gui_app->ws_gui_sel_flag == FALSE)
-        {
-                if (event->type == GDK_2BUTTON_PRESS) 
-                {
-                        ws_gui_app->ws_gui_double_click = TRUE;
-                        g_timer_stop(ws_gui_app->timer);
-                        g_timer_reset(ws_gui_app->timer);
-                        return FALSE;
-                }
-
-                g_signal_stop_emission_by_name(G_OBJECT(
+       if (ws_gui_app->ws_gui_sel_flag == FALSE)
+       {
+               if (event->type == GDK_2BUTTON_PRESS) 
+               {
+                       ws_gui_app->ws_gui_double_click = TRUE;
+                       g_timer_stop(ws_gui_app->timer);
+                       g_timer_reset(ws_gui_app->timer);
+                       return FALSE;
+               }
+
+               g_signal_stop_emission_by_name(G_OBJECT(
                                                ws_gui_app->ws_gui_html),
-                                               "button-press-event");
-                g_timer_start(ws_gui_app->timer);
-                gtk_timeout_add((guint)(PRESS_TIME*1000),
-                                (GtkFunction)(ws_gui_show_popup),
-                                ws_gui_app);
-                return FALSE;
-        }
-        else
-        {
-                ws_gui_app->ws_gui_sel_flag = FALSE;
-                return FALSE;
-        }
+                                       "button-press-event");
+               g_timer_start(ws_gui_app->timer);
+               gtk_timeout_add((guint)(PRESS_TIME*1000),
+                               (GtkFunction)(ws_gui_show_popup),
+                               ws_gui_app);
+               return FALSE;
+       }
+       else
+       {
+               ws_gui_app->ws_gui_sel_flag = FALSE;
+               return FALSE;
+       }
 
 }
 
 /** handles button release event and examines whether 'click' or 'tap and hold' 
 event it supposed to be
- *
- * @param widget - object which received a signal
- * @param event - type of event which has been performed
- * @param user_data - user data set when the signal handler was connected 
- * @return TRUE to stop other handlers from being invoked for the event. 
- FALSE to propagate the event further
- */
+*
+* @param widget - object which received a signal
+* @param event - type of event which has been performed
+* @param user_data - user data set when the signal handler was connected 
+* @return TRUE to stop other handlers from being invoked for the event. 
+FALSE to propagate the event further
+*/
 gboolean ws_gui_button_release (GtkWidget *widget,
-                                GdkEventButton *event,
-                                gpointer user_data)
+                               GdkEventButton *event,
+                               gpointer user_data)
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
-        gdouble tmp = g_timer_elapsed(ws_gui_app->timer, NULL);
-        g_timer_stop(ws_gui_app->timer);
-        g_timer_reset(ws_gui_app->timer);
-        if (ws_gui_app->ws_gui_double_click == TRUE)
-        {
-                ws_gui_app->ws_gui_double_click = FALSE;
-                return FALSE;
-        }
-        else if (tmp < PRESS_TIME)
-        {
-                struct _GtkHTML *tmp = (struct _GtkHTML *)
-                                        (ws_gui_app->ws_gui_html);
-                html_engine_unselect_all(tmp->engine);
-                return TRUE;
-        }
-                return FALSE;
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+       gdouble tmp = g_timer_elapsed(ws_gui_app->timer, NULL);
+       g_timer_stop(ws_gui_app->timer);
+       g_timer_reset(ws_gui_app->timer);
+       if (ws_gui_app->ws_gui_double_click == TRUE)
+       {
+               ws_gui_app->ws_gui_double_click = FALSE;
+               return FALSE;
+       }
+       else if (tmp < PRESS_TIME)
+       {
+               struct _GtkHTML *tmp = (struct _GtkHTML *)
+                                       (ws_gui_app->ws_gui_html);
+               html_engine_unselect_all(tmp->engine);
+               return TRUE;
+       }
+               return FALSE;
 }
 
 /** displays popup menu if user holds a stylus more than PRESS_TIME seconds
- *
- * @param user_data - user data set when the signal handler was connected 
- * @return 
- */
+*
+* @param user_data - user data set when the signal handler was connected 
+* @return 
+*/
 guint ws_gui_show_popup (gpointer user_data)
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
-        gdouble tmp = g_timer_elapsed(ws_gui_app->timer, NULL);
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+       gdouble tmp = g_timer_elapsed(ws_gui_app->timer, NULL);
        if (tmp > PRESS_TIME)
-        {
-                ws_gui_create_popup_menu(ws_gui_app);
-        }
-        return (guint)(FALSE);
+       {
+               ws_gui_create_popup_menu(ws_gui_app);
+       }
+       return (guint)(FALSE);
 
 }
 
 /** checks clipboard content and sets sensitivity of widgets 
- *
- * @param widget - object which recived a signal
- * @param user_data - user data set when the signal handler was connected 
- * @return 
- */
+*
+* @param widget - object which recived a signal
+* @param user_data - user data set when the signal handler was connected 
+* @return 
+*/
 void ws_gui_check_clipboard (GtkWidget *widget, gpointer user_data) 
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
-        if (gtk_clipboard_wait_for_text(ws_gui_app->ws_gui_clipboard) != NULL)
-        {
-                gtk_widget_set_sensitive(
-                         GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_paste),
-                         TRUE);
-        }
-        else
-        {
-                gtk_widget_set_sensitive(
-                         GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_paste),
-                         FALSE);
-        }
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+       if (gtk_clipboard_wait_for_text(ws_gui_app->ws_gui_clipboard) != NULL)
+       {
+               gtk_widget_set_sensitive(
+                       GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_paste),
+                       TRUE);
+       }
+       else
+       {
+               gtk_widget_set_sensitive(
+                       GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_paste),
+                       FALSE);
+       }
 
        struct _GtkHTML *tmp = (struct _GtkHTML *)(ws_gui_app->ws_gui_html);
 
@@ -1887,106 +1887,106 @@ void ws_gui_check_clipboard (GtkWidget *widget, gpointer user_data)
 }
 
 /** gets received string (with translation), formats it and sends it to be 
- * displayed
- *
- * @param received_string - content received from Manager
- * @param user_data - user data set when the function has been called
- * @return 
- */
+* displayed
+*
+* @param received_string - content received from Manager
+* @param user_data - user data set when the function has been called
+* @return 
+*/
 gchar * format_html (gchar * received_string, gpointer user_data)
 {
        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
-        GString *str_final;
+       GString *str_final;
        GString *str_tmp;
-        str_final = g_string_new(received_string);
+       str_final = g_string_new(received_string);
        str_tmp = g_string_new(received_string);
-        gchar * tmp;
+       gchar * tmp;
        gchar * tmp2;
-       gchar * returned_value;
+       gchar * returned_value;
        
        ws_gui_app->raw_translation=g_string_erase(ws_gui_app->raw_translation, 
-                                                  0, 
-                                                 -1);
-
-        while (strstr(str_final->str, "<PATTERN_OPEN>") != NULL)
-        {
-                tmp = strstr(str_final->str, "<PATTERN_OPEN>");
-                str_final =  g_string_erase(str_final,
-                                           (long)(tmp - str_final->str),
-                                           14);
-                str_final =  g_string_insert(str_final,
-                 (long)(tmp - str_final->str),
-                 "<html><head></head><body><center><table width=\"95%\"><tr>"
-                "<td><table border=1 width=100%><tr>"
-                "<th background=\"file:/usr/share/pixmaps/ws_top.png\">"
-                "<img align=left src=\"file:/usr/share/pixmaps/"
-                "engine_xdxf_icon.png\"><font color=\"#eeeeee\">");
+                                               0, 
+                                               -1);
+
+       while (strstr(str_final->str, "<PATTERN_OPEN>") != NULL)
+       {
+               tmp = strstr(str_final->str, "<PATTERN_OPEN>");
+               str_final =  g_string_erase(str_final,
+                                       (long)(tmp - str_final->str),
+                                       14);
+               str_final =  g_string_insert(str_final,
+               (long)(tmp - str_final->str),
+               "<html><head></head><body><center><table width=\"95%\"><tr>"
+               "<td><table border=1 width=100%><tr>"
+               "<th background=\"file:/usr/share/pixmaps/ws_top.png\">"
+               "<img align=left src=\"file:/usr/share/pixmaps/"
+               "engine_xdxf_icon.png\"><font color=\"#eeeeee\">");
                
                tmp2 = strstr(str_tmp->str, "<PATTERN_OPEN>");
                if (ws_gui_app->last_word != NULL)
                {
                        str_tmp =  g_string_erase(str_tmp,
-                                           (long)(tmp2 - str_tmp->str),
-                                           14 + strlen(ws_gui_app->last_word));
+                                       (long)(tmp2 - str_tmp->str),
+                                       14 + strlen(ws_gui_app->last_word));
                }
        }
 
-        while (strstr(str_final->str, "<PATTERN_CLOSED>") != NULL)
-        {
-                tmp = strstr(str_final->str, "<PATTERN_CLOSED>");
-                str_final =  g_string_erase(str_final,
-                                            (long)(tmp - str_final->str),
-                                            16);
-                str_final =  g_string_insert(str_final,
-                                            (long)(tmp - str_final->str),
-                                            "</font></th></tr></table>");
+       while (strstr(str_final->str, "<PATTERN_CLOSED>") != NULL)
+       {
+               tmp = strstr(str_final->str, "<PATTERN_CLOSED>");
+               str_final =  g_string_erase(str_final,
+                                       (long)(tmp - str_final->str),
+                                       16);
+               str_final =  g_string_insert(str_final,
+                                       (long)(tmp - str_final->str),
+                                       "</font></th></tr></table>");
 
                tmp2 = strstr(str_tmp->str, "<PATTERN_CLOSED>");
                str_tmp =  g_string_erase(str_tmp,
-                                          (long)(tmp2 - str_tmp->str),
-                                          16);
-        }
-
-        while (strstr(str_final->str, "<TRANSLATION_OPEN>") != NULL)
-        {
-                tmp = strstr(str_final->str, "<TRANSLATION_OPEN>");
-                str_final =  g_string_erase (str_final,
-                                             (long)(tmp - str_final->str),
-                                             18);
-                str_final =  g_string_insert (str_final,
-                (long)(tmp - str_final->str),
-                "<table border=1 width=100%><tr><td background=\"file:/usr/"
+                                       (long)(tmp2 - str_tmp->str),
+                                       16);
+       }
+
+       while (strstr(str_final->str, "<TRANSLATION_OPEN>") != NULL)
+       {
+               tmp = strstr(str_final->str, "<TRANSLATION_OPEN>");
+               str_final =  g_string_erase (str_final,
+                                       (long)(tmp - str_final->str),
+                                       18);
+               str_final =  g_string_insert (str_final,
+               (long)(tmp - str_final->str),
+               "<table border=1 width=100%><tr><td background=\"file:/usr/"
                "share/pixmaps/ws_tra.png\">");
 
                tmp2 = strstr(str_tmp->str, "<TRANSLATION_OPEN>");
                str_tmp =  g_string_erase(str_tmp,
-                                           (long)(tmp2 - str_tmp->str),
-                                           18);
+                                       (long)(tmp2 - str_tmp->str),
+                                       18);
        }
 
-        while (strstr(str_final->str, "<TRANSLATION_CLOSED>") != NULL)
-        {
-                tmp = strstr(str_final->str, "<TRANSLATION_CLOSED>");
-                str_final =  g_string_erase(str_final,
-                                            (long)(tmp - str_final->str),
-                                            20);
-                str_final =  g_string_insert(str_final,
-                                             (long)(tmp - str_final->str),
-                                             "</td></tr></table></center>");
+       while (strstr(str_final->str, "<TRANSLATION_CLOSED>") != NULL)
+       {
+               tmp = strstr(str_final->str, "<TRANSLATION_CLOSED>");
+               str_final =  g_string_erase(str_final,
+                                       (long)(tmp - str_final->str),
+                                       20);
+               str_final =  g_string_insert(str_final,
+                                       (long)(tmp - str_final->str),
+                                       "</td></tr></table></center>");
 
                tmp2 = strstr(str_tmp->str, "<TRANSLATION_CLOSED>");
                str_tmp =  g_string_erase(str_tmp,
-                                          (long)(tmp2 - str_tmp->str),
-                                         20);
+                                       (long)(tmp2 - str_tmp->str),
+                                       20);
        }
 
-        str_final = g_string_append(str_final,
-                                    "</td></tr></table></body></html>");
+       str_final = g_string_append(str_final,
+                               "</td></tr></table></body></html>");
 
        ws_gui_app->raw_translation = g_string_insert(
                                                ws_gui_app->raw_translation,
-                                               0,
-                                               str_tmp->str);
+                                               0,
+                                               str_tmp->str);
        
        returned_value = g_strdup(str_final->str);
        g_string_free(str_final, TRUE);
@@ -1995,14 +1995,14 @@ gchar * format_html (gchar * received_string, gpointer user_data)
 }
 
 /** open bookmarks database 
- *
- * @param menuitem - object which recived the signal
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+*
+* @param menuitem - object which recived the signal
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_dictionary_open_bookmark(GtkMenuItem *menuitem, gpointer user_data)
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
 
        ws_gui_read_active_dictionaries(ws_gui_app);
        
@@ -2014,9 +2014,9 @@ void ws_gui_dictionary_open_bookmark(GtkMenuItem *menuitem, gpointer user_data)
        ws_gui_app->bookmark_mode = TRUE;
        ws_gui_set_bookmarks_sensitivity(ws_gui_app);
        g_object_set(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
-                                     "prefix",
-                                      "*",
-                                      NULL);
+                               "prefix",
+                               "*",
+                               NULL);
        ws_dbus_notify(ws_gui_app->dbus_data, WS_DBUS_BOOKMARK_MODE_ON);
        
        if(ws_gui_app->ws_gui_history->len >= 0)
@@ -2036,11 +2036,11 @@ void ws_gui_dictionary_open_bookmark(GtkMenuItem *menuitem, gpointer user_data)
 }
 
 /** closes bookmarks database 
- *
- * @param menuitem - object which recived the signal
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+*
+* @param menuitem - object which recived the signal
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_dictionary_close_bookmark(GtkMenuItem *menuitem, gpointer user_data)
 {
        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
@@ -2050,7 +2050,7 @@ void ws_gui_dictionary_close_bookmark(GtkMenuItem *menuitem, gpointer user_data)
        g_free(ws_gui_app->last_word);
        ws_gui_app->last_word = NULL;
 
-        ws_gui_app->bookmark_mode = FALSE;
+       ws_gui_app->bookmark_mode = FALSE;
        ws_gui_set_bookmarks_sensitivity(ws_gui_app);   
        ws_dbus_notify(ws_gui_app->dbus_data, WS_DBUS_BOOKMARK_MODE_OFF);
 
@@ -2069,9 +2069,9 @@ void ws_gui_dictionary_close_bookmark(GtkMenuItem *menuitem, gpointer user_data)
        if (g_strstrip(ws_gui_app->last_searched) != NULL && ws_gui_app->first_run == FALSE) 
        {
        g_object_set(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
-                                     "prefix",
-                                      ws_gui_app->last_searched,
-                                      NULL);
+                               "prefix",
+                               ws_gui_app->last_searched,
+                               NULL);
        //ws_dbus_client_find_word(ws_gui_app->dbus_data, ws_gui_app->last_searched);
        ws_gui_search(NULL, ws_gui_app);
        }
@@ -2082,14 +2082,14 @@ void ws_gui_dictionary_close_bookmark(GtkMenuItem *menuitem, gpointer user_data)
 /*     else if (ws_gui_app->first_run == FALSE) 
        {
                g_object_set(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
-                                    "prefix",
-                                      "\0",
-                                      NULL);
+                               "prefix",
+                               "\0",
+                               NULL);
                GArray *tmp;
-                tmp = g_array_new(TRUE, TRUE, sizeof(gchar*));
-                gtk_list_store_clear(ws_gui_app->ws_gui_w_list->ws_gui_store);
-                ws_gui_app->ws_gui_w_list->ws_gui_model = 
-                                       create_and_fill_model(tmp, ws_gui_app);
+               tmp = g_array_new(TRUE, TRUE, sizeof(gchar*));
+               gtk_list_store_clear(ws_gui_app->ws_gui_w_list->ws_gui_store);
+               ws_gui_app->ws_gui_w_list->ws_gui_model = 
+                                       create_and_fill_model(tmp, ws_gui_app);
                
                ws_dbus_client_find_word(ws_gui_app->dbus_data, ws_gui_app->last_searched);
                gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
@@ -2098,11 +2098,11 @@ void ws_gui_dictionary_close_bookmark(GtkMenuItem *menuitem, gpointer user_data)
 }
 
 /** adds bookmark to bookmarks database 
- *
- * @param menuitem - object which recived the signal
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+*
+* @param menuitem - object which recived the signal
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_dictionary_add_bookmark(GtkMenuItem *menuitem, gpointer user_data)
 {
        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
@@ -2121,27 +2121,27 @@ void ws_gui_dictionary_add_bookmark(GtkMenuItem *menuitem, gpointer user_data)
 }
 
 /** removes bookmark from bookmarks database 
- *
- * @param menuitem - object which recived the signal
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+*
+* @param menuitem - object which recived the signal
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_dictionary_remove_bookmark(GtkMenuItem *menuitem, 
-                                      gpointer user_data)
+                               gpointer user_data)
 {
        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
 
-               if (ws_gui_app->last_word != NULL)
+       if (ws_gui_app->last_word != NULL)
        {
                ws_gui_remove_bookmark_dialog(ws_gui_app);
 
                ws_gui_clear_list(ws_gui_app->ws_gui_w_list->ws_gui_store, ws_gui_app);
                gchar *temp;
                g_object_get(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
-                                      "prefix",
-                                      &temp,
-                                      NULL);
-               ws_dbus_client_find_word (ws_gui_app->dbus_data, temp);
+                               "prefix",
+                               &temp,
+                               NULL);
+               ws_dbus_client_find_word (ws_gui_app->dbus_data, temp);
                //gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
                
        }
@@ -2150,24 +2150,24 @@ void ws_gui_dictionary_remove_bookmark(GtkMenuItem *menuitem,
                hildon_banner_show_information(GTK_WIDGET(
                                ws_gui_app->ws_gui_hildon_window),
                                NULL,
-                              _("ws_ni_select_word_to_remove"));
+                       _("ws_ni_select_word_to_remove"));
        }
        
        
 }
 
 /** checks wheather dictionaries are available or not; according to the result
- * dimmes proper menuitem 
- *
- * @param menuitem - object which recived the signal
- * @param user_data - user data set when the signal handler was connected 
- * @return
- */
+* dimmes proper menuitem 
+*
+* @param menuitem - object which recived the signal
+* @param user_data - user data set when the signal handler was connected 
+* @return
+*/
 void ws_gui_dict_availablity(GtkMenuItem *menuitem, gpointer user_data)
 {
        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
        if (gconf_client_dir_exists(ws_gui_app->client, 
-                                   GCONF_PATH, NULL) == TRUE)
+                               GCONF_PATH, NULL) == TRUE)
        {
                ws_gui_app->directories = gconf_client_all_dirs(
                                                        ws_gui_app->client,
@@ -2193,23 +2193,23 @@ void ws_gui_dict_availablity(GtkMenuItem *menuitem, gpointer user_data)
        else 
        {
        gtk_widget_set_sensitive(GTK_WIDGET
-                             (ws_gui_app->ws_gui_menu->ws_gui_menu_remove_dict),
-                             FALSE);
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_remove_dict),
+                       FALSE);
        gtk_widget_set_sensitive(GTK_WIDGET
-                             (ws_gui_app->ws_gui_menu->ws_gui_menu_select_dict),
-                             FALSE);
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_select_dict),
+                       FALSE);
        gtk_widget_set_sensitive(GTK_WIDGET
-                           (ws_gui_app->ws_gui_menu->ws_gui_menu_optimize_dict),
-                           FALSE);
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_optimize_dict),
+                       FALSE);
        }
 
 }
 
 /** sets sensitivity of menu items due to bookmark's mode
- *
- * @param user_data - user data set when the function was called 
- * @return
- */
+*
+* @param user_data - user data set when the function was called 
+* @return
+*/
 void ws_gui_set_bookmarks_sensitivity(gpointer user_data)
 {
        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
@@ -2230,8 +2230,8 @@ void ws_gui_set_bookmarks_sensitivity(gpointer user_data)
                                                        GCONF_PATH, NULL);
                
        for (i=0; i<g_slist_length(ws_gui_app->directories); i++)
-        {
-               string = (gchar*)g_slist_nth_data(ws_gui_app->directories, i);
+       {
+               string = (gchar*)g_slist_nth_data(ws_gui_app->directories, i);
                name = g_path_get_basename(string);
                string = g_strconcat(string, "/active", NULL);
                
@@ -2239,41 +2239,41 @@ void ws_gui_set_bookmarks_sensitivity(gpointer user_data)
                {
                        ws_gui_app->directories_last = 
                                g_slist_append(ws_gui_app->directories_last, 
-                                              string);
+                                       string);
                }
 
                if (strcmp(name, "bookmarks") == 0)
                {
                        gconf_client_set_bool(ws_gui_app->client, 
-                                             string, 
-                                             TRUE, 
-                                             NULL);
+                                       string, 
+                                       TRUE, 
+                                       NULL);
                }
                else
                {
                        gconf_client_set_bool(ws_gui_app->client, 
-                                             string, 
-                                             FALSE, 
-                                             NULL);
+                                       string, 
+                                       FALSE, 
+                                       NULL);
                }
        }
 
        //setting sensitivity of components
        gtk_widget_set_sensitive(
                GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_open_bookmark),
-                FALSE);
+               FALSE);
        gtk_widget_set_sensitive(
                GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_close_bookmark),
-                TRUE);
+               TRUE);
        gtk_widget_set_sensitive(
-              GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_remove_bookmark),
-               TRUE);
+       GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_remove_bookmark),
+       TRUE);
        gtk_widget_set_sensitive(
                GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_add_bookmark),
-                FALSE);
+               FALSE);
        gtk_widget_set_sensitive(
                GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_dictionaries),
-                FALSE);
+               FALSE);
        }
        else 
        {
@@ -2284,9 +2284,9 @@ void ws_gui_set_bookmarks_sensitivity(gpointer user_data)
        }
        
        for (i=0; i<g_slist_length(ws_gui_app->directories_last); i++)
-        {
-               string = (gchar*)g_slist_nth_data(ws_gui_app->directories_last, 
-                                                 i);
+       {
+               string = (gchar*)g_slist_nth_data(ws_gui_app->directories_last, 
+                                               i);
                
                if (string != NULL)
                {
@@ -2300,19 +2300,19 @@ void ws_gui_set_bookmarks_sensitivity(gpointer user_data)
        //setting sensitivity of components
        gtk_widget_set_sensitive(
                GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_open_bookmark),
-                TRUE);
+               TRUE);
        gtk_widget_set_sensitive(
                GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_close_bookmark),
-                FALSE);
+               FALSE);
        gtk_widget_set_sensitive(
-              GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_remove_bookmark),
-               FALSE);
+       GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_remove_bookmark),
+       FALSE);
        gtk_widget_set_sensitive(
                GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_add_bookmark),
-                TRUE);
+               TRUE);
        gtk_widget_set_sensitive(
                GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_dictionaries),
-                TRUE);
+               TRUE);
 
        g_free(bookmarks_path);
        }
@@ -2320,55 +2320,55 @@ void ws_gui_set_bookmarks_sensitivity(gpointer user_data)
 }
 
 /** sets sensitivity of menu items due to user selection made
- *
- * @param user_data - user data set when the function was called 
- * @return
- */
+*
+* @param user_data - user data set when the function was called 
+* @return
+*/
 void ws_gui_set_bookmark_menu_items(GtkMenuItem *menuitem, gpointer user_data)
 {
        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
        if (ws_gui_app->bookmark_mode == TRUE && ws_gui_app->last_word != NULL)
        {
-              gtk_widget_set_sensitive(
-              GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_remove_bookmark),
-               TRUE);
+       gtk_widget_set_sensitive(
+       GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_remove_bookmark),
+       TRUE);
        }
        else
        {
-              gtk_widget_set_sensitive(
-              GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_remove_bookmark),
-               FALSE);
+       gtk_widget_set_sensitive(
+       GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_remove_bookmark),
+       FALSE);
        }
 
        if (ws_gui_app->last_word == NULL || 
-           (ws_gui_app->last_word[0] == '\0') ||
-           ws_gui_app->bookmark_mode == TRUE)
+       (ws_gui_app->last_word[0] == '\0') ||
+       ws_gui_app->bookmark_mode == TRUE)
        {
-              gtk_widget_set_sensitive(
-              GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_add_bookmark),
-               FALSE);
+       gtk_widget_set_sensitive(
+       GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_add_bookmark),
+       FALSE);
        }
        else
        {
-              gtk_widget_set_sensitive(
-              GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_add_bookmark),
-               TRUE);
+       gtk_widget_set_sensitive(
+       GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_add_bookmark),
+       TRUE);
        }
 }
 /** reads gconf entries and sets variables with a proper data; it is necessary
- * for changing the bookmarks mode
- *
- * @param user_data - user data set when the function was called
- * @return
- */
+* for changing the bookmarks mode
+*
+* @param user_data - user data set when the function was called
+* @return
+*/
 void ws_gui_read_active_dictionaries(gpointer user_data)
 {
        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
 
        
        ws_gui_app->directories = gconf_client_all_dirs(ws_gui_app->client,
-                                             GCONF_PATH,
-                                             NULL);
+                                       GCONF_PATH,
+                                       NULL);
 }
 
 void ws_gui_clear_array(GArray *history)
@@ -2384,15 +2384,15 @@ void ws_gui_view_cursor_changed(GtkTreeView *treeview, gpointer user_data)
        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
        gchar *string;
        if (gtk_tree_selection_get_selected(ws_gui_app->ws_gui_w_list->ws_gui_selection,
-                                       &ws_gui_app->ws_gui_w_list->ws_gui_model,
-                                       &ws_gui_app->ws_gui_w_list->ws_gui_iter))
+                               &ws_gui_app->ws_gui_w_list->ws_gui_model,
+                               &ws_gui_app->ws_gui_w_list->ws_gui_iter))
        {
        gtk_tree_model_get(ws_gui_app->ws_gui_w_list->ws_gui_model,
-                                   &ws_gui_app->ws_gui_w_list->ws_gui_iter,
-                                   COL_WORD,
-                                   &string,
-                                  -1);
-       if (string != NULL)
+                               &ws_gui_app->ws_gui_w_list->ws_gui_iter,
+                               COL_WORD,
+                               &string,
+                               -1);
+       if (string != NULL)
                {
                //gtk_widget_show(ws_gui_app->ws_gui_banner_translation_loading);
                ws_gui_app->loading = TRUE;
@@ -2407,10 +2407,10 @@ void ws_gui_view_cursor_changed(GtkTreeView *treeview, gpointer user_data)
 
                if (ws_gui_app->history_flag == FALSE)
                {
-                      ws_gui_history_add(string, ws_gui_app);
+               ws_gui_history_add(string, ws_gui_app);
                
                }
-                g_free (string);
+               g_free (string);
                }
                
        }
@@ -2440,8 +2440,8 @@ void ws_gui_set_toolbar_avail(gpointer user_data) {
                        FALSE);
        
                gtk_widget_set_sensitive(
-                       GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
-                       TRUE);
+                       GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
+                       TRUE);
        }
 }
 
index 2a6d3c9..3d11a81 100644 (file)
@@ -40,17 +40,17 @@ void ws_gui_create_window(gpointer user_data)
 //     ws_gui_app->ws_gui_w_list->ws_gui_list_item_data_string = 
 //                                                  (ws_gui_app->welcome_note);
 
-        GArray *array_tmp = g_array_new (TRUE, TRUE, sizeof(gchar*));
+       GArray *array_tmp = g_array_new (TRUE, TRUE, sizeof(gchar*));
        ws_gui_app->raw_translation = g_string_new(" ");
        ws_gui_app->last_searched = NULL;
        ws_gui_app->last_searched_in_book = NULL;
        ws_gui_app->last_word = NULL;
 
-        ws_gui_app->ws_gui_banner_flag = FALSE;
-        ws_gui_app->ws_gui_full_screen_flag = FALSE;
-        ws_gui_app->caching_flag = FALSE;
-        ws_gui_app->ws_gui_double_click = FALSE;
-        ws_gui_app->ws_gui_sel_flag = FALSE;
+       ws_gui_app->ws_gui_banner_flag = FALSE;
+       ws_gui_app->ws_gui_full_screen_flag = FALSE;
+       ws_gui_app->caching_flag = FALSE;
+       ws_gui_app->ws_gui_double_click = FALSE;
+       ws_gui_app->ws_gui_sel_flag = FALSE;
        ws_gui_app->bookmark_mode = FALSE;
        ws_gui_app->bookmark_avail = TRUE;
        ws_gui_app->html_flag = TRUE;
@@ -61,90 +61,90 @@ void ws_gui_create_window(gpointer user_data)
 
        ws_gui_app->zoom = ZOOM_DEFAULT;
 
-        ws_gui_app->timer = g_timer_new();
-        g_timer_stop(ws_gui_app->timer);
+       ws_gui_app->timer = g_timer_new();
+       g_timer_stop(ws_gui_app->timer);
 
-        ws_gui_app->ws_gui_history = g_array_new(TRUE, TRUE, sizeof(gchar*));
+       ws_gui_app->ws_gui_history = g_array_new(TRUE, TRUE, sizeof(gchar*));
        ws_gui_app->ws_gui_history_list = g_array_new(TRUE, TRUE, sizeof(gchar*));
        ws_gui_app->ws_gui_history_iter = g_array_new(TRUE, TRUE, sizeof(gchar*));
        ws_gui_app->history_flag = FALSE;
-        ws_gui_app->ws_gui_history_cur_pos = -1;
+       ws_gui_app->ws_gui_history_cur_pos = -1;
        
-        ws_gui_app->ws_gui_hildon_program = 
-        HILDON_PROGRAM(hildon_program_get_instance());
+       ws_gui_app->ws_gui_hildon_program = 
+       HILDON_PROGRAM(hildon_program_get_instance());
 
-        g_set_application_name(PACKAGE);
+       g_set_application_name(PACKAGE);
 
-        ws_gui_app->ws_gui_hildon_window = HILDON_WINDOW(hildon_window_new());
+       ws_gui_app->ws_gui_hildon_window = HILDON_WINDOW(hildon_window_new());
 
-        hildon_program_add_window(ws_gui_app->ws_gui_hildon_program,
-                                  ws_gui_app->ws_gui_hildon_window);
+       hildon_program_add_window(ws_gui_app->ws_gui_hildon_program,
+                               ws_gui_app->ws_gui_hildon_window);
 
        ws_gui_create_main_menu(ws_gui_app);
-        ws_gui_create_find_toolbar(ws_gui_app);
+       ws_gui_create_find_toolbar(ws_gui_app);
 
-        ws_gui_app->ws_gui_hpane = gtk_hpaned_new();
+       ws_gui_app->ws_gui_hpane = gtk_hpaned_new();
 
-        ws_gui_app->ws_gui_scrolledwindow_left = 
-                gtk_scrolled_window_new (NULL, NULL);
+       ws_gui_app->ws_gui_scrolledwindow_left = 
+               gtk_scrolled_window_new (NULL, NULL);
 
-        gtk_scrolled_window_set_policy(
-                GTK_SCROLLED_WINDOW (ws_gui_app->ws_gui_scrolledwindow_left), 
-                GTK_POLICY_AUTOMATIC,
-                GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_policy(
+               GTK_SCROLLED_WINDOW (ws_gui_app->ws_gui_scrolledwindow_left), 
+               GTK_POLICY_AUTOMATIC,
+               GTK_POLICY_AUTOMATIC);
 
-        gtk_paned_set_position(GTK_PANED(ws_gui_app->ws_gui_hpane), 100);
+       gtk_paned_set_position(GTK_PANED(ws_gui_app->ws_gui_hpane), 100);
 
-        gtk_scrolled_window_set_placement(GTK_SCROLLED_WINDOW
-                                       (ws_gui_app->ws_gui_scrolledwindow_left),
-                                       GTK_CORNER_TOP_LEFT);
+       gtk_scrolled_window_set_placement(GTK_SCROLLED_WINDOW
+                               (ws_gui_app->ws_gui_scrolledwindow_left),
+                               GTK_CORNER_TOP_LEFT);
 
-        ws_gui_app->ws_gui_scrolledwindow_right = 
-                gtk_scrolled_window_new (NULL, NULL);
+       ws_gui_app->ws_gui_scrolledwindow_right = 
+               gtk_scrolled_window_new (NULL, NULL);
 
-        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW
-                                     (ws_gui_app->ws_gui_scrolledwindow_right), 
-                                     GTK_POLICY_NEVER,
-                                     GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW
+                               (ws_gui_app->ws_gui_scrolledwindow_right), 
+                               GTK_POLICY_NEVER,
+                               GTK_POLICY_AUTOMATIC);
 
-        ws_gui_app->ws_gui_w_list->ws_gui_store = 
-                gtk_list_store_new (NUM_COLS, G_TYPE_STRING, G_TYPE_UINT);
+       ws_gui_app->ws_gui_w_list->ws_gui_store = 
+               gtk_list_store_new (NUM_COLS, G_TYPE_STRING, G_TYPE_UINT);
 
-        ws_gui_app->ws_gui_w_list->ws_gui_view = 
-                create_view_and_model(array_tmp, ws_gui_app);
+       ws_gui_app->ws_gui_w_list->ws_gui_view = 
+               create_view_and_model(array_tmp, ws_gui_app);
 
        g_array_free(array_tmp, TRUE);
 
-        gtk_widget_show_all(GTK_WIDGET(ws_gui_app->ws_gui_w_list->ws_gui_view));
+       gtk_widget_show_all(GTK_WIDGET(ws_gui_app->ws_gui_w_list->ws_gui_view));
 
-        gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW
-                                       (ws_gui_app->ws_gui_scrolledwindow_left), 
-                                        ws_gui_app->ws_gui_w_list->ws_gui_view);
+       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW
+                               (ws_gui_app->ws_gui_scrolledwindow_left), 
+                                       ws_gui_app->ws_gui_w_list->ws_gui_view);
 
-        ws_gui_app->ws_gui_html = gtk_html_new();
+       ws_gui_app->ws_gui_html = gtk_html_new();
 
-        ws_gui_app->p = pango_font_description_from_string("Tahoma 12");
-        gtk_widget_modify_font(GTK_WIDGET(
-                                       ws_gui_app->ws_gui_html),ws_gui_app->p);
+       ws_gui_app->p = pango_font_description_from_string("Tahoma 12");
+       gtk_widget_modify_font(GTK_WIDGET(
+                                       ws_gui_app->ws_gui_html),ws_gui_app->p);
 
-        g_signal_connect(GTK_OBJECT (ws_gui_app->ws_gui_html),
-                                 "url_requested",
-                                 G_CALLBACK(ws_gui_url_requested),
-                                 ws_gui_app);
+       g_signal_connect(GTK_OBJECT (ws_gui_app->ws_gui_html),
+                               "url_requested",
+                               G_CALLBACK(ws_gui_url_requested),
+                               ws_gui_app);
 
-        gtk_html_load_from_string(GTK_HTML(ws_gui_app->ws_gui_html),
-                        ws_gui_app->welcome_note,
-                        -1);
+       gtk_html_load_from_string(GTK_HTML(ws_gui_app->ws_gui_html),
+                       ws_gui_app->welcome_note,
+                       -1);
        
        gtk_html_set_magnification(GTK_HTML(ws_gui_app->ws_gui_html), 
-                                  ws_gui_app->zoom);
+                               ws_gui_app->zoom);
 
-        gtk_html_set_editable(GTK_HTML(ws_gui_app->ws_gui_html), FALSE); 
-        gtk_html_allow_selection(GTK_HTML(ws_gui_app->ws_gui_html), TRUE);
+       gtk_html_set_editable(GTK_HTML(ws_gui_app->ws_gui_html), FALSE); 
+       gtk_html_allow_selection(GTK_HTML(ws_gui_app->ws_gui_html), TRUE);
 
-        gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW
-                                      (ws_gui_app->ws_gui_scrolledwindow_right),
-                                       ws_gui_app->ws_gui_html);
+       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW
+                               (ws_gui_app->ws_gui_scrolledwindow_right),
+                               ws_gui_app->ws_gui_html);
 
        /*adding vbox & label - used for notifications */
 
@@ -155,78 +155,78 @@ void ws_gui_create_window(gpointer user_data)
        ws_gui_app->ws_gui_list_label = gtk_label_new(_("ws_ti_list_full"));
 
        ws_gui_app->p = pango_font_description_from_string("Tahoma 10");
-        gtk_widget_modify_font(GTK_WIDGET(ws_gui_app->ws_gui_list_label), ws_gui_app->p);
+       gtk_widget_modify_font(GTK_WIDGET(ws_gui_app->ws_gui_list_label), ws_gui_app->p);
 
        /*HBox packing ....*/
        gtk_box_pack_start(GTK_BOX(ws_gui_app->ws_gui_list_hbox),
-                          ws_gui_app->ws_gui_list_image,
-                          FALSE,
-                          FALSE,
-                          0);
+                       ws_gui_app->ws_gui_list_image,
+                       FALSE,
+                       FALSE,
+                       0);
        
        gtk_box_pack_start(GTK_BOX(ws_gui_app->ws_gui_list_hbox),
-                          ws_gui_app->ws_gui_list_label,
-                          FALSE,
-                          FALSE,
-                          0);
+                       ws_gui_app->ws_gui_list_label,
+                       FALSE,
+                       FALSE,
+                       0);
        
        // gtk_widget_set_size_request (ws_gui_app->ws_gui_list_label, 150, -1);
 
        /*VBox packing ....*/
        gtk_box_pack_start(GTK_BOX(ws_gui_app->ws_gui_list_vbox),
-                          ws_gui_app->ws_gui_scrolledwindow_left,
-                          TRUE,
-                          TRUE,
-                          0);
+                       ws_gui_app->ws_gui_scrolledwindow_left,
+                       TRUE,
+                       TRUE,
+                       0);
 
        gtk_box_pack_end(GTK_BOX(ws_gui_app->ws_gui_list_vbox),
-                          ws_gui_app->ws_gui_list_eventbox,
-                          FALSE,
-                          FALSE,
-                          0);
+                       ws_gui_app->ws_gui_list_eventbox,
+                       FALSE,
+                       FALSE,
+                       0);
        
        gtk_container_add (GTK_CONTAINER (ws_gui_app->ws_gui_list_eventbox), 
-                          ws_gui_app->ws_gui_list_hbox);
+                       ws_gui_app->ws_gui_list_hbox);
        /************************************************/
 
 
        gtk_paned_pack1(GTK_PANED(ws_gui_app->ws_gui_hpane),
-                       ws_gui_app->ws_gui_list_vbox,
-                       TRUE,
-                       TRUE);
-        gtk_paned_pack2(GTK_PANED(ws_gui_app->ws_gui_hpane),
-                       ws_gui_app->ws_gui_scrolledwindow_right,
-                       TRUE,
-                       TRUE);
+               ws_gui_app->ws_gui_list_vbox,
+               TRUE,
+               TRUE);
+       gtk_paned_pack2(GTK_PANED(ws_gui_app->ws_gui_hpane),
+               ws_gui_app->ws_gui_scrolledwindow_right,
+               TRUE,
+               TRUE);
 
-        gtk_container_add(GTK_CONTAINER(ws_gui_app->ws_gui_hildon_window), 
-                        ws_gui_app->ws_gui_hpane);
+       gtk_container_add(GTK_CONTAINER(ws_gui_app->ws_gui_hildon_window), 
+                       ws_gui_app->ws_gui_hpane);
 
-        gtk_widget_show_all(GTK_WIDGET(ws_gui_app->ws_gui_hildon_window));
+       gtk_widget_show_all(GTK_WIDGET(ws_gui_app->ws_gui_hildon_window));
 
        gtk_widget_hide_all(GTK_WIDGET(ws_gui_app->ws_gui_list_eventbox));
        /*gtk_widget_hide_all(GTK_WIDGET(ws_gui_app->ws_gui_list_hbox));*/
 
-        ws_gui_app->ws_gui_w_list->ws_gui_selection = 
-                gtk_tree_view_get_selection (GTK_TREE_VIEW
-                (ws_gui_app->ws_gui_w_list->ws_gui_view));
+       ws_gui_app->ws_gui_w_list->ws_gui_selection = 
+               gtk_tree_view_get_selection (GTK_TREE_VIEW
+               (ws_gui_app->ws_gui_w_list->ws_gui_view));
 
        gtk_tree_selection_set_mode(
-                                   ws_gui_app->ws_gui_w_list->ws_gui_selection,
-                                     GTK_SELECTION_BROWSE);
+                               ws_gui_app->ws_gui_w_list->ws_gui_selection,
+                               GTK_SELECTION_BROWSE);
        
        ws_gui_app->directories = g_slist_alloc();
        ws_gui_set_bookmarks_sensitivity(ws_gui_app);
 
        ws_gui_app->ws_gui_banner_list_searching = hildon_banner_show_animation(
-                                   GTK_WIDGET(ws_gui_app->ws_gui_hildon_window),
-                                   NULL,
-                                   _("ws_ab_searching"));
+                               GTK_WIDGET(ws_gui_app->ws_gui_hildon_window),
+                               NULL,
+                               _("ws_ab_searching"));
 
        ws_gui_app->ws_gui_banner_translation_loading = hildon_banner_show_animation(
-                                   GTK_WIDGET(ws_gui_app->ws_gui_hildon_window),
-                                   NULL,
-                                   _("ws_ab_loading"));
+                               GTK_WIDGET(ws_gui_app->ws_gui_hildon_window),
+                               NULL,
+                               _("ws_ab_loading"));
        
 //     gtk_widget_set_sensitive(GTK_WIDGET
 //                     (ws_gui_app->ws_gui_menu->ws_gui_popup_bookmark),
@@ -339,67 +339,67 @@ void ws_gui_create_main_menu (gpointer user_data)
 {
        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
 
-        ws_gui_app->ws_gui_menu->ws_gui_submenu_0 = gtk_menu_new();
-        ws_gui_app->ws_gui_menu->ws_gui_submenu_1 = gtk_menu_new();
-        ws_gui_app->ws_gui_menu->ws_gui_submenu_2 = gtk_menu_new();
-        ws_gui_app->ws_gui_menu->ws_gui_submenu_3 = gtk_menu_new();
+       ws_gui_app->ws_gui_menu->ws_gui_submenu_0 = gtk_menu_new();
+       ws_gui_app->ws_gui_menu->ws_gui_submenu_1 = gtk_menu_new();
+       ws_gui_app->ws_gui_menu->ws_gui_submenu_2 = gtk_menu_new();
+       ws_gui_app->ws_gui_menu->ws_gui_submenu_3 = gtk_menu_new();
        ws_gui_app->ws_gui_menu->ws_gui_submenu_4 = gtk_menu_new();
-        ws_gui_app->ws_gui_menu->ws_gui_main_menu = gtk_menu_new();
+       ws_gui_app->ws_gui_menu->ws_gui_main_menu = gtk_menu_new();
 
-        ws_gui_app->ws_gui_menu->ws_gui_menu_dictionaries =
-                gtk_menu_item_new_with_label(_("ws_me_dictionaries"));
-        ws_gui_app->ws_gui_menu->ws_gui_menu_bookmarks =
-                gtk_menu_item_new_with_label(_("ws_me_bookmarks"));
+       ws_gui_app->ws_gui_menu->ws_gui_menu_dictionaries =
+               gtk_menu_item_new_with_label(_("ws_me_dictionaries"));
+       ws_gui_app->ws_gui_menu->ws_gui_menu_bookmarks =
+               gtk_menu_item_new_with_label(_("ws_me_bookmarks"));
        ws_gui_app->ws_gui_menu->ws_gui_menu_edit = 
-                gtk_menu_item_new_with_label(_("ws_me_edit"));
-        ws_gui_app->ws_gui_menu->ws_gui_menu_view = 
-                gtk_menu_item_new_with_label(_("ws_me_view"));
-        ws_gui_app->ws_gui_menu->ws_gui_menu_search = 
-                gtk_menu_item_new_with_label(_("ws_me_search"));
-        ws_gui_app->ws_gui_menu->ws_gui_menu_about = 
-                gtk_menu_item_new_with_label(_("ws_me_about"));
-        ws_gui_app->ws_gui_menu->ws_gui_menu_close = 
-                gtk_menu_item_new_with_label(_("ws_me_close"));
-        ws_gui_app->ws_gui_menu->ws_gui_separator = 
-                gtk_separator_menu_item_new();
-        ws_gui_app->ws_gui_menu->ws_gui_separator1 = 
-                gtk_separator_menu_item_new();
-
-        ws_gui_app->ws_gui_menu->ws_gui_menu_load_dict = 
-                gtk_menu_item_new_with_label(_("ws_me_dictionaries_load"));
-        ws_gui_app->ws_gui_menu->ws_gui_menu_select_dict = 
-                gtk_menu_item_new_with_label(_("ws_me_dictionaries_select"));
-        ws_gui_app->ws_gui_menu->ws_gui_menu_remove_dict = 
-                gtk_menu_item_new_with_label(_("ws_me_dictionaries_remove"));
-        ws_gui_app->ws_gui_menu->ws_gui_menu_optimize_dict = 
-                gtk_menu_item_new_with_label(_("ws_me_dictionaries_optimize"));
-
-        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_0,
-                        ws_gui_app->ws_gui_menu->ws_gui_menu_load_dict);
-        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_0,
-                        ws_gui_app->ws_gui_menu->ws_gui_menu_select_dict);
-        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_0,
-                        ws_gui_app->ws_gui_menu->ws_gui_menu_remove_dict);
-        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_0,
-                        ws_gui_app->ws_gui_menu->ws_gui_menu_optimize_dict);
+               gtk_menu_item_new_with_label(_("ws_me_edit"));
+       ws_gui_app->ws_gui_menu->ws_gui_menu_view = 
+               gtk_menu_item_new_with_label(_("ws_me_view"));
+       ws_gui_app->ws_gui_menu->ws_gui_menu_search = 
+               gtk_menu_item_new_with_label(_("ws_me_search"));
+       ws_gui_app->ws_gui_menu->ws_gui_menu_about = 
+               gtk_menu_item_new_with_label(_("ws_me_about"));
+       ws_gui_app->ws_gui_menu->ws_gui_menu_close = 
+               gtk_menu_item_new_with_label(_("ws_me_close"));
+       ws_gui_app->ws_gui_menu->ws_gui_separator = 
+               gtk_separator_menu_item_new();
+       ws_gui_app->ws_gui_menu->ws_gui_separator1 = 
+               gtk_separator_menu_item_new();
+
+       ws_gui_app->ws_gui_menu->ws_gui_menu_load_dict = 
+               gtk_menu_item_new_with_label(_("ws_me_dictionaries_load"));
+       ws_gui_app->ws_gui_menu->ws_gui_menu_select_dict = 
+               gtk_menu_item_new_with_label(_("ws_me_dictionaries_select"));
+       ws_gui_app->ws_gui_menu->ws_gui_menu_remove_dict = 
+               gtk_menu_item_new_with_label(_("ws_me_dictionaries_remove"));
+       ws_gui_app->ws_gui_menu->ws_gui_menu_optimize_dict = 
+               gtk_menu_item_new_with_label(_("ws_me_dictionaries_optimize"));
+
+       gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_0,
+                       ws_gui_app->ws_gui_menu->ws_gui_menu_load_dict);
+       gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_0,
+                       ws_gui_app->ws_gui_menu->ws_gui_menu_select_dict);
+       gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_0,
+                       ws_gui_app->ws_gui_menu->ws_gui_menu_remove_dict);
+       gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_0,
+                       ws_gui_app->ws_gui_menu->ws_gui_menu_optimize_dict);
 
        ws_gui_app->ws_gui_menu->ws_gui_menu_open_bookmark = 
-                gtk_menu_item_new_with_label(_("ws_me_bookmarks_open"));
-        ws_gui_app->ws_gui_menu->ws_gui_menu_close_bookmark = 
-                gtk_menu_item_new_with_label(_("ws_me_bookmarks_close"));
+               gtk_menu_item_new_with_label(_("ws_me_bookmarks_open"));
+       ws_gui_app->ws_gui_menu->ws_gui_menu_close_bookmark = 
+               gtk_menu_item_new_with_label(_("ws_me_bookmarks_close"));
        ws_gui_app->ws_gui_menu->ws_gui_menu_add_bookmark = 
-                gtk_menu_item_new_with_label(_("ws_me_bookmarks_add"));
+               gtk_menu_item_new_with_label(_("ws_me_bookmarks_add"));
        ws_gui_app->ws_gui_menu->ws_gui_menu_remove_bookmark = 
-                gtk_menu_item_new_with_label(_("ws_me_bookmarks_remove"));
+               gtk_menu_item_new_with_label(_("ws_me_bookmarks_remove"));
 
        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_4,
-                        ws_gui_app->ws_gui_menu->ws_gui_menu_open_bookmark);
+                       ws_gui_app->ws_gui_menu->ws_gui_menu_open_bookmark);
        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_4,
-                        ws_gui_app->ws_gui_menu->ws_gui_menu_close_bookmark);
+                       ws_gui_app->ws_gui_menu->ws_gui_menu_close_bookmark);
        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_4,
-                        ws_gui_app->ws_gui_menu->ws_gui_menu_add_bookmark);
+                       ws_gui_app->ws_gui_menu->ws_gui_menu_add_bookmark);
        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_4,
-                        ws_gui_app->ws_gui_menu->ws_gui_menu_remove_bookmark);
+                       ws_gui_app->ws_gui_menu->ws_gui_menu_remove_bookmark);
 
        ws_gui_app->ws_gui_menu->ws_gui_menu_copy = 
                gtk_menu_item_new_with_label(_("ws_me_edit_copy"));
@@ -415,7 +415,7 @@ void ws_gui_create_main_menu (gpointer user_data)
                        ws_gui_app->ws_gui_menu->ws_gui_menu_select_all);
        
        ws_gui_app->ws_gui_menu->ws_gui_menu_hide_list = 
-           gtk_check_menu_item_new_with_label(_("ws_me_view_hide_words_list"));
+       gtk_check_menu_item_new_with_label(_("ws_me_view_hide_words_list"));
        ws_gui_app->ws_gui_menu->ws_gui_menu_zoom_in = 
                gtk_menu_item_new_with_label(_("ws_me_view_zoom_in"));
        ws_gui_app->ws_gui_menu->ws_gui_menu_zoom_out = 
@@ -435,200 +435,200 @@ void ws_gui_create_main_menu (gpointer user_data)
                gtk_menu_item_new_with_label(_("ws_me_search_find"));
        ws_gui_app->ws_gui_menu->ws_gui_menu_find_next = 
                gtk_menu_item_new_with_label(_("ws_me_search_find_next"));
-        ws_gui_app->ws_gui_menu->ws_gui_menu_find_prev = 
-               gtk_menu_item_new_with_label(_("ws_me_search_find_prev"));
-        ws_gui_app->ws_gui_menu->ws_gui_menu_stop = 
-               gtk_menu_item_new_with_label(_("ws_me_search_stop"));
-        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_3,
-                       ws_gui_app->ws_gui_menu->ws_gui_menu_find_word);
-        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_3,
-                       ws_gui_app->ws_gui_menu->ws_gui_menu_find_next);
-        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_3,
-                       ws_gui_app->ws_gui_menu->ws_gui_menu_find_prev);
-        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_3,
-                       ws_gui_app->ws_gui_menu->ws_gui_menu_stop);
+       ws_gui_app->ws_gui_menu->ws_gui_menu_find_prev = 
+       gtk_menu_item_new_with_label(_("ws_me_search_find_prev"));
+       ws_gui_app->ws_gui_menu->ws_gui_menu_stop = 
+       gtk_menu_item_new_with_label(_("ws_me_search_stop"));
+       gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_3,
+               ws_gui_app->ws_gui_menu->ws_gui_menu_find_word);
+       gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_3,
+               ws_gui_app->ws_gui_menu->ws_gui_menu_find_next);
+       gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_3,
+               ws_gui_app->ws_gui_menu->ws_gui_menu_find_prev);
+       gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_submenu_3,
+               ws_gui_app->ws_gui_menu->ws_gui_menu_stop);
+
 
+       gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_main_menu,
+               ws_gui_app->ws_gui_menu->ws_gui_menu_dictionaries);
+       gtk_menu_item_set_submenu(GTK_MENU_ITEM
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_dictionaries),
+                       ws_gui_app->ws_gui_menu->ws_gui_submenu_0);
 
        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_main_menu,
-                       ws_gui_app->ws_gui_menu->ws_gui_menu_dictionaries);
-        gtk_menu_item_set_submenu(GTK_MENU_ITEM
-                            (ws_gui_app->ws_gui_menu->ws_gui_menu_dictionaries),
-                             ws_gui_app->ws_gui_menu->ws_gui_submenu_0);
+               ws_gui_app->ws_gui_menu->ws_gui_menu_bookmarks);
+       gtk_menu_item_set_submenu(GTK_MENU_ITEM
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_bookmarks),
+                       ws_gui_app->ws_gui_menu->ws_gui_submenu_4);
+
+       gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_main_menu,
+               ws_gui_app->ws_gui_menu->ws_gui_separator1);
+
+       gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_main_menu,
+               ws_gui_app->ws_gui_menu->ws_gui_menu_edit);
+       gtk_menu_item_set_submenu(GTK_MENU_ITEM
+                               (ws_gui_app->ws_gui_menu->ws_gui_menu_edit), 
+                               ws_gui_app->ws_gui_menu->ws_gui_submenu_1);
+
+       gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_main_menu,
+                       ws_gui_app->ws_gui_menu->ws_gui_menu_view);
+       gtk_menu_item_set_submenu(GTK_MENU_ITEM
+                               (ws_gui_app->ws_gui_menu->ws_gui_menu_view), 
+                               ws_gui_app->ws_gui_menu->ws_gui_submenu_2);
 
-        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_main_menu,
-                       ws_gui_app->ws_gui_menu->ws_gui_menu_bookmarks);
-        gtk_menu_item_set_submenu(GTK_MENU_ITEM
-                            (ws_gui_app->ws_gui_menu->ws_gui_menu_bookmarks),
-                             ws_gui_app->ws_gui_menu->ws_gui_submenu_4);
+       gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_main_menu,
+                       ws_gui_app->ws_gui_menu->ws_gui_menu_search);
+       gtk_menu_item_set_submenu(GTK_MENU_ITEM
+                               (ws_gui_app->ws_gui_menu->ws_gui_menu_search), 
+                               ws_gui_app->ws_gui_menu->ws_gui_submenu_3);
 
        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_main_menu,
-                       ws_gui_app->ws_gui_menu->ws_gui_separator1);
-
-        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_main_menu,
-                       ws_gui_app->ws_gui_menu->ws_gui_menu_edit);
-        gtk_menu_item_set_submenu(GTK_MENU_ITEM
-                                 (ws_gui_app->ws_gui_menu->ws_gui_menu_edit), 
-                                 ws_gui_app->ws_gui_menu->ws_gui_submenu_1);
-
-        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_main_menu,
-                        ws_gui_app->ws_gui_menu->ws_gui_menu_view);
-        gtk_menu_item_set_submenu(GTK_MENU_ITEM
-                                  (ws_gui_app->ws_gui_menu->ws_gui_menu_view), 
-                                  ws_gui_app->ws_gui_menu->ws_gui_submenu_2);
-
-        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_main_menu,
-                        ws_gui_app->ws_gui_menu->ws_gui_menu_search);
-        gtk_menu_item_set_submenu(GTK_MENU_ITEM
-                                  (ws_gui_app->ws_gui_menu->ws_gui_menu_search), 
-                                  ws_gui_app->ws_gui_menu->ws_gui_submenu_3);
-
-        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_main_menu,
-                        ws_gui_app->ws_gui_menu->ws_gui_separator);
-        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_main_menu,
-                        ws_gui_app->ws_gui_menu->ws_gui_menu_about);
-        gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_main_menu,
-                        ws_gui_app->ws_gui_menu->ws_gui_menu_close);
-
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_load_dict),
-                         "activate",
-                         G_CALLBACK(ws_gui_dictionary_loader),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT(
-                         ws_gui_app->ws_gui_menu->ws_gui_menu_select_dict),
-                         "activate",
-                         G_CALLBACK(ws_gui_dictionary_chooser),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_remove_dict),
-                         "activate",
-                         G_CALLBACK(ws_gui_dictionary_remover),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_optimize_dict),
-                         "activate",
-                         G_CALLBACK(ws_gui_dictionary_optimizer), ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_open_bookmark),
-                         "activate",
-                         G_CALLBACK(ws_gui_dictionary_open_bookmark), 
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_close_bookmark),
-                         "activate",
-                         G_CALLBACK(ws_gui_dictionary_close_bookmark), 
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_add_bookmark),
-                         "activate",
-                         G_CALLBACK(ws_gui_dictionary_add_bookmark), 
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_remove_bookmark),
-                         "activate",
-                         G_CALLBACK(ws_gui_dictionary_remove_bookmark), 
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_copy),
-                         "activate", 
-                         GTK_SIGNAL_FUNC(ws_gui_html_copy),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_paste),
-                         "activate",
-                         GTK_SIGNAL_FUNC(ws_gui_html_paste),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_select_all),
-                         "activate",
-                         GTK_SIGNAL_FUNC(ws_gui_html_select_all),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                        (ws_gui_app->ws_gui_menu->ws_gui_menu_hide_list),
-                         "activate",
-                         GTK_SIGNAL_FUNC(ws_gui_words_list_hide_from_menu),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_zoom_in),
-                         "activate",
-                         G_CALLBACK(ws_gui_html_zoom_in),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_zoom_out),
-                         "activate",
-                         G_CALLBACK(ws_gui_html_zoom_out),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_full_screen),
-                         "activate",
-                         GTK_SIGNAL_FUNC(ws_gui_full_screen),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_find_word),
-                         "activate",
-                         GTK_SIGNAL_FUNC(ws_gui_search),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_find_next),
-                         "activate",
-                         GTK_SIGNAL_FUNC(ws_gui_history_next),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_find_prev),
-                         "activate",
-                         GTK_SIGNAL_FUNC(ws_gui_history_back),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_stop),
-                         "activate",
-                         GTK_SIGNAL_FUNC(ws_gui_search_stop),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_about), 
-                         "activate",
-                         G_CALLBACK(ws_gui_about_application),
-                         ws_gui_app);
-        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_close),
-                         "activate", 
-                         G_CALLBACK(ws_gui_menu_quit),
-                         ws_gui_app);
+                       ws_gui_app->ws_gui_menu->ws_gui_separator);
+       gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_main_menu,
+                       ws_gui_app->ws_gui_menu->ws_gui_menu_about);
+       gtk_menu_append(ws_gui_app->ws_gui_menu->ws_gui_main_menu,
+                       ws_gui_app->ws_gui_menu->ws_gui_menu_close);
 
        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_edit),
-                         "activate",
-                         GTK_SIGNAL_FUNC(ws_gui_check_clipboard),
-                         ws_gui_app);
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_load_dict),
+                       "activate",
+                       G_CALLBACK(ws_gui_dictionary_loader),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT(
+                       ws_gui_app->ws_gui_menu->ws_gui_menu_select_dict),
+                       "activate",
+                       G_CALLBACK(ws_gui_dictionary_chooser),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_remove_dict),
+                       "activate",
+                       G_CALLBACK(ws_gui_dictionary_remover),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_optimize_dict),
+                       "activate",
+                       G_CALLBACK(ws_gui_dictionary_optimizer), ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_open_bookmark),
+                       "activate",
+                       G_CALLBACK(ws_gui_dictionary_open_bookmark), 
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_close_bookmark),
+                       "activate",
+                       G_CALLBACK(ws_gui_dictionary_close_bookmark), 
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_add_bookmark),
+                       "activate",
+                       G_CALLBACK(ws_gui_dictionary_add_bookmark), 
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_remove_bookmark),
+                       "activate",
+                       G_CALLBACK(ws_gui_dictionary_remove_bookmark), 
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_copy),
+                       "activate", 
+                       GTK_SIGNAL_FUNC(ws_gui_html_copy),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_paste),
+                       "activate",
+                       GTK_SIGNAL_FUNC(ws_gui_html_paste),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_select_all),
+                       "activate",
+                       GTK_SIGNAL_FUNC(ws_gui_html_select_all),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_hide_list),
+                       "activate",
+                       GTK_SIGNAL_FUNC(ws_gui_words_list_hide_from_menu),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_zoom_in),
+                       "activate",
+                       G_CALLBACK(ws_gui_html_zoom_in),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_zoom_out),
+                       "activate",
+                       G_CALLBACK(ws_gui_html_zoom_out),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_full_screen),
+                       "activate",
+                       GTK_SIGNAL_FUNC(ws_gui_full_screen),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_find_word),
+                       "activate",
+                       GTK_SIGNAL_FUNC(ws_gui_search),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_find_next),
+                       "activate",
+                       GTK_SIGNAL_FUNC(ws_gui_history_next),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_find_prev),
+                       "activate",
+                       GTK_SIGNAL_FUNC(ws_gui_history_back),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_stop),
+                       "activate",
+                       GTK_SIGNAL_FUNC(ws_gui_search_stop),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_about), 
+                       "activate",
+                       G_CALLBACK(ws_gui_about_application),
+                       ws_gui_app);
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_close),
+                       "activate", 
+                       G_CALLBACK(ws_gui_menu_quit),
+                       ws_gui_app);
 
        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_dictionaries),
-                         "activate",
-                         GTK_SIGNAL_FUNC(ws_gui_dict_availablity),
-                         ws_gui_app);
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_edit),
+                       "activate",
+                       GTK_SIGNAL_FUNC(ws_gui_check_clipboard),
+                       ws_gui_app);
+
        g_signal_connect(G_OBJECT
-                         (ws_gui_app->ws_gui_menu->ws_gui_menu_bookmarks),
-                         "activate",
-                         GTK_SIGNAL_FUNC(ws_gui_set_bookmark_menu_items),
-                         ws_gui_app);
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_dictionaries),
+                       "activate",
+                       GTK_SIGNAL_FUNC(ws_gui_dict_availablity),
+                       ws_gui_app);
 
-        hildon_window_set_menu(HILDON_WINDOW(ws_gui_app->ws_gui_hildon_window),
-                               GTK_MENU(
-                                    ws_gui_app->ws_gui_menu->ws_gui_main_menu));
+       g_signal_connect(G_OBJECT
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_bookmarks),
+                       "activate",
+                       GTK_SIGNAL_FUNC(ws_gui_set_bookmark_menu_items),
+                       ws_gui_app);
 
-        gtk_widget_set_sensitive(GTK_WIDGET
-                                 (ws_gui_app->ws_gui_menu->ws_gui_menu_stop),
-                                 FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET
-                               (ws_gui_app->ws_gui_menu->ws_gui_menu_find_next),
-                               FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET
-                               (ws_gui_app->ws_gui_menu->ws_gui_menu_find_prev),
-                               FALSE);
+       hildon_window_set_menu(HILDON_WINDOW(ws_gui_app->ws_gui_hildon_window),
+                       GTK_MENU(
+                               ws_gui_app->ws_gui_menu->ws_gui_main_menu));
+
+       gtk_widget_set_sensitive(GTK_WIDGET
+                               (ws_gui_app->ws_gui_menu->ws_gui_menu_stop),
+                               FALSE);
+       gtk_widget_set_sensitive(GTK_WIDGET
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_find_next),
+                       FALSE);
+       gtk_widget_set_sensitive(GTK_WIDGET
+                       (ws_gui_app->ws_gui_menu->ws_gui_menu_find_prev),
+                       FALSE);
 
        
        
-        gtk_widget_show_all(ws_gui_app->ws_gui_menu->ws_gui_main_menu);
+       gtk_widget_show_all(ws_gui_app->ws_gui_menu->ws_gui_main_menu);
 }
 
 
@@ -836,104 +836,104 @@ void ws_gui_create_popup_menu (gpointer user_data)
  */
 void ws_gui_dictionary_chooser(GtkMenuItem *menuitem, gpointer user_data)
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
-        GtkWidget *dialog1;
-        GtkWidget *dialog_vbox1;
-        GtkWidget *scrolledwindow1;
-        GtkWidget *viewport1;
-        GtkWidget *vbox1;
-
-        GtkWidget *checkbutton;
-        GtkWidget *cancel_button;
-        GtkWidget *ok_button;
-        guint i =0;
-        gchar* string;
-        gchar* path;
-        const gchar* name;
-        GArray *checkboxes;
-
-        checkboxes = g_array_new (TRUE, TRUE, sizeof(GtkWidget*));
-
-        if (gconf_client_dir_exists(ws_gui_app->client, 
-                                   GCONF_PATH, NULL) == TRUE)
-        {
-               ws_gui_app->directories = 
-                       gconf_client_all_dirs(ws_gui_app->client,
-                                             GCONF_PATH,
-                                             NULL);
-        }
-        else 
-        {
-               g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO,
-                  "\n.::GUI::. /apps/mdictionary/dictionaries does not exist!!");
-        }
-
-        dialog1 = gtk_dialog_new ();
-        gtk_window_set_title (GTK_WINDOW (dialog1), 
-                            (_("ws_ti_choose_dictionaries_title")));
-        gtk_window_set_type_hint (GTK_WINDOW (dialog1),
-                                  GDK_WINDOW_TYPE_HINT_DIALOG);
-        gtk_window_set_default_size(GTK_WINDOW (dialog1), 300, 200);
-
-        dialog_vbox1 = GTK_DIALOG (dialog1)->vbox;
-        gtk_widget_show (dialog_vbox1);
-
-        scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
-        gtk_widget_show (scrolledwindow1);
-        gtk_box_pack_start (GTK_BOX (dialog_vbox1),
-                            scrolledwindow1,
-                            TRUE,
-                            TRUE,
-                            0);
-
-        viewport1 = gtk_viewport_new (NULL, NULL);
-        gtk_widget_show (viewport1);
-        gtk_container_add (GTK_CONTAINER (scrolledwindow1), viewport1);
-
-        vbox1 = gtk_vbox_new (FALSE, 0);
-        gtk_widget_show (vbox1);
-        gtk_container_add (GTK_CONTAINER (viewport1), vbox1);
-
-        for (i=0; i< g_slist_length(ws_gui_app->directories);i++)
-        {
-               string = (gchar*)g_slist_nth_data(ws_gui_app->directories, i); 
-               name = g_path_get_basename(string);
-               checkbutton = gtk_check_button_new_with_label(name);
-               path = g_strconcat(string, "/active", NULL);
-
-               if (gconf_client_get_bool(ws_gui_app->client, 
-                                        path, 
-                                        NULL) == TRUE)
-               {
-                       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
-                                                    checkbutton),
-                                                    TRUE);
-               }
-               else 
-               {
-                       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
-                                                    checkbutton),
-                                                    FALSE);
-               }
-
-                       g_array_append_val(checkboxes, checkbutton);
-                       gtk_box_pack_start (GTK_BOX (vbox1), 
-                                  checkbutton, 
-                                  FALSE, 
-                                  FALSE, 
-                                  0);
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+       GtkWidget *dialog1;
+       GtkWidget *dialog_vbox1;
+       GtkWidget *scrolledwindow1;
+       GtkWidget *viewport1;
+       GtkWidget *vbox1;
+
+       GtkWidget *checkbutton;
+       GtkWidget *cancel_button;
+       GtkWidget *ok_button;
+       guint i =0;
+       gchar* string;
+       gchar* path;
+       const gchar* name;
+       GArray *checkboxes;
+
+       checkboxes = g_array_new (TRUE, TRUE, sizeof(GtkWidget*));
+
+       if (gconf_client_dir_exists(ws_gui_app->client, 
+                               GCONF_PATH, NULL) == TRUE)
+       {
+       ws_gui_app->directories = 
+               gconf_client_all_dirs(ws_gui_app->client,
+                                       GCONF_PATH,
+                                       NULL);
+       }
+       else 
+       {
+       g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO,
+               "\n.::GUI::. /apps/mdictionary/dictionaries does not exist!!");
+       }
+
+       dialog1 = gtk_dialog_new ();
+       gtk_window_set_title (GTK_WINDOW (dialog1), 
+                       (_("ws_ti_choose_dictionaries_title")));
+       gtk_window_set_type_hint (GTK_WINDOW (dialog1),
+                               GDK_WINDOW_TYPE_HINT_DIALOG);
+       gtk_window_set_default_size(GTK_WINDOW (dialog1), 300, 200);
+
+       dialog_vbox1 = GTK_DIALOG (dialog1)->vbox;
+       gtk_widget_show (dialog_vbox1);
+
+       scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+       gtk_widget_show (scrolledwindow1);
+       gtk_box_pack_start (GTK_BOX (dialog_vbox1),
+                       scrolledwindow1,
+                       TRUE,
+                       TRUE,
+                       0);
+
+       viewport1 = gtk_viewport_new (NULL, NULL);
+       gtk_widget_show (viewport1);
+       gtk_container_add (GTK_CONTAINER (scrolledwindow1), viewport1);
+
+       vbox1 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox1);
+       gtk_container_add (GTK_CONTAINER (viewport1), vbox1);
+
+       for (i=0; i< g_slist_length(ws_gui_app->directories);i++)
+       {
+       string = (gchar*)g_slist_nth_data(ws_gui_app->directories, i); 
+       name = g_path_get_basename(string);
+       checkbutton = gtk_check_button_new_with_label(name);
+       path = g_strconcat(string, "/active", NULL);
+
+       if (gconf_client_get_bool(ws_gui_app->client, 
+                                       path, 
+                                       NULL) == TRUE)
+       {
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
+                                               checkbutton),
+                                               TRUE);
+       }
+       else 
+       {
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
+                                               checkbutton),
+                                               FALSE);
+       }
+
+               g_array_append_val(checkboxes, checkbutton);
+               gtk_box_pack_start (GTK_BOX (vbox1), 
+                               checkbutton, 
+                               FALSE, 
+                               FALSE, 
+                               0);
                
                if (strcmp(name, "bookmarks") == 0)
                {
                        if (ws_gui_app->bookmark_avail == FALSE) 
                        {
-                       gtk_widget_set_sensitive(GTK_WIDGET(checkbutton),
-                                                FALSE);
+                       gtk_widget_set_sensitive(GTK_WIDGET(checkbutton),
+                                               FALSE);
                        }
                }
 
                gtk_widget_show (checkbutton);
-               }
+       }
 
        cancel_button = gtk_button_new_from_stock (_("ws_db_cancel"));
        gtk_widget_show (cancel_button);
@@ -1020,175 +1020,175 @@ void ws_gui_dictionary_chooser(GtkMenuItem *menuitem, gpointer user_data)
  */
 void ws_gui_dictionary_optimizer(GtkMenuItem *menuitem, gpointer user_data)
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
 
-        GtkWidget *dialog1;
-        GtkWidget *dialog_vbox1;
-        GtkWidget *scrolledwindow1;
-        GtkWidget *viewport1;
-        GtkWidget *vbox1;
+       GtkWidget *dialog1;
+       GtkWidget *dialog_vbox1;
+       GtkWidget *scrolledwindow1;
+       GtkWidget *viewport1;
+       GtkWidget *vbox1;
 
-        GtkWidget *checkbutton;
-        GtkWidget *cancel_button;
-        GtkWidget *ok_button;
-        guint i =0;
-        gchar* string;
-        gchar* path;
-        const gchar* name;
-        GArray *checkboxes;
+       GtkWidget *checkbutton;
+       GtkWidget *cancel_button;
+       GtkWidget *ok_button;
+       guint i =0;
+       gchar* string;
+       gchar* path;
+       const gchar* name;
+       GArray *checkboxes;
 
-        checkboxes = g_array_new (TRUE, TRUE, sizeof(GtkWidget*));
+       checkboxes = g_array_new (TRUE, TRUE, sizeof(GtkWidget*));
 
        //check if a gconf directory exists
-        if (gconf_client_dir_exists(ws_gui_app->client, 
-                                   GCONF_PATH, 
-                                   NULL) == TRUE)
-        {
-                ws_gui_app->directories = 
-                    gconf_client_all_dirs(ws_gui_app->client, GCONF_PATH, NULL);
-        }
-        else 
-        {
-                g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO,
-                  "\n.::GUI::. /apps/mdictionary/dictionaries does not exist!!");
-        }
-
-        for (i=0; i< g_slist_length(ws_gui_app->directories);i++)
-        {
-                string = (gchar*)g_slist_nth_data(ws_gui_app->directories, i); 
-                name = g_path_get_basename(string);
-
-                path = g_strconcat(string, "/optimized", NULL);
-                if (gconf_client_get_bool (ws_gui_app->client,
-                                          path, 
-                                          NULL) == FALSE)
-                {
-                        checkbutton = gtk_check_button_new_with_label(name);
-                        g_array_append_val(checkboxes, checkbutton);
-                }
-        }
-        if (checkboxes->len <= 0)
-        {
-                ws_gui_app->ws_message_dialog = gtk_message_dialog_new(
-                                   GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_ERROR,
-                                   GTK_BUTTONS_OK,
-                                   _("ws_ni_no_dictionaries_to_optimize"));
-               gtk_widget_show_all(ws_gui_app->ws_message_dialog);
-               if (gtk_dialog_run (GTK_DIALOG (
-                        ws_gui_app->ws_message_dialog)) == GTK_RESPONSE_OK)
-               {
-                        gtk_widget_destroy(ws_gui_app->ws_message_dialog);
-               }
-               }
-               else
-               {
-                dialog1 = gtk_dialog_new ();
-                gtk_window_set_title(GTK_WINDOW (dialog1),
-                                     (_("ws_ti_choose_dictionaries_title")));
-                gtk_window_set_type_hint(GTK_WINDOW (dialog1),
-                                         GDK_WINDOW_TYPE_HINT_DIALOG);
-                gtk_window_set_default_size(GTK_WINDOW (dialog1), 300, 200);
-
-                dialog_vbox1 = GTK_DIALOG (dialog1)->vbox;
-                gtk_widget_show (dialog_vbox1);
-
-                scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
-                gtk_widget_show (scrolledwindow1);
-                gtk_box_pack_start(GTK_BOX (dialog_vbox1),
-                                   scrolledwindow1,
-                                   TRUE,
-                                   TRUE,
-                                   0);
-
-                viewport1 = gtk_viewport_new (NULL, NULL);
-                gtk_widget_show (viewport1);
-                gtk_container_add (GTK_CONTAINER (scrolledwindow1), viewport1);
-
-                vbox1 = gtk_vbox_new (FALSE, 0);
-                gtk_widget_show (vbox1);
-                gtk_container_add (GTK_CONTAINER (viewport1), vbox1);
-                for (i=0; i<checkboxes->len; i++)
-                {
-                        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
-                                      g_array_index(checkboxes, GtkWidget*, i)),
-                                      FALSE);
-                        gtk_box_pack_start(GTK_BOX (vbox1),
-                                       g_array_index(checkboxes, GtkWidget*, i),
-                                       FALSE,
-                                       FALSE,
-                                       0);
-                        gtk_widget_show(g_array_index(checkboxes, 
-                                                     GtkWidget*, 
-                                                     i));
-                }
-                cancel_button = gtk_button_new_from_stock (_("ws_db_cancel"));
-                gtk_widget_show (cancel_button);
-                gtk_dialog_add_action_widget(GTK_DIALOG (dialog1),
-                                             cancel_button,
-                                             GTK_RESPONSE_CANCEL);
-                ok_button = gtk_button_new_from_stock (_("ws_db_ok"));
-                gtk_widget_show (ok_button);
-                gtk_dialog_add_action_widget(GTK_DIALOG (dialog1),
-                                             ok_button,
-                                             GTK_RESPONSE_OK);
-                i = gtk_dialog_run(GTK_DIALOG(dialog1));
-                if (i == GTK_RESPONSE_OK) 
-                {
-                        for(i=0;i<(checkboxes->len);i++)
-                        {
-                                if (gtk_toggle_button_get_active(
-                                    GTK_TOGGLE_BUTTON(
-                                        g_array_index(checkboxes,
-                                                GtkWidget *, i))) == TRUE)
-                                {
-                                        name = gtk_button_get_label(GTK_BUTTON(
-                                                g_array_index(checkboxes,
-                                                              GtkWidget *,
-                                                              i)));
-                                        path=g_strconcat(GCONF_PATH,
-                                                         "/",
-                                                         name,
-                                                         "/optimized",
-                                                         NULL);
-                                        gconf_client_set_bool(
-                                                            ws_gui_app->client,
-                                                             path,
-                                                             TRUE,
-                                                             NULL);
-                                }
-                                if (gtk_toggle_button_get_active(
-                                     GTK_TOGGLE_BUTTON(
-                                       g_array_index(checkboxes,
-                                                     GtkWidget *, i))) == FALSE)
-                                {
-                                        name = gtk_button_get_label(GTK_BUTTON
-                                                      (g_array_index(checkboxes,
-                                                                     GtkWidget*,
-                                                                     i)));
-                                        path=g_strconcat(GCONF_PATH,
-                                                         "/",
-                                                         name,
-                                                         "/optimized",
-                                                         NULL);
-                                        gconf_client_set_bool(
-                                                            ws_gui_app->client,
-                                                             path,
-                                                             FALSE,
-                                                             NULL);
-                                }
-                        }
-                        ws_dbus_notify(ws_gui_app->dbus_data,
-                                       WS_DBUS_INFO_CONFIG_CHANGED);
-                        gtk_widget_destroy (dialog1);
-                }
-                else if (i == GTK_RESPONSE_CANCEL) 
-                {
-                        gtk_widget_destroy (dialog1);
-                }
-        }
-        g_slist_free(ws_gui_app->directories);
+       if (gconf_client_dir_exists(ws_gui_app->client, 
+                               GCONF_PATH, 
+                               NULL) == TRUE)
+       {
+               ws_gui_app->directories = 
+               gconf_client_all_dirs(ws_gui_app->client, GCONF_PATH, NULL);
+       }
+       else 
+       {
+               g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO,
+               "\n.::GUI::. /apps/mdictionary/dictionaries does not exist!!");
+       }
+
+       for (i=0; i< g_slist_length(ws_gui_app->directories);i++)
+       {
+               string = (gchar*)g_slist_nth_data(ws_gui_app->directories, i); 
+               name = g_path_get_basename(string);
+
+               path = g_strconcat(string, "/optimized", NULL);
+               if (gconf_client_get_bool (ws_gui_app->client,
+                                       path, 
+                                       NULL) == FALSE)
+               {
+                       checkbutton = gtk_check_button_new_with_label(name);
+                       g_array_append_val(checkboxes, checkbutton);
+               }
+       }
+       if (checkboxes->len <= 0)
+       {
+               ws_gui_app->ws_message_dialog = gtk_message_dialog_new(
+                               GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
+                               GTK_DIALOG_DESTROY_WITH_PARENT,
+                               GTK_MESSAGE_ERROR,
+                               GTK_BUTTONS_OK,
+                               _("ws_ni_no_dictionaries_to_optimize"));
+       gtk_widget_show_all(ws_gui_app->ws_message_dialog);
+       if (gtk_dialog_run (GTK_DIALOG (
+                       ws_gui_app->ws_message_dialog)) == GTK_RESPONSE_OK)
+       {
+                       gtk_widget_destroy(ws_gui_app->ws_message_dialog);
+       }
+       }
+       else
+       {
+               dialog1 = gtk_dialog_new ();
+               gtk_window_set_title(GTK_WINDOW (dialog1),
+                               (_("ws_ti_choose_dictionaries_title")));
+               gtk_window_set_type_hint(GTK_WINDOW (dialog1),
+                                       GDK_WINDOW_TYPE_HINT_DIALOG);
+               gtk_window_set_default_size(GTK_WINDOW (dialog1), 300, 200);
+
+               dialog_vbox1 = GTK_DIALOG (dialog1)->vbox;
+               gtk_widget_show (dialog_vbox1);
+
+               scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+               gtk_widget_show (scrolledwindow1);
+               gtk_box_pack_start(GTK_BOX (dialog_vbox1),
+                               scrolledwindow1,
+                               TRUE,
+                               TRUE,
+                               0);
+
+               viewport1 = gtk_viewport_new (NULL, NULL);
+               gtk_widget_show (viewport1);
+               gtk_container_add (GTK_CONTAINER (scrolledwindow1), viewport1);
+
+               vbox1 = gtk_vbox_new (FALSE, 0);
+               gtk_widget_show (vbox1);
+               gtk_container_add (GTK_CONTAINER (viewport1), vbox1);
+               for (i=0; i<checkboxes->len; i++)
+               {
+                       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
+                               g_array_index(checkboxes, GtkWidget*, i)),
+                               FALSE);
+                       gtk_box_pack_start(GTK_BOX (vbox1),
+                               g_array_index(checkboxes, GtkWidget*, i),
+                               FALSE,
+                               FALSE,
+                               0);
+                       gtk_widget_show(g_array_index(checkboxes, 
+                                               GtkWidget*, 
+                                               i));
+               }
+               cancel_button = gtk_button_new_from_stock (_("ws_db_cancel"));
+               gtk_widget_show (cancel_button);
+               gtk_dialog_add_action_widget(GTK_DIALOG (dialog1),
+                                       cancel_button,
+                                       GTK_RESPONSE_CANCEL);
+               ok_button = gtk_button_new_from_stock (_("ws_db_ok"));
+               gtk_widget_show (ok_button);
+               gtk_dialog_add_action_widget(GTK_DIALOG (dialog1),
+                                       ok_button,
+                                       GTK_RESPONSE_OK);
+               i = gtk_dialog_run(GTK_DIALOG(dialog1));
+               if (i == GTK_RESPONSE_OK) 
+               {
+                       for(i=0;i<(checkboxes->len);i++)
+                       {
+                               if (gtk_toggle_button_get_active(
+                               GTK_TOGGLE_BUTTON(
+                                       g_array_index(checkboxes,
+                                               GtkWidget *, i))) == TRUE)
+                               {
+                                       name = gtk_button_get_label(GTK_BUTTON(
+                                               g_array_index(checkboxes,
+                                                       GtkWidget *,
+                                                       i)));
+                                       path=g_strconcat(GCONF_PATH,
+                                                       "/",
+                                                       name,
+                                                       "/optimized",
+                                                       NULL);
+                                       gconf_client_set_bool(
+                                                       ws_gui_app->client,
+                                                       path,
+                                                       TRUE,
+                                                       NULL);
+                               }
+                               if (gtk_toggle_button_get_active(
+                               GTK_TOGGLE_BUTTON(
+                               g_array_index(checkboxes,
+                                               GtkWidget *, i))) == FALSE)
+                               {
+                                       name = gtk_button_get_label(GTK_BUTTON
+                                               (g_array_index(checkboxes,
+                                                               GtkWidget*,
+                                                               i)));
+                                       path=g_strconcat(GCONF_PATH,
+                                                       "/",
+                                                       name,
+                                                       "/optimized",
+                                                       NULL);
+                                       gconf_client_set_bool(
+                                                       ws_gui_app->client,
+                                                       path,
+                                                       FALSE,
+                                                       NULL);
+                               }
+                       }
+                       ws_dbus_notify(ws_gui_app->dbus_data,
+                               WS_DBUS_INFO_CONFIG_CHANGED);
+                       gtk_widget_destroy (dialog1);
+               }
+               else if (i == GTK_RESPONSE_CANCEL) 
+               {
+                       gtk_widget_destroy (dialog1);
+               }
+       }
+       g_slist_free(ws_gui_app->directories);
 }
 
 /** this function creates dialog popup window which allows to load a new
@@ -1199,46 +1199,46 @@ void ws_gui_dictionary_optimizer(GtkMenuItem *menuitem, gpointer user_data)
  */
 void ws_gui_dictionary_loader(GtkMenuItem *menuitem, gpointer user_data)
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
 
-        GtkWidget *dialog;
-  //      GtkWidget *dialog2;  
+       GtkWidget *dialog;
+//      GtkWidget *dialog2;    
 
        dialog = hildon_file_chooser_dialog_new(
                                GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
                                GTK_FILE_CHOOSER_ACTION_OPEN);
+
        gtk_window_set_default_size(GTK_WINDOW (dialog), 200, 200);
-        gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER(dialog), FALSE);
+       gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER(dialog), FALSE);
 
        //gtk_widget_show(GTK_WIDGET(dialog));
 
-        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
-        { 
-                gchar *filename;
-                gchar *name;
-             //   gchar *path;
-                gint len;
-              //  gchar *filepath;
+       if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+       { 
+               gchar *filename;
+               gchar *name;
+       //   gchar *path;
+               gint len;
+       //  gchar *filepath;
 
-                gchar* tmp;
+               gchar* tmp;
                
-                filename = gtk_file_chooser_get_filename(
-                                                     GTK_FILE_CHOOSER (dialog));
-                name = g_path_get_basename(filename);
-                len = strlen(filename) - strlen(name) -1;
-                tmp = g_strndup (filename, len);
+               filename = gtk_file_chooser_get_filename(
+                                               GTK_FILE_CHOOSER (dialog));
+               name = g_path_get_basename(filename);
+               len = strlen(filename) - strlen(name) -1;
+               tmp = g_strndup (filename, len);
                                
                
-                tmp = g_path_get_basename(tmp);
+               tmp = g_path_get_basename(tmp);
                
-                if (g_str_has_suffix(name, ".xdxf") 
+               if (g_str_has_suffix(name, ".xdxf") 
                        || g_str_has_suffix(name, ".idx") 
                        || g_str_has_suffix(name, ".ifo")
                        || g_str_has_suffix(name, ".idx.gz")
                        || g_str_has_suffix(name, ".dict")
                        || g_str_has_suffix(name, ".dict.dz"))
-                {
+               {
                        g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "\n:::GUUUUIII GUIII::: check");
                        if (ws_gui_load_dict(filename, ws_gui_app) == TRUE)
                        {
@@ -1247,30 +1247,30 @@ void ws_gui_dictionary_loader(GtkMenuItem *menuitem, gpointer user_data)
                                hildon_banner_show_information(GTK_WIDGET(
                                        ws_gui_app->ws_gui_hildon_window),
                                        NULL,
-                                      _("ws_ni_dictionary_added"));
+                               _("ws_ni_dictionary_added"));
                        } 
-                }
+               }
                else if (g_str_has_suffix(name, ".bz2"))
                {       
                        ws_dbus_client_extract_dictionary(ws_gui_app->dbus_data, filename);
                        gtk_widget_destroy(dialog);
                        ws_refresh_search_results(ws_gui_app);
                }
-                else
-                {
-                        gtk_widget_destroy (dialog);
+               else
+               {
+                       gtk_widget_destroy (dialog);
                        hildon_banner_show_information(GTK_WIDGET(
                                        ws_gui_app->ws_gui_hildon_window),
                                        NULL,
-                                      _("ws_ni_dictionary_wrong_file"));
-                }
-
-               }
-               else 
-               {
-               gtk_widget_destroy (dialog);
-               }
+                               _("ws_ni_dictionary_wrong_file"));
+               }
 
+       }
+       else 
+       {
+               gtk_widget_destroy (dialog);
+       }
+       
 }
 
 /** this function creates dialog popup window which allows to load dictionary
@@ -1293,44 +1293,44 @@ gboolean ws_gui_load_dict(gchar *filename, gpointer user_data)
        gchar *tmp = g_strndup (filename, len);;
        tmp = g_path_get_basename(tmp);
        
+
        filepath = g_strndup (filename, len);
-        path = g_strconcat(GCONF_PATH, "/", tmp, "/path", NULL);
-        gconf_client_set_string(ws_gui_app->client,
-                               path,
-                                filepath,
-                                NULL);
+       path = g_strconcat(GCONF_PATH, "/", tmp, "/path", NULL);
+       gconf_client_set_string(ws_gui_app->client,
+                               path,
+                               filepath,
+                               NULL);
        g_free(path); 
        path = NULL;
        path = g_strconcat(GCONF_PATH,
-                               "/",
-                                tmp,
-                                "/active",
-                                NULL);
-       
-        dialog1 = gtk_message_dialog_new(GTK_WINDOW(
-                                         ws_gui_app->ws_gui_hildon_window),
-                                         GTK_DIALOG_DESTROY_WITH_PARENT,
-                                         GTK_MESSAGE_QUESTION,
-                                         GTK_BUTTONS_YES_NO,
-                                       _("ws_ni_dictionaries_activation_question"));
-
-        gtk_widget_show_all(GTK_WIDGET(dialog1));
-
-        if (gtk_dialog_run (GTK_DIALOG (dialog1)) == GTK_RESPONSE_YES)
-        {
-               gconf_client_set_bool(ws_gui_app->client,
-                                        path,
-                                        TRUE,
-                                        NULL);
-        }
-        else 
-        {
-               gconf_client_set_bool(ws_gui_app->client,
-                                        path,
-                                        FALSE,
-                                        NULL);
-        }
+                               "/",
+                               tmp,
+                               "/active",
+                               NULL);
+       
+       dialog1 = gtk_message_dialog_new(GTK_WINDOW(
+                                       ws_gui_app->ws_gui_hildon_window),
+                                       GTK_DIALOG_DESTROY_WITH_PARENT,
+                                       GTK_MESSAGE_QUESTION,
+                                       GTK_BUTTONS_YES_NO,
+                               _("ws_ni_dictionaries_activation_question"));
+
+       gtk_widget_show_all(GTK_WIDGET(dialog1));
+
+       if (gtk_dialog_run (GTK_DIALOG (dialog1)) == GTK_RESPONSE_YES)
+       {
+               gconf_client_set_bool(ws_gui_app->client,
+                                       path,
+                                       TRUE,
+                                       NULL);
+       }
+       else 
+       {
+               gconf_client_set_bool(ws_gui_app->client,
+                                       path,
+                                       FALSE,
+                                       NULL);
+       }
        gtk_widget_destroy (dialog1);
        g_free(path); 
        path = NULL;
@@ -1385,116 +1385,116 @@ gboolean ws_gui_load_dict(gchar *filename, gpointer user_data)
  */
 void ws_gui_dictionary_remover(GtkMenuItem *menuitem, gpointer user_data)
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
 
-        GtkWidget *dialog1;
-        GtkWidget *dialog_vbox1;
-        GtkWidget *scrolledwindow1;
+       GtkWidget *dialog1;
+       GtkWidget *dialog_vbox1;
+       GtkWidget *scrolledwindow1;
        GtkWidget *viewport1;
-        GtkWidget *vbox1;
-        GtkWidget *checkbutton;
-        GtkWidget *cancel_button;
-        GtkWidget *ok_button;
-        guint i =0;
-        gchar* string;
-        gchar* path;
-        const gchar* name;
-        GArray *checkboxes;
-
-        checkboxes = g_array_new (TRUE, TRUE, sizeof(GtkWidget*));
-
-        if (gconf_client_dir_exists(ws_gui_app->client, GCONF_PATH, NULL) 
+       GtkWidget *vbox1;
+       GtkWidget *checkbutton;
+       GtkWidget *cancel_button;
+       GtkWidget *ok_button;
+       guint i =0;
+       gchar* string;
+       gchar* path;
+       const gchar* name;
+       GArray *checkboxes;
+
+       checkboxes = g_array_new (TRUE, TRUE, sizeof(GtkWidget*));
+
+       if (gconf_client_dir_exists(ws_gui_app->client, GCONF_PATH, NULL) 
                                                                        == TRUE)
-        {
-                ws_gui_app->directories = gconf_client_all_dirs(
-                                                             ws_gui_app->client,
-                                                             GCONF_PATH,
-                                                             NULL);
-        }
-        else 
-        {
-                g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO,
-                  "\n.::GUI::. /apps/mdictionary/dictionaries does not exist!!");
-        }
-
-        dialog1 = gtk_dialog_new ();
-        gtk_window_set_title (GTK_WINDOW (dialog1), 
-                            (_("ws_ti_remove_dictionaries_title")));
-        gtk_window_set_type_hint (GTK_WINDOW (dialog1),
-                                  GDK_WINDOW_TYPE_HINT_DIALOG);
-        gtk_window_set_default_size(GTK_WINDOW (dialog1), 300, 200);
-
-        dialog_vbox1 = GTK_DIALOG (dialog1)->vbox;
-        gtk_widget_show (dialog_vbox1);
-
-        scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
-        gtk_widget_show (scrolledwindow1);
-        gtk_box_pack_start (GTK_BOX (dialog_vbox1),
-                            scrolledwindow1,
-                            TRUE,
-                            TRUE,
-                            0);
-
-        viewport1 = gtk_viewport_new (NULL, NULL);
-        gtk_widget_show (viewport1);
-        gtk_container_add (GTK_CONTAINER (scrolledwindow1), viewport1);
-
-        vbox1 = gtk_vbox_new (FALSE, 0);
-        gtk_widget_show (vbox1);
-        gtk_container_add (GTK_CONTAINER (viewport1), vbox1);
-
-        for (i=0; i< g_slist_length(ws_gui_app->directories);i++)
-        {
-                string = (gchar*)g_slist_nth_data(ws_gui_app->directories, i); 
-                name = g_path_get_basename(string);
-                checkbutton = gtk_check_button_new_with_label(name);
-
-                g_array_append_val(checkboxes, checkbutton);
-                gtk_box_pack_start (GTK_BOX (vbox1),
-                                    checkbutton,
-                                    FALSE,
-                                    FALSE,
-                                    0);
+       {
+               ws_gui_app->directories = gconf_client_all_dirs(
+                                                       ws_gui_app->client,
+                                                       GCONF_PATH,
+                                                       NULL);
+       }
+       else 
+       {
+               g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO,
+               "\n.::GUI::. /apps/mdictionary/dictionaries does not exist!!");
+       }
+
+       dialog1 = gtk_dialog_new ();
+       gtk_window_set_title (GTK_WINDOW (dialog1), 
+                       (_("ws_ti_remove_dictionaries_title")));
+       gtk_window_set_type_hint (GTK_WINDOW (dialog1),
+                               GDK_WINDOW_TYPE_HINT_DIALOG);
+       gtk_window_set_default_size(GTK_WINDOW (dialog1), 300, 200);
+
+       dialog_vbox1 = GTK_DIALOG (dialog1)->vbox;
+       gtk_widget_show (dialog_vbox1);
+
+       scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+       gtk_widget_show (scrolledwindow1);
+       gtk_box_pack_start (GTK_BOX (dialog_vbox1),
+                       scrolledwindow1,
+                       TRUE,
+                       TRUE,
+                       0);
+
+       viewport1 = gtk_viewport_new (NULL, NULL);
+       gtk_widget_show (viewport1);
+       gtk_container_add (GTK_CONTAINER (scrolledwindow1), viewport1);
+
+       vbox1 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox1);
+       gtk_container_add (GTK_CONTAINER (viewport1), vbox1);
+
+       for (i=0; i< g_slist_length(ws_gui_app->directories);i++)
+       {
+               string = (gchar*)g_slist_nth_data(ws_gui_app->directories, i); 
+               name = g_path_get_basename(string);
+               checkbutton = gtk_check_button_new_with_label(name);
+
+               g_array_append_val(checkboxes, checkbutton);
+               gtk_box_pack_start (GTK_BOX (vbox1),
+                               checkbutton,
+                               FALSE,
+                               FALSE,
+                               0);
                
                if (strcmp(name, "bookmarks") == 0)
                {
-                  gtk_widget_set_sensitive(GTK_WIDGET(checkbutton), FALSE);
+               gtk_widget_set_sensitive(GTK_WIDGET(checkbutton), FALSE);
+               }
+               gtk_widget_show (checkbutton);
+       }
+
+       cancel_button = gtk_button_new_from_stock (_("ws_db_cancel"));
+       gtk_widget_show (cancel_button);
+       gtk_dialog_add_action_widget (GTK_DIALOG (dialog1),
+                               cancel_button,
+                               GTK_RESPONSE_CANCEL);
+
+       ok_button = gtk_button_new_from_stock 
+                       (_("ws_bd_remove_dictionaries_remove_selected"));
+       gtk_widget_show (ok_button);
+       gtk_dialog_add_action_widget(GTK_DIALOG (dialog1),
+                               ok_button,
+                               GTK_RESPONSE_OK);
+
+       i = gtk_dialog_run(GTK_DIALOG(dialog1));
+
+       if (i == GTK_RESPONSE_OK) 
+       {
+               for(i=0;i<(checkboxes->len);i++)
+               {
+                       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+                       g_array_index(checkboxes, GtkWidget *, i))) == TRUE)
+                       {
+
+                               name = gtk_button_get_label(GTK_BUTTON(
+                               g_array_index(checkboxes, GtkWidget *, i)));
+                               path=g_strconcat(GCONF_PATH, "/", name, NULL);
+                               gconf_client_recursive_unset(ws_gui_app->client,
+                                       path,
+                                       GCONF_UNSET_INCLUDING_SCHEMA_NAMES,
+                                       NULL);
+                       } 
                }
-                gtk_widget_show (checkbutton);
-        }
-
-        cancel_button = gtk_button_new_from_stock (_("ws_db_cancel"));
-        gtk_widget_show (cancel_button);
-        gtk_dialog_add_action_widget (GTK_DIALOG (dialog1),
-                                      cancel_button,
-                                      GTK_RESPONSE_CANCEL);
-
-        ok_button = gtk_button_new_from_stock 
-                              (_("ws_bd_remove_dictionaries_remove_selected"));
-        gtk_widget_show (ok_button);
-        gtk_dialog_add_action_widget(GTK_DIALOG (dialog1),
-                                     ok_button,
-                                     GTK_RESPONSE_OK);
-
-        i = gtk_dialog_run(GTK_DIALOG(dialog1));
-
-        if (i == GTK_RESPONSE_OK) 
-        {
-                for(i=0;i<(checkboxes->len);i++)
-                {
-                        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
-                            g_array_index(checkboxes, GtkWidget *, i))) == TRUE)
-                        {
-
-                                name = gtk_button_get_label(GTK_BUTTON(
-                                    g_array_index(checkboxes, GtkWidget *, i)));
-                                path=g_strconcat(GCONF_PATH, "/", name, NULL);
-                                gconf_client_recursive_unset(ws_gui_app->client,
-                                             path,
-                                             GCONF_UNSET_INCLUDING_SCHEMA_NAMES,
-                                             NULL);
-                        } 
-                 }
 
                if(ws_gui_app->ws_gui_history->len >= 0)
                {
@@ -1505,23 +1505,23 @@ void ws_gui_dictionary_remover(GtkMenuItem *menuitem, gpointer user_data)
                }
                ws_gui_check_history(ws_gui_app);               
 
-                ws_dbus_notify(ws_gui_app->dbus_data, 
-                              WS_DBUS_INFO_CONFIG_CHANGED);
+               ws_dbus_notify(ws_gui_app->dbus_data, 
+                       WS_DBUS_INFO_CONFIG_CHANGED);
 
                hildon_banner_show_information(GTK_WIDGET(
                                ws_gui_app->ws_gui_hildon_window),
                                NULL,
                                _("ws_ib_dictionary_removed"));
 
-                gtk_widget_destroy (dialog1);
+               gtk_widget_destroy (dialog1);
                ws_refresh_search_results(ws_gui_app);
-        }
-        else if (i == GTK_RESPONSE_CANCEL) 
-        {
-                gtk_widget_destroy (dialog1);
-        }
+       }
+       else if (i == GTK_RESPONSE_CANCEL) 
+       {
+               gtk_widget_destroy (dialog1);
+       }
 
-        g_slist_free(ws_gui_app->directories);
+       g_slist_free(ws_gui_app->directories);
 }
 
 /** this function creates dialog popup window which displays information about
@@ -1532,85 +1532,85 @@ void ws_gui_dictionary_remover(GtkMenuItem *menuitem, gpointer user_data)
  */
 void ws_gui_about_application(GtkMenuItem *menuitem, gpointer user_data)
 {
-        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
-
-        gtk_widget_set_sensitive(GTK_WIDGET
-                                 (ws_gui_app->ws_gui_hildon_find_toolbar),
-                                 FALSE);
-
-        GtkWidget *about_dialog;
-        GtkWidget *dialog_vbox1;
-        GtkWidget *vbox1;
-        GtkWidget *image;
-        GtkWidget *label2;
-        GtkWidget *label3;
-        GtkWidget *label4;
-        GtkWidget *scrolledwindow;
-        GtkWidget *textview;
-        GtkWidget *button1;
+       WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+
+       gtk_widget_set_sensitive(GTK_WIDGET
+                               (ws_gui_app->ws_gui_hildon_find_toolbar),
+                               FALSE);
+
+       GtkWidget *about_dialog;
+       GtkWidget *dialog_vbox1;
+       GtkWidget *vbox1;
+       GtkWidget *image;
+       GtkWidget *label2;
+       GtkWidget *label3;
+       GtkWidget *label4;
+       GtkWidget *scrolledwindow;
+       GtkWidget *textview;
+       GtkWidget *button1;
 
        const gchar *ws_version;
 
-        about_dialog = gtk_dialog_new ();
-        gtk_window_set_title (GTK_WINDOW (about_dialog), 
-                             _("ws_ti_about_title"));
-        gtk_window_set_default_size(GTK_WINDOW (about_dialog), 350, 350);
+       about_dialog = gtk_dialog_new ();
+       gtk_window_set_title (GTK_WINDOW (about_dialog), 
+                       _("ws_ti_about_title"));
+       gtk_window_set_default_size(GTK_WINDOW (about_dialog), 350, 350);
 
-        dialog_vbox1 = GTK_DIALOG (about_dialog)->vbox;
-        gtk_widget_show (dialog_vbox1);
+       dialog_vbox1 = GTK_DIALOG (about_dialog)->vbox;
+       gtk_widget_show (dialog_vbox1);
 
-        vbox1 = gtk_vbox_new (FALSE, 0);
-        gtk_widget_show (vbox1);
-        gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox1, TRUE, TRUE, 0);
+       vbox1 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox1);
+       gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox1, TRUE, TRUE, 0);
 
-        image = gtk_image_new_from_file ("/usr/share/pixmaps/mdictionary_about.png");
-        gtk_box_pack_start (GTK_BOX (vbox1), image, TRUE, TRUE, 0);
+       image = gtk_image_new_from_file ("/usr/share/pixmaps/mdictionary_about.png");
+       gtk_box_pack_start (GTK_BOX (vbox1), image, TRUE, TRUE, 0);
 
-        label2 = gtk_label_new ("mDictionary");
-        ws_gui_app->p = pango_font_description_from_string("Tahoma 18");
-        gtk_widget_modify_font(GTK_WIDGET(label2), ws_gui_app->p);
-        gtk_label_set_pattern (GTK_LABEL(label2), "__________");
-        gtk_box_pack_start (GTK_BOX (vbox1), label2, FALSE, FALSE, 5);
+       label2 = gtk_label_new ("mDictionary");
+       ws_gui_app->p = pango_font_description_from_string("Tahoma 18");
+       gtk_widget_modify_font(GTK_WIDGET(label2), ws_gui_app->p);
+       gtk_label_set_pattern (GTK_LABEL(label2), "__________");
+       gtk_box_pack_start (GTK_BOX (vbox1), label2, FALSE, FALSE, 5);
 
        ws_version = g_strconcat("Maemo Multilingual Dictionary\nver. ",
                                WS_VERSION,
                                NULL);
-        label3 = gtk_label_new_with_mnemonic (_(ws_version));
-        ws_gui_app->p = pango_font_description_from_string("Tahoma 12");
-        gtk_widget_modify_font(GTK_WIDGET(label3), ws_gui_app->p);
-        gtk_box_pack_start (GTK_BOX (vbox1), label3, FALSE, FALSE, 5);
-        gtk_label_set_justify (GTK_LABEL (label3), GTK_JUSTIFY_CENTER);
+       label3 = gtk_label_new_with_mnemonic (_(ws_version));
+       ws_gui_app->p = pango_font_description_from_string("Tahoma 12");
+       gtk_widget_modify_font(GTK_WIDGET(label3), ws_gui_app->p);
+       gtk_box_pack_start (GTK_BOX (vbox1), label3, FALSE, FALSE, 5);
+       gtk_label_set_justify (GTK_LABEL (label3), GTK_JUSTIFY_CENTER);
 
-        label4 = gtk_label_new ("Copyright 2006 - 2007, ComArch S.A\nAll rights " 
+       label4 = gtk_label_new ("Copyright 2006 - 2007, ComArch S.A\nAll rights " 
                                "reserved");
-        ws_gui_app->p = pango_font_description_from_string("Tahoma 12");
-        gtk_widget_modify_font(GTK_WIDGET(label4), ws_gui_app->p);
-        gtk_box_pack_start (GTK_BOX (vbox1), label4, FALSE, FALSE, 5);
-        gtk_label_set_justify (GTK_LABEL (label4), GTK_JUSTIFY_CENTER);
-
-        scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
-        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW
-                                             (scrolledwindow),
-                                             GTK_SHADOW_ETCHED_OUT);
-        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW
-                                        (scrolledwindow),
-                                        GTK_POLICY_AUTOMATIC,
-                                        GTK_POLICY_AUTOMATIC);
-        gtk_box_pack_start (GTK_BOX (vbox1),
-                            scrolledwindow,
-                            TRUE,
-                            TRUE,
-                            0);
-
-        textview = gtk_text_view_new ();
-        ws_gui_app->p = pango_font_description_from_string("Tahoma 10");
-        gtk_widget_modify_font(GTK_WIDGET(textview), ws_gui_app->p);
-        gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE);
-        gtk_text_view_set_left_margin(GTK_TEXT_VIEW(textview), 10);
-        gtk_text_view_set_right_margin(GTK_TEXT_VIEW(textview), 10);
-        gtk_container_add (GTK_CONTAINER (scrolledwindow), textview);
-        gtk_text_buffer_set_text(
-                        gtk_text_view_get_buffer(GTK_TEXT_VIEW (textview)),
+       ws_gui_app->p = pango_font_description_from_string("Tahoma 12");
+       gtk_widget_modify_font(GTK_WIDGET(label4), ws_gui_app->p);
+       gtk_box_pack_start (GTK_BOX (vbox1), label4, FALSE, FALSE, 5);
+       gtk_label_set_justify (GTK_LABEL (label4), GTK_JUSTIFY_CENTER);
+
+       scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
+       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW
+                                       (scrolledwindow),
+                                       GTK_SHADOW_ETCHED_OUT);
+       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW
+                                       (scrolledwindow),
+                                       GTK_POLICY_AUTOMATIC,
+                                       GTK_POLICY_AUTOMATIC);
+       gtk_box_pack_start (GTK_BOX (vbox1),
+                       scrolledwindow,
+                       TRUE,
+                       TRUE,
+                       0);
+
+       textview = gtk_text_view_new ();
+       ws_gui_app->p = pango_font_description_from_string("Tahoma 10");
+       gtk_widget_modify_font(GTK_WIDGET(textview), ws_gui_app->p);
+       gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE);
+       gtk_text_view_set_left_margin(GTK_TEXT_VIEW(textview), 10);
+       gtk_text_view_set_right_margin(GTK_TEXT_VIEW(textview), 10);
+       gtk_container_add (GTK_CONTAINER (scrolledwindow), textview);
+       gtk_text_buffer_set_text(
+                       gtk_text_view_get_buffer(GTK_TEXT_VIEW (textview)),
  /*                       "The following third party\ncomponents may be\nincluded"
                        " depending \non your system configuration:\n\nD-BUS "
                        "- License information:\nhttp://opensource.org/"
@@ -1636,23 +1636,23 @@ void ws_gui_about_application(GtkMenuItem *menuitem, gpointer user_data)
                        " English-Finnish dictionary -\n"
                        " Converted by swaj under GNU\n"
                        " Public License, Version: 1.0",
-                        -1);
+                       -1);
 
-        button1 = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-        gtk_dialog_add_action_widget(GTK_DIALOG(about_dialog),
-                                     button1,
-                                     GTK_RESPONSE_CLOSE);
+       button1 = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+       gtk_dialog_add_action_widget(GTK_DIALOG(about_dialog),
+                               button1,
+                               GTK_RESPONSE_CLOSE);
 
-        gtk_widget_show_all (GTK_WIDGET(about_dialog));
+       gtk_widget_show_all (GTK_WIDGET(about_dialog));
 
-        if (gtk_dialog_run(GTK_DIALOG(about_dialog)) == GTK_RESPONSE_CLOSE)
-        {
-                gtk_widget_destroy(GTK_WIDGET(about_dialog));
-        }
+       if (gtk_dialog_run(GTK_DIALOG(about_dialog)) == GTK_RESPONSE_CLOSE)
+       {
+               gtk_widget_destroy(GTK_WIDGET(about_dialog));
+       }
 
-        gtk_widget_set_sensitive(
-                             GTK_WIDGET(ws_gui_app->ws_gui_hildon_find_toolbar),
-                             TRUE);
+       gtk_widget_set_sensitive(
+                       GTK_WIDGET(ws_gui_app->ws_gui_hildon_find_toolbar),
+                       TRUE);
 }
 
 void ws_gui_add_bookmark_dialog(gpointer user_data)
@@ -1806,17 +1806,17 @@ void ws_gui_list_full_dialog(GtkWidget *widget, GdkEventButton *event, gpointer
        WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
        
        ws_gui_app->ws_message_dialog =  gtk_message_dialog_new(
-                                 GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
-                                  GTK_DIALOG_DESTROY_WITH_PARENT,
-                                  GTK_MESSAGE_INFO,
-                                  GTK_BUTTONS_OK,
-                                  _("ws_ni_words_list_full"));
-
-            if (gtk_dialog_run(
-                               GTK_DIALOG(ws_gui_app->ws_message_dialog)) 
-                                 == GTK_RESPONSE_OK)
-                       {
-                               gtk_widget_destroy(
-                                                ws_gui_app->ws_message_dialog);
-                       }
+                               GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
+                               GTK_DIALOG_DESTROY_WITH_PARENT,
+                               GTK_MESSAGE_INFO,
+                               GTK_BUTTONS_OK,
+                               _("ws_ni_words_list_full"));
+
+       if (gtk_dialog_run(
+                       GTK_DIALOG(ws_gui_app->ws_message_dialog)) 
+                               == GTK_RESPONSE_OK)
+               {
+                       gtk_widget_destroy(
+                                               ws_gui_app->ws_message_dialog);
+               }
 }