doesn't work

diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index 4181cbb..6f2f78d 100644 (file)
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -150,7 +150,7 @@ desktop_plugin_visible_notify (GObject    *object,
     gboolean visible;
     Animation_WallpaperPrivate *priv = desktop_plugin->priv;
     g_object_get (object, "is-on-current-desktop", &visible, NULL);
-    /* fprintf (stderr, "is-on-current-desktop changed. visible: %u", visible); */
+    fprintf (stderr, "LWP is-on-current-desktop changed. visible: %u", visible); 
     if (priv){
              if (priv->one_in_all_view){
                     if (visible)
@@ -239,6 +239,7 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
     priv->xapplet = 0;
     priv->yapplet = 0;
     priv->scene = NULL;
+    priv->pid = 0;
     priv->theme = g_strdup("Modern");
     //priv->theme = g_strdup("Accel");
     desktop_plugin->priv->main_widget = gtk_fixed_new();
@@ -280,7 +281,7 @@ fprintf(stderr,"lw_applet_finalize\n");
             destroy_scene(desktop_plugin);
      }
 */    
-     
+    fprintf(stderr,"sddddddddd1111111 %i\n", priv->view); 
      if (priv){
             switch (priv->view + 1){
                case 1: send_dbus_signal (priv, LIVEWP_SIGNAL_INTERFACE, 
@@ -297,20 +298,28 @@ fprintf(stderr,"lw_applet_finalize\n");
                        break;
             }
      }
+    fprintf(stderr,"sddddddddd222222222222\n"); 
      if(priv->alive_timer > 0) 
          g_source_remove(priv->alive_timer);
 
+    fprintf(stderr,"sddddddddd222333333222222222\n"); 
      livewp_deinitialize_dbus(priv);
-     while (TRUE){
-         wpid = wait(&status);
-        if (wpid == priv->pid)
-            break;
+
+    fprintf(stderr,"sddddddddd222334333222222222\n"); 
+     if (priv->pid >0){
+    fprintf(stderr,"sddddddddd22233433333333333333333333322222233222222222\n"); 
+            while (TRUE){
+                wpid = wait(&status);
+                if (wpid == priv->pid)
+                    break;
+            }
      }
 }
 
 static void
 desktop_widget_finalize (GObject *object)
 {
+fprintf(stderr,"desktop lw_applet_finalize\n");
       /* Call the base class's implementation: */
      G_OBJECT_CLASS (animation_wallpaper_plugin_parent_class)->finalize (object);
 }

diff --git a/applet/src/livewp-main.c b/applet/src/livewp-main.c
index 532b862..d11e207 100644 (file)
--- a/applet/src/livewp-main.c
+++ b/applet/src/livewp-main.c
@@ -349,7 +349,7 @@ main(int argc, char *argv[])
         return -1;   
 
 
-    if (current_active_view() == view || priv->one_in_all_view) 
+    if (current_active_view() == view && !priv->one_in_all_view) 
         priv->visible = TRUE;
     else 
         priv->visible = FALSE;

diff --git a/applet/src/livewp-scene.c b/applet/src/livewp-scene.c
index 79958c3..7129006 100644 (file)
--- a/applet/src/livewp-scene.c
+++ b/applet/src/livewp-scene.c
@@ -231,9 +231,11 @@ init_scene_External(AWallpaperPlugin *desktop_plugin){
         *strview =NULL;
     gint i;
     Window  id_xwindow;
+    fprintf(stderr,"init_scene_External1\n");
     if (!desktop_plugin->priv->visible)
         return;
     
+    fprintf(stderr,"init_scene_External2\n");
     exec_path = g_strdup(g_hash_table_lookup(desktop_plugin->priv->hash_theme, "exec_path"));
     window_id = g_strdup(g_hash_table_lookup(desktop_plugin->priv->hash_theme, "window_id"));
     view = g_strdup(g_hash_table_lookup(desktop_plugin->priv->hash_theme, "view"));

diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c
index fa81c7b..6432f9d 100644 (file)
--- a/applet/src/livewp-settings.c
+++ b/applet/src/livewp-settings.c
@@ -545,16 +545,17 @@ lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data){
 
     if (hildon_check_button_get_active (HILDON_CHECK_BUTTON(one_in_all_view_button)) != one_in_all_view){
         save_one_in_all_views_to_config(hildon_check_button_get_active (HILDON_CHECK_BUTTON(one_in_all_view_button)));
-        if (hildon_check_button_get_active (HILDON_CHECK_BUTTON(one_in_all_view_button))){
-            stop_applet(1);
-            stop_applet(2);
-            stop_applet(3);
-            stop_applet(4);
-            start_applet(1);
-            start_applet(2);
-            start_applet(3);
-            start_applet(4);
-        }
+        fprintf(stderr,"CHECK!!!!!!!!!!!!!!\n");
+        stop_applet(0);
+        stop_applet(1);
+        stop_applet(2);
+        stop_applet(3);
+        sleep(7);
+        start_applet(0);
+        start_applet(1);
+        start_applet(2);
+        start_applet(3);
+        
     }
     if (window)
         gtk_widget_destroy(window);