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

[livewp] / applet / src / livewp-settings.c

diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c
index 9b2d135..bcede27 100644 (file)
--- a/applet/src/livewp-settings.c
+++ b/applet/src/livewp-settings.c
@@ -34,7 +34,11 @@ void lw_about(void){
     gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
     gtk_window_set_modal(GTK_WINDOW(window), TRUE);
     vbox = gtk_vbox_new (FALSE, 5);
+<<<<<<< HEAD
+    label_about = gtk_label_new (_("Live Wallpaper Version 0.8.5 \n Copyright(c) 2010\n \
+=======
     label_about = gtk_label_new (_("Live Wallpaper Version 0.8.2 \n Copyright(c) 2010\n \
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 Tanya Makova\n Vlad Vasiliev\n \
 Copyright(c) 2010 for design themes Berlin, Modern and Accel Vasya Bobrikov\n \
 Copyright(c) 2010 for design theme Matrix and icons Andrew Zhilin\n \
@@ -316,14 +320,14 @@ fill_theme_button (Animation_WallpaperPrivate *priv, GtkWidget *button, gchar *c
     if (!strcmp(category, "Unknown")){
         store = priv->extheme_list;
         while (store){  
-            if (!strcmp("Sherman's Aquarium" , g_hash_table_lookup(store->data, "name"))){
+            if (!strcmp("Shermans Aquarium" , g_hash_table_lookup(store->data, "name"))){
                 flag = TRUE;
                 break;
             }
             store = g_slist_next(store);
         }
         if (!flag)
-            hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), "Sherman's Aquarium");
+            hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), "Shermans Aquarium");
     }
 
         hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (button),
@@ -539,7 +543,6 @@ void
 additional_parametr_for_theme_video(GtkWidget *vbox, Animation_WallpaperPrivate *priv){
 
     GtkWidget *file_button;
-    GtkWidget *sound_button;
     GtkWidget *rich_animation_button;
 
     if (priv->theme_string_parametr1)
@@ -560,13 +563,16 @@ additional_parametr_for_theme_video(GtkWidget *vbox, Animation_WallpaperPrivate
                                    rich_animation_button, TRUE, TRUE, 5);
     g_object_set_data(G_OBJECT(priv->window), "rich_animation_button", rich_animation_button);
     /* Create sound button */  
+#if 0
+
+    /* Doesn't work in real device. Hardware volume buttons can to change volume for mutted track */
     sound_button = create_bool_button(priv->theme_bool_parametr1, _("Sound"));
     gtk_box_pack_start(GTK_BOX(vbox),
                                    sound_button, TRUE, TRUE, 5);
     g_object_set_data(G_OBJECT(priv->window), "sound_button", sound_button);
-
-    gtk_widget_show (file_button);
     gtk_widget_show (sound_button);
+#endif
+    gtk_widget_show (file_button);
     gtk_widget_show (rich_animation_button);
 
 }
@@ -657,7 +663,7 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) {
                     }
                 }
                 /* Check Xsnow program */
-                if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), "Sherman's Aquarium")){
+                if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), "Shermans Aquarium")){
                     if (access("/usr/bin/shermans", F_OK) != 0){
                         hildon_banner_show_information(GTK_WIDGET(button), NULL, 
                         _("You haven't got the installed package 'Sherman's Aquarium'. Please install it via using Application Manager"));
@@ -684,14 +690,15 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) {
                             g_free(priv->theme_string_parametr1);
                         priv->theme_string_parametr1 = g_strdup((gchar*)hildon_button_get_value (HILDON_BUTTON(button1)));
                     }
+                    /* 
                     temp_button = g_object_get_data(G_OBJECT(priv->window), "sound_button");
                     if (temp_button){
-                        /* Check rich animation */
                         if (hildon_check_button_get_active (HILDON_CHECK_BUTTON(temp_button)))
                             priv->theme_bool_parametr1 = TRUE;
                         else
                             priv->theme_bool_parametr1 = FALSE;
                     }
+                    */
                 }
                 /* Check external themes */
                 GSList *store = priv->extheme_list;