From: tanya <tanya@tanin.oblgaz>
Date: Fri, 9 Apr 2010 12:29:03 +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=07130e8773d06776d59601d6ec6ddaca52681bbd;p=livewp

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

Conflicts:

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

07130e8773d06776d59601d6ec6ddaca52681bbd
diff --cc applet/src/livewp-home-widget.c
index 6537b75,529f41e..4f083cb
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@@ -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;