Merge branch 'billboard'

Conflicts:
	applet/src/livewp-scene.c

diff --git a/applet/debian/control b/applet/debian/control
index 3f94ea6..56ec469 100644 (file)
--- a/applet/debian/control
+++ b/applet/debian/control
@@ -10,6 +10,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Animation wallpaper shows the picture varying during the day.
 XB-Description-ru_RU: Анимационные обои, меняющие свой вид в зависимости от времени суток 
+XB-Description-fi_FI: Näyttää ajankohdan mukaan muuttuvan taustakuvan
 XB-Maemo-Display-Name: Live Wallpaper
 Xsbc-Bugtracker: https://garage.maemo.org/tracker/?atid=5336&group_id=1471&func=browse
 XB-Maemo-Icon-26:

diff --git a/applet/gen_locale_files.sh b/applet/gen_locale_files.sh
index e769850..799bd69 100755 (executable)
--- a/applet/gen_locale_files.sh
+++ b/applet/gen_locale_files.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ALL_LANGUAGES="ru_RU fi_FI"
+ALL_LANGUAGES="ru_RU fi_FI es_ES es_MX"
 
 xgettext --from-code=UTF-8 --keyword=_ --keyword=Q_ -f po/POTFILES.in -s -C -o po/livewp.pot
 cd po

diff --git a/applet/po/LINGUAS b/applet/po/LINGUAS
index 9122d63..3abfbf0 100644 (file)
--- a/applet/po/LINGUAS
+++ b/applet/po/LINGUAS
@@ -1,4 +1,5 @@
 # please keep this list sorted alphabetically
 fi_FI
 ru_RU
-
+es_ES
+es_MX

diff --git a/applet/po/es_ES.po b/applet/po/es_ES.po
new file mode 100644 (file)
index 0000000..f6e10fb
--- /dev/null
+++ b/applet/po/es_ES.po
@@ -0,0 +1,86 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Alejandro López <alejandro.lopez@free.fr>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/livewp-settings.c:33
+#: src/livewp-settings.c:154
+msgid "About"
+msgstr "Acerca de"
+
+#: src/livewp-settings.c:62
+#: src/livewp-settings.c:82
+#: src/livewp-settings.c:164
+msgid "Berlin"
+msgstr "Berlin"
+
+#: src/livewp-settings.c:113
+msgid "Enable"
+msgstr "Activar"
+
+#: src/livewp-config.c:36
+#: src/livewp-config.c:64
+#, c-format
+msgid "Failed to initialize GConf. Quitting.\n"
+msgstr "Falló la inicialización de GConf. Terminando.\n"
+
+#: src/livewp-settings.c:37
+msgid ""
+"Live Wallpaper\n"
+" Version 0.5 \n"
+" Copyright(c) 2010\n"
+" Tanya Makova\n"
+" Vlad Vasiliev\n"
+" Copyright(c) 2010 for design themes Berlin and Modern Vasya Bobrikov\n"
+" Copyright(c) 2010 for design theme Matrix Andrew Zhilin\n"
+" Translators:\n"
+" Finnish - Marko Vertainen\n"
+" Russian - Tanya Makova \n"
+"           Vlad Vasiliev\n"
+msgstr ""
+"Live Wallpaper\n"
+" versión 0.5\n"
+" Copyright(c) 2010\n"
+" Tanya Makova\n"
+" Vlad Vasiliev\n"
+" Copyright(c) 2010 del diseño de los temas Berlin y Moderno, Vasya Bobrikov\n"
+" Copyright(c) 2010 del diseño del tema Matriz, Andrew Zhilin\n"
+" Traductores:\n"
+" Finlandés - Marko Vertainen\n"
+" Ruso - Tanya Makova \n"
+"        Vlad Vasiliev\n"
+
+#: src/livewp-settings.c:135
+msgid "Live Wallpaper Settings"
+msgstr "Configuración de Live Wallpaper"
+
+#: src/livewp-settings.c:64
+#: src/livewp-settings.c:90
+#: src/livewp-settings.c:168
+msgid "Matrix"
+msgstr "Matriz"
+
+#: src/livewp-settings.c:63
+#: src/livewp-settings.c:86
+#: src/livewp-settings.c:166
+msgid "Modern"
+msgstr "Moderno"
+
+#: src/livewp-settings.c:103
+msgid "Rich Animation"
+msgstr "Animación rica"
+
+#: src/livewp-settings.c:155
+msgid "Save"
+msgstr "Guardar"
+
+#: src/livewp-settings.c:76
+msgid "Theme"
+msgstr "Tema"
+

