fixed time to change image, added icons to slideshow and flash, added change image...

diff --git a/applet/data/Makefile.am b/applet/data/Makefile.am
index 1da616c..fdbe4c1 100644 (file)
--- a/applet/data/Makefile.am
+++ b/applet/data/Makefile.am
@@ -46,6 +46,12 @@ crazytheme_DATA = theme/CrazyChickens/*
 videothemedir = $(datadir)/livewp/theme/Video
 videotheme_DATA = theme/Video/* 
 
+flashthemedir = $(datadir)/livewp/theme/Flash
+flashtheme_DATA = theme/Flash/* 
+
+slideshowthemedir = $(datadir)/livewp/theme/Slideshow
+slideshowtheme_DATA = theme/Slideshow/* 
+
 xsnowthemedir = $(datadir)/livewp/theme/Xsnow
 xsnowtheme_DATA = theme/Xsnow/* 
 
@@ -94,6 +100,8 @@ EXTRA_DIST = $(berlintheme_DATA) \
             $(crazytheme_DATA) \
             $(liqflowtheme_DATA) \
             $(videotheme_DATA) \
+            $(flashtheme_DATA) \
+            $(slideshowtheme_DATA) \
             $(xshowtheme_DATA) \
             $(conkytheme_DATA) \
             $(colorfloodtheme_DATA) \

diff --git a/applet/data/Makefile.in b/applet/data/Makefile.in
index 56b2d96..2199810 100644 (file)
--- a/applet/data/Makefile.in
+++ b/applet/data/Makefile.in
@@ -67,7 +67,7 @@ CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-am__installdirs = "$(DESTDIR)$(accelthemedir)" "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(colorfloodthemedir)" "$(DESTDIR)$(conkythemedir)" "$(DESTDIR)$(crazythemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(externalthemedir)" "$(DESTDIR)$(fifteenthemedir)" "$(DESTDIR)$(liqflowthemedir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" "$(DESTDIR)$(videothemedir)" "$(DESTDIR)$(xsnowthemedir)"
+am__installdirs = "$(DESTDIR)$(accelthemedir)" "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(colorfloodthemedir)" "$(DESTDIR)$(conkythemedir)" "$(DESTDIR)$(crazythemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(externalthemedir)" "$(DESTDIR)$(fifteenthemedir)" "$(DESTDIR)$(flashthemedir)" "$(DESTDIR)$(liqflowthemedir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" "$(DESTDIR)$(slideshowthemedir)" "$(DESTDIR)$(videothemedir)" "$(DESTDIR)$(xsnowthemedir)"
 accelthemeDATA_INSTALL = $(INSTALL_DATA)
 berlinthemeDATA_INSTALL = $(INSTALL_DATA)
 colorfloodthemeDATA_INSTALL = $(INSTALL_DATA)
@@ -77,16 +77,19 @@ dbus_serviceDATA_INSTALL = $(INSTALL_DATA)
 desktoppanelDATA_INSTALL = $(INSTALL_DATA)
 externalthemeDATA_INSTALL = $(INSTALL_DATA)
 fifteenthemeDATA_INSTALL = $(INSTALL_DATA)
+flashthemeDATA_INSTALL = $(INSTALL_DATA)
 liqflowthemeDATA_INSTALL = $(INSTALL_DATA)
 matrixthemeDATA_INSTALL = $(INSTALL_DATA)
 modernthemeDATA_INSTALL = $(INSTALL_DATA)
+slideshowthemeDATA_INSTALL = $(INSTALL_DATA)
 videothemeDATA_INSTALL = $(INSTALL_DATA)
 xsnowthemeDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(acceltheme_DATA) $(berlintheme_DATA) $(colorfloodtheme_DATA) \
        $(conkytheme_DATA) $(crazytheme_DATA) $(dbus_service_DATA) \
        $(desktoppanel_DATA) $(externaltheme_DATA) \
-       $(fifteentheme_DATA) $(liqflowtheme_DATA) $(matrixtheme_DATA) \
-       $(moderntheme_DATA) $(videotheme_DATA) $(xsnowtheme_DATA)
+       $(fifteentheme_DATA) $(flashtheme_DATA) $(liqflowtheme_DATA) \
+       $(matrixtheme_DATA) $(moderntheme_DATA) $(slideshowtheme_DATA) \
+       $(videotheme_DATA) $(xsnowtheme_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -263,6 +266,10 @@ crazytheme_DATA = theme/CrazyChickens/*
 #orrerytheme_DATA = theme/Orrery/* 
 videothemedir = $(datadir)/livewp/theme/Video
 videotheme_DATA = theme/Video/* 
+flashthemedir = $(datadir)/livewp/theme/Flash
+flashtheme_DATA = theme/Flash/* 
+slideshowthemedir = $(datadir)/livewp/theme/Slideshow
+slideshowtheme_DATA = theme/Slideshow/* 
 xsnowthemedir = $(datadir)/livewp/theme/Xsnow
 xsnowtheme_DATA = theme/Xsnow/* 
 colorfloodthemedir = $(datadir)/livewp/theme/Colorflood
@@ -287,6 +294,8 @@ EXTRA_DIST = $(berlintheme_DATA) \
             $(crazytheme_DATA) \
             $(liqflowtheme_DATA) \
             $(videotheme_DATA) \
+            $(flashtheme_DATA) \
+            $(slideshowtheme_DATA) \
             $(xshowtheme_DATA) \
             $(conkytheme_DATA) \
             $(colorfloodtheme_DATA) \
@@ -488,6 +497,23 @@ uninstall-fifteenthemeDATA:
          echo " rm -f '$(DESTDIR)$(fifteenthemedir)/$$f'"; \
          rm -f "$(DESTDIR)$(fifteenthemedir)/$$f"; \
        done
+install-flashthemeDATA: $(flashtheme_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(flashthemedir)" || $(mkdir_p) "$(DESTDIR)$(flashthemedir)"
+       @list='$(flashtheme_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " $(flashthemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(flashthemedir)/$$f'"; \
+         $(flashthemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(flashthemedir)/$$f"; \
+       done
+
+uninstall-flashthemeDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(flashtheme_DATA)'; for p in $$list; do \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " rm -f '$(DESTDIR)$(flashthemedir)/$$f'"; \
+         rm -f "$(DESTDIR)$(flashthemedir)/$$f"; \
+       done
 install-liqflowthemeDATA: $(liqflowtheme_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(liqflowthemedir)" || $(mkdir_p) "$(DESTDIR)$(liqflowthemedir)"
@@ -539,6 +565,23 @@ uninstall-modernthemeDATA:
          echo " rm -f '$(DESTDIR)$(modernthemedir)/$$f'"; \
          rm -f "$(DESTDIR)$(modernthemedir)/$$f"; \
        done
+install-slideshowthemeDATA: $(slideshowtheme_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(slideshowthemedir)" || $(mkdir_p) "$(DESTDIR)$(slideshowthemedir)"
+       @list='$(slideshowtheme_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " $(slideshowthemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(slideshowthemedir)/$$f'"; \
+         $(slideshowthemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(slideshowthemedir)/$$f"; \
+       done
+
+uninstall-slideshowthemeDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(slideshowtheme_DATA)'; for p in $$list; do \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " rm -f '$(DESTDIR)$(slideshowthemedir)/$$f'"; \
+         rm -f "$(DESTDIR)$(slideshowthemedir)/$$f"; \
+       done
 install-videothemeDATA: $(videotheme_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(videothemedir)" || $(mkdir_p) "$(DESTDIR)$(videothemedir)"
@@ -581,7 +624,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-       $(mkdir_p) $(distdir)/external_themes $(distdir)/theme/Accel $(distdir)/theme/Berlin $(distdir)/theme/Colorflood $(distdir)/theme/Conky $(distdir)/theme/CrazyChickens $(distdir)/theme/Fifteen $(distdir)/theme/Liqflow $(distdir)/theme/Matrix $(distdir)/theme/Modern $(distdir)/theme/Video
+       $(mkdir_p) $(distdir)/external_themes $(distdir)/theme/Accel $(distdir)/theme/Berlin $(distdir)/theme/Colorflood $(distdir)/theme/Conky $(distdir)/theme/CrazyChickens $(distdir)/theme/Fifteen $(distdir)/theme/Flash $(distdir)/theme/Liqflow $(distdir)/theme/Matrix $(distdir)/theme/Modern $(distdir)/theme/Slideshow $(distdir)/theme/Video
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \
@@ -612,7 +655,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-       for dir in "$(DESTDIR)$(accelthemedir)" "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(colorfloodthemedir)" "$(DESTDIR)$(conkythemedir)" "$(DESTDIR)$(crazythemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(externalthemedir)" "$(DESTDIR)$(fifteenthemedir)" "$(DESTDIR)$(liqflowthemedir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" "$(DESTDIR)$(videothemedir)" "$(DESTDIR)$(xsnowthemedir)"; do \
+       for dir in "$(DESTDIR)$(accelthemedir)" "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(colorfloodthemedir)" "$(DESTDIR)$(conkythemedir)" "$(DESTDIR)$(crazythemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(externalthemedir)" "$(DESTDIR)$(fifteenthemedir)" "$(DESTDIR)$(flashthemedir)" "$(DESTDIR)$(liqflowthemedir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" "$(DESTDIR)$(slideshowthemedir)" "$(DESTDIR)$(videothemedir)" "$(DESTDIR)$(xsnowthemedir)"; do \
          test -z "$$dir" || $(mkdir_p) "$$dir"; \
        done
 install: install-am
@@ -662,8 +705,9 @@ install-data-am: install-accelthemeDATA install-berlinthemeDATA \
        install-crazythemeDATA install-data-local \
        install-dbus_serviceDATA install-desktoppanelDATA \
        install-externalthemeDATA install-fifteenthemeDATA \
-       install-liqflowthemeDATA install-matrixthemeDATA \
-       install-modernthemeDATA install-videothemeDATA \
+       install-flashthemeDATA install-liqflowthemeDATA \
+       install-matrixthemeDATA install-modernthemeDATA \
+       install-slideshowthemeDATA install-videothemeDATA \
        install-xsnowthemeDATA
 
 install-exec-am:
@@ -694,10 +738,11 @@ uninstall-am: uninstall-accelthemeDATA uninstall-berlinthemeDATA \
        uninstall-colorfloodthemeDATA uninstall-conkythemeDATA \
        uninstall-crazythemeDATA uninstall-dbus_serviceDATA \
        uninstall-desktoppanelDATA uninstall-externalthemeDATA \
-       uninstall-fifteenthemeDATA uninstall-info-am \
-       uninstall-liqflowthemeDATA uninstall-local \
+       uninstall-fifteenthemeDATA uninstall-flashthemeDATA \
+       uninstall-info-am uninstall-liqflowthemeDATA uninstall-local \
        uninstall-matrixthemeDATA uninstall-modernthemeDATA \
-       uninstall-videothemeDATA uninstall-xsnowthemeDATA
+       uninstall-slideshowthemeDATA uninstall-videothemeDATA \
+       uninstall-xsnowthemeDATA
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
        distclean distclean-generic distclean-libtool distdir dvi \
@@ -708,8 +753,9 @@ uninstall-am: uninstall-accelthemeDATA uninstall-berlinthemeDATA \
        install-data-local install-dbus_serviceDATA \
        install-desktoppanelDATA install-exec install-exec-am \
        install-externalthemeDATA install-fifteenthemeDATA \
-       install-info install-info-am install-liqflowthemeDATA \
-       install-man install-matrixthemeDATA install-modernthemeDATA \
+       install-flashthemeDATA install-info install-info-am \
+       install-liqflowthemeDATA install-man install-matrixthemeDATA \
+       install-modernthemeDATA install-slideshowthemeDATA \
        install-strip install-videothemeDATA install-xsnowthemeDATA \
        installcheck installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-generic \
@@ -719,9 +765,11 @@ uninstall-am: uninstall-accelthemeDATA uninstall-berlinthemeDATA \
        uninstall-conkythemeDATA uninstall-crazythemeDATA \
        uninstall-dbus_serviceDATA uninstall-desktoppanelDATA \
        uninstall-externalthemeDATA uninstall-fifteenthemeDATA \
-       uninstall-info-am uninstall-liqflowthemeDATA uninstall-local \
+       uninstall-flashthemeDATA uninstall-info-am \
+       uninstall-liqflowthemeDATA uninstall-local \
        uninstall-matrixthemeDATA uninstall-modernthemeDATA \
-       uninstall-videothemeDATA uninstall-xsnowthemeDATA
+       uninstall-slideshowthemeDATA uninstall-videothemeDATA \
+       uninstall-xsnowthemeDATA
 
 
 install-data-local:

diff --git a/applet/src/livewp-actor.c b/applet/src/livewp-actor.c
index b12a2c5..8d468f1 100644 (file)
--- a/applet/src/livewp-actor.c
+++ b/applet/src/livewp-actor.c
@@ -249,6 +249,16 @@ set_actor_scale(Actor *actor, double scalex, double scaley)
 
 }
 void
+set_actor_opacity(Actor *actor, gint opacity)
+{
+    hildon_animation_actor_set_opacity(
+            HILDON_ANIMATION_ACTOR(actor->widget),
+            opacity
+    );
+
+}
+
+void
 set_actor_rotation(Actor *actor, gint axis, double degrees, gint x, gint y, gint z)
 {
     hildon_animation_actor_set_rotation(
@@ -904,31 +914,55 @@ void
 change_slideshow(Actor *actor, AWallpaperPlugin *desktop_plugin)
 {
        gint num, next, prev, now;
-       Actor *a;
-       num = actor->scale;
-       prev = actor->opacity;
-       now = time(NULL);
-       srand(now);
-       next = rand()%num;
-       while (num > 1 && next == prev)
-               next = rand()%num;
+       Actor *a1 = NULL, *a2 = NULL;
+    
+    struct timeval tvb;
+    suseconds_t ms;
+    long sec;
+    double t;
 
-       fprintf(stderr, "change slideshow num=%d prev=%d next=%d\n", num, prev, next);
+    now = time(NULL);
+       num = actor->scale; // total number of images
+       prev = actor->opacity; // number of current image
+    next = actor->z; // number of new image
+    if (next < 0){
+        // new image not selected, first step of animation
+           srand(now);
+           next = rand()%num;
+           while (num > 1 && next == prev)
+                   next = rand()%num;
+        a2 = g_ptr_array_index(actor->child, next);
+           a2->visible = TRUE;
+           create_hildon_actor(a2, desktop_plugin);
+        set_actor_opacity(a2, 0);
+        actor->z = next;
+    }else {
+        a2 = g_ptr_array_index(actor->child, next);
+    }
+           
+    gettimeofday(&tvb, NULL);
+
+    ms = tvb.tv_usec;
+    sec = tvb.tv_sec;
+
+    t = (double)((double)sec+(double)ms/1000000 - actor->time_start_animation) / actor->duration_animation;
+    
+    set_actor_opacity(a2, path_line(0, 255, t));
 
        if (prev > -1){
-               //hide prev
-               fprintf(stderr, "desctory %d\n", prev);
-               a = g_ptr_array_index(actor->child, prev);
-               a->visible = FALSE;
-               destroy_hildon_actor(a);
+               a1 = g_ptr_array_index(actor->child, prev);
+        set_actor_opacity(a1, path_line(255, 0, t));
        }
-       //show next
-       fprintf(stderr, "show %d\n", next);
-       a = g_ptr_array_index(actor->child, next);
-       a->visible = TRUE;
-       create_hildon_actor(a, desktop_plugin);
-       actor->opacity = next;
-       actor->time_start_animation = now + 5;
+    if (t >= 1){
+        // last step of animation
+               actor->opacity = next;
+        actor->z = -1;
+        if (prev > -1){
+                   a1->visible = FALSE;
+                   destroy_hildon_actor(a1);
+        }
+           actor->time_start_animation = now + desktop_plugin->priv->theme_int_parametr1;
+    }
 }
 
 void

diff --git a/applet/src/livewp-actor.h b/applet/src/livewp-actor.h
index 13499e8..d1b4604 100644 (file)
--- a/applet/src/livewp-actor.h
+++ b/applet/src/livewp-actor.h
@@ -77,6 +77,7 @@ void change_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin);
 void destroy_actor(Actor *actor);
 void set_actor_position(Actor *actor, gint x, gint y, gint z, AWallpaperPlugin *desktop_plugin);
 void set_actor_scale(Actor *actor, double scalex, double scaley);
+void set_actor_opacity(Actor *actor, gint opacity);
 void set_actor_rotation(Actor *actor, gint axis, double degrees, gint x, gint y, gint z);
 void set_actor_visible(Actor *actor, gboolean visible);
 void change_obj(Actor * actor, AWallpaperPlugin *desktop_plugin);

diff --git a/applet/src/livewp-config.c b/applet/src/livewp-config.c
index 59bd7ec..f5ca024 100644 (file)
--- a/applet/src/livewp-config.c
+++ b/applet/src/livewp-config.c
@@ -144,6 +144,18 @@ read_config(Animation_WallpaperPrivate *priv) {
         priv->theme_string_parametr1 = g_strdup(gconf_value_get_string(value));
         gconf_value_free(value);
     }
+    /* get theme additional int parameter 1  */
+    str = g_strdup_printf("%s%i", GCONF_KEY_ADDITIONAL_INT_1 , id);
+    value = gconf_client_get(gconf_client, str, NULL);
+    if (str){
+        g_free(str);
+        str = NULL;
+    }
+    if (value) {
+        priv->theme_int_parametr1 = gconf_value_get_int(value);
+        gconf_value_free(value);
+    }
+
     /* get parameter one theme in all view */
     priv->one_in_all_view = get_one_in_all_views_from_config();
     return 0;
