fix conflict

diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index 280e5c0..f727b24 100644 (file)
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -338,15 +338,15 @@ init_scene(AWallpaperPlugin *desktop_plugin)
 
 
   snprintf(str, 255, "sky%i.png", scene.daytime);
-  actor = init_object("sky", str, 0, 0, 5, 800, 480, 1, 100, 255, NULL);
+  actor = init_object(desktop_plugin, "sky", str, 0, 0, 5, 800, 480, 1, 100, 255, NULL);
   scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor));
 
   snprintf(str, 255, "town%i.png", scene.daytime);
-  actor = init_object("town", str, 0, 480-374, 10, 800, 374, 1, 100, 255, NULL);
+  actor = init_object(desktop_plugin, "town", str, 0, 480-374, 10, 800, 374, 1, 100, 255, NULL);
   scene.static_actors = g_slist_append(scene.static_actors, G_OBJECT(actor));
   
   snprintf(str, 255, "border%i.png", scene.daytime);
-  actor = init_object("border", str, 0, 480-79, 30, 800, 79, 1, 100, 255, NULL);
+  actor = init_object(desktop_plugin, "border", str, 0, 480-79, 30, 800, 79, 1, 100, 255, NULL);
   scene.static_actors = g_slist_append(scene.static_actors, G_OBJECT(actor));
   
   //if (scene.daytime == TIME_DAY) snprintf(str, 255, "tram.png");