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

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

diff --cc applet/configure.ac
index 8506692,8506692..d6a7628
--- 1/applet/configure.ac
--- 2/applet/configure.ac
+++ b/applet/configure.ac
@@@ -24,7 -24,7 +24,6 @@@ PKG_CHECK_MODULES(CONTROLPANEL, hildon-
  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)

diff --cc applet/debian/changelog
index c044b42,5829864..06e05d0
--- 1/applet/debian/changelog
--- 2/applet/debian/changelog
+++ b/applet/debian/changelog
@@@ -1,3 -1,9 +1,15 @@@
++live-wallpaper (0.7) unstable; urgency=low
++
++  * Done real live background for PR 1.2
++
++ -- Vlad Vasiliev <vlad@gas.by>  Thu, 22 Jul 2010 22:39:10 +0200
++
+ live-wallpaper (0.6.2) unstable; urgency=low
+ 
+   * Fixed drying of battery  
+ 
+  -- Vlad Vasiliev <vlad@gas.by>  Thu, 22 Jul 2010 22:39:10 +0200
+ 
  live-wallpaper (0.6.1) unstable; urgency=low
  
    * Fixed craching after click in setting icon on applet 

diff --cc applet/src/Makefile.am
index 0da5d3f,14fa9b1..3e09fd5
--- 1/applet/src/Makefile.am
--- 2/applet/src/Makefile.am
+++ b/applet/src/Makefile.am
@@@ -1,20 -1,17 +1,20 @@@
 -#SOURCE_FILES = livewp-main.c \
 -#            livewp-home-widget.c livewp-home-widget.h \
 -#            livewp-astro.c livewp-astro.h \
 -#            livewp-rules.c livewp-rules.h \
 -#            livewp-settings.c livewp-settings.h livewp-common.h \
 -#            livewp-config.c livewp-config.h \
 -#            livewp-dbus.c livewp-dbus.h
 +SOURCE_FILES = livewp-main.c \
 +             livewp-home-widget.c livewp-home-widget.h \
 +             livewp-astro.c livewp-astro.h \
 +             livewp-rules.c livewp-rules.h \
 +             livewp-settings.c livewp-settings.h livewp-common.h \
 +             livewp-config.c livewp-config.h \
 +             livewp-dbus.c livewp-dbus.h \
 +             livewp-actor.c livewp-actor.h \
 +             livewp-scene.c livewp-scene.h
 +
 +
 +bin_PROGRAMS = livewp
 +livewp_SOURCES = $(SOURCE_FILES)
  #
- livewp_CFLAGS = -Wall $(EXAMPLE_CFLAGS) $(OSSO_CFLAGS) -DAPPLICATION
 -#bin_PROGRAMS = livewp
 -#livewp_SOURCES = $(SOURCE_FILES)
++livewp_CFLAGS = -Wall $(EXAMPLE_CFLAGS) $(OSSO_CFLAGS) $(SQLITE_CFLAGS) -DAPPLICATION
  #
- livewp_LDADD = $(EXAMPLE_LIBS) $(OSSO_LIBS)
 -#livewp_CFLAGS = -Wall $(EXAMPLE_CFLAGS) $(OSSO_CFLAGS) -DAPPLICATION
 -#
 -#livewp_LDADD = $(EXAMPLE_LIBS) $(OSSO_LIBS)
++livewp_LDADD = $(EXAMPLE_LIBS) $(OSSO_LIBS) $(SQLITE_LIBS) 
  
  # We invent desktoplib_LTLIBRARIES instead of the normal lib_LTLIBRARIES,
  # so we can specify the non-standard installation directory.
@@@ -29,9 -26,9 +29,9 @@@ liblivewp_home_widget_la_SOURCES = live
                                   livewp-dbus.c livewp-dbus.h \
                                   livewp-actor.c livewp-actor.h \
                                   livewp-scene.c livewp-scene.h
--liblivewp_home_widget_la_LIBADD = $(EXAMPLE_LIBS) $(OSSO_LIBS) 
++liblivewp_home_widget_la_LIBADD = $(EXAMPLE_LIBS) $(OSSO_LIBS)  $(SQLITE_LIBS) 
  
--AM_CFLAGS = -Wall $(EXAMPLE_CFLAGS) $(OSSO_CFLAGS) 
++AM_CFLAGS = -Wall $(EXAMPLE_CFLAGS) $(OSSO_CFLAGS) $(SQLITE_CFLAGS) 
  
  panellib_LTLIBRARIES =  liblivewp-panel-widget.la
  panellibdir = $(HILDON_PANEL_LIB_DIR)
@@@ -40,7 -37,7 +40,7 @@@ liblivewp_panel_widget_la_SOURCES = liv
                                   livewp-config.c livewp-config.h \
                                   livewp-control-widget.c livewp-control-widget.h \
                                   livewp-dbus.c livewp-dbus.h
--liblivewp_panel_widget_la_LIBADD = $(EXAMPLE_LIBS) $(OSSO_LIBS) $(CONTROLPANEL_LIBS) 
++liblivewp_panel_widget_la_LIBADD = $(EXAMPLE_LIBS) $(OSSO_LIBS) $(CONTROLPANEL_LIBS)   
  
  liblivewp_panel_widget_la_CFLAGS = -Wall $(EXAMPLE_CFLAGS) $(OSSO_CFLAGS)  $(CONTROLPANEL_CFLAGS) -DCONTROLPANEL 
  

diff --cc applet/src/livewp-home-widget.c
index 23ca412,e4dc31b..ca268fe
--- 1/applet/src/livewp-home-widget.c
--- 2/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@@ -454,8 -454,7 +454,8 @@@ animation_wallpaper_plugin_init (AWallp
      livewp_initialize_dbus(priv);
  
      priv->desktop_plugin = desktop_plugin;
 +    priv->window = desktop_plugin;
-     priv->visible = TRUE;
+     priv->visible = FALSE;
      priv->short_timer = 0;
      priv->xapplet = 0;
      priv->yapplet = 0;