[Xfce4-commits] <xfce4-settings:master> Fix check for compositing

[Nick Schermer]

Updating branch refs/heads/master
         to de05a685e10a8eedd60081830481cb4690f29223 (commit)
       from 6d490988e1f3546a5db3f32ce21b519776783778 (commit)

commit de05a685e10a8eedd60081830481cb4690f29223
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Tue Oct 9 17:44:10 2012 +0200

    Fix check for compositing

 dialogs/display-settings/main.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index b7f3e3e..4b2cf8c 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -997,14 +997,14 @@ display_setting_screen_changed(GtkWidget *widget, GdkScreen *old_screen, gpointe
     GdkScreen *screen = gtk_widget_get_screen(widget);
     GdkColormap *colormap = gdk_screen_get_rgba_colormap(screen);
     
-    if (!colormap)
+    if (gdk_screen_is_composited(screen))
     {
-        colormap = gdk_screen_get_rgb_colormap(screen);
-        supports_alpha = FALSE;
+        supports_alpha = TRUE;
     }
     else
     {
-        supports_alpha = TRUE;
+        colormap = gdk_screen_get_rgb_colormap(screen);
+        supports_alpha = FALSE;
     }
     
     gtk_widget_set_colormap(widget, colormap);
@@ -1026,7 +1026,7 @@ display_setting_identity_popup_expose(GtkWidget *popup, GdkEventExpose *event, g
         cairo_paint (cr);
     }
     
-    /* Draw rounded corners. FIXME Does not work with xfce compositor off. */
+    /* Draw rounded corners. */
     else
     {
         cairo_set_source_rgba(cr, 0, 0, 0, 0);