Another coredumping bug fixed

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

diff --git a/Makefile b/Makefile
index 838aea9..3f1eb52 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,8 +37,8 @@ MAJOR_VER = 0
 MINOR_VER = 6
 RELEASE_MAJOR_VER = 1
 RELEASE_MINOR_VER = 0
-RELEASE_PATCH_VER = RC
-PACK_VER = 1
+RELEASE_PATCH_VER = 0
+PACK_VER = 0
 FRM_VER = 0.1
 
 # VERSION_FILE = ./${INCLUDE}/ws_version.h

diff --git a/src/gui/src/ws_gui_callbacks.c b/src/gui/src/ws_gui_callbacks.c
index d076072..14dedf8 100644 (file)
--- a/src/gui/src/ws_gui_callbacks.c
+++ b/src/gui/src/ws_gui_callbacks.c
@@ -405,7 +405,7 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
         for (i=0;i<words->len;++i)
         {
                 data = g_array_index (words, osso_rpc_t, i);
-                tmp_word = g_strconcat(data.value.s,NULL);
+                tmp_word = g_strdup(data.value.s);
                 g_array_append_val(tmp, tmp_word);
         }
        
@@ -429,7 +429,7 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
        if (ws_gui_app->history_flag == TRUE)
        {
 
-       GValue value;// = { 0, };
+       GValue value = { 0, };
        GtkTreeIter tmp_iter;
        gchar *pattern;
        gboolean keep_searching = TRUE;
@@ -928,12 +928,10 @@ void ws_gui_history_back(GtkButton *button, gpointer user_data)
                              ws_gui_app->ws_gui_history_cur_pos)),
                             NULL);
        
-               
-       
                ws_dbus_client_find_word (ws_gui_app->dbus_data, 
-                                       g_array_index(ws_gui_app->ws_gui_history_list,
+                                       g_strstrip(g_array_index(ws_gui_app->ws_gui_history_list,
                                                gchar*, 
-                                       ws_gui_app->ws_gui_history_cur_pos)
+                                       ws_gui_app->ws_gui_history_cur_pos))
                                        );
         }
         else 
@@ -990,9 +988,9 @@ void ws_gui_history_next(GtkButton *button, gpointer user_data)
        
                
                ws_dbus_client_find_word(ws_gui_app->dbus_data, 
-                                       g_array_index(ws_gui_app->ws_gui_history_list,
+                                       g_strstrip(g_array_index(ws_gui_app->ws_gui_history_list,
                                        gchar*, 
-                                               ws_gui_app->ws_gui_history_cur_pos)
+                                               ws_gui_app->ws_gui_history_cur_pos))
                                        );
 
         }