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

Conflicts:
	applet/po/ru_RU.po

diff --git a/applet/configure.ac b/applet/configure.ac
index c67ff94..8506692 100644 (file)
--- a/applet/configure.ac
+++ b/applet/configure.ac
@@ -24,6 +24,7 @@ PKG_CHECK_MODULES(CONTROLPANEL, hildon-control-panel)
 AC_SUBST(CONTROLPANEL_CFLAGS)
 AC_SUBST(CONTROLPANEL_LIBS)
 
+AC_CHECK_LIB([sqlite3], [sqlite3Init], [LIBS="-lsqlite3 $LIBS"])
 # Discover where to install the .desktop file:
 HILDON_HOME_DESKTOP_DIR=`pkg-config libhildondesktop-1 --variable=hildonhomedesktopentrydir`
 AC_SUBST(HILDON_HOME_DESKTOP_DIR)
@@ -32,6 +33,11 @@ AC_SUBST(HILDON_HOME_DESKTOP_DIR)
 HILDON_DESKTOP_LIB_DIR=`pkg-config libhildondesktop-1 --variable=hildondesktoplibdir`
 AC_SUBST(HILDON_DESKTOP_LIB_DIR) 
 
+PKG_CHECK_MODULES(SQLITE, [sqlite3])
+AC_SUBST(SQLITE_LIBS)
+AC_SUBST(SQLITE_CFLAGS)
+
+
 # Discover where to install the panel's lib file:
 HILDON_PANEL_LIB_DIR=`pkg-config hildon-control-panel --variable=pluginlibdir`
 AC_SUBST(HILDON_PANEL_LIB_DIR) 
@@ -48,7 +54,7 @@ GETTEXT_PACKAGE=$PACKAGE
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "${GETTEXT_PACKAGE}", [Name of gettext package])
 AC_DEFINE_UNQUOTED([LOCALEDIR], "${localedir}", [Path to store localization files])
-ALL_LINGUAS="ru_RU fi_FI"
+ALL_LINGUAS="ru_RU fi_FI es_ES es_MX"
 AM_GLIB_GNU_GETTEXT
 
 

diff --git a/applet/data/Makefile.in b/applet/data/Makefile.in
index 45d47ab..ede4186 100644 (file)
--- a/applet/data/Makefile.in
+++ b/applet/data/Makefile.in
@@ -181,6 +181,8 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@

diff --git a/applet/debian/changelog b/applet/debian/changelog
index a88804f..9001300 100644 (file)
--- a/applet/debian/changelog
+++ b/applet/debian/changelog
@@ -1,9 +1,19 @@
+live-wallpaper (0.5.1) unstable; urgency=low
+
+  * Fixed bug with load theme at startup 
+
+ -- Vlad Vasiliev <vlad@gas.by>  Tue, 15 Jun 2010 23:29:10 +0200
+
 live-wallpaper (0.5) unstable; urgency=low
 
   * Removed unusable menu icon again
   * Added icon to package
+  * Added icon in the control panel applet
+  * Added start/stop applet button in the control panel
+  * Added billboard in Modern theme with information about missing calls, sms, emails and chats
+  * Updated Russian, Spanish, Finnish translation
 
- -- Vlad Vasiliev <vlad@gas.by>  Sun, 02 May 2010 21:29:10 +0200
+ -- Vlad Vasiliev <vlad@gas.by>  Sat, 12 Jun 2010 21:29:10 +0200
 
 live-wallpaper (0.4.2) unstable; urgency=low
 

diff --git a/applet/debian/control b/applet/debian/control
index 56ec469..88bbbbd 100644 (file)
--- a/applet/debian/control
+++ b/applet/debian/control
@@ -2,7 +2,7 @@ Source: live-wallpaper
 Section: user/desktop
 Priority: optional
 Maintainer: Vlad Vasiliev vlad@gas.by
-Build-Depends: debhelper (>= 5), autotools-dev, libhildondesktop1-dev (>= 2.1.16), libosso-dev (>= 1), hildon-control-panel-dev
+Build-Depends: debhelper (>= 5), autotools-dev, libhildondesktop1-dev (>= 2.1.16), libosso-dev (>= 1), hildon-control-panel-dev, libsqlite3-dev
 Standards-Version: 3.7.2
 
 Package: live-wallpaper

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

