From: Vlad Vasiliev <vlad@toshiba2.oblgaz>
Date: Sat, 24 Apr 2010 06:29:17 +0000 (+0300)
Subject: dbus is done
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=41be806456fab08aacfef486b7f6f3131da97163;p=livewp

dbus is done
---

diff --git a/applet/src/livewp-config.c b/applet/src/livewp-config.c
index 2f93107..a6e1a84 100644
--- a/applet/src/livewp-config.c
+++ b/applet/src/livewp-config.c
@@ -30,7 +30,7 @@ read_config(Animation_WallpaperPrivate *priv) {
     GConfClient *gconf_client = NULL;
     gchar *tmp = NULL;
     GConfValue *value = NULL;
-
+    
     gconf_client = gconf_client_get_default();
     if (!gconf_client) {
         fprintf(stderr, _("Failed to initialize GConf. Quitting.\n"));
diff --git a/applet/src/livewp-dbus.c b/applet/src/livewp-dbus.c
index b294644..89e746a 100644
--- a/applet/src/livewp-dbus.c
+++ b/applet/src/livewp-dbus.c
@@ -55,7 +55,7 @@ livewp_initialize_dbus(Animation_WallpaperPrivate *priv){
             /* add the callback */
             dbus_connection_add_filter(priv->dbus_conn_session,
                                        get_livewp_signal_cb,
-                                       NULL, NULL);
+                                       priv, NULL);
         }
 
   // }
@@ -129,7 +129,7 @@ get_livewp_signal_cb(DBusConnection *conn, DBusMessage *msg, Animation_Wallpaper
 #if defined APPLICATION
     fprintf(stderr,"Application\n");
 #else 
-    fprintf(stderr,"Plugin\n");
+    fprintf(stderr,"Plugin %p\n", priv);
 #endif
 
     if (dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_RELOAD_CONFIG)){
diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index 3e2f606..d6bab1a 100644
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -1593,9 +1593,13 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
     fprintf(stderr, "!!!!!!!plugin init \n");
     Animation_WallpaperPrivate *priv =  Animation_Wallpaper_HOME_PLUGIN_GET_PRIVATE (desktop_plugin);
     desktop_plugin->priv =  Animation_Wallpaper_HOME_PLUGIN_GET_PRIVATE (desktop_plugin);
+    priv->osso = osso_initialize(PACKAGE, VERSION, TRUE, NULL);
 
     /* Load config */
     read_config(priv);
+    /* Initialize DBUS */
+    livewp_initialize_dbus(priv);
+
     priv->desktop_plugin = desktop_plugin;
     priv->visible = TRUE;
     priv->short_timer = 0;
diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c
index ee68c1c..388aa2b 100644
--- a/applet/src/livewp-settings.c
+++ b/applet/src/livewp-settings.c
@@ -146,7 +146,8 @@ lw_settings(GtkWidget *widget, Animation_WallpaperPrivate *priv){
                     priv->rich_animation = FALSE;
             }
             save_config(priv);
-            send_dbus_signal (LIVEWP_SIGNAL_INTERFACE,
+            send_dbus_signal (priv,
+                              LIVEWP_SIGNAL_INTERFACE,
                               LIVEWP_SIGNAL_PATH,
                               LIVEWP_RELOAD_CONFIG);
         break;