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

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

diff --cc applet/src/livewp-common.h
Simple merge

diff --cc applet/src/livewp-home-widget.c
index 9510cef,d5c7e9b..e208f7d
--- 1/applet/src/livewp-home-widget.c
--- 2/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@@ -403,8 -405,14 +403,16 @@@ animation_wallpaper_plugin_init (AWallp
      priv->short_timer = 0;
      priv->xapplet = 0;
      priv->yapplet = 0;
 +    priv->scene = NULL;
 +//    priv->theme = g_strdup("Modern");
+ //#if 0 
+     priv->hash_scene_func = g_hash_table_new(g_str_hash, g_str_equal);
+     
+     g_hash_table_insert(priv->hash_scene_func, g_strdup("Berlin"), (gpointer)&init_scene_Berlin);
+     g_hash_table_insert(priv->hash_scene_func, g_strdup("Modern"), (gpointer)&init_scene_Modern);
+     g_hash_table_insert(priv->hash_scene_func, g_strdup("Matrix"), (gpointer)&init_scene_Matrix);
+ //#endif
+     //priv->theme = g_strdup("Modern");
      desktop_plugin->priv->main_widget = gtk_fixed_new();
  
      gtk_widget_set_size_request(desktop_plugin->priv->main_widget, 100, 32);

diff --cc applet/src/livewp-scene.c
Simple merge