Merge branch 'master' of https://vcs.maemo.org/git/livewp

[livewp] / applet / src / livewp-home-widget.c

diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index f7f0706..e8e9904 100644 (file)
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -367,9 +367,9 @@ change_tram(Actor * actor, AWallpaperPlugin *desktop_plugin)
 void
 change_plane1(Actor *actor, AWallpaperPlugin *desktop_plugin)
 {
-    gint x0 = 620, y0 = 233, scale0 = 100,
-         x1 = 79, y1 = -146, scale1 = 100, 
-         x, y, scale;
+    gint x0 = 620, y0 = 233,
+         x1 = 79, y1 = -146, 
+         x, y;
     struct timeval tvb;     
     suseconds_t ms;
     long sec;
@@ -413,9 +413,9 @@ change_plane1(Actor *actor, AWallpaperPlugin *desktop_plugin)
 void
 change_plane2(Actor *actor, AWallpaperPlugin *desktop_plugin)
 {
-    gint x0 = -actor->width, y0 = 45, scale0 = 100,
-         x1 = 800, y1 = 20, scale1 = 100, 
-         x, y, scale;
+    gint x0 = -actor->width, y0 = 45,
+         x1 = 800, y1 = 20, 
+         x, y;
     struct timeval tvb;     
     suseconds_t ms;
     long sec;
@@ -701,8 +701,7 @@ change_static_actor(Actor * actor, AWallpaperPlugin *desktop_plugin)
 void 
 change_static_actor_with_corner(Actor * actor, AWallpaperPlugin *desktop_plugin)
 {
-    gchar *newfile;
-    gchar           buffer[2048];
+    gchar buffer[2048];
 
     if (desktop_plugin->priv->right_corner)
         gtk_widget_destroy(desktop_plugin->priv->right_corner);
@@ -921,7 +920,7 @@ init_scene(AWallpaperPlugin *desktop_plugin)
   actor = init_object(desktop_plugin, "sun", "sun.png", 
                       0, 0, 6, 88, 88, 
                       TRUE, TRUE, 100, 255, 
-                      (gpointer)&change_sun, &probability_sun, NULL);
+                      (gpointer)&change_sun, (gpointer)&probability_sun, NULL);
   actor->time_start_animation = now;
   actor->duration_animation = G_MAXINT;
   change_sun(actor, desktop_plugin);
@@ -1229,7 +1228,7 @@ init_scene1(AWallpaperPlugin *desktop_plugin)
   
   actor = init_object(desktop_plugin, "sun", "sun.png", 0, 0, 6, 88, 88, 
                       TRUE, TRUE, 100, 255, 
-                      (gpointer)&change_sun, &probability_sun, NULL);
+                      (gpointer)&change_sun, (gpointer)&probability_sun, NULL);
   actor->time_start_animation = time(NULL);
   actor->duration_animation = G_MAXINT;
   change_sun(actor, desktop_plugin);
@@ -1455,7 +1454,7 @@ change_actor(GtkWidget * actor)
 static gboolean
 short_timeout (AWallpaperPlugin *desktop_plugin)
 {
-    gint daytime = get_daytime();
+    //gint daytime = get_daytime();
     GSList * tmp;
     void (*pfunc)(gpointer, gpointer);
     time_t now;
@@ -1585,6 +1584,7 @@ gboolean
 rich_animation_press(GtkWidget *widget, GdkEvent *event,
                                             gpointer user_data){
     fprintf(stderr,"gggggggggggggggggggg2222\n");
+    return FALSE;
 }    
 static void
 animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)