From 9e5145beccd596c2cd88de65c6c9a056ecac9c0c Mon Sep 17 00:00:00 2001
From: vlad <vlad@vlanout.(none)>
Date: Sat, 14 Aug 2010 22:10:43 +0300
Subject: [PATCH] fixed start theme Xsnow

---
 applet/src/livewp-scene.c    |   10 +++++++---
 applet/src/livewp-settings.c |   16 ++++------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/applet/src/livewp-scene.c b/applet/src/livewp-scene.c
index 233000d..86cd0d9 100644
--- a/applet/src/livewp-scene.c
+++ b/applet/src/livewp-scene.c
@@ -179,7 +179,7 @@ bus_call (GstBus *bus, GstMessage *msg, AWallpaperPlugin *desktop_plugin)
 /*******************************************************************************/
 void
 init_scene_External(AWallpaperPlugin *desktop_plugin){
-    //fprintf(stderr,"init_scene_Xsnow\n");
+
     char* child_argv[2048];
     char *run_string = NULL;
     gchar *exec_path = NULL,
@@ -199,10 +199,14 @@ init_scene_External(AWallpaperPlugin *desktop_plugin){
         return;
     if (window_id){
         strwin = g_strdup_printf(" %s %i", window_id, GDK_WINDOW_XID(desktop_plugin->priv->window->window));
-    }
+    }else
+        strwin = "";
+
     if (view){
         strview = g_strdup_printf(" %s %i", view, desktop_plugin->priv->view);
-    }
+    }else
+        strview = "";
+
     run_string = g_strdup_printf("%s%s%s", exec_path, strwin, strview);
     fprintf(stderr, "runs string = %s\n", run_string);
     parsestring(run_string, child_argv);
diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c
index cf69168..af04973 100644
--- a/applet/src/livewp-settings.c
+++ b/applet/src/livewp-settings.c
@@ -522,6 +522,7 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) {
     gtk_window_set_title(GTK_WINDOW(window), _("View Settings"));
     gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
     gtk_window_set_modal(GTK_WINDOW(window), TRUE);
+
     /* Create Enable button */
     enable_button = create_enable_button(check_applet_state(view)); 
     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox),
@@ -532,7 +533,7 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) {
     g_signal_connect (G_OBJECT (category_button), "value-changed",  G_CALLBACK (changed_value_category_cb), priv);
     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox),
                                    category_button, TRUE, TRUE, 5);
-    /* Create custom vbox */
+    /* Create Custom vbox */
     vbox = gtk_vbox_new (FALSE, 5);
     g_object_set_data(G_OBJECT(window), "custom_vbox", vbox);
 
@@ -544,25 +545,16 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) {
                                    theme_button, TRUE, TRUE, 5);
     fill_theme_button(priv, theme_button, hildon_button_get_value(HILDON_BUTTON (category_button)));
 
+    /* Pack custom vbox. It must be last widget */
     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox),
                                    vbox, TRUE, TRUE, 5);
-#if 0
-    if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Berlin"))||
-        !strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Matrix"))||
-        !strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Accel"))||
-        !strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Modern"))){
-        rich_animation_additional_parametr(vbox, priv);
-    }
 
-    if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Video"))){
-        additional_parametr_for_theme_video(vbox, priv);
-    } 
-#endif
     gtk_widget_show (enable_button);
     gtk_widget_show (category_button);
     gtk_widget_show (theme_button);
     gtk_widget_show (vbox);
     gtk_widget_show (window);
+
     save_button = gtk_dialog_add_button(GTK_DIALOG(window), _("Save"), GTK_RESPONSE_YES);
 
     result = gtk_dialog_run(GTK_DIALOG(window));
-- 
1.7.9.5