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

diff --combined applet/src/livewp-main.c
index 3bbee37,6397530..05b55f5
--- 1/applet/src/livewp-main.c
--- 2/applet/src/livewp-main.c
+++ b/applet/src/livewp-main.c
@@@ -31,10 -31,11 +31,11 @@@ main(int argc, char *argv[]
  {
      GtkWidget *main_widget = NULL;
      GtkWidget *window;
 -    GtkWidget *button;
 +    GtkWidget *button, *vbox;
      gint result;
      HildonProgram       *app;
      osso_context_t  *osso_context=NULL;
+     Animation_WallpaperPrivate *priv = g_new0 (Animation_WallpaperPrivate, 1);
  
  #ifdef ENABLE_NLS
      setlocale(LC_ALL, "");
@@@ -42,6 -43,7 +43,7 @@@
      bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
      textdomain(GETTEXT_PACKAGE);
  #endif
+     /* Ininitializing */
      hildon_gtk_init (&argc, &argv);
      app = HILDON_PROGRAM (hildon_program_get_instance());
      g_set_application_name (PACKAGE);
@@@ -52,18 -54,18 +54,20 @@@
          return 1;
      }
  
+     /* Load config */
+     read_config(priv);
  
- 
+     /* Create Main GUI */
      main_widget = hildon_stackable_window_new ();
      gtk_window_set_title(GTK_WINDOW(main_widget), PACKAGE);
  
 +    vbox = gtk_vbox_new(FALSE, 5);
      button = hildon_button_new(HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT,
                                 HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
      hildon_button_set_text(HILDON_BUTTON(button), "кнопка", "");
 -    gtk_container_add(GTK_CONTAINER(main_widget), button);
 -
 +    //gtk_container_add(GTK_CONTAINER(main_widget), button);
 +    gtk_box_pack_start(vbox, button, FALSE, FALSE, 0);
 +    gtk_container_add(GTK_CONTAINER(main_widget), vbox);
  
      hildon_program_add_window(app, HILDON_WINDOW(main_widget));