@@ -247,6 +259,17 @@ save_config(Animation_WallpaperPrivate *priv) {
             g_free(str);
             str = NULL;
     }
+    str = g_strdup_printf("%s%i",GCONF_KEY_ADDITIONAL_INT_1, id);
+    if (priv->theme_int_parametr1){
+        gconf_client_set_int(gconf_client,
+                  str,
+                  priv->theme_int_parametr1, NULL);
+    }else
+        gconf_client_unset(gconf_client, str, NULL);
+    if (str){
+            g_free(str);
+            str = NULL;
+    }
 
 }
 /*******************************************************************************/

diff --git a/applet/src/livewp-config.h b/applet/src/livewp-config.h
index b3b2c1d..036e150 100644 (file)
--- a/applet/src/livewp-config.h
+++ b/applet/src/livewp-config.h
@@ -33,6 +33,7 @@
 #define GCONF_KEY_RANIMATION                        GCONF_KEY_PREFIX"/rich_animation"
 #define GCONF_KEY_ADDITIONAL_STRING_1               GCONF_KEY_PREFIX"/additional_string_1"
 #define GCONF_KEY_ADDITIONAL_BOOL_1                 GCONF_KEY_PREFIX"/additional_bool_1"
+#define GCONF_KEY_ADDITIONAL_INT_1                  GCONF_KEY_PREFIX"/additional_int_1"
 void init_scene_Modern(AWallpaperPlugin *desktop_plugin);
 void init_scene_Berlin(AWallpaperPlugin *desktop_plugin);
 void init_scene_Matrix(AWallpaperPlugin *desktop_plugin);

