Flexible dbus-wrapper interface

[mdictionary] / src / gui / src / ws_gui.c

diff --git a/src/gui/src/ws_gui.c b/src/gui/src/ws_gui.c
index b8cd3fb..5c7af8d 100644 (file)
--- a/src/gui/src/ws_gui.c
+++ b/src/gui/src/ws_gui.c
@@ -93,7 +93,35 @@ int main(int argc, char *argv[])
                         WS_DBUS_CONFIG_REMOTE_IFACE,
                         "org.maemo.WhiteStorkManager");
 
-        ws_dbus_connect (ws_gui_app->dbus_data);
+       ws_dbus_add_method (ws_gui_app->dbus_data,
+                        "return_words",
+                       WS_DBUS_TYPE_GARRAY,
+                       WS_DBUS_TYPE_INVALID);
+                        
+       ws_dbus_add_method (ws_gui_app->dbus_data,
+                        "return_translations",
+                       WS_DBUS_TYPE_STRING,
+                       WS_DBUS_TYPE_INVALID);
+
+       ws_dbus_add_method (ws_gui_app->dbus_data,
+                        "return_extracted_dict",
+                       WS_DBUS_TYPE_STRING,
+                       WS_DBUS_TYPE_INVALID);
+
+       ws_dbus_add_method (ws_gui_app->dbus_data,
+                        "update_progressbar",
+                       WS_DBUS_TYPE_DOUBLE,
+                       WS_DBUS_TYPE_INVALID);
+
+       ws_dbus_add_method (ws_gui_app->dbus_data,
+                        "signal",
+                       WS_DBUS_TYPE_SIGNAL,
+                       WS_DBUS_TYPE_INVALID);
+
+        ws_dbus_add_method (ws_gui_app->dbus_data,
+                        "search_home_applet",
+                       WS_DBUS_TYPE_STRING,
+                       WS_DBUS_TYPE_INVALID);
 
         ws_dbus_set_cb (ws_gui_app->dbus_data,
                         "return_words",
@@ -106,7 +134,7 @@ int main(int argc, char *argv[])
                         ws_gui_app);
         ws_dbus_set_cb (ws_gui_app->dbus_data,
                         "return_extracted_dict",
-                        ws_dbus_server_return_extracted_dict2,
+                        ws_dbus_server_return_extracted_bzip,
                         ws_gui_app);
         ws_dbus_set_cb (ws_gui_app->dbus_data,
                         "update_progressbar",
@@ -116,6 +144,13 @@ int main(int argc, char *argv[])
                         "signal",
                         ws_gui_signal_hander,
                         ws_gui_app);
+       /* added by Dariusz Wiechecki - HISA */
+        ws_dbus_set_cb (ws_gui_app->dbus_data,
+                        "search_home_applet",
+                        ws_gui_search_home_handler,
+                        ws_gui_app);
+
+        ws_dbus_connect (ws_gui_app->dbus_data);
 
         //setting the clipboard
         ws_gui_app->ws_gui_clipboard = 
@@ -123,10 +158,12 @@ int main(int argc, char *argv[])
                                           GDK_SELECTION_CLIPBOARD);
 
         //connecting the signals
-       g_signal_connect(G_OBJECT (ws_gui_app->ws_gui_w_list->ws_gui_selection),
-                         "changed",
-                         G_CALLBACK (ws_gui_tree_selection_changed), 
+       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),