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

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

diff --git a/applet/src/livewp-scene.c b/applet/src/livewp-scene.c
index 8c55810..69f71dd 100644 (file)
--- a/applet/src/livewp-scene.c
+++ b/applet/src/livewp-scene.c
@@ -68,10 +68,8 @@ init_scene_Accel(AWallpaperPlugin *desktop_plugin)
     GPtrArray *child;
     gint now = time(NULL);
     gchar *str;
-    gint sizes[4] = {170, 229, 130, 150}, 
-        sizes1[4] = {57, 76, 43, 50},
-        heights[4] = {0, 100, 200, 300}, 
-        n, i, j;
+    gint sizes1[4] = {57, 76, 43, 50},
+         n, j;
     
     fprintf(stderr, "init scene accel\n");
     scene = g_new0(Scene, 1);
@@ -88,16 +86,14 @@ init_scene_Accel(AWallpaperPlugin *desktop_plugin)
     
     for (j= 0; j<4; j++){
     for (n=0; n<4; n++){
-        //for (i=0; i<3; i++){
-            str = g_strdup_printf("tape%i.png", n+1);
-            actor = init_object(desktop_plugin, "tape", str,
-                                fast_rnd(800), fast_rnd(480), 2+fast_rnd(6), 800, sizes1[n],
-                                TRUE, TRUE, 100, 255,
-                                NULL, NULL, NULL);
-            scene->actors = g_slist_append(scene->actors, actor);
-            g_ptr_array_add(child, actor);
-            g_free(str);
-        //}
+        str = g_strdup_printf("tape%i.png", n+1);
+        actor = init_object(desktop_plugin, "tape", str,
+                            fast_rnd(800), fast_rnd(480), 2+fast_rnd(6), 800, sizes1[n],
+                            TRUE, TRUE, 100, 255,
+                            NULL, NULL, NULL);
+        scene->actors = g_slist_append(scene->actors, actor);
+        g_ptr_array_add(child, actor);
+        g_free(str);
     }
     }
     actor = init_object(desktop_plugin, "tape", "", 
@@ -177,10 +173,11 @@ init_scene_Xsnow(AWallpaperPlugin *desktop_plugin){
     fprintf(stderr,"init_scene_Xsnow\n");
     char* child_argv[128];
     char *run_string = NULL;
-
-//    fprintf(stderr, "PARAMETR %s\n",  desktop_plugin->priv->theme_string_parametr1);
-//    run_string = g_strdup_printf("/usr/bin/mplayer -vo x11 -wid %d %s\n", \
+#if 0
+    fprintf(stderr, "PARAMETR %s\n",  desktop_plugin->priv->theme_string_parametr1);
+    run_string = g_strdup_printf("/usr/bin/mplayer -vo x11 -wid %d %s\n", \
                                 GDK_WINDOW_XID(desktop_plugin->priv->window->window), desktop_plugin->priv->theme_string_parametr1);
+#endif
     if (!desktop_plugin->priv->visible)
         return;
     run_string= g_strdup_printf("/usr/bin/xsnow");