From 17451fc872107da608c8b44b044866578d0d120f Mon Sep 17 00:00:00 2001
From: Tanya <tanya@bookdmitri.oblgaz>
Date: Sun, 28 Mar 2010 00:01:52 +0200
Subject: [PATCH] 123

---
 applet/src/livewp-home-widget.c |   33 ++++++++++++++++++---------------
 applet/src/livewp-home-widget.h |    5 ++---
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index 7bb4f58..1c44f0e 100644
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -163,6 +163,7 @@ init_object(gchar * name, gint x, gint y, gint z, gint width, gint height)
   GtkWidget *actor;
   GdkPixbuf *pixbuf;
   GtkWidget *image;
+  gdouble scale = 1.0;
 
   actor = hildon_animation_actor_new();
   gchar str[256];
@@ -184,14 +185,20 @@ init_object(gchar * name, gint x, gint y, gint z, gint width, gint height)
   hildon_animation_actor_set_show (actor, 1);
   realize(actor);
   gtk_widget_show_all(actor);
+  
   g_object_set_data(G_OBJECT(actor), "name", name);
   g_object_set_data(G_OBJECT(actor), "image", image);
   g_object_set_data(G_OBJECT(actor), "x", x);
   g_object_set_data(G_OBJECT(actor), "y", y);
   g_object_set_data(G_OBJECT(actor), "z", z);
   g_object_set_data(G_OBJECT(actor), "scale", 10);
-
-  
+/*
+  a.widget = actor;
+  a.name = name;
+  a.x = x;
+  a.y = y;
+  a.z = z;
+  */
   //objects_list = g_slist_append(objects_list, G_OBJECT(actor));
   //objects_list = g_slist_append(objects_list, G_OBJECT(a));
   return actor;
@@ -247,8 +254,8 @@ static void
 change_actor(GtkWidget * actor)
 {
     char * name;
-    gint x, y, daytime, sc;
-    double scale;
+    gint x, y, daytime, scale;
+    gdouble sc;
     double alt, azm;
 
     GtkWidget *image;
@@ -269,14 +276,11 @@ change_actor(GtkWidget * actor)
     if (name == "cloud1"){
         x = g_object_get_data(G_OBJECT(actor), "x");
         y = g_object_get_data(G_OBJECT(actor), "y");
-        sc = g_object_get_data(G_OBJECT(actor), "scale");
+        scale = g_object_get_data(G_OBJECT(actor), "scale");
 
         /* Start */
         image = g_object_get_data(G_OBJECT(actor), "image");
         
-<<<<<<< HEAD:applet/src/livewp-home-widget.c
-        x += 20;
-=======
         gtk_container_remove(actor, image);  
         pixbuf = gdk_pixbuf_new_from_file_at_size ("/usr/share/anwall/sun.png", 
                                              200, 
@@ -295,21 +299,20 @@ change_actor(GtkWidget * actor)
 
             
         x += 40;
->>>>>>> 62f8681405784e829cd53f1a59c30656729b22b7:applet/src/livewp-home-widget.c
         y -= 20;
-        sc -= 1;
+        scale -= 1;
         if (x > 500){
             x = 400;
             y = 150;
-            sc = 10;
+            sc = 1;
         }
-        scale = (double)sc / 10;
-        hildon_animation_actor_set_scale(actor, scale, scale);
-        fprintf(stderr, "cloud x=%d y=%d scale=%f", x, y, scale);
+        sc = (double)scale / 10;
+        hildon_animation_actor_set_scale(actor, sc, sc);
+        fprintf(stderr, "cloud x=%d y=%d scale=%f", x, y, sc);
         actor_set_position_full(actor, x, y, g_object_get_data(G_OBJECT(actor), "z"));
         g_object_set_data(G_OBJECT(actor), "x", x);
         g_object_set_data(G_OBJECT(actor), "y", y);
-        g_object_set_data(G_OBJECT(actor), "scale", sc);
+        g_object_set_data(G_OBJECT(actor), "scale", scale);
     }
 
 }
diff --git a/applet/src/livewp-home-widget.h b/applet/src/livewp-home-widget.h
index 3688aab..c9d181f 100644
--- a/applet/src/livewp-home-widget.h
+++ b/applet/src/livewp-home-widget.h
@@ -76,12 +76,11 @@ typedef struct {
 typedef struct {
     GtkWidget * widget;
     gchar * name;
-    gchar * filename;
+    GtkWidget * image;
     gint x;
     gint y;
     gint z;
-    gint widht;
-    gint height;
+    double scale;
     gboolean visible;
 
 } Actor;
-- 
1.7.9.5