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

[Olivier Fourdan]

Author: olivier
Date: 2006-08-21 20:28:36 +0000 (Mon, 21 Aug 2006)
New Revision: 22848

Modified:
   xfwm4/trunk/src/client.c
   xfwm4/trunk/src/mypixmap.c
Log:
Improve the fix for themes which are missing the menu button.

Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c	2006-08-21 20:13:05 UTC (rev 22847)
+++ xfwm4/trunk/src/client.c	2006-08-21 20:28:36 UTC (rev 22848)
@@ -1422,6 +1422,12 @@
     xfwmPixmapFree (&c->appmenu[INACTIVE]);
     xfwmPixmapFree (&c->appmenu[PRESSED]);
 
+    if (screen_info->buttons[MENU_BUTTON][ACTIVE].pixmap == None)
+    {
+        /* The current theme has no menu button */
+        return;
+    }
+
     xfwmPixmapDuplicate (&screen_info->buttons[MENU_BUTTON][ACTIVE],
                          &c->appmenu[ACTIVE]);
     xfwmPixmapDuplicate (&screen_info->buttons[MENU_BUTTON][INACTIVE],

Modified: xfwm4/trunk/src/mypixmap.c
===================================================================
--- xfwm4/trunk/src/mypixmap.c	2006-08-21 20:13:05 UTC (rev 22847)
+++ xfwm4/trunk/src/mypixmap.c	2006-08-21 20:28:36 UTC (rev 22848)
@@ -1036,6 +1036,8 @@
     
     TRACE ("entering xfwmPixmapFree");
     
+    pm->width = 0;
+    pm->height = 0;
     if (pm->pixmap != None)
     {
         XFreePixmap (myScreenGetXDisplay(pm->screen_info), pm->pixmap);