diff --git a/applet/po/es_MX.po b/applet/po/es_MX.po
new file mode 100644 (file)
index 0000000..f6e10fb
--- /dev/null
+++ b/applet/po/es_MX.po
@@ -0,0 +1,86 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Alejandro López <alejandro.lopez@free.fr>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/livewp-settings.c:33
+#: src/livewp-settings.c:154
+msgid "About"
+msgstr "Acerca de"
+
+#: src/livewp-settings.c:62
+#: src/livewp-settings.c:82
+#: src/livewp-settings.c:164
+msgid "Berlin"
+msgstr "Berlin"
+
+#: src/livewp-settings.c:113
+msgid "Enable"
+msgstr "Activar"
+
+#: src/livewp-config.c:36
+#: src/livewp-config.c:64
+#, c-format
+msgid "Failed to initialize GConf. Quitting.\n"
+msgstr "Falló la inicialización de GConf. Terminando.\n"
+
+#: src/livewp-settings.c:37
+msgid ""
+"Live Wallpaper\n"
+" Version 0.5 \n"
+" Copyright(c) 2010\n"
+" Tanya Makova\n"
+" Vlad Vasiliev\n"
+" Copyright(c) 2010 for design themes Berlin and Modern Vasya Bobrikov\n"
+" Copyright(c) 2010 for design theme Matrix Andrew Zhilin\n"
+" Translators:\n"
+" Finnish - Marko Vertainen\n"
+" Russian - Tanya Makova \n"
+"           Vlad Vasiliev\n"
+msgstr ""
+"Live Wallpaper\n"
+" versión 0.5\n"
+" Copyright(c) 2010\n"
+" Tanya Makova\n"
+" Vlad Vasiliev\n"
+" Copyright(c) 2010 del diseño de los temas Berlin y Moderno, Vasya Bobrikov\n"
+" Copyright(c) 2010 del diseño del tema Matriz, Andrew Zhilin\n"
+" Traductores:\n"
+" Finlandés - Marko Vertainen\n"
+" Ruso - Tanya Makova \n"
+"        Vlad Vasiliev\n"
+
+#: src/livewp-settings.c:135
+msgid "Live Wallpaper Settings"
+msgstr "Configuración de Live Wallpaper"
+
+#: src/livewp-settings.c:64
+#: src/livewp-settings.c:90
+#: src/livewp-settings.c:168
+msgid "Matrix"
+msgstr "Matriz"
+
+#: src/livewp-settings.c:63
+#: src/livewp-settings.c:86
+#: src/livewp-settings.c:166
+msgid "Modern"
+msgstr "Moderno"
+
+#: src/livewp-settings.c:103
+msgid "Rich Animation"
+msgstr "Animación rica"
+
+#: src/livewp-settings.c:155
+msgid "Save"
+msgstr "Guardar"
+
+#: src/livewp-settings.c:76
+msgid "Theme"
+msgstr "Tema"
+

diff --git a/applet/src/livewp-common.h b/applet/src/livewp-common.h
index 8dcdd1c..88cb82f 100644 (file)
--- a/applet/src/livewp-common.h
+++ b/applet/src/livewp-common.h
@@ -62,10 +62,13 @@ struct _Scene
     guint seed; /* init value for random  */
     guint notification;
 };
+
 typedef struct _AWallpaperPlugin AWallpaperPlugin;
 typedef struct _AWallpaperPluginClass AWallpaperPluginClass;
 typedef struct _Animation_WallpaperPrivate Animation_WallpaperPrivate;
 
+
+
 struct _Animation_WallpaperPrivate
 {
     gint long_timer;
@@ -93,8 +96,7 @@ struct _AWallpaperPlugin
 
 struct _AWallpaperPluginClass
 {
-    HDHomePluginItemClass parent_class;
-
+  HDHomePluginItemClass parent_class;
 };
 
 

diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index aa10397..8c2733a 100644 (file)
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -39,7 +39,6 @@ HD_DEFINE_PLUGIN_MODULE (AWallpaperPlugin, animation_wallpaper_plugin, HD_TYPE_H
 #define Animation_Wallpaper_HOME_PLUGIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE (obj,\
                                                           Animation_Wallpaper_TYPE_HOME_PLUGIN,\
                                                           Animation_WallpaperPrivate))
-
 static void
 lw_applet_realize (GtkWidget *widget)
 {
@@ -102,7 +101,6 @@ realize (GtkWidget *widget)
     screen = gtk_widget_get_screen (widget);
     gtk_widget_set_colormap (widget, gdk_screen_get_rgba_colormap (screen));
 }
-
 /* Set position of widget on desktop */
 static void
 init_applet_position(gint *xapplet, gint *yapplet)
@@ -232,6 +230,7 @@ create_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin)
   //g_object_set_data(G_OBJECT(ha), "image", image);
   actor->image = image;
   hildon_animation_actor_set_parent (HILDON_ANIMATION_ACTOR (ha), GTK_WINDOW(desktop_plugin));
+
   actor->widget = ha;
   set_actor_position(actor, actor->x, actor->y, actor->z, desktop_plugin);
   set_actor_scale(actor, (double)actor->scale/100, (double)actor->scale/100);
@@ -329,7 +328,8 @@ run_long_timeout(AWallpaperPlugin *desktop_plugin)
     time_t now;
     Actor *actor;
 
-
+    if (!desktop_plugin->priv->scene)
+       return;
     //fprintf(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;
@@ -408,14 +408,12 @@ desktop_plugin_visible_notify (GObject    *object,
         }
     }
 }
