Fixed #66. Bookmarks are now added and removed properly. Improved the

versioning system and removed some unnecessary blabber from ws_dbus.c

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

diff --git a/Makefile b/Makefile
index 4c36e58..5d98811 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -87,12 +87,12 @@ MAIL_ADDRESS = mdictionary-devel@garage.maemo.org
 LOCALEDIR=/usr/share/locale
 GETTEXT_PACKAGE=whitestork
 ALL_LINGUAS="en_GB"
-
+#APP_VER = ${MAJOR_VER}.${MINOR_VER}.`svn info | grep "Revision:" | awk '{print $$2}'`
 
 ifeq (${MAKECMDGOALS}, release-package)
        APP_VER = ${RELEASE_MAJOR_VER}.${RELEASE_MINOR_VER}.${RELEASE_PATCH_VER}
 else
-       APP_VER = ${MAJOR_VER}.${MINOR_VER}.`svn info | grep "Revision:" | awk '{print $$2}'`
+       APP_VER = ${MAJOR_VER}.${MINOR_VER}.`svn log -r HEAD -q | grep -v -e -- | awk '{print $$1}' | tr -d r`
 endif
 
 FILES = ${DATA}/files_debbuild

diff --git a/debian/files b/debian/files
index 6faa604..a28c1e6 100644 (file)
--- a/debian/files
+++ b/debian/files
@@ -1,3 +1,3 @@
-whitestorkgui_1.1.0-1_i386.deb user/office optional
-whitestork_1.1.0-1_i386.deb user/office optional
-whitestorkplugins_1.1.0-1_i386.deb user/office optional
+whitestorkgui_1.1.0-1_arm.deb user/office optional
+whitestork_1.1.0-1_arm.deb user/office optional
+whitestorkplugins_1.1.0-1_arm.deb user/office optional

diff --git a/debian/whitestork.substvars b/debian/whitestork.substvars
index 3fe52c0..fb706ed 100644 (file)
--- a/debian/whitestork.substvars
+++ b/debian/whitestork.substvars
@@ -1 +1 @@
-shlibs:Depends=libbz2-1.0, libc6 (>= 2.3.5-1), libdb1, libdbus-1-2 (>= 0.61), libdbus-glib-1-2 (>= 0.61), libgconf2-6 (>= 2.6.4.14), libglib2.0-0 (>= 2.8.6-1osso1), libosso1 (>= 1.14-1)
+shlibs:Depends=libbz2-1.0, libc6 (>= 2.3.5-1), libdb1, libdbus-1-2 (>= 0.61), libdbus-glib-1-2 (>= 0.61), libgconf2-6 (>= 2.6.4.15), libglib2.0-0 (>= 2.8.6-1osso1), libosso1 (>= 1.20-1)

diff --git a/include/ws_dbus.h b/include/ws_dbus.h
index 82d954d..f2d02e8 100644 (file)
--- a/include/ws_dbus.h
+++ b/include/ws_dbus.h
@@ -254,7 +254,7 @@ void ws_dbus_multipleargs_test (WSDBusData * ws_dbus_data, gchar *method, ...);
 
 #define ws_dbus_client_find_translation(structure,arg) ws_dbus_call_method(structure,"find_translation",WS_DBUS_TYPE_STRING,arg,WS_DBUS_TYPE_INVALID)
 
-#define ws_dbus_client_add_bookmark(structure,arg1,arg2)       ws_dbus_call_method(structure,"signal",WS_DBUS_TYPE_STRING,arg1,WS_DBUS_TYPE_STRING,arg2,WS_DBUS_TYPE_INVALID)
+#define ws_dbus_client_add_bookmark(structure,arg1,arg2)       ws_dbus_call_method(structure,"add_bookmark",WS_DBUS_TYPE_STRING,arg1,WS_DBUS_TYPE_STRING,arg2,WS_DBUS_TYPE_INVALID)
 
 #define ws_dbus_client_remove_bookmark(structure,arg)  ws_dbus_call_method(structure,"remove_bookmark",WS_DBUS_TYPE_STRING,arg,WS_DBUS_TYPE_INVALID)
 

diff --git a/src/bookmarks/bdb/src/engine_bookmark.c b/src/bookmarks/bdb/src/engine_bookmark.c
index 0777316..2e85fff 100755 (executable)
--- a/src/bookmarks/bdb/src/engine_bookmark.c
+++ b/src/bookmarks/bdb/src/engine_bookmark.c
@@ -932,7 +932,7 @@ void bm_engine_search_word_list(Engine* engine,
        while(0 == code) {
                down_word = g_utf8_casefold((gchar*)(search.data),-1);
                
-               if( 0 == g_pattern_match_string( regex, down_word ) )
+               if( g_pattern_match_string( regex, down_word ) == TRUE )
                {
                        tmp = g_strdup(search.data);
                        g_array_append_val(result, tmp );

diff --git a/src/dbus_wrapper/src/ws_dbus.c b/src/dbus_wrapper/src/ws_dbus.c
index d9be50f..addf066 100644 (file)
--- a/src/dbus_wrapper/src/ws_dbus.c
+++ b/src/dbus_wrapper/src/ws_dbus.c
@@ -568,7 +568,7 @@ WSDBusStatus ws_dbus_call_method (WSDBusData * ws_dbus_data, gchar *method, ...)
                
                temp->type = va_arg (arglist, WSDBusDataType);
                
-               g_debug ("Type: %c ", temp->type);
+//             g_debug ("Type: %c ", temp->type);
                
                if (temp->type == WS_DBUS_TYPE_INVALID) break;