From 25c37b7637a03f55f33925d12b48ef5d58c7788d Mon Sep 17 00:00:00 2001
From: kojima <kojima>
Date: Fri, 11 Mar 2005 01:58:55 +0000
Subject: [PATCH] applied patch to rename .AppInfo directory

---
 ChangeLog           |  2 +-
 src/Makefile.am     | 11 +++++++++++
 src/application.c   |  2 +-
 src/icon.c          |  4 ++--
 src/session.c       |  4 ++--
 util/wmaker.inst.in |  8 ++++++--
 util/wmsetup.c      |  3 ++-
 7 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 524f1636..d4d7d1f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,7 @@ Changes since version 0.91.0:
   default installation path (for non GNUstep users) is now $(prefix)/bin
 - fixed bug with infinite loop in some circumstances in fitText() in WINGs
 - fixed to allow parallel builds on SMP systems using make -j
-
+- applied .AppInfo --> Library path rename patch (Alex Perez <aperez@student.santarosa.edu>)
 
 Changes since version 0.90.0:
 .............................
diff --git a/src/Makefile.am b/src/Makefile.am
index 06d7700f..d9f10fb5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,8 +4,11 @@ BUILT_SOURCES = wconfig.h
 
 bin_PROGRAMS = wmaker
 
+noinst_PROGRAMS = wsmap
+
 EXTRA_DIST = 
 
+wsmap_SOURCES= wsmap.c
 
 wmaker_SOURCES = 	\
 	GNUstep.h \
@@ -121,3 +124,11 @@ wmaker_LDADD = \
 	@INTLIBS@ \
 	@DLLIBS@
 
+wsmap_LDADD = \
+	$(top_builddir)/WINGs/libWINGs.a\
+	$(top_builddir)/wrlib/libwraster.la\
+	@XFTLIBS@ \
+	@XLIBS@ \
+	@INTLIBS@ \
+	@DLLIBS@
+
diff --git a/src/application.c b/src/application.c
index 24196ecd..ad5d388c 100644
--- a/src/application.c
+++ b/src/application.c
@@ -400,7 +400,7 @@ wApplicationCreate(WWindow *wwin)
 
         /* If the icon was saved by us from the client supplied icon, but is
          * missing, recreate it. */
-        if (tmp && strstr(tmp, ".AppInfo/WindowMaker")!=NULL &&
+        if (tmp && strstr(tmp, "Library/WindowMaker/CachedPixmaps")!=NULL &&
             stat(tmp, &dummy)!=0 && errno==ENOENT) {
             wmessage(_("recreating missing icon '%s'"), tmp);
             path = wIconStore(wapp->app_icon->icon);
diff --git a/src/icon.c b/src/icon.c
index 6425a0a0..cd6c90ae 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -496,7 +496,7 @@ getnameforicon(WWindow *wwin)
     prefix = wusergnusteppath();
     len = strlen(prefix)+64+strlen(suffix);
     path = wmalloc(len+1);
-    snprintf(path, len, "%s/.AppInfo", prefix);
+    snprintf(path, len, "%s/Library/WindowMaker/CachedPixmaps", prefix);
 
     if (access(path, F_OK)!=0) {
         if (mkdir(path, S_IRUSR|S_IWUSR|S_IXUSR)) {
@@ -527,7 +527,7 @@ getnameforicon(WWindow *wwin)
 
 /*
  * wIconStore--
- * 	Stores the client supplied icon at ~/GNUstep/.AppInfo/WindowMaker
+ * 	Stores the client supplied icon at ~/GNUstep/Library/WindowMaker/CachedPixmaps
  * and returns the path for that icon. Returns NULL if there is no
  * client supplied icon or on failure.
  *
diff --git a/src/session.c b/src/session.c
index cbb38a7b..83cf97ef 100644
--- a/src/session.c
+++ b/src/session.c
@@ -699,7 +699,7 @@ wSessionSendSaveYourself(WScreen *scr)
  * might want to keep the dock configuration while not wanting to
  * resume a previously saved session.
  * So, wmaker specific state info can be saved in
- * ~/GNUstep/.AppInfo/WindowMaker/statename.state
+ * ~/GNUstep/Library/WindowMaker/statename.state
  * Its better to not put it in the defaults directory because:
  * - its not a defaults file (having domain names like wmaker0089504baa
  * in the defaults directory wouldn't be very neat)
@@ -1023,7 +1023,7 @@ smSaveYourselfPhase2Proc(SmcConn smc_conn, SmPointer client_data)
     i = 0;
     do {
         if (gsPrefix)
-            snprintf(statefile, len, "%s/.AppInfo/WindowMaker/wmaker.%l%i.state",
+            snprintf(statefile, len, "%s/Library/WindowMaker/wmaker.%l%i.state",
                      prefix, t, i);
         else
             snprintf(statefile, len, "%s/wmaker.%l%i.state", prefix, t, i);
diff --git a/util/wmaker.inst.in b/util/wmaker.inst.in
index 53d253e4..2c2c0fdc 100644
--- a/util/wmaker.inst.in
+++ b/util/wmaker.inst.in
@@ -135,8 +135,12 @@ else
 fi
 
 
-if [ ! -d "$GSDIR/.AppInfo" ]; then
-	make_dir $GSDIR/.AppInfo
+if [ ! -d "$GSDIR/Library/WindowMaker/CachedPixmaps" ]; then
+	make_dir $GSDIR/WindowMaker/CachedPixmaps
+fi
+
+if [ ! -d "$GSDIR/Library/WindowMaker/WPrefs" ]; then
+	make_dir $GSDIR/WindowMaker/WPrefs
 fi
 
 if [ ! -d "$GSDIR/Defaults" ]; then
diff --git a/util/wmsetup.c b/util/wmsetup.c
index c486bbc3..b01e6f0e 100644
--- a/util/wmsetup.c
+++ b/util/wmsetup.c
@@ -41,17 +41,18 @@ main()
 
 char *RequiredDirectories[] = {
     "/Defaults",
-    "/.AppInfo",
     "/Library",
     "/Library/Icons",
     "/Library/WindowMaker",
     "/Library/WindowMaker/Backgrounds",
     "/Library/WindowMaker/IconSets",
     "/Library/WindowMaker/Pixmaps",
+    "/Library/WindowMaker/CachedPixmaps",
     "/Library/WindowMaker/SoundSets",
     "/Library/WindowMaker/Sounds",
     "/Library/WindowMaker/Styles",
     "/Library/WindowMaker/Themes",
+    "/Library/WindowMaker/WPrefs",
     NULL
 };
 
-- 
2.11.4.GIT