diff --git a/applet/po/es_ES.po b/applet/po/es_ES.po
index 74f4555..e9535bd 100644 (file)
--- a/applet/po/es_ES.po
+++ b/applet/po/es_ES.po
@@ -10,25 +10,28 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/livewp-settings.c:33 src/livewp-settings.c:155
+#: src/livewp-settings.c:33
+#: src/livewp-settings.c:155
 msgid "About"
 msgstr "Acerca de"
 
-#: src/livewp-settings.c:63 src/livewp-settings.c:83 src/livewp-settings.c:165
+#: src/livewp-settings.c:63
+#: src/livewp-settings.c:83
+#: src/livewp-settings.c:165
 msgid "Berlin"
-msgstr "Berlin"
+msgstr "Berlín"
 
 #: src/livewp-settings.c:114
 msgid "Enable"
 msgstr "Activar"
 
-#: src/livewp-config.c:36 src/livewp-config.c:64
+#: 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
-#, fuzzy
 msgid ""
 "Live Wallpaper\n"
 " Version 0.5 \n"
@@ -44,13 +47,14 @@ msgid ""
 "           Vlad Vasiliev\n"
 msgstr ""
 "Live Wallpaper\n"
-" versión 0.5\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"
+" Copyright(c) 2010 del diseño de los temas Berlín y Moderno, Vasya Bobrikov\n"
+" Copyright(c) 2010 del diseño del tema Matrix, Andrew Zhilin\n"
 " Traductores:\n"
+" Castellano - Alejandro López\n"
 " Finlandés - Marko Vertainen\n"
 " Ruso - Tanya Makova \n"
 "        Vlad Vasiliev\n"
@@ -59,11 +63,15 @@ msgstr ""
 msgid "Live Wallpaper Settings"
 msgstr "Configuración de Live Wallpaper"
 
-#: src/livewp-settings.c:65 src/livewp-settings.c:91 src/livewp-settings.c:169
+#: src/livewp-settings.c:65
+#: src/livewp-settings.c:91
+#: src/livewp-settings.c:169
 msgid "Matrix"
-msgstr "Matriz"
+msgstr "Matrix"
 
-#: src/livewp-settings.c:64 src/livewp-settings.c:87 src/livewp-settings.c:167
+#: src/livewp-settings.c:64
+#: src/livewp-settings.c:87
+#: src/livewp-settings.c:167
 msgid "Modern"
 msgstr "Moderno"
 
@@ -78,3 +86,4 @@ msgstr "Guardar"
 #: src/livewp-settings.c:77
 msgid "Theme"
 msgstr "Tema"
+

diff --git a/applet/po/es_MX.po b/applet/po/es_MX.po
index 74f4555..e9535bd 100644 (file)
--- a/applet/po/es_MX.po
+++ b/applet/po/es_MX.po
@@ -10,25 +10,28 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/livewp-settings.c:33 src/livewp-settings.c:155
+#: src/livewp-settings.c:33
+#: src/livewp-settings.c:155
 msgid "About"
 msgstr "Acerca de"
 
-#: src/livewp-settings.c:63 src/livewp-settings.c:83 src/livewp-settings.c:165
+#: src/livewp-settings.c:63
+#: src/livewp-settings.c:83
+#: src/livewp-settings.c:165
 msgid "Berlin"
-msgstr "Berlin"
+msgstr "Berlín"
 
 #: src/livewp-settings.c:114
 msgid "Enable"
 msgstr "Activar"
 
-#: src/livewp-config.c:36 src/livewp-config.c:64
+#: 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
-#, fuzzy
 msgid ""
 "Live Wallpaper\n"
 " Version 0.5 \n"
@@ -44,13 +47,14 @@ msgid ""
 "           Vlad Vasiliev\n"
 msgstr ""
 "Live Wallpaper\n"
-" versión 0.5\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"
+" Copyright(c) 2010 del diseño de los temas Berlín y Moderno, Vasya Bobrikov\n"
+" Copyright(c) 2010 del diseño del tema Matrix, Andrew Zhilin\n"
 " Traductores:\n"