-
 gboolean
 rich_animation_press(GtkWidget *widget, GdkEvent *event,
                                             gpointer user_data){
     fprintf(stderr,"gggggggggggggggggggg2222\n");
     return FALSE;
 }    
-
 static void
 animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
 {
@@ -438,6 +436,8 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
     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);
     
@@ -466,13 +466,12 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
         g_signal_connect(rich_animation, "button-press-event", G_CALLBACK(rich_animation_press), desktop_plugin);
         gtk_fixed_put(GTK_FIXED(desktop_plugin->priv->main_widget), rich_animation, 0, 0);
     }
-/*
-    GtkWidget *label = gtk_label_new ("ddddddddddddd"); 
+#if 0
+    GtkWidget *label = gtk_label_new ("1111ddddddddd");
     gtk_widget_set_size_request(label, 95, 30);
     gtk_widget_show (label);
     gtk_container_add (GTK_CONTAINER (desktop_plugin), label);
-    gtk_fixed_put(GTK_FIXED(widget), label, 0, 0);
-*/
+#endif
     hd_home_plugin_item_set_settings (HD_HOME_PLUGIN_ITEM (desktop_plugin), TRUE);
     g_signal_connect (desktop_plugin, "show-settings",
                             G_CALLBACK (show_settings), priv);
@@ -499,7 +498,7 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
     /* TODO Move scene to priv */
     //scene.timer_type = LONG_TIMER_TYPE;
     g_signal_connect (desktop_plugin, "notify::is-on-current-desktop",
-                     G_CALLBACK (desktop_plugin_visible_notify), desktop_plugin);
+                   G_CALLBACK (desktop_plugin_visible_notify), desktop_plugin);
 
    
     //sleep(2);
@@ -508,21 +507,50 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
 static void
 lw_applet_finalize (GObject *object)
 {
+fprintf(stderr,"lw_applet_finalize\n");
+/*
      AWallpaperPlugin *desktop_plugin = Animation_Wallpaper_HOME_PLUGIN (object);
      Animation_WallpaperPrivate *priv = desktop_plugin->priv;
-
-     livewp_deinitialize_dbus(priv);
-     fprintf(stderr,"finalaze %i\n", priv->long_timer);
-     if (priv->long_timer){
-        g_source_remove(priv->long_timer);
-        priv->long_timer = 0;
-     }
-     if (priv->short_timer){
-        g_source_remove(priv->short_timer);
-        priv->short_timer = 0;
+     
+     if (priv){
+            livewp_deinitialize_dbus(priv);
+            fprintf(stderr,"finalaze %i\n", priv->long_timer);
+            if (priv->long_timer){
+               g_source_remove(priv->long_timer);
+               priv->long_timer = 0;
+            }
+            if (priv->short_timer){
+               g_source_remove(priv->short_timer);
+               priv->short_timer = 0;
+            }
+
+            destroy_scene(desktop_plugin);
      }
+*/
+}
 
-     destroy_scene(desktop_plugin);
+static void
+desktop_widget_finalize (GObject *object)
+{
+     AWallpaperPlugin *desktop_plugin = Animation_Wallpaper_HOME_PLUGIN (object);
+     Animation_WallpaperPrivate *priv = desktop_plugin->priv;
+     
+     if (priv){
+            livewp_deinitialize_dbus(priv);
+            fprintf(stderr,"finalaze %i\n", priv->long_timer);
+            if (priv->long_timer){
+               g_source_remove(priv->long_timer);
+               priv->long_timer = 0;
+            }
+            if (priv->short_timer){
+               g_source_remove(priv->short_timer);
+               priv->short_timer = 0;
+            }
+
+            destroy_scene(desktop_plugin);
+     }
+      /* Call the base class's implementation: */
+      G_OBJECT_CLASS (animation_wallpaper_plugin_parent_class)->finalize (object);
 }
 
 static void
