Subject: iconfile and miniiconfile variables

From: Tavis Ormandy <[email-masked]>
Date: Mon, 10 May 2004 20:47:06 +0100

I've found the iconfile and miniiconfile variables really handy, but the
only limitation is that without knowing the ImagePath, their use is limited
to within fvwm image settings..with a minor alteration to get the full
path, they can still be used this way, and externally...

What do you think? :)

$ cvs diff expand.c 
Index: expand.c
===================================================================
RCS file: /home/cvs/fvwm/fvwm/fvwm/expand.c,v
retrieving revision 1.16
diff -u -w -r1.16 expand.c
--- expand.c    30 Mar 2004 16:09:49 -0000      1.16
+++ expand.c    10 May 2004 19:44:47 -0000
@@ -383,13 +383,22 @@
        case VAR_W_ICONFILE:
                if (fw && !IS_EWMH_DESKTOP(FW_W(fw)))
                {
+                       /* expand the path if possible */
+                       string = PictureFindImageFile(fw->icon_bitmap_file,
NULL, R_OK);
+                       if (!string)
+                       {
                        string = fw->icon_bitmap_file;
                }
+               }
                break;
        case VAR_W_MINIICONFILE:
                if (fw && !IS_EWMH_DESKTOP(FW_W(fw)))
                {
+                       string = PictureFindImageFile(fw->mini_pixmap_file,
NULL, R_OK);
+                       if (!string)
+                       {
                        string = fw->mini_pixmap_file;
+                       }
                }
                break;
        case VAR_W_CLASS:

-- 
-------------------------------------
[email-masked] | finger me for my gpg key.
-------------------------------------------------------