+" Castellano - Alejandro López\n"
 " Finlandés - Marko Vertainen\n"
 " Ruso - Tanya Makova \n"
 "        Vlad Vasiliev\n"
@@ -59,11 +63,15 @@ msgstr ""
 msgid "Live Wallpaper Settings"
 msgstr "Configuración de Live Wallpaper"
 
-#: src/livewp-settings.c:65 src/livewp-settings.c:91 src/livewp-settings.c:169
+#: src/livewp-settings.c:65
+#: src/livewp-settings.c:91
+#: src/livewp-settings.c:169
 msgid "Matrix"
-msgstr "Matriz"
+msgstr "Matrix"
 
-#: src/livewp-settings.c:64 src/livewp-settings.c:87 src/livewp-settings.c:167
+#: src/livewp-settings.c:64
+#: src/livewp-settings.c:87
+#: src/livewp-settings.c:167
 msgid "Modern"
 msgstr "Moderno"
 
@@ -78,3 +86,4 @@ msgstr "Guardar"
 #: src/livewp-settings.c:77
 msgid "Theme"
 msgstr "Tema"
+

diff --git a/applet/po/fi_FI.po b/applet/po/fi_FI.po
index 72daa64..51cd77d 100644 (file)
--- a/applet/po/fi_FI.po
+++ b/applet/po/fi_FI.po
@@ -8,32 +8,35 @@ msgstr ""
 "Project-Id-Version: 0.4\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-10 09:19+0300\n"
-"PO-Revision-Date: 2010-04-23 15:27+0200\n"
+"PO-Revision-Date: 2010-06-10 16:50+0200\n"
 "Last-Translator: Marko Vertainen <marko.vertainen@iki.fi>\n"
 "Language-Team: fi_FI <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/livewp-settings.c:33 src/livewp-settings.c:155
+#: src/livewp-settings.c:33
+#: src/livewp-settings.c:155
 msgid "About"
 msgstr "Tietoja"
 
-#: src/livewp-settings.c:63 src/livewp-settings.c:83 src/livewp-settings.c:165
+#: src/livewp-settings.c:63
+#: src/livewp-settings.c:83
+#: src/livewp-settings.c:165
 msgid "Berlin"
 msgstr "Berliini"
 
 #: src/livewp-settings.c:114
 msgid "Enable"
-msgstr ""
+msgstr "Käytä"
 
-#: src/livewp-config.c:36 src/livewp-config.c:64
+#: src/livewp-config.c:36
+#: src/livewp-config.c:64
 #, c-format
 msgid "Failed to initialize GConf. Quitting.\n"
 msgstr "GConf asetus epäonnistui. Lopetetaan.\n"
 
 #: src/livewp-settings.c:37
-#, fuzzy
 msgid ""
 "Live Wallpaper\n"
 " Version 0.5 \n"
@@ -49,22 +52,31 @@ msgid ""
 "           Vlad Vasiliev\n"
 msgstr ""
 "Live Wallpaper\n"
-" Versio 0.4.2 \n"
+" Versio 0.5 \n"
 " Copyright(c) 2010\n"
 " Tanya Makova\n"
 " Vlad Vasiliev\n"
 " Copyright(c) 2010 teemojen Berliini ja Moderni suunnittelu Vasya Bobrikov\n"
-" Copyright(c) 2010 teeman Matrix suunnittelu Andrew Zhilin"
+" Copyright(c) 2010 teeman Matrix suunnittelu Andrew Zhilin\n"
+" Kääntäjät:\n"
+" Suomi - Marko Vertainen\n"
+" Espanja - Alejandro López\n"
+" Venäjä - Tanya Makova \n"
+"          Vlad Vasiliev\n"
 
 #: src/livewp-settings.c:136
 msgid "Live Wallpaper Settings"
 msgstr "Elävän taustakuvan asetukset"
 
-#: src/livewp-settings.c:65 src/livewp-settings.c:91 src/livewp-settings.c:169
+#: src/livewp-settings.c:65
+#: src/livewp-settings.c:91
+#: src/livewp-settings.c:169
 msgid "Matrix"
 msgstr "Matrix"
 
-#: src/livewp-settings.c:64 src/livewp-settings.c:87 src/livewp-settings.c:167
+#: src/livewp-settings.c:64
+#: src/livewp-settings.c:87
+#: src/livewp-settings.c:167
 msgid "Modern"
 msgstr "Moderni"
 
