From 087a16400fd798f31684190b71fc5e396b2c634e Mon Sep 17 00:00:00 2001
From: kojima <kojima>
Date: Tue, 26 Oct 2004 01:11:15 +0000
Subject: [PATCH] updated Makefiles files for po dirs

---
 WPrefs.app/po/Makefile.am     |  2 +-
 WindowMaker/Defaults/WMGLOBAL |  2 +-
 po/Makefile.am                |  2 +-
 src/defaults.c                | 16 ++++++++++++++--
 src/switchpanel.c             |  6 ++++--
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/WPrefs.app/po/Makefile.am b/WPrefs.app/po/Makefile.am
index d3ebea86..52eb2bee 100644
--- a/WPrefs.app/po/Makefile.am
+++ b/WPrefs.app/po/Makefile.am
@@ -12,7 +12,7 @@ POTFILES  = \
 	$(top_builddir)/WPrefs.app/Configurations.c \
 	$(top_builddir)/WPrefs.app/Expert.c \
 	$(top_builddir)/WPrefs.app/Focus.c \
-	$(top_builddir)/WPrefs.app/Font.c \
+	$(top_builddir)/WPrefs.app/FontSimple.c \
 	$(top_builddir)/WPrefs.app/Icons.c \
 	$(top_builddir)/WPrefs.app/KeyboardSettings.c \
 	$(top_builddir)/WPrefs.app/KeyboardShortcuts.c \
diff --git a/WindowMaker/Defaults/WMGLOBAL b/WindowMaker/Defaults/WMGLOBAL
index 4eacc80e..7f24b81f 100644
--- a/WindowMaker/Defaults/WMGLOBAL
+++ b/WindowMaker/Defaults/WMGLOBAL
@@ -1,7 +1,7 @@
 {
   SystemFont = "Trebuchet MS,Luxi Sans";
   BoldSystemFont = "Trebuchet MS,Luxi Sans:bold";
-  DefaultFontSize = 12;
+  DefaultFontSize = 11;
   AntialiasedText = Yes;
   FloppyPath = "/floppy";
   DoubleClickTime = 250;
diff --git a/po/Makefile.am b/po/Makefile.am
index b5057faa..7655a1fe 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -20,7 +20,6 @@ POTFILES  = \
 	$(top_builddir)/src/icon.c \
 	$(top_builddir)/src/main.c \
 	$(top_builddir)/src/menu.c \
-	$(top_builddir)/src/menureader.c \
 	$(top_builddir)/src/misc.c \
 	$(top_builddir)/src/pixmap.c \
 	$(top_builddir)/src/resources.c \
@@ -30,6 +29,7 @@ POTFILES  = \
 	$(top_builddir)/src/stacking.c \
 	$(top_builddir)/src/startup.c \
 	$(top_builddir)/src/switchmenu.c \
+	$(top_builddir)/src/switchpanel.c \
 	$(top_builddir)/src/texture.c \
 	$(top_builddir)/src/wdefaults.c \
 	$(top_builddir)/src/window.c \
diff --git a/src/defaults.c b/src/defaults.c
index c4dd6771..4216a51d 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -3538,7 +3538,13 @@ setSwPOptions(WScreen *scr, WDefaultEntry *entry, WMPropList *array, void *foo)
     switch (WMGetPropListItemCount(array))
     {
     case 4:
-        path= FindImage(wPreferences.pixmap_path, WMGetFromPLString(WMGetFromPLArray(array, 1)));
+        if (!WMIsPLString(WMGetFromPLArray(array, 1))) {
+            wwarning(_("Invalid arguments for option \"%s\""),
+                     entry->key);
+            break;
+        } else
+          path= FindImage(wPreferences.pixmap_path, WMGetFromPLString(WMGetFromPLArray(array, 1)));
+
         if (!path) {
             wwarning(_("Could not find image \"%s\" for option \"%s\""), 
                      WMGetFromPLString(WMGetFromPLArray(array, 1)),
@@ -3607,7 +3613,13 @@ setSwPOptions(WScreen *scr, WDefaultEntry *entry, WMPropList *array, void *foo)
         }
 
     case 1:
-        path= FindImage(wPreferences.pixmap_path, WMGetFromPLString(WMGetFromPLArray(array, 0)));
+        if (!WMIsPLString(WMGetFromPLArray(array, 0))) {
+            wwarning(_("Invalid arguments for option \"%s\""),
+                     entry->key);
+            break;
+        } else
+          path= FindImage(wPreferences.pixmap_path, WMGetFromPLString(WMGetFromPLArray(array, 0)));
+
         if (!path) {
             wwarning(_("Could not find image \"%s\" for option \"%s\""), 
                      WMGetFromPLString(WMGetFromPLArray(array, 0)),
diff --git a/src/switchpanel.c b/src/switchpanel.c
index d4de1874..8f727b4c 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -432,7 +432,9 @@ WSwitchPanel *wInitSwitchPanel(WScreen *scr, WWindow *curwin, int workspace)
     int width, height;
     int iconsThatFitCount;
     int count;
-  
+    WMRect rect;
+    rect= wGetRectForHead(scr, wGetHeadForPointerLocation(scr));
+
     memset(panel, 0, sizeof(WSwitchPanel));
 
     panel->scr= scr;
@@ -449,7 +451,7 @@ WSwitchPanel *wInitSwitchPanel(WScreen *scr, WWindow *curwin, int workspace)
     width= ICON_TILE_SIZE*count;
     iconsThatFitCount= count;
 
-    if (width > WMScreenWidth(scr->wmscreen)) {
+    if (width > rect.size.width) {
         iconsThatFitCount = (WMScreenWidth(scr->wmscreen)-SCREEN_BORDER_SPACING)/ICON_TILE_SIZE;
         width= iconsThatFitCount*ICON_TILE_SIZE;
     }