From a076a55a9f74286e5991b50298cfc0e9e2ce8494 Mon Sep 17 00:00:00 2001
From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 1 Aug 2005 13:17:55 +0000
Subject: [PATCH] removed libContactsUI fixed some gcc 4.0 warnings

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@932 d1b88da0-ebda-0310-925b-ed51d893ca5b
---
 UI/Contacts/ChangeLog              |  8 ++++++++
 UI/Contacts/GNUmakefile            |  7 ++-----
 UI/Contacts/GNUmakefile.preamble   | 15 ---------------
 UI/Contacts/UIxContactEditorBase.m |  2 +-
 UI/Contacts/UIxContactView.m       |  2 +-
 UI/Contacts/Version                |  2 +-
 6 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/UI/Contacts/ChangeLog b/UI/Contacts/ChangeLog
index 7a55b533..afdb8c4f 100644
--- a/UI/Contacts/ChangeLog
+++ b/UI/Contacts/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-01  Helge Hess  <helge.hess@skyrix.com>
+
+	* v0.9.28
+	
+	* moved classes from shared library back to bundle
+
+	* UIxContactEditorBase.m, UIxContactView.m: fixed some gcc 4.0 warning
+
 2005-07-26  Helge Hess  <helge.hess@opengroupware.org>
 
 	* English.lproj/Localizable.strings: added a missing semicolon
diff --git a/UI/Contacts/GNUmakefile b/UI/Contacts/GNUmakefile
index b7f4f3f6..43c6dcb1 100644
--- a/UI/Contacts/GNUmakefile
+++ b/UI/Contacts/GNUmakefile
@@ -2,18 +2,16 @@
 
 include ../common.make
 
-LIBRARY_NAME = libContactsUI
 BUNDLE_NAME = ContactsUI
 
 ContactsUI_PRINCIPAL_CLASS = ContactsUIProduct
 
 ContactsUI_LANGUAGES = English French
 
-libContactsUI_OBJC_FILES = \
+ContactsUI_OBJC_FILES =			\
 	UIxContactsListViewBase.m	\
 	UIxContactEditorBase.m		\
-
-ContactsUI_OBJC_FILES =			\
+	\
 	ContactsUIProduct.m		\
 	UIxContactsSelectionView.m	\
 	UIxContactView.m		\
@@ -31,7 +29,6 @@ ContactsUI_LOCALIZED_RESOURCE_FILES +=	\
 # make
 
 -include GNUmakefile.preamble
-include $(GNUSTEP_MAKEFILES)/library.make
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
 include ../../fhsbundle.make
diff --git a/UI/Contacts/GNUmakefile.preamble b/UI/Contacts/GNUmakefile.preamble
index e7b69962..9dd6a860 100644
--- a/UI/Contacts/GNUmakefile.preamble
+++ b/UI/Contacts/GNUmakefile.preamble
@@ -5,18 +5,3 @@ ADDITIONAL_INCLUDE_DIRS += \
 
 ADDITIONAL_LIB_DIRS += \
 	-L./$(GNUSTEP_OBJ_DIR)
-
-libContactsUI_LIBRARIES_DEPEND_UPON += \
-	-lOGoContentStore	\
-	-lSOGo		\
-	\
-	-lGDLContentStore	\
-	-lGDLAccess		\
-	-lNGObjWeb		\
-	-lNGLdap		\
-	-lNGiCal		\
-	-lNGMime		\
-	-lNGStreams -lNGExtensions -lEOControl	\
-	-lXmlRpc -lDOM -lSaxObjC
-
-ContactsUI_BUNDLE_LIBS += -lContactsUI
diff --git a/UI/Contacts/UIxContactEditorBase.m b/UI/Contacts/UIxContactEditorBase.m
index 53cf78dd..80ff0096 100644
--- a/UI/Contacts/UIxContactEditorBase.m
+++ b/UI/Contacts/UIxContactEditorBase.m
@@ -174,7 +174,7 @@
   return YES;
 }
 
-- (id)defaultAction {
+- (id<WOActionResults>)defaultAction {
   // TODO: very similiar to apt-editor (apt editor would need to use std names
   NSString *c;
   
diff --git a/UI/Contacts/UIxContactView.m b/UI/Contacts/UIxContactView.m
index dc4d565e..2059b001 100644
--- a/UI/Contacts/UIxContactView.m
+++ b/UI/Contacts/UIxContactView.m
@@ -74,7 +74,7 @@
 
 /* action */
 
-- (id)defaultAction {
+- (id<WOActionResults>)defaultAction {
   if ([[self clientObject] record] == nil) {
     return [NSException exceptionWithHTTPStatus:404 /* Not Found */
 			reason:@"could not locate contact"];
diff --git a/UI/Contacts/Version b/UI/Contacts/Version
index 42bd0ad3..76cf18e3 100644
--- a/UI/Contacts/Version
+++ b/UI/Contacts/Version
@@ -1,6 +1,6 @@
 # GNUstep makefile
 
-SUBMINOR_VERSION:=27
+SUBMINOR_VERSION:=28
 
 # v0.9.18 requires NGExtensions v4.5.136
 # v0.9.16 requires libSOGoUI    v0.9.16
-- 
2.39.5