From 22cf36c72adf103e093f3485f1fd7d9abc6a5d02 Mon Sep 17 00:00:00 2001
From: Vlad Vasiliev <vlad@toshiba2.oblgaz>
Date: Mon, 29 Mar 2010 17:53:42 +0300
Subject: [PATCH] fixed structure of code

---
 applet/src/livewp-common.h      |   12 ++++++++++++
 applet/src/livewp-home-widget.c |    5 ++---
 applet/src/livewp-home-widget.h |    7 +++++++
 applet/src/livewp-multiactor.h  |   13 ++-----------
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/applet/src/livewp-common.h b/applet/src/livewp-common.h
index 3534c13..dafabaa 100644
--- a/applet/src/livewp-common.h
+++ b/applet/src/livewp-common.h
@@ -29,3 +29,15 @@
 
 #define GETTEXT_PACKAGE "livewp"
 #include <glib/gi18n-lib.h>
+
+typedef struct {
+    gchar * name;
+    GSList * child;
+    gint x;
+    gint y;
+    gint z;
+    double scale;
+    gboolean visible;
+
+} MultiActor;
+
diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index 6cb20a0..4d5a088 100644
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -26,7 +26,6 @@
 #include "livewp-home-widget.h"
 #include <gconf/gconf-client.h>
 #include "livewp-rules.h"
-#include "livewp-multiactor.h"
 
 #define PLUGIN_NAME "livewp-home-widget.desktop-0"
 #define GCONF_KEY_POSITION "/apps/osso/hildon-desktop/applets/%s/position"
@@ -150,7 +149,7 @@ init_applet_position(void)
   g_object_unref(gconf_client);
 }
 
-static void
+void
 actor_set_position_full(GtkWidget *actor, gint x, gint y, gint z)
 {
  fprintf(stderr, "actor_set_position_full\n");
@@ -275,7 +274,7 @@ void change_multiactor()
 
     x = ma1->x + 10;
     y = ma1->y + 10;
-    //multiactor_set_position(ma1, x, y, 0);
+    multiactor_set_position(ma1, x, y, 0);
 
 }
 
diff --git a/applet/src/livewp-home-widget.h b/applet/src/livewp-home-widget.h
index bd17c68..8aa868c 100644
--- a/applet/src/livewp-home-widget.h
+++ b/applet/src/livewp-home-widget.h
@@ -94,4 +94,11 @@ struct _Animation_WallpaperPrivate
       gpointer data;
 };
 void live_wallpaper_settings(GtkWidget *widget, gpointer user_data);
+MultiActor *multiactor_init(gchar * name, GSList * child, gint x, gint y, gint z, double scale, gboolean visible);
+void multiactor_set_visible(MultiActor *ma, gboolean visible);
+void multiactor_set_scale(MultiActor *ma, double scale);
+void multiactor_set_position(MultiActor *ma, gint dx, gint dy, gint dz);
+void actor_set_position_full(GtkWidget *actor, gint x, gint y, gint z);
+
+
 #endif
diff --git a/applet/src/livewp-multiactor.h b/applet/src/livewp-multiactor.h
index 4c788b8..f8ec6ac 100644
--- a/applet/src/livewp-multiactor.h
+++ b/applet/src/livewp-multiactor.h
@@ -28,20 +28,11 @@
 #include <glib-object.h>
 
 #include <libhildondesktop/libhildondesktop.h>
-
-typedef struct {
-    gchar * name;
-    GSList * child;
-    gint x;
-    gint y;
-    gint z;
-    double scale;
-    gboolean visible;
-
-} MultiActor;
+#include "livewp-common.h"
 /*******************************************************************************/
 MultiActor * multiactor_init(gchar * name, GSList * child, gint x, gint y, gint z, double scale, gboolean visible);
 void multiactor_set_visible(MultiActor *ma, gboolean visible);
 void multiactor_set_scale(MultiActor *ma, double scale);
 void multiactor_set_position(MultiActor *ma, gint dx, gint dy, gint dz);
+void actor_set_position_full(GtkWidget *actor, gint x, gint y, gint z);
 #endif
-- 
1.7.9.5