some change in multiactor

[livewp] / applet / src / livewp-multiactor.c

diff --git a/applet/src/livewp-multiactor.c b/applet/src/livewp-multiactor.c
index de39357..a282a1f 100644 (file)
--- a/applet/src/livewp-multiactor.c
+++ b/applet/src/livewp-multiactor.c
@@ -26,19 +26,17 @@
 
 MultiActor * multiactor_init(gchar * name, GSList * child, gint x, gint y, gint z, double scale, gboolean visible)
 {
-    MultiActor ma, *p;
-    ma.name = name;
-    ma.child = child;
-    ma.x = x;
-    ma.y = y;
-    ma.z = z;
-    ma.scale = scale;
-    ma.visible = visible;
-
-    p = &ma;
-    fprintf(stderr, "init multiactor p=%p name=%s\n", p, p->name);
-
-    return p;
+    MultiActor *ma = NULL;
+    ma = g_new0(MultiActor, 1);
+    ma->name = name;
+    ma->child = child;
+    ma->x = x;
+    ma->y = y;
+    ma->z = z;
+    ma->scale = scale;
+    ma->visible = visible;
+    fprintf(stderr, "multiator init name=%s\n", ma->name);
+    return ma;
 }
 
 void multiactor_set_visible(MultiActor *ma, gboolean visible)
@@ -48,11 +46,11 @@ void multiactor_set_visible(MultiActor *ma, gboolean visible)
     while (tmp != NULL){
         if (visible == FALSE){
             // hide all
-            hildon_animate_actor_set_show(tmp->data, visible);
+            hildon_animation_actor_set_show(tmp->data, visible);
         }else {
             // show only needed
             cur_visible = g_object_get_data(G_OBJECT(tmp->data), "visible");
-            if (cur_visible) hildon_animate_actor_set_show(tmp->data, visible);
+            if (cur_visible) hildon_animation_actor_set_show(tmp->data, visible);
         }
         tmp = g_slist_next(tmp);
     }
@@ -62,7 +60,7 @@ void multiactor_set_scale(MultiActor *ma, double scale)
 {
     GSList * tmp = ma->child;
     while (tmp != NULL){
-        hildon_animate_actor_set_scale(tmp->data, scale, scale);
+        hildon_animation_actor_set_scale(tmp->data, scale, scale);
         tmp = g_slist_next(tmp);
     }
     ma->scale = scale;