removed libContactsUI

fixed some gcc 4.0 warnings

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@932 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/UI/Contacts/ChangeLog b/UI/Contacts/ChangeLog
index 7a55b53336c710a9a65fa365d12f9475be6ba9f8..afdb8c4fde83b691be89fbf699f0abe381ce3ace 100644 (file)
--- 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 b7f4f3f68e5b546fef37e74f700a15a52fa8179c..43c6dcb196a7343c67d174009d3a2e4559ce4e54 100644 (file)
--- 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 e7b69962293924eaad43bdff010d8c3a01379ae7..9dd6a86033de4d171909ac473a23644ce0447237 100644 (file)
--- 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 53cf78ddc375fac6212cb64510bb70bdf5cf22fd..80ff0096c33015498f421b238422e44b88471960 100644 (file)
--- 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 dc4d565e89ddff6101d3058b85f587b1f78fa8f0..2059b001fdf9d626009ccadf9cd8b3f0c4609f61 100644 (file)
--- 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 42bd0ad31a110fe665fc07e7bab37a59ed5c194a..76cf18e3262b8fa68e98e24cd5d4ac41123aec09 100644 (file)
--- 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