changed some parametres

diff --git a/applet/data/Makefile.in b/applet/data/Makefile.in
index ac07958..412c636 100644 (file)
--- a/applet/data/Makefile.in
+++ b/applet/data/Makefile.in
@@ -243,7 +243,6 @@ matrixthemedir = $(datadir)/livewp/theme/Matrix
 matrixtheme_DATA = theme/Matrix/* 
 accelthemedir = $(datadir)/livewp/theme/Accel
 acceltheme_DATA = theme/Accel/* 
- = ======
 videothemedir = $(datadir)/livewp/theme/Video
 videotheme_DATA = theme/Video/* 
 dbus_servicedir = $(datadir)/dbus-1/services
@@ -257,7 +256,9 @@ icondir = $(datadir)/icons/hicolor
 EXTRA_DIST = $(berlintheme_DATA) \
             $(moderntheme_DATA) \
             $(matrixtheme_DATA) \
-<<<<<<< HEAD
+            $(acceltheme_DATA) \
+            $(videotheme_DATA) \
+            $(dbus_service_DATA)
 
 all: all-am
 
@@ -428,7 +429,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-       $(mkdir_p) $(distdir)/theme/Berlin $(distdir)/theme/Matrix $(distdir)/theme/Modern
+       $(mkdir_p) $(distdir)/theme/Accel $(distdir)/theme/Berlin $(distdir)/theme/Matrix $(distdir)/theme/Modern $(distdir)/theme/Video
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \
@@ -556,9 +557,6 @@ uninstall-am: uninstall-accelthemeDATA uninstall-berlinthemeDATA \
        uninstall-videothemeDATA
 
 
-<<<<<<< HEAD
->>>>>>> master
-
 install-data-local:
        i=livewp; \
        $(mkinstalldirs) $(DESTDIR)$(icondir)/26x26/hildon; \
@@ -573,11 +571,6 @@ uninstall-local:
        rm $(DESTDIR)$(icondir)/26x26/hildon/$$i.png; \
        rm $(DESTDIR)$(icondir)/40x40/hildon/$$i.png; \
        $(DESTDIR)$(icondir)/scalable/hildon/$$i.png;
-            $(acceltheme_DATA) \
-=======
-            $(videotheme_DATA) \
->>>>>>> master
-            $(dbus_service_DATA)
 
 livewp.desktop: livewp.desktop.in
        sed "s/__VERSION__/$(VERSION)/g" $< >$@.tmp && \

diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index ed856a0..3d53e65 100644 (file)
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -534,7 +534,7 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
     g_hash_table_insert(priv->hash_scene_func, g_strdup("Accel"), (gpointer)&init_scene_Accel);
     g_hash_table_insert(priv->hash_scene_func, g_strdup("Video"), (gpointer)&init_scene_Video);
 //#endif
-    priv->theme = g_strdup("Accel");
+    //priv->theme = g_strdup("Accel");
     desktop_plugin->priv->main_widget = gtk_fixed_new();
 
     gtk_widget_set_size_request(desktop_plugin->priv->main_widget, 1, 1);

diff --git a/applet/src/livewp-main.c b/applet/src/livewp-main.c
index 15eb491..42e2994 100644 (file)
--- a/applet/src/livewp-main.c
+++ b/applet/src/livewp-main.c
@@ -183,6 +183,7 @@ main(int argc, char *argv[])
     gtk_widget_show_all(GTK_WIDGET(main_widget));
 
     priv->hash_scene_func = g_hash_table_new(g_str_hash, g_str_equal);
+    g_hash_table_insert(priv->hash_scene_func, g_strdup("Accel"),  (gpointer)&init_scene_Accel);
     g_hash_table_insert(priv->hash_scene_func, g_strdup("Berlin"), (gpointer)&init_scene_Berlin);
     g_hash_table_insert(priv->hash_scene_func, g_strdup("Modern"), (gpointer)&init_scene_Modern);
     g_hash_table_insert(priv->hash_scene_func, g_strdup("Matrix"), (gpointer)&init_scene_Matrix);

diff --git a/applet/src/livewp-scene.c b/applet/src/livewp-scene.c
index d9fa751..c658a60 100644 (file)
--- a/applet/src/livewp-scene.c
+++ b/applet/src/livewp-scene.c
@@ -64,6 +64,7 @@ init_scene_Accel(AWallpaperPlugin *desktop_plugin)
         heights[4] = {0, 100, 200, 300}, 
         n, i, j;
     
+    fprintf(stderr, "init scene accel\n");
     scene = g_new0(Scene, 1);
     scene->actors = NULL;
     desktop_plugin->priv->scene = scene;
@@ -81,7 +82,7 @@ init_scene_Accel(AWallpaperPlugin *desktop_plugin)
         for (i=0; i<3; i++){
             str = g_strdup_printf("tape%i_%i.png", n+1, i);
             actor = init_object(desktop_plugin, "tape", str,
-                                fast_rnd(700), fast_rnd(430), 5+fast_rnd(20), 800, sizes[n],
+                                fast_rnd(700), fast_rnd(430), 1+fast_rnd(10), 800, sizes[n],
                                 TRUE, TRUE, 100, 255,
                                 NULL, NULL, NULL);
             scene->actors = g_slist_append(scene->actors, actor);