Merge branch 'master' of ssh://drop.maemo.org/git/livewp

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

diff --git a/applet/src/livewp-main.c b/applet/src/livewp-main.c
index 614092b..4df4827 100644 (file)
--- a/applet/src/livewp-main.c
+++ b/applet/src/livewp-main.c
@@ -39,16 +39,15 @@ void conky_visible(AWallpaperPlugin *desktop_plugin);
 void 
 set_live_bg (Display *display, Window xwindow, int mode)
 {
-        Atom atom;
+   Atom atom;
+   atom = XInternAtom (display, "_HILDON_LIVE_DESKTOP_BACKGROUND", False);
+   fprintf (stderr, "XID: 0x%x\n", (unsigned)xwindow);
 
-        atom = XInternAtom (display, "_HILDON_LIVE_DESKTOP_BACKGROUND", False);
-        fprintf (stderr, "XID: 0x%x\n", (unsigned)xwindow);
-
-        XChangeProperty (display,
-                      xwindow,
-                       atom,
-                       XA_INTEGER, 32, PropModeReplace,
-                       (unsigned char *) &mode, 1);
+   XChangeProperty (display,
+                 xwindow,
+                  atom,
+                  XA_INTEGER, 32, PropModeReplace,
+                  (unsigned char *) &mode, 1);
 }
 /*******************************************************************************/
 
@@ -291,7 +290,10 @@ create_xwindow (Animation_WallpaperPrivate *priv){
     label = gtk_label_new(_("Loading Livewallpaper scene ..."));
     gtk_container_add (GTK_CONTAINER (main_widget), label);
     gtk_widget_show_all(GTK_WIDGET(main_widget));
-    set_live_bg(GDK_WINDOW_XDISPLAY (main_widget->window), GDK_WINDOW_XID (main_widget->window), priv->view);
+    if (priv->one_in_all_view)
+        set_live_bg(GDK_WINDOW_XDISPLAY (main_widget->window), GDK_WINDOW_XID (main_widget->window), -1);
+    else
+        set_live_bg(GDK_WINDOW_XDISPLAY (main_widget->window), GDK_WINDOW_XID (main_widget->window), priv->view);
 }
 /*******************************************************************************/
 int
@@ -335,15 +337,23 @@ main(int argc, char *argv[])
     priv->running = FALSE;
     /* fprintf(stderr,"XWINDOW %i\n",GDK_WINDOW_XID (main_widget->window)); */
     priv->desktop_plugin = desktop_plugin;
+
+
     priv->view = view;
+    fill_priv(priv);
+    fprintf(stderr,"THEME %s\n", priv->theme);
 
-    if (current_active_view() == view) 
+    /* Check activity of opition "One theme in all views" */
+    if (priv->one_in_all_view && view >1)
+        return -1;   
+
+
+    if (current_active_view() == view && !priv->one_in_all_view) 
         priv->visible = TRUE;
     else 
         priv->visible = FALSE;
 
-    fill_priv(priv);
-    
+
     create_xwindow(priv);
     /* Initialize DBUS */
     livewp_initialize_dbus(priv);