@@ -82,3 +94,4 @@ msgstr "Teema"
 
 #~ msgid "Settings"
 #~ msgstr "Asetukset"
+

diff --git a/applet/po/ru_RU.po b/applet/po/ru_RU.po
index 498f8aa..3f00877 100644 (file)
--- a/applet/po/ru_RU.po
+++ b/applet/po/ru_RU.po
@@ -25,7 +25,7 @@ msgstr "Берлин"
 
 #: src/livewp-settings.c:114
 msgid "Enable"
-msgstr ""
+msgstr "Включить"
 
 #: src/livewp-config.c:36 src/livewp-config.c:64
 #, c-format

diff --git a/applet/src/livewp-actor.c b/applet/src/livewp-actor.c
index f169e0b..8e4e0a3 100644 (file)
--- a/applet/src/livewp-actor.c
+++ b/applet/src/livewp-actor.c
@@ -117,7 +117,7 @@ set_actor_position(Actor *actor, gint x, gint y, gint z, AWallpaperPlugin *deskt
 int get_notify_count(gchar *notify_type)
 {
     sqlite3 *db = NULL;
-    sqlite3 *res = NULL;
+    sqlite3_stmt *res = NULL;
     gint rc = 0, result = 0;
     gchar sql[1024];
 
@@ -182,13 +182,10 @@ gchar * read_notification()
 void 
 change_billboard(Actor * actor, AWallpaperPlugin *desktop_plugin)
 {
-    GtkWidget *label;
-    gchar *mes = NULL, *message = NULL;
-    PangoFontDescription *pfd = NULL;
     gint count = 0;
     Actor *a = NULL;
      
-    fprintf(stderr, "change_billboard\n");   
+    //fprintf(stderr, "change_billboard\n");   
     
     if (desktop_plugin->priv->scene->notification < time(NULL)){
         count = get_notify_count("general_missed");
@@ -220,22 +217,12 @@ change_billboard(Actor * actor, AWallpaperPlugin *desktop_plugin)
             set_actor_visible(a, FALSE);
         }
 
-        #if 0
-        message = read_notification();
-        label = actor->image;
-        mes = g_markup_printf_escaped("<span bgcolor=\"%s\" foreground=\"%s\">%s</span>", "#FFFFFF", "#000000", message);
-        gtk_label_set_markup(GTK_LABEL(label), mes);
-        pfd = pango_font_description_from_string("Sans 16");
-        gtk_widget_modify_font(GTK_WIDGET(label), NULL);
-        gtk_widget_modify_font(GTK_WIDGET(label), pfd);
-        pango_font_description_free(pfd);
-#endif
         desktop_plugin->priv->scene->notification = FALSE;
     }
     actor->time_start_animation = time(NULL) + 20;    
 }
 
-
+#if 0
 void 
 change_billboard1(Actor * actor, AWallpaperPlugin *desktop_plugin)
 {
@@ -253,7 +240,7 @@ change_billboard1(Actor * actor, AWallpaperPlugin *desktop_plugin)
         fprintf(stderr, "error open db %d %s\n", rc, sqlite3_errmsg(db));
     }else {
         snprintf(sql, sizeof(sql)-1, "select count(id) from Events where event_type_id=%d", 3);
-//#if 0
+
         rc = sqlite3_prepare(db, sql, sizeof(sql)-1, &res, NULL);
         if (rc != SQLITE_OK){
             fprintf(stderr, "error prepare %d %s\n", rc, sql);
@@ -277,7 +264,7 @@ change_billboard1(Actor * actor, AWallpaperPlugin *desktop_plugin)
         //fprintf(stderr, "count sms = %d\n", sms_count);
         sqlite3_finalize(res);
 
-//#endif
+
         sqlite3_close(db);
     }
     label = actor->image;
@@ -290,7 +277,7 @@ change_billboard1(Actor * actor, AWallpaperPlugin *desktop_plugin)
     pango_font_description_free(pfd);
     actor->time_start_animation = time(NULL) + 20;    
 }
-
+#endif
 
 void 
 change_moon(Actor * actor, AWallpaperPlugin *desktop_plugin)

diff --git a/applet/src/livewp-dbus.c b/applet/src/livewp-dbus.c
index 7dadc5b..bc470b0 100644 (file)
--- a/applet/src/livewp-dbus.c
+++ b/applet/src/livewp-dbus.c
@@ -124,9 +124,11 @@ send_dbus_signal (Animation_WallpaperPrivate *priv,
   success = dbus_connection_send (priv->dbus_conn_session, message, NULL);
   dbus_message_unref (message);
   
+#if 0
   fprintf (stderr, "%s '%s' message.\n",
                                  success ? "Sent" : "Failed to send",
                                  member);
+#endif
 
 }
 
@@ -139,7 +141,7 @@ get_livewp_signal_cb(DBusConnection *conn, DBusMessage *msg, Animation_Wallpaper
     START_FUNCTION;
 #endif
 
-    fprintf (stderr, "PATH11111111111111111111 %s %s %s\n",   dbus_message_get_path(msg),   dbus_message_get_interface (msg), dbus_message_get_member (msg));
+    //fprintf (stderr, "PATH11111111111111111111 %s %s %s\n",   dbus_message_get_path(msg),   dbus_message_get_interface (msg), dbus_message_get_member (msg));
     if (dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_RELOAD_CONFIG)){
         if(read_config(priv)){
                 fprintf(stderr, "\nCan not read config file.\n");
@@ -150,16 +152,16 @@ get_livewp_signal_cb(DBusConnection *conn, DBusMessage *msg, Animation_Wallpaper
 #endif
         }
     }
-    fprintf(stderr, "Type %i\n", dbus_message_get_type (msg));
+    //fprintf(stderr, "Type %i\n", dbus_message_get_type (msg));
     if (dbus_message_is_method_call(msg, NOTIFY_SIGNAL_INTERFACE, NOTIFY_MEMBER)){
-        fprintf(stderr,"read notifications.db notify\n");    
+        //fprintf(stderr,"read notifications.db notify\n");    
         //read_notification(priv->desktop_plugin);
-        priv->scene->notification = time(NULL) + 10;
+        priv->scene->notification = time(NULL) + 5;
     }
     if (dbus_message_is_signal(msg, NOTIFY_SIGNAL_INTERFACE, CLOSENOTIFY_MEMBER)){
-        fprintf(stderr,"read notifications.db close notify\n");    
+        //fprintf(stderr,"read notifications.db close notify\n");    
         //read_notification(priv->desktop_plugin);
-        priv->scene->notification = time(NULL) + 10;
+        priv->scene->notification = time(NULL) + 5;
     }
 
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;

diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index 8c2733a..3ff8735 100644 (file)
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -445,7 +445,7 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
     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");
+    //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);
@@ -480,9 +480,9 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
     init_applet_position(&(priv->xapplet), &(priv->yapplet));
 
     
-    fprintf(stderr, "!!!theme = %s\n", priv->theme);
-    snprintf(str, sizeof(str) - 1, "%s", "init_scene2");
-    fprintf(stderr, " str = %s\n", str);
+    //fprintf(stderr, "!!!theme = %s\n", priv->theme);
+    //snprintf(str, sizeof(str) - 1, "%s", "init_scene2");
+    //fprintf(stderr, " str = %s\n", str);
     priv->scene = NULL;
 #if 0
     if (!strcmp(priv->theme,"Modern"))

diff --git a/applet/src/livewp-scene.c b/applet/src/livewp-scene.c
index d59acea..32502ba 100644 (file)
--- a/applet/src/livewp-scene.c
+++ b/applet/src/livewp-scene.c
@@ -76,7 +76,7 @@ init_scene_Matrix(AWallpaperPlugin *desktop_plugin)
       y2 = -480;
   }
 
-  fprintf(stderr, "init scene2 \n");
+  //fprintf(stderr, "init scene2 \n");
   scene = g_new0(Scene, 1);
   //scene.daytime = get_daytime();
   scene->actors = NULL;

diff --git a/applet/src/tags b/applet/src/tags
deleted file mode 100644 (file)
index 3037c46..0000000
--- a/applet/src/tags
+++ /dev/null
@@ -1,222 +0,0 @@
-!_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