bzip files

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

diff --git a/data/locale/en_GB.po b/data/locale/en_GB.po
index d5846df..80d8fbe 100644 (file)
--- a/data/locale/en_GB.po
+++ b/data/locale/en_GB.po
@@ -195,6 +195,10 @@ msgstr "Would you like to optimize this dictionary?"
 msgid "ws_ni_dictionary_added"
 msgstr "New dictionary has been added."
 
+#: ../gui/src/ws_gui_callbacks.c:439
+msgid "ws_ni_dictionary_not_added"
+msgstr "Dictionary could not be added."
+
 #: ../gui/src/ws_gui_layout.c:1138
 msgid "ws_ni_dictionary_wrong_file"
 msgstr "Wrong dictionary file."

diff --git a/data/locale/es.po b/data/locale/es.po
index b7de39f..5273469 100644 (file)
--- a/data/locale/es.po
+++ b/data/locale/es.po
@@ -192,9 +192,14 @@ msgid "ws_ni_dictionaries_optimalization_question"
 msgstr "¿Quiere optimizar este diccionario?"
 
 #: ../gui/src/ws_gui_layout.c:1131
+#: ../gui/src/ws_gui_callbacks.c:447
 msgid "ws_ni_dictionary_added"
 msgstr "Se ha añadido un diccionario nuevo."
 
+#: ../gui/src/ws_gui_callbacks.c:439
+msgid "ws_ni_dictionary_not_added"
+msgstr "No se ha añadido un diccionario nuevo."
+
 #: ../gui/src/ws_gui_layout.c:1138
 msgid "ws_ni_dictionary_wrong_file"
 msgstr "Archivo de diccionario incorrecto."

diff --git a/data/locale/pl_PL.po b/data/locale/pl_PL.po
index 70f59ef..d60e508 100644 (file)
--- a/data/locale/pl_PL.po
+++ b/data/locale/pl_PL.po
@@ -190,6 +190,10 @@ msgstr "Czy chcesz zoptymalizowac ten słownik teraz?"
 msgid "ws_ni_dictionary_added"
 msgstr "Nowy słownik został dodany."
 
+#: ../gui/src/ws_gui_callbacks.c:439
+msgid "ws_ni_dictionary_not_added"
+msgstr "Słownik nie mógł zostać dodany."
+
 #: ../gui/src/ws_gui_layout.c:1138
 msgid "ws_ni_dictionary_wrong_file"
 msgstr "Zły plik słownika."

diff --git a/src/gui/src/ws_gui_callbacks.c b/src/gui/src/ws_gui_callbacks.c
index 156aae1..04961c6 100644 (file)
--- a/src/gui/src/ws_gui_callbacks.c
+++ b/src/gui/src/ws_gui_callbacks.c
@@ -358,9 +358,9 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
                                  ws_gui_app->ws_gui_history_cur_pos)) == TRUE);
        {
        
-       g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "\n\nString from iter: %s", 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));
-       g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "GUI-TrePath: %s\n\n", gtk_tree_path_to_string(ws_gui_app->ws_gui_w_list->path));
+       //g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "\n\nString from iter: %s", 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));
+//     g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "GUI-TrePath: %s\n\n", gtk_tree_path_to_string(ws_gui_app->ws_gui_w_list->path));
 
                gtk_tree_selection_select_iter(
                                ws_gui_app->ws_gui_w_list->ws_gui_selection,
@@ -432,12 +432,22 @@ void ws_dbus_server_return_extracted_bzip(GError *error,
         osso_rpc_t data;
 
         data = g_array_index (words, osso_rpc_t, 0);
+       //g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "\n\n!!!GUI!!!\n przyszlo: %s", data.value.s);
+       if (data.value.s == "\0")
+       {
+               gtk_infoprint(GTK_WINDOW(
+                                ws_gui_app->ws_gui_hildon_window),
+                                _("ws_ni_dictionary_not_added"));
+       }
+       else
+       {
        if (ws_gui_load_dict(data.value.s, ws_gui_app) == TRUE)
        {
                gtk_infoprint(GTK_WINDOW(
                                       ws_gui_app->ws_gui_hildon_window),
                                       _("ws_ni_dictionary_added"));
        }
+       }
 }
 
 /**
@@ -959,13 +969,16 @@ GtkTreeModel * create_and_fill_model (GArray *words_list, gpointer user_data)
            ws_gui_app->history_flag == FALSE && 
            (0 != strcmp(ws_gui_app->last_word, tmp)))
         {
-       
-       
-                ws_dbus_client_find_translation(ws_gui_app->dbus_data, tmp);
+               ws_dbus_client_find_translation(ws_gui_app->dbus_data, tmp);
+               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);
                 ws_gui_history_add(tmp, ws_gui_app);
                g_free(ws_gui_app->last_word);
                ws_gui_app->last_word = NULL;
                ws_gui_app->last_word = g_strdup (tmp);
+               g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "\n\nString from iter: %s", 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));
         }
         
         return GTK_TREE_MODEL(ws_gui_app->ws_gui_w_list->ws_gui_store);