From: Vlad Vasiliev <vlad@toshiba2.oblgaz>
Date: Thu, 22 Apr 2010 18:46:57 +0000 (+0300)
Subject: Merge branch 'master' of https://vcs.maemo.org/git/livewp
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=dbc31d23631094e8b4c9fc7f6fa289e558d4190a;p=livewp

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

dbc31d23631094e8b4c9fc7f6fa289e558d4190a
diff --cc applet/src/livewp-main.c
index 67f3025,932cbc4..6397530
--- a/applet/src/livewp-main.c
+++ b/applet/src/livewp-main.c
@@@ -53,12 -52,17 +54,19 @@@ main(int argc, char *argv[]
          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);
+ 
+     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);
+ 
+ 
      hildon_program_add_window(app, HILDON_WINDOW(main_widget));
  
      gtk_widget_show_all(GTK_WIDGET(main_widget));