fixed immediate start animation

diff --git a/applet/data/Makefile.in b/applet/data/Makefile.in
index 0acf8d4..b0c9054 100644 (file)
--- a/applet/data/Makefile.in
+++ b/applet/data/Makefile.in
@@ -125,14 +125,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -144,7 +142,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
@@ -157,6 +154,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
 NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@

diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index dec4510..57aef46 100644 (file)
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -763,8 +763,8 @@ init_scene2(AWallpaperPlugin *desktop_plugin)
   Actor *actor;
   gint now = time(NULL);
 
-  /* fprintf(stderr, "init scene \n");*/
-  scene.daytime = get_daytime();
+  fprintf(stderr, "init scene2 \n");
+  //scene.daytime = get_daytime();
   scene.actors = NULL;
 
   
@@ -806,11 +806,7 @@ init_scene2(AWallpaperPlugin *desktop_plugin)
   actor->duration_animation = G_MAXINT;
   scene.actors = g_slist_append(scene.actors, actor);
 
-
-    
-
-
-    run_long_timeout(desktop_plugin);
+  run_long_timeout(desktop_plugin);
 }
 /* Init Modern Scene */
 static void
@@ -1358,7 +1354,8 @@ if (!desktop_plugin->priv->visible || !desktop_plugin->priv->rich_animation){
 }
 
 void
-run_long_timeout(AWallpaperPlugin *desktop_plugin){
+run_long_timeout(AWallpaperPlugin *desktop_plugin)
+{
 
     gint daytime = get_daytime();
     GSList * tmp;
@@ -1367,7 +1364,7 @@ run_long_timeout(AWallpaperPlugin *desktop_plugin){
     Actor *actor;
 
 
-    //fprintf(stderr, "timer daytime=%d\n", daytime);
+    //fprintf(stderr, "!!!run long timeout short_timer=%d\n", desktop_plugin->priv->short_timer);
     if (scene.daytime != daytime){
         scene.daytime = daytime;
         tmp = scene.actors;
@@ -1393,6 +1390,7 @@ run_long_timeout(AWallpaperPlugin *desktop_plugin){
             if (desktop_plugin->priv->rich_animation){
                 actor->time_start_animation = now;
                 desktop_plugin->priv->short_timer = g_timeout_add(SHORT_TIMER, (GtkFunction)short_timeout, desktop_plugin);
+                //fprintf(stderr, " start shor timer %d\n", desktop_plugin->priv->short_timer);
             }
             else {
                 (*actor->func_change)(actor, desktop_plugin);
@@ -1465,6 +1463,8 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
     /* Load config */
     read_config(priv);
     priv->desktop_plugin = desktop_plugin;
+    priv->visible = TRUE;
+    priv->short_timer = 0;
     desktop_plugin->priv->main_widget = gtk_fixed_new();
 
     gtk_widget_set_size_request(desktop_plugin->priv->main_widget, 100, 32);
@@ -1508,7 +1508,6 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
     else if (!strcmp(priv->theme, "Matrix"))
         init_scene2(desktop_plugin);
     priv->long_timer = g_timeout_add(LONG_TIMER, (GtkFunction)long_timeout, desktop_plugin);
-    priv->short_timer = 0;
     /* TODO Move scene to priv */
     scene.timer_type = LONG_TIMER_TYPE;
     g_signal_connect (desktop_plugin, "notify::is-on-current-desktop",