diff --git a/applet/src/livewp-scene.c b/applet/src/livewp-scene.c
index c1184c0..2113f9b 100644 (file)
--- a/applet/src/livewp-scene.c
+++ b/applet/src/livewp-scene.c
@@ -395,7 +395,8 @@ init_scene_Slideshow(AWallpaperPlugin *desktop_plugin)
        GSList *store = NULL;
        gint num = 0;
 
-       fprintf(stderr, "init scene Slideshow %d %s\n", desktop_plugin->priv->theme_int_parametr1, desktop_plugin->priv->theme_string_parametr1);
+       fprintf(stderr, "init scene Slideshow %d %s\n", desktop_plugin->priv->theme_int_parametr1, 
+                desktop_plugin->priv->theme_string_parametr1);
 
        scene = g_new0(Scene, 1);
        scene->actors = NULL;
@@ -417,7 +418,6 @@ init_scene_Slideshow(AWallpaperPlugin *desktop_plugin)
                        if(dp->d_type == DT_REG || dp->d_type == DT_LNK){
                                str = g_strdup_printf("%s/%s", desktop_plugin->priv->theme_string_parametr1, dp->d_name);
                                store = g_slist_append(store, str);
-                               fprintf(stderr, "%s\n", str);
                                num++;
                        }
                }
