From: Vlad Vasiliev <vlad@toshiba2.oblgaz>
Date: Sun, 11 Apr 2010 19:23:54 +0000 (+0300)
Subject: Merge branch 'master' of https://vcs.maemo.org/git/livewp
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=5827a1e99a8f88ead7a5ee675a8668437f81bd32;p=livewp

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

Conflicts:

	applet/src/livewp-home-widget.c
---

5827a1e99a8f88ead7a5ee675a8668437f81bd32
diff --cc applet/src/livewp-home-widget.c
index 59472f0,5644ade..9cc7e06
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@@ -306,15 -302,10 +304,15 @@@ change_tram(Actor * actor, AWallpaperPl
     
      if (!actor->visible){
          actor->visible = TRUE;
-         if (daytime == TIME_NIGHT){
 -        if (scene.daytime == TIME_NIGHT)
++        if (scene.daytime == TIME_NIGHT){
 +            if (actor->filename)
 +                g_free(actor->filename);
              actor->filename = g_strdup("tram_dark.png");
 -        else
 +        } else{
 +            if (actor->filename)
 +                g_free(actor->filename);
              actor->filename = g_strdup("tram.png");
 +        }
          create_hildon_actor(actor, desktop_plugin);
      }
      t = (double)((double)sec+(double)ms/1000000 - actor->time_start_animation) / actor->duration_animation;
@@@ -352,15 -342,10 +349,15 @@@ change_plane1(Actor *actor, AWallpaperP
     
      if (!actor->visible){
          actor->visible = TRUE;
-         if (daytime == TIME_NIGHT){
 -        if (scene.daytime == TIME_NIGHT)
++        if (scene.daytime == TIME_NIGHT){
 +            if (actor->filename)
 +                g_free(actor->filename);
              actor->filename = g_strdup("tu154.png");
 -        else
 +        }else{
 +            if (actor->filename)
 +                g_free(actor->filename);
              actor->filename = g_strdup("tu154.png");
 +        }
          create_hildon_actor(actor, desktop_plugin);
      }
      t = (double)((double)sec+(double)ms/1000000 - actor->time_start_animation) / actor->duration_animation;
@@@ -399,15 -383,10 +395,16 @@@ change_plane2(Actor *actor, AWallpaperP
     
      if (!actor->visible){
          actor->visible = TRUE;
-         if (daytime == TIME_NIGHT){
++        if (scene.daytime == TIME_NIGHT){
 +            if (actor->filename)
 +                g_free(actor->filename);
+         if (scene.daytime == TIME_NIGHT)
              actor->filename = g_strdup("plane3.png");
 -        else
 +        }else{
 +            if (actor->filename)
 +                g_free(actor->filename);
              actor->filename = g_strdup("plane3.png");
 +        }
          create_hildon_actor(actor, desktop_plugin);
      }
      t = (double)((double)sec+(double)ms/1000000 - actor->time_start_animation) / actor->duration_animation;