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

Conflicts:

	applet/src/livewp-home-widget.c

diff --combined applet/src/livewp-home-widget.c
index 6537b75,529f41e..4f083cb
--- 1/applet/src/livewp-home-widget.c
--- 2/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@@ -608,7 -608,6 +608,7 @@@ get_sun_screen_pos(double alt, double a
           o_height = 128; 
      *x = (int)(azm * 800) - 64;
      *y = (int)((1 - alt) * y0) - 64;
 +    //fprintf(stderr, "sun pos x=%d y=%d\n", *x, *y);
  }
  
  void change_multiactor()
@@@ -705,14 -704,16 +705,17 @@@ change_actor(GtkWidget * actor
  static gboolean
  plugin_on_timeout (AWallpaperPlugin *desktop_plugin)
  {
--  gint daytime = get_daytime();
--  GSList * tmp;
--  gchar * name;
--  void (*pfunc)(gpointer, gpointer);
--  time_t now;
--  gint t;
- 
--  Actor *actor;
 -
 -if (!desktop_plugin->priv->visible)
 -    return TRUE;
++      gint daytime = get_daytime();
++      GSList * tmp;
++      gchar * name;
++      void (*pfunc)(gpointer, gpointer);
++      time_t now;
++      gint t;
++      Actor *actor;
++
++    /* TODO  remove timeout */
++    if (!desktop_plugin->priv->visible)
++        return TRUE;
  fprintf(stderr, "timer daytime=%d\n", daytime);
    if (scene.daytime != daytime){
        tmp = scene.actors;
@@@ -814,7 -815,11 +817,11 @@@ desktop_plugin_visible_notify (GObjec
  {
        gboolean visible;
        g_object_get (object, "is-on-current-desktop", &visible, NULL);
-       fprintf (stderr, "is-on-current-desktop changed. visible: %u", visible);
+       if (visible)
+         desktop_plugin->priv->visible = TRUE;
+       else
+         desktop_plugin->priv->visible = FALSE;
+    /*   fprintf (stderr, "is-on-current-desktop changed. visible: %u", visible); */
  }
  
  static void