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

diff --combined applet/src/livewp-home-widget.c
index d99b128,2c3edbf..4f55a67
--- 1/applet/src/livewp-home-widget.c
--- 2/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@@ -212,6 -212,8 +212,6 @@@ voi
  create_hildon_actor_text(Actor *actor, AWallpaperPlugin *desktop_plugin) 
  {
    GtkWidget *ha = NULL;
 -  GdkPixbuf *pixbuf = NULL;
 -  GtkWidget *image = NULL;
    GtkWidget *label = NULL;
  
    ha = hildon_animation_actor_new();
@@@ -376,7 -378,7 +376,7 @@@ run_long_timeout(AWallpaperPlugin *desk
  
      if (!desktop_plugin->priv->scene)
        return;
-     /* fprintf(stderr, "!!!run long timeout short_timer=%d\n", desktop_plugin->priv->short_timer); */
+     /*ifprintf(stderr, "!!!run long timeout short_timer=%d\n", desktop_plugin->priv->short_timer); */
      if (desktop_plugin->priv->scene->daytime != daytime){
          desktop_plugin->priv->scene->daytime = daytime;
          tmp = desktop_plugin->priv->scene->actors;
@@@ -418,7 -420,7 +418,7 @@@ long_timeout (AWallpaperPlugin *desktop
      GstFormat fmt = GST_FORMAT_TIME;
      gint64 p;
  
-     /* fprintf(stderr, "long_timeout %i\n", desktop_plugin->priv->long_timer); */
+     /*fprintf(stderr, "long_timeout %i\n", desktop_plugin->priv->long_timer); */
      if (desktop_plugin->priv->pipeline){
        if (!desktop_plugin->priv->visible){
                gst_element_query_position(desktop_plugin->priv->pipeline, &fmt, &p);