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

Conflicts:

	applet/src/livewp-home-widget.c

diff --cc applet/src/livewp-home-widget.c
index 8946ca7,c23f2ea..47bcca8
--- 1/applet/src/livewp-home-widget.c
--- 2/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@@ -305,34 -309,21 +309,21 @@@ init_scene(AWallpaperPlugin *desktop_pl
    scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor));
    //ma1->multiactor_init("sun", g_slist_append(list, G_OBJECT(actor)));
  
 -  actor = init_object("sky", "sky.png", 0, 0, 5, 800, 480, 1, 100, 255, NULL);
 +  actor = init_object(desktop_plugin, "sky", "sky.png", 0, 0, 5, 800, 480, 1, 100, 255, NULL);
    scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor));
  
 -  actor = init_object("town", "town.png", 0, 480-374, 10, 800, 374, 1, 100, 255, NULL);
 +  actor = init_object(desktop_plugin, "town", "town.png", 0, 480-374, 10, 800, 374, 1, 100, 255, NULL);
    scene.static_actors = g_slist_append(scene.static_actors, G_OBJECT(actor));
    
 -  actor = init_object("border", "border.png", 0, 480-79, 30, 800, 79, 1, 100, 255, NULL);
 +  actor = init_object(desktop_plugin, "border", "border.png", 0, 480-79, 30, 800, 79, 1, 100, 255, NULL);
    scene.static_actors = g_slist_append(scene.static_actors, G_OBJECT(actor));
    
-   actor = init_object(desktop_plugin, "tram", "tram.png", -350, 60+480-374+34, 25, 350, 274, 1, 100, 255, &change_tram);
 -  actor = init_object("tram", "tram.png", -300, 191, 25, 350, 240, 1, 100, 255, NULL);
++  actor = init_object(desktop_plugin, "tram", "tram.png", -300, 191, 25, 350, 240, 1, 100, 255, NULL);
    scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor));
    
- /*
-   actor = init_object("cloud1", 400, 150, 2, 200, 150, NULL);
-   scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor));
- 
-   actor = init_object("sun", 10, 10, 50, 88, 88, NULL);
-   list = g_slist_append(list, G_OBJECT(actor));
-   actor = init_object("cloud1", 50, 50, 49, 150, 100, NULL);
-   list = g_slist_append(list, G_OBJECT(actor));
- 
-   ma1 = multiactor_init("multi", list, 0, 0, 50, 1.0, TRUE);
-   //objects_list = g_slist_append(objects_list, G_OBJECT(ma)); 
-   */
- 
  }
  static void
 -init_scene1(GtkWidget *window)
 +init_scene1(AWallpaperPlugin *desktop_plugin)
  {
    GtkWidget *actor;
    GdkPixbuf *pixbuf;