From 71f735069a302f5017c995fff0850c070f4c2008 Mon Sep 17 00:00:00 2001
From: kojima <kojima>
Date: Sun, 21 May 2000 16:15:56 +0000
Subject: [PATCH] *** empty log message ***

---
 WINGs/Makefile.am | 38 +++++---------------------------------
 WINGs/WUtil.h     |  1 -
 WINGs/wpanel.c    |  5 +++--
 WINGs/wtest.c     | 14 ++++++++++++++
 4 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index 7d5d1b21..776c2c02 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -5,14 +5,6 @@ AUTOMAKE_OPTIONS = no-dependencies
 SUBDIRS = Resources
 
 
-LIBLIST= $(top_builddir)/wrlib/libwraster.la\
-	 @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ \
-	-lm @LIBPL@
-
-
-#lib_LTLIBRARIES = libWINGs.la
-
-lib_LIBRARIES = libWINGs.a libWUtil.a
 
 #libWINGs_la_LDFLAGS = -version-info 1:1:0
 
@@ -23,38 +15,18 @@ bin_SCRIPTS = get-wings-flags get-wutil-flags
 noinst_PROGRAMS = wtest wmquery wmfile fontl testmywidget testcolorpanel\
 	connect puzzle
 
-testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
-
-testmywidget_LDADD = libWINGs.a $(LIBLIST)
-
-puzzle_SOURCES = puzzle.c
-
-puzzle_LDADD = libWINGs.a $(LIBLIST)
+lib_LIBRARIES = libWINGs.a libWUtil.a
 
-fontl_SOURCES = fontl.c
 
-fontl_LDADD = libWINGs.a $(LIBLIST)
+LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la\
+	 @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ \
+	-lm @LIBPL@
 
-wtest_SOURCES = wtest.c
 
-wtest_LDADD = libWINGs.a $(LIBLIST)
+testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
 
 wtest_DEPENDENCIES = libWINGs.a
 
-wmfile_SOURCES = wmfile.c 
-
-wmfile_LDADD = libWINGs.a $(LIBLIST)
-	
-testcolorpanel_SOURCES = testcolorpanel.c
-
-testcolorpanel_LDADD = libWINGs.a $(LIBLIST)
-
-wmquery_SOURCES = wmquery.c 
-
-wmquery_LDADD = libWINGs.a $(LIBLIST)
-
-connect_SOURCES = connect.c
-
 connect_LDADD = libWUtil.a @LIBRARY_SEARCH_PATH@ @NETLIBS@ @LIBPL@
 
 
diff --git a/WINGs/WUtil.h b/WINGs/WUtil.h
index e6507850..10e25c45 100644
--- a/WINGs/WUtil.h
+++ b/WINGs/WUtil.h
@@ -579,7 +579,6 @@ void WMSetUDObjectForKey(WMUserDefaults *database, proplist_t object,
 
 void WMRemoveUDObjectForKey(WMUserDefaults *database, char *defaultName);
 
-/* Free the returned string when no longer needed */
 char *WMGetUDStringForKey(WMUserDefaults *database, char *defaultName);
 
 int WMGetUDIntegerForKey(WMUserDefaults *database, char *defaultName);
diff --git a/WINGs/wpanel.c b/WINGs/wpanel.c
index d6ed0939..c7149a86 100644
--- a/WINGs/wpanel.c
+++ b/WINGs/wpanel.c
@@ -97,12 +97,13 @@ WMCreateAlertPanel(WMScreen *scrPtr, WMWindow *owner,
     panel->retKey = XKeysymToKeycode(scrPtr->display, XK_Return);
     panel->escKey = XKeysymToKeycode(scrPtr->display, XK_Escape);
 
-    if (owner)
+    if (owner) {
 	panel->win = WMCreatePanelWithStyleForWindow(owner, "alertPanel",
 						     WMTitledWindowMask);
-    else
+    } else {
 	panel->win = WMCreateWindowWithStyle(scrPtr, "alertPanel",
 					     WMTitledWindowMask);
+    }
 
     WMSetWindowInitialPosition(panel->win,
 	 (scrPtr->rootView->size.width - WMWidgetWidth(panel->win))/2,
diff --git a/WINGs/wtest.c b/WINGs/wtest.c
index 8676505c..008c58da 100644
--- a/WINGs/wtest.c
+++ b/WINGs/wtest.c
@@ -975,6 +975,18 @@ void testDragAndDrop(WMScreen *scr)
 
 #include "WUtil.h"
 
+void testUD()
+{
+    WMUserDefaults *defs;
+    char str[32];
+
+    defs = WMGetStandardUserDefaults();
+
+    sprintf(str, "TEST DATA");
+    puts(str);
+    WMSetUDStringForKey(defs, str, "testKey");
+    puts(str);
+}
 
 
 int main(int argc, char **argv)
@@ -986,6 +998,8 @@ int main(int argc, char **argv)
     /* Initialize the application */
     WMInitializeApplication("Test", &argc, argv);
     
+    testUD();
+    
     /*
      * Open connection to the X display.
      */
-- 
2.11.4.GIT