From af8a670fbdab4f13be4c5dbdf6d57af7229d2b78 Mon Sep 17 00:00:00 2001 From: Vlad Vasiliev Date: Fri, 23 Apr 2010 14:46:55 +0300 Subject: [PATCH] added dbsu interface --- applet/src/livewp-dbus.c | 12 ++++++++---- applet/src/livewp-dbus.h | 2 +- applet/src/livewp-main.c | 3 +++ applet/src/livewp-settings.c | 3 +++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/applet/src/livewp-dbus.c b/applet/src/livewp-dbus.c index 5e2db50..b294644 100644 --- a/applet/src/livewp-dbus.c +++ b/applet/src/livewp-dbus.c @@ -98,7 +98,8 @@ livewp_deinitialize_dbus(Animation_WallpaperPrivate *priv){ } /*******************************************************************************/ void -send_dbus_signal (const gchar *interface, +send_dbus_signal (Animation_WallpaperPrivate *priv, + const gchar *interface, const gchar *path, const gchar *member) { @@ -108,7 +109,7 @@ send_dbus_signal (const gchar *interface, dbus_message_set_interface (message, interface); dbus_message_set_path (message, path); dbus_message_set_member (message, member); -// success = dbus_connection_send (priv->dbus_conn_session, message, NULL); + success = dbus_connection_send (priv->dbus_conn_session, message, NULL); dbus_message_unref (message); fprintf (stderr, "%s '%s' message.\n", @@ -124,18 +125,21 @@ get_livewp_signal_cb(DBusConnection *conn, DBusMessage *msg, Animation_Wallpaper #ifdef DEBUGFUNCTIONCALL START_FUNCTION; #endif -/* + #if defined APPLICATION fprintf(stderr,"Application\n"); #else fprintf(stderr,"Plugin\n"); #endif -*/ + if (dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_RELOAD_CONFIG)){ if(read_config(priv)){ fprintf(stderr, "\nCan not read config file.\n"); }else{ read_config(priv); +#ifndef APPLICATION + reload_scene(priv->desktop_plugin); +#endif } } #ifndef APPLICATION diff --git a/applet/src/livewp-dbus.h b/applet/src/livewp-dbus.h index de903ce..f035bda 100644 --- a/applet/src/livewp-dbus.h +++ b/applet/src/livewp-dbus.h @@ -33,6 +33,6 @@ void livewp_initialize_dbus(Animation_WallpaperPrivate *priv); void livewp_deinitialize_dbus(Animation_WallpaperPrivate *priv); DBusHandlerResult get_livewp_signal_cb(DBusConnection *conn, DBusMessage *msg, Animation_WallpaperPrivate *priv); -void send_dbus_signal (const gchar *interface, const gchar *path, const gchar *member); +void send_dbus_signal (Animation_WallpaperPrivate *priv, const gchar *interface, const gchar *path, const gchar *member); /*******************************************************************************/ #endif diff --git a/applet/src/livewp-main.c b/applet/src/livewp-main.c index cfa03dd..4591b4f 100644 --- a/applet/src/livewp-main.c +++ b/applet/src/livewp-main.c @@ -67,6 +67,9 @@ main(int argc, char *argv[]) /* Load config */ read_config(priv); + /* Initialize DBUS */ + livewp_initialize_dbus(priv); + /* Create Main GUI */ main_widget = hildon_stackable_window_new (); gtk_window_set_title(GTK_WINDOW(main_widget), PACKAGE); diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c index 3da521c..ce2de02 100644 --- a/applet/src/livewp-settings.c +++ b/applet/src/livewp-settings.c @@ -146,6 +146,9 @@ lw_settings(GtkWidget *widget, Animation_WallpaperPrivate *priv){ priv->rich_animation = FALSE; } save_config(priv); + send_dbus_signal (LIVEWP_SIGNAL_INTERFACE, + LIVEWP_SIGNAL_PATH, + LIVEWP_RELOAD_CONFIG); //reload_scene(priv->desktop_plugin); break; default: -- 1.7.9.5