[Xfce4-commits] r25821 - xfwm4/trunk/src

[Olivier Fourdan]

Author: olivier
Date: 2007-06-17 07:28:34 +0000 (Sun, 17 Jun 2007)
New Revision: 25821

Modified:
   xfwm4/trunk/src/screen.c
Log:
Add missing pixmap inits

Modified: xfwm4/trunk/src/screen.c
===================================================================
--- xfwm4/trunk/src/screen.c	2007-06-16 23:17:52 UTC (rev 25820)
+++ xfwm4/trunk/src/screen.c	2007-06-17 07:28:34 UTC (rev 25821)
@@ -55,7 +55,7 @@
     PangoLayout *layout;
     Atom wm_sn_atom;
     long desktop_visible;
-    int i;
+    int i, j;
 
     g_return_val_if_fail (display_info, NULL);
     g_return_val_if_fail (GDK_IS_SCREEN (gscr), NULL);
@@ -201,29 +201,29 @@
     screen_info->title_shadow_colors[INACTIVE].gc = NULL;
     screen_info->title_shadow_colors[INACTIVE].allocated = FALSE;
 
-    for (i = 0; i < BUTTON_COUNT; i++)
+    for (i = 0; i < SIDE_COUNT; i++)
     {
-        xfwmPixmapInit (screen_info, &screen_info->buttons[i][ACTIVE]);
-        xfwmPixmapInit (screen_info, &screen_info->buttons[i][INACTIVE]);
-        xfwmPixmapInit (screen_info, &screen_info->buttons[i][PRESSED]);
-        xfwmPixmapInit (screen_info, &screen_info->buttons[i][T_ACTIVE]);
-        xfwmPixmapInit (screen_info, &screen_info->buttons[i][T_INACTIVE]);
-        xfwmPixmapInit (screen_info, &screen_info->buttons[i][T_PRESSED]);
+        xfwmPixmapInit (screen_info, &screen_info->sides[i][ACTIVE]);
+        xfwmPixmapInit (screen_info, &screen_info->sides[i][INACTIVE]);
     }
     for (i = 0; i < CORNER_COUNT; i++)
     {
         xfwmPixmapInit (screen_info, &screen_info->corners[i][ACTIVE]);
         xfwmPixmapInit (screen_info, &screen_info->corners[i][INACTIVE]);
     }
-    for (i = 0; i < SIDE_COUNT; i++)
+    for (i = 0; i < BUTTON_COUNT; i++)
     {
-        xfwmPixmapInit (screen_info, &screen_info->sides[i][ACTIVE]);
-        xfwmPixmapInit (screen_info, &screen_info->sides[i][INACTIVE]);
+        for (j = 0; j < STATE_COUNT; j++)
+        {
+            xfwmPixmapInit (screen_info, &screen_info->buttons[i][j]);
+        }
     }
     for (i = 0; i < TITLE_COUNT; i++)
     {
         xfwmPixmapInit (screen_info, &screen_info->title[i][ACTIVE]);
         xfwmPixmapInit (screen_info, &screen_info->title[i][INACTIVE]);
+        xfwmPixmapInit (screen_info, &screen_info->top[i][ACTIVE]);
+        xfwmPixmapInit (screen_info, &screen_info->top[i][INACTIVE]);
     }
 
     return (screen_info);