@@ -530,9 +558,11 @@ animation_wallpaper_plugin_class_init (AWallpaperPluginClass *klass) {
 
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
     GtkObjectClass *gobject_class = GTK_OBJECT_CLASS (klass);
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
     /* gobject */
     gobject_class->destroy = (gpointer)lw_applet_finalize;
+    object_class->finalize = desktop_widget_finalize;
     widget_class->realize = lw_applet_realize;
     widget_class->expose_event = lw_applet_expose_event;
 
@@ -544,4 +574,9 @@ static void
 animation_wallpaper_plugin_class_finalize (AWallpaperPluginClass *class) {
 }
 
+Animation_WallpaperPrivate*
+animation_wallpaper_plugin_new (void)
+{
+  return g_object_new (Animation_Wallpaper_TYPE_HOME_PLUGIN , NULL);
+}
 

diff --git a/applet/src/livewp-home-widget.h b/applet/src/livewp-home-widget.h
index 5dfd66a..49b5215 100644 (file)
--- a/applet/src/livewp-home-widget.h
+++ b/applet/src/livewp-home-widget.h
@@ -62,8 +62,8 @@ typedef struct {
 
 GType animation_wallpaper_plugin_get_type(void);
 
+Animation_WallpaperPrivate* animation_wallpaper_plugin_new (void);
 G_END_DECLS
-
 void lw_settings(gpointer user_data, gpointer data);
 //void actor_set_position_full(GtkWidget *actor, gint x, gint y, gint z);
 gint read_config(Animation_WallpaperPrivate *priv);

diff --git a/applet/src/livewp-scene.c b/applet/src/livewp-scene.c
index d25eed8..d59acea 100644 (file)
--- a/applet/src/livewp-scene.c
+++ b/applet/src/livewp-scene.c
@@ -27,16 +27,19 @@
 void 
 destroy_scene(AWallpaperPlugin *desktop_plugin)
 {
-    GSList * tmp = desktop_plugin->priv->scene->actors;
-    while (tmp != NULL){
-        destroy_actor(tmp->data);
-        tmp = g_slist_next(tmp);
-    }
-    g_slist_free(tmp);
-    desktop_plugin->priv->scene->actors = NULL;
     if (desktop_plugin->priv->scene){
-       g_free(desktop_plugin->priv->scene);
-       desktop_plugin->priv->scene = NULL;
+           GSList * tmp = desktop_plugin->priv->scene->actors;
+           while (tmp != NULL){
+               destroy_actor(tmp->data);
+               tmp = g_slist_next(tmp);
+           }
+           if (tmp)
+               g_slist_free(tmp);
+           desktop_plugin->priv->scene->actors = NULL;
+           if (desktop_plugin->priv->scene){
+               g_free(desktop_plugin->priv->scene);
+               desktop_plugin->priv->scene = NULL;
+           }
     }
 }
 
@@ -161,14 +164,12 @@ init_scene_Modern(AWallpaperPlugin *desktop_plugin)
   scene->seed = time(NULL);
   scene->notification = TRUE;
   desktop_plugin->priv->scene = scene;
-  
-
   actor = init_object(desktop_plugin, "sky", "sky0.png", 
                       0, 0, 5, 800, 480, 
                       TRUE , TRUE, 100, 255, 
                       (gpointer)&change_static_actor, NULL, NULL);
-  change_static_actor(actor, desktop_plugin);
   scene->actors = g_slist_append(scene->actors, actor);
+  change_static_actor(actor, desktop_plugin);
   
   actor = init_object(desktop_plugin, "sun", "sun.png", 
                       0, 0, 6, 88, 88, 

diff --git a/applet/src/tags b/applet/src/tags
new file mode 100644 (file)
index 0000000..3037c46
--- /dev/null
+++ b/applet/src/tags
@@ -0,0 +1,222 @@
+!_TAG_FILE_FORMAT      2       /extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED      1       /0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_PROGRAM_AUTHOR   Darren Hiebert  /dhiebert@users.sourceforge.net/
+!_TAG_PROGRAM_NAME     Exuberant Ctags //
+!_TAG_PROGRAM_URL      http://ctags.sourceforge.net    /official site/
+!_TAG_PROGRAM_VERSION  5.8     //
+AWallpaperPlugin       livewp-common.h /^typedef struct _AWallpaperPlugin AWallpaperPlugin;$/;"        t       typeref:struct:_AWallpaperPlugin
+AWallpaperPluginClass  livewp-common.h /^typedef struct _AWallpaperPluginClass AWallpaperPluginClass;$/;"      t       typeref:struct:_AWallpaperPluginClass
+Actor  livewp-actor.h  /^typedef struct _Actor Actor;$/;"      t       typeref:struct:_Actor
+Animation_WallpaperPrivate     livewp-common.h /^typedef struct _Animation_WallpaperPrivate Animation_WallpaperPrivate;$/;"    t       typeref:struct:_Animation_WallpaperPrivate
+Animation_Wallpaper_HOME_PLUGIN        livewp-home-widget.h    36;"    d
+Animation_Wallpaper_HOME_PLUGIN_CLASS  livewp-home-widget.h    39;"    d
+Animation_Wallpaper_HOME_PLUGIN_GET_CLASS      livewp-home-widget.h    48;"    d
+Animation_Wallpaper_HOME_PLUGIN_GET_PRIVATE    livewp-home-widget.c    39;"    d       file:
+Animation_Wallpaper_IS_HOME_PLUGIN     livewp-home-widget.h    42;"    d
+Animation_Wallpaper_IS_HOME_PLUGIN_CLASS       livewp-home-widget.h    45;"    d
+Animation_Wallpaper_PLUGIN_H   livewp-home-widget.h    25;"    d
+Animation_Wallpaper_TYPE_HOME_PLUGIN   livewp-home-widget.h    34;"    d
+ENABLE_NLS     config.h        5;"     d
+GCONF_KEY_MODIFIED     livewp-home-widget.c    35;"    d       file:
+GCONF_KEY_POSITION     livewp-home-widget.c    34;"    d       file:
+GCONF_KEY_PREFIX       livewp-config.h 31;"    d
+GCONF_KEY_RANIMATION   livewp-config.h 33;"    d
+GCONF_KEY_THEME        livewp-config.h 32;"    d
+GCONF_KEY_VIEW livewp-home-widget.c    36;"    d       file:
+GETTEXT_PACKAGE        config.h        8;"     d
+GETTEXT_PACKAGE        livewp-common.h 37;"    d
+HAVE_BIND_TEXTDOMAIN_CODESET   config.h        11;"    d
+HAVE_DCGETTEXT config.h        14;"    d
+HAVE_DLFCN_H   config.h        17;"    d
+HAVE_GETTEXT   config.h        20;"    d
+HAVE_INTTYPES_H        config.h        23;"    d
+HAVE_LC_MESSAGES       config.h        26;"    d
+HAVE_LOCALE_H  config.h        29;"    d
+HAVE_MEMORY_H  config.h        32;"    d
+HAVE_STDINT_H  config.h        35;"    d
+HAVE_STDLIB_H  config.h        38;"    d
+HAVE_STRINGS_H config.h        41;"    d
+HAVE_STRING_H  config.h        44;"    d
+HAVE_SYS_STAT_H        config.h        47;"    d
+HAVE_SYS_TYPES_H       config.h        50;"    d
+HAVE_UNISTD_H  config.h        53;"    d
+LIVEWP_RELOAD_CONFIG   livewp-common.h 104;"   d
+LIVEWP_RELOAD_PLUGIN   livewp-common.h 105;"   d
+LIVEWP_SIGNAL_INTERFACE        livewp-common.h 100;"   d
+LIVEWP_SIGNAL_PATH     livewp-common.h 101;"   d
+LIVEWP_SIGNAL_RELOAD_CONFIG_INTERFACE  livewp-common.h 102;"   d
+LIVEWP_SIGNAL_RELOAD_CONFIG_PATH       livewp-common.h 103;"   d
+LOCALEDIR      config.h        56;"    d
+LONG_TIMER     livewp-common.h 47;"    d
+LONG_TIMER_TYPE        livewp-common.h /^enum { SHORT_TIMER_TYPE, LONG_TIMER_TYPE };$/;"       e       enum:__anon1
+MOON_DECREAS   livewp-rules.h  41;"    d
+MOON_DECREASHALF       livewp-rules.h  40;"    d
+MOON_FULL      livewp-rules.h  39;"    d
+MOON_GROWS     livewp-rules.h  37;"    d
+MOON_GROWSHALF livewp-rules.h  38;"    d
+MOON_NONE      livewp-rules.h  36;"    d
+PACKAGE        config.h        59;"    d
+PACKAGE_BUGREPORT      config.h        62;"    d
+PACKAGE_NAME   config.h        65;"    d
+PACKAGE_STRING config.h        68;"    d
+PACKAGE_TARNAME        config.h        71;"    d
+PACKAGE_VERSION        config.h        74;"    d
+PLUGIN_NAME    livewp-home-widget.c    33;"    d       file:
+SHORT_TIMER    livewp-common.h 45;"    d
+SHORT_TIMER_TYPE       livewp-common.h /^enum { SHORT_TIMER_TYPE, LONG_TIMER_TYPE };$/;"       e       enum:__anon1
+SKY_LEVEL      livewp-common.h 49;"    d
+STDC_HEADERS   config.h        77;"    d
+SUN_LEVEL      livewp-common.h 50;"    d
+Scene  livewp-common.h /^typedef struct _Scene Scene;$/;"      t       typeref:struct:_Scene
+THEME_PATH     livewp-common.h 44;"    d
+TIME_DAY       livewp-rules.h  31;"    d
+TIME_NIGHT     livewp-rules.h  32;"    d
+TIME_SUNRISE   livewp-rules.h  33;"    d
+TIME_SUNSET    livewp-rules.h  34;"    d
+TOWN_LEVEL     livewp-common.h 51;"    d
+TRAM_LEVEL     livewp-common.h 52;"    d
+VERSION        config.h        80;"    d
+Xstartposition livewp-common.h 41;"    d
+Ystartposition livewp-common.h 42;"    d
+_AWallpaperPlugin      livewp-common.h /^struct _AWallpaperPlugin$/;"  s
+_AWallpaperPluginClass livewp-common.h /^struct _AWallpaperPluginClass$/;"     s
+_Actor livewp-actor.h  /^struct _Actor$/;"     s
+_Animation_WallpaperPrivate    livewp-common.h /^struct _Animation_WallpaperPrivate$/;"        s
+_Scene livewp-common.h /^struct _Scene $/;"    s
+_livewp_actor_h        livewp-actor.h  26;"    d
+_livewp_astro_h        livewp-astro.h  25;"    d
+_livewp_common_h       livewp-common.h 26;"    d
+_livewp_config_h       livewp-config.h 26;"    d
+_livewp_dbus_h livewp-dbus.h   26;"    d
+_livewp_multiactor_h   livewp-multiactor.h     26;"    d
+_livewp_rules_h        livewp-rules.h  25;"    d
+_livewp_scene_h        livewp-scene.h  26;"    d
+actors livewp-common.h /^    GSList * actors;$/;"      m       struct:_Scene
+altitude       livewp-astro.c  /^double altitude(double lon, double lat, int year, int month, int day, int hour, int min, int zone)$/;"        f
+animation_wallpaper_plugin_class_finalize      livewp-home-widget.c    /^animation_wallpaper_plugin_class_finalize (AWallpaperPluginClass *class) {$/;"        f       file:
+animation_wallpaper_plugin_class_init  livewp-home-widget.c    /^animation_wallpaper_plugin_class_init (AWallpaperPluginClass *klass) {$/;"    f       file:
+animation_wallpaper_plugin_init        livewp-home-widget.c    /^animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)$/;"        f       file:
+azimuth        livewp-astro.c  /^double azimuth(double lon, double lat, int year, int month, int day, int hour, int min, int zone)$/;" f
+btn_power_clicked      livewp-main.c   /^btn_power_clicked(HildonButton *btn, gpointer data)$/;"       f
+btn_setting_clicked    livewp-main.c   /^btn_setting_clicked(HildonButton *btn, gpointer data)$/;"     f
+change_cloud   livewp-actor.c  /^change_cloud(Actor *actor, AWallpaperPlugin *desktop_plugin)$/;"      f
+change_hildon_actor    livewp-home-widget.c    /^change_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin)$/;"       f
+change_layer   livewp-actor.c  /^change_layer(Actor * actor, AWallpaperPlugin *desktop_plugin)$/;"     f
+change_moon    livewp-actor.c  /^change_moon(Actor * actor, AWallpaperPlugin *desktop_plugin)$/;"      f
+change_plane1  livewp-actor.c  /^change_plane1(Actor *actor, AWallpaperPlugin *desktop_plugin)$/;"     f
+change_plane2  livewp-actor.c  /^change_plane2(Actor *actor, AWallpaperPlugin *desktop_plugin)$/;"     f
+change_signal  livewp-actor.c  /^change_signal(Actor * actor, AWallpaperPlugin *desktop_plugin)$/;"    f
+change_static_actor    livewp-actor.c  /^change_static_actor(Actor * actor, AWallpaperPlugin *desktop_plugin)$/;"      f
+change_static_actor_with_corner        livewp-actor.c  /^change_static_actor_with_corner(Actor * actor, AWallpaperPlugin *desktop_plugin)$/;"  f
+change_sun     livewp-actor.c  /^change_sun(Actor * actor, AWallpaperPlugin *desktop_plugin)$/;"       f
+change_tram    livewp-actor.c  /^change_tram(Actor * actor, AWallpaperPlugin *desktop_plugin)$/;"      f
+change_wind    livewp-actor.c  /^change_wind(Actor *actor, AWallpaperPlugin *desktop_plugin)$/;"       f
+change_window1 livewp-actor.c  /^change_window1(Actor * actor, AWallpaperPlugin *desktop_plugin)$/;"   f
+check_applet_state     livewp-settings.c       /^check_applet_state(void){$/;" f
+child  livewp-actor.h  /^    GPtrArray *child;$/;"     m       struct:_Actor
+create_enable_button   livewp-settings.c       /^create_enable_button (gboolean active)$/;"    f
+create_hildon_actor    livewp-home-widget.c    /^create_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin) $/;"      f
+create_rich_animation_button   livewp-settings.c       /^create_rich_animation_button (gboolean active)$/;"    f
+create_theme_selector  livewp-settings.c       /^create_theme_selector (void)$/;"      f
+create_themes_button   livewp-settings.c       /^create_themes_button (gchar *theme){$/;"      f
+day_of_year    livewp-astro.c  /^int day_of_year(int year, int month, int day)$/;"     f
+daytime        livewp-common.h /^    gint daytime;$/;" m       struct:_Scene
+dbus_conn      livewp-common.h /^    DBusConnection      *dbus_conn;$/;"       m       struct:_Animation_WallpaperPrivate
+dbus_conn_session      livewp-common.h /^    DBusConnection      *dbus_conn_session;$/;"       m       struct:_Animation_WallpaperPrivate
+deg2rad        livewp-astro.c  /^double deg2rad(double deg)$/;"        f
+desktop_plugin livewp-common.h /^    AWallpaperPlugin *desktop_plugin;$/;"     m       struct:_Animation_WallpaperPrivate
+desktop_plugin_visible_notify  livewp-home-widget.c    /^desktop_plugin_visible_notify (GObject    *object,$/;"        f       file:
+destroy_actor  livewp-actor.c  /^destroy_actor(Actor *actor)$/;"       f
+destroy_hildon_actor   livewp-home-widget.c    /^destroy_hildon_actor(Actor *actor)$/;"        f
+destroy_scene  livewp-scene.c  /^destroy_scene(AWallpaperPlugin *desktop_plugin)$/;"   f
+duration_animation     livewp-actor.h  /^    gint duration_animation;$/;"      m       struct:_Actor
+execute        livewp-control-widget.c /^execute(osso_context_t *osso, gpointer data, gboolean user_activated){$/;"    f
+expose_event   livewp-home-widget.c    /^expose_event (GtkWidget *widget,GdkEventExpose *event,$/;"    f       file:
+fast_rnd       livewp-rules.c  /^fast_rnd(gint max)$/;"        f
+filename       livewp-actor.h  /^    gchar *filename;$/;"      m       struct:_Actor
+func_change    livewp-actor.h  /^    void (*func_change)(gpointer, gpointer);$/;"      m       struct:_Actor
+func_probability       livewp-actor.h  /^    void (*func_probability)(gpointer);$/;"   m       struct:_Actor
+get_coord      livewp-rules.c  /^void get_coord(double * lat, double * lon)$/;"        f
+get_daytime    livewp-rules.c  /^int get_daytime()$/;" f
+get_livewp_signal_cb   livewp-dbus.c   /^get_livewp_signal_cb(DBusConnection *conn, DBusMessage *msg, Animation_WallpaperPrivate *priv){$/;"   f
+get_localtime  livewp-rules.c  /^void get_localtime(int * year, int * month, int * day, int * hour, int * min, int * zone)$/;" f
+get_max_sun_alt        livewp-rules.c  /^get_max_sun_alt(double lon, double lat, int year, int month, int day, int zone)$/;"   f
+get_moon_phase livewp-rules.c  /^int get_moon_phase()$/;"      f
+get_next_sunrise       livewp-rules.c  /^time_t get_next_sunrise()$/;" f
+get_next_sunset        livewp-rules.c  /^time_t get_next_sunset()$/;"  f
+get_sun_pos    livewp-rules.c  /^void get_sun_pos(double * alt, double * azm)$/;"      f
+get_sun_screen_pos     livewp-rules.c  /^get_sun_screen_pos(double alt, double azm, gint * x, gint * y)$/;"    f
+hash_scene_func        livewp-common.h /^    GHashTable * hash_scene_func;$/;" m       struct:_Animation_WallpaperPrivate
+height livewp-actor.h  /^    gint height;$/;"  m       struct:_Actor
+image  livewp-actor.h  /^    GtkWidget * image;$/;"    m       struct:_Actor
+init_applet_position   livewp-home-widget.c    /^init_applet_position(gint *xapplet, gint *yapplet)$/;"        f       file:
+init_object    livewp-actor.c  /^init_object(AWallpaperPlugin *desktop_plugin, $/;"    f
+init_scene_Berlin      livewp-scene.c  /^init_scene_Berlin(AWallpaperPlugin *desktop_plugin)$/;"       f
+init_scene_Matrix      livewp-scene.c  /^init_scene_Matrix(AWallpaperPlugin *desktop_plugin)$/;"       f
+init_scene_Modern      livewp-scene.c  /^init_scene_Modern(AWallpaperPlugin *desktop_plugin)$/;"       f
+init_scene_theme       livewp-scene.c  /^init_scene_theme(AWallpaperPlugin *desktop_plugin)$/;"        f
+jd     livewp-astro.c  /^double jd(int year, int month, int day, double uu)$/;"        f
+livewp_deinitialize_dbus       livewp-dbus.c   /^livewp_deinitialize_dbus(Animation_WallpaperPrivate *priv){$/;"       f
+livewp_initialize_dbus livewp-dbus.c   /^livewp_initialize_dbus(Animation_WallpaperPrivate *priv){$/;" f
+locangle       livewp-astro.c  /^double locangle(double lat, double sindec, double cosdec)$/;" f
+long_timeout   livewp-home-widget.c    /^long_timeout (AWallpaperPlugin *desktop_plugin)$/;"   f       file:
+long_timer     livewp-common.h /^    gint long_timer;$/;"      m       struct:_Animation_WallpaperPrivate
+lw_about       livewp-settings.c       /^void lw_about(void){$/;"      f
+lw_applet_expose_event livewp-home-widget.c    /^lw_applet_expose_event(GtkWidget      *widget,$/;"    f       file:
+lw_applet_finalize     livewp-home-widget.c    /^lw_applet_finalize (GObject *object)$/;"      f       file:
+lw_applet_realize      livewp-home-widget.c    /^lw_applet_realize (GtkWidget *widget)$/;"     f       file:
+lw_settings    livewp-settings.c       /^lw_settings(Animation_WallpaperPrivate *priv, gpointer data){$/;"     f
+main   livewp-main.c   /^main(int argc, char *argv[])$/;"      f
+main_widget    livewp-common.h /^    GtkWidget *main_widget;$/;"       m       struct:_Animation_WallpaperPrivate
+moon_phase     livewp-astro.c  /^double moon_phase(int year, int month, int day)$/;"   f
+multiactor_init        livewp-multiactor.c     /^MultiActor * multiactor_init(gchar * name, GSList * child, gint x, gint y, gint z, double scale, gboolean visible)$/;"        f
+multiactor_set_position        livewp-multiactor.c     /^void multiactor_set_position(MultiActor *ma, gint dx, gint dy, gint dz)$/;"   f
+multiactor_set_scale   livewp-multiactor.c     /^void multiactor_set_scale(MultiActor *ma, double scale)$/;"   f
+multiactor_set_visible livewp-multiactor.c     /^void multiactor_set_visible(MultiActor *ma, gboolean visible)$/;"     f
+name   livewp-actor.h  /^    gchar  *name;$/;" m       struct:_Actor
+opacity        livewp-actor.h  /^    gint opacity; $/;"        m       struct:_Actor
+osso   livewp-common.h /^    osso_context_t      *osso;$/;"    m       struct:_Animation_WallpaperPrivate
+parent livewp-common.h /^    HDHomePluginItem parent;$/;"      m       struct:_AWallpaperPlugin
+parent_class   livewp-common.h /^    HDHomePluginItemClass parent_class;$/;"   m       struct:_AWallpaperPluginClass
+path_line      livewp-actor.c  /^path_line(gint x0, gint x1, double t)$/;"     f       file:
+priv   livewp-common.h /^    Animation_WallpaperPrivate *priv;$/;"     m       struct:_AWallpaperPlugin
+read_config    livewp-config.c /^read_config(Animation_WallpaperPrivate *priv) {$/;"   f
+realize        livewp-home-widget.c    /^realize (GtkWidget *widget)$/;"       f       file:
+reload_scene   livewp-scene.c  /^reload_scene(AWallpaperPlugin *desktop_plugin)$/;"    f
+rich_animation livewp-common.h /^    gboolean rich_animation;$/;"      m       struct:_Animation_WallpaperPrivate
+rich_animation_press   livewp-home-widget.c    /^rich_animation_press(GtkWidget *widget, GdkEvent *event,$/;"  f
+right_corner   livewp-common.h /^    GtkWidget *right_corner;$/;"      m       struct:_Animation_WallpaperPrivate
+rightasc       livewp-astro.c  /^double rightasc(double l)$/;" f
+run_long_timeout       livewp-home-widget.c    /^run_long_timeout(AWallpaperPlugin *desktop_plugin)$/;"        f
+save_config    livewp-config.c /^save_config(Animation_WallpaperPrivate *priv) {$/;"   f
+save_state     livewp-control-widget.c /^save_state(osso_context_t *osso, gpointer data)$/;"   f
+scale  livewp-actor.h  /^    gint scale;$/;"   m       struct:_Actor
+scene  livewp-common.h /^    Scene *scene;$/;" m       struct:_Animation_WallpaperPrivate
+seed   livewp-common.h /^    guint seed; \/* init value for random  *\/$/;"    m       struct:_Scene
+send_dbus_signal       livewp-dbus.c   /^send_dbus_signal (Animation_WallpaperPrivate *priv,$/;"       f
+set_actor_position     livewp-actor.c  /^set_actor_position(Actor *actor, gint x, gint y, gint z, AWallpaperPlugin *desktop_plugin)$/;"        f
+set_actor_scale        livewp-actor.c  /^set_actor_scale(Actor *actor, double scalex, double scaley)$/;"       f
+set_actor_visible      livewp-actor.c  /^set_actor_visible(Actor *actor, gboolean visible)$/;" f
+short_timeout  livewp-home-widget.c    /^short_timeout (AWallpaperPlugin *desktop_plugin)$/;"  f       file:
+short_timer    livewp-common.h /^    gint short_timer;$/;"     m       struct:_Animation_WallpaperPrivate
+show_settings  livewp-settings.c       /^show_settings(GtkWidget *widget, Animation_WallpaperPrivate *priv){$/;"       f
+start_applet   livewp-settings.c       /^start_applet(void){$/;"       f
+stop_applet    livewp-settings.c       /^stop_applet(void){$/;"        f
+sun_rise_set   livewp-astro.c  /^sun_rise_set(double lon, double lat, $/;"     f
+theme  livewp-common.h /^    gchar *theme;$/;" m       struct:_Animation_WallpaperPrivate
+time_start_animation   livewp-actor.h  /^    time_t time_start_animation;$/;"  m       struct:_Actor
+timer_type     livewp-common.h /^    gint timer_type;$/;"      m       struct:_Scene
+tout   livewp-astro.c  /^double tout(double t, double lng_hour)$/;"    f
+truel  livewp-astro.c  /^double truel(double m)$/;"    f
+ut     livewp-astro.c  /^double ut(int hour, int min, int zone)$/;"    f
+visible        livewp-actor.h  /^    gboolean visible;$/;"     m       struct:_Actor
+visible        livewp-common.h /^    gboolean visible;$/;"     m       struct:_Animation_WallpaperPrivate
+widget livewp-actor.h  /^    GtkWidget * widget;$/;"   m       struct:_Actor
+width  livewp-actor.h  /^    gint width;$/;"   m       struct:_Actor
+wind_angle     livewp-common.h /^    double wind_angle; \/\/ [-1 .. 1]$/;"     m       struct:_Scene
+wind_orientation       livewp-common.h /^    gint wind_orientation; \/\/ +\/- 1$/;"    m       struct:_Scene
+x      livewp-actor.h  /^    gint x;$/;"       m       struct:_Actor
+xapplet        livewp-common.h /^    gint xapplet;$/;" m       struct:_Animation_WallpaperPrivate
+y      livewp-actor.h  /^    gint y;$/;"       m       struct:_Actor
+yapplet        livewp-common.h /^    gint yapplet;$/;" m       struct:_Animation_WallpaperPrivate
+z      livewp-actor.h  /^    gint z;$/;"       m       struct:_Actor