+++ /dev/null
---- WindowMaker-0.51.0/src/gnome.c.areas Wed Jan 20 10:00:00 1999
-+++ WindowMaker-0.51.0/src/gnome.c Mon Feb 15 17:23:09 1999
-@@ -94,6 +94,8 @@
- static Atom _XA_WIN_APP_STATE;
- static Atom _XA_WIN_EXPANDED_SIZE;
- static Atom _XA_WIN_ICONS;
-+static Atom _XA_WIN_AREA;
-+static Atom _XA_WIN_AREA_COUNT;
- static Atom _XA_WIN_WORKSPACE;
- static Atom _XA_WIN_WORKSPACE_COUNT;
- static Atom _XA_WIN_WORKSPACE_NAMES;
-@@ -104,7 +106,7 @@
- void
- wGNOMEInitStuff(WScreen *scr)
- {
-- Atom supportedStuff[10];
-+ Atom supportedStuff[12];
- int count;
-
- if (!_XA_WIN_SUPPORTING_WM_CHECK) {
-@@ -126,11 +128,16 @@
-
- _XA_WIN_ICONS = XInternAtom(dpy, "_WIN_ICONS", False);
-
-+ _XA_WIN_AREA = XInternAtom(dpy, "_WIN_AREA", False);
-+
-+ _XA_WIN_AREA_COUNT =
-+ XInternAtom(dpy, "_WIN_AREA_COUNT", False);
-+
- _XA_WIN_WORKSPACE = XInternAtom(dpy, "_WIN_WORKSPACE", False);
-
- _XA_WIN_WORKSPACE_COUNT =
- XInternAtom(dpy, "_WIN_WORKSPACE_COUNT", False);
--
-+
- _XA_WIN_WORKSPACE_NAMES =
- XInternAtom(dpy, "_WIN_WORKSPACE_NAMES", False);
-
-@@ -173,6 +180,8 @@
- supportedStuff[count++] = _XA_WIN_APP_STATE;
- supportedStuff[count++] = _XA_WIN_EXPANDED_SIZE;
- supportedStuff[count++] = _XA_WIN_ICONS;
-+ supportedStuff[count++] = _XA_WIN_AREA;
-+ supportedStuff[count++] = _XA_WIN_AREA_COUNT;
- supportedStuff[count++] = _XA_WIN_WORKSPACE;
- supportedStuff[count++] = _XA_WIN_WORKSPACE_COUNT;
- supportedStuff[count++] = _XA_WIN_WORKSPACE_NAMES;
-@@ -221,11 +230,16 @@
- wGNOMEUpdateWorkspaceHints(WScreen *scr)
- {
- long val;
-+ long val2[2];
-
- val = scr->workspace_count;
-+ val2[0] = 1;
-+ val2[1] = 1;
-
- XChangeProperty(dpy, scr->root_win, _XA_WIN_WORKSPACE_COUNT, XA_CARDINAL,
- 32, PropModeReplace, (unsigned char*)&val, 1);
-+ XChangeProperty(dpy, scr->root_win, _XA_WIN_AREA_COUNT, XA_CARDINAL,
-+ 32, PropModeReplace, (unsigned char*)&val2, 2);
-
- wGNOMEUpdateWorkspaceNamesHint(scr);
- }
-@@ -254,11 +268,16 @@
- wGNOMEUpdateCurrentWorkspaceHint(WScreen *scr)
- {
- long val;
-+ long val2[2];
-
- val = scr->current_workspace;
-+ val2[0] = 0;
-+ val2[1] = 0;
-
- XChangeProperty(dpy, scr->root_win, _XA_WIN_WORKSPACE, XA_CARDINAL,
- 32, PropModeReplace, (unsigned char*)&val, 1);
-+ XChangeProperty(dpy, scr->root_win, _XA_WIN_AREA, XA_CARDINAL,
-+ 32, PropModeReplace, (unsigned char*)&val2, 2);
- }
-
-
+++ /dev/null
-diff -ur WindowMaker-CVS-20040723.orig/WPrefs.app/Expert.c WindowMaker-CVS-20040723/WPrefs.app/Expert.c
---- WindowMaker-CVS-20040723.orig/WPrefs.app/Expert.c 2004-07-23 07:23:15.000000000 +0200
-+++ WindowMaker-CVS-20040723/WPrefs.app/Expert.c 2004-09-05 04:26:07.050661872 +0200
-@@ -84,7 +84,7 @@
- WMSetButtonText(panel->swi[7], _("Smooth font edges (needs restart)."));
-
- //if (!WMHasAntialiasingSupport(WMWidgetScreen(panel->box)))
-- WMSetButtonEnabled(panel->swi[7], False);
-+ //WMSetButtonEnabled(panel->swi[7], False);
-
- WMRealizeWidget(panel->box);
- WMMapSubwidgets(panel->box);
+++ /dev/null
---- WindowMaker-0.80.2/util/wmchlocale.in.orig Tue Jul 24 01:13:24 2001
-+++ WindowMaker-0.80.2/util/wmchlocale.in Sat Nov 23 14:26:30 2002
-@@ -52,7 +52,7 @@
- test="--test";;
- *)
- if [ -z "$new_locale" ]; then
-- new_locale="$i"
-+ new_locale="${i%_*}"
- else
- echo -e "\nUnrecognized command line argument, run without arguments to see help.\n"
- exit 1
-@@ -65,7 +65,7 @@
- fi
-
- if [ -n "$auto" ] && [ -z "$new_locale" ]; then
-- new_locale=$LANG
-+ new_locale=${LANG%_*}
- if [ -z "$new_locale" ]; then
- new_locale="${LC_ALL%_*}"
- fi
-@@ -75,7 +75,7 @@
- if [ -z "$default" ]; then
- echo -e "\nNo locale is set, using default...\n" >/dev/stderr
- fi
--elif ! (locale -a |grep "^$new_locale$" &>/dev/null); then
-+elif ! (locale -a |grep "^$new_locale$" >/dev/null 2>/dev/null); then
- if [ -z "$auto" ]; then
- echo -e "\n"\
- "Locale $new_locale is not supported on your system..."\
-@@ -86,7 +86,7 @@
- "Check your LANG and LC_ALL variables or install your locale support\n"\
- "\n" >/dev/stderr
- fi
-- exit 1
-+# exit 1 -- disabled, `locale -a` doesn't work under glibc 2.3.1
- fi
-
- echo -n "Setting Window Maker root menu... "
-@@ -104,7 +104,7 @@
- for new_menu in $menu_list; do
- for wm_dir in $LOCALDIR $GLOBALDIR; do
- if [ -f "$wm_dir/$new_menu" ]; then
-- if [ -z "$new_locale" ] || ( [ -n "$new_locale" ] && echo "$new_menu" |grep "menu.$new_locale" &>/dev/null ); then
-+ if [ -z "$new_locale" ] || ( [ -n "$new_locale" ] && echo "$new_menu" |grep "menu.$new_locale" >/dev/null 2>/dev/null); then
- echo "success"
- else
- echo "fail (copying default)"
-@@ -135,11 +135,11 @@
- else
- args="--locale=$new_locale $nodef"
- fi
--if wsetfont "$args" &>/dev/null; then
-+if wsetfont "$args" >/dev/null 2>/dev/null; then
- echo "success"
- else
- echo -n "fail"
-- if wsetfont default "$test" &>/dev/null; then
-+ if wsetfont default "$test" >/dev/null 2>/dev/null; then
- echo " (setting default)"
- else
- echo " (totally)"