Merge branch 'accel'

diff --cc applet/src/livewp-main.c
Simple merge

diff --cc applet/src/livewp-scene.c
Simple merge

diff --cc applet/src/livewp-scene.h
Simple merge

diff --cc applet/src/livewp-settings.c
index e08eca6,6f56fb4..06c2dd2
--- 1/applet/src/livewp-settings.c
--- 2/applet/src/livewp-settings.c
+++ b/applet/src/livewp-settings.c
@@@ -410,14 -290,11 +416,16 @@@ lw_theme_settings(GtkWidget *button, An
                      priv->theme = g_strdup("Modern");
                  if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Matrix")))
                      priv->theme = g_strdup("Matrix");
+                 if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Accel")))
+                     priv->theme = g_strdup("Accel");
                  if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Video"))){
                      priv->theme = g_strdup("Video");
 -                    priv->theme_string_parametr1 = g_strdup("/home/user/MyDocs/.videos/9.mp4");
 +                    button1 = g_object_get_data(G_OBJECT(priv->window), "filename_button");
 +                    if (button1){
 +                        if (priv->theme_string_parametr1)
 +                            g_free(priv->theme_string_parametr1);
 +                        priv->theme_string_parametr1 = g_strdup((gchar*)hildon_button_get_value (HILDON_BUTTON(button1)));
 +                    }
                  }
  
              }