@@ -426,22 +426,20 @@ init_scene_Slideshow(AWallpaperPlugin *desktop_plugin)
 
        child = g_ptr_array_sized_new(num);
        while (store){
-               fprintf(stderr, "file=%s\n", store->data);
-
                actor = init_object(desktop_plugin, "original", store->data,
                                0, 0, 5, 800, 480,
-                               FALSE, FALSE, 100, 255,
+                               FALSE, FALSE, 100, 0,
                                NULL, NULL, NULL);
                scene->actors = g_slist_append(scene->actors, actor);
                g_ptr_array_add(child, actor);
                store = g_slist_next(store);
        }
        actor = init_object(desktop_plugin, "images", "",
-                       0, 0, 5, 800, 480,
+                       0, 0, -1, 800, 480,
                        FALSE, FALSE, num, -1,
                        (gpointer)&change_slideshow, NULL, child);
        actor->time_start_animation = now;
-       actor->duration_animation = G_MAXINT;
+       actor->duration_animation = 5;
        scene->actors = g_slist_append(scene->actors, actor);
        desktop_plugin->priv->rich_animation = TRUE;
        run_long_timeout(desktop_plugin);

diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c
index d1d517e..db6006c 100644 (file)
--- a/applet/src/livewp-settings.c
+++ b/applet/src/livewp-settings.c
@@ -928,11 +928,10 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) {
                        }
                        button2 = g_object_get_data(G_OBJECT(priv->window), "time_button");
                        if (button2){
-                               if (priv->theme_int_parametr1)
-                                       g_free(priv->theme_int_parametr1);
+                               //if (priv->theme_int_parametr1)
+                               //      g_free(priv->theme_int_parametr1);
                         int_param = atoi(hildon_button_get_value (HILDON_BUTTON(button2)));
                                priv->theme_int_parametr1 = int_param;
-                        fprintf(stderr, "qqqq %i %s\n", priv->theme_int_parametr1, priv->theme_string_parametr1);
                        }
                 }
                 /* Check external themes */