From 586e5f5642748fb0cab6689ccc5c327c0e9e734c Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 19 Feb 2010 16:45:07 +0000
Subject: [PATCH] Monotone-Parent: 42e55c8292b29dad1cd5260453c22ca05fb07f6e
 Monotone-Revision: 5ca4f59d87c4968d9506582dbf635a39d0ac2f55

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-02-19T16:45:07
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                         | 4 ++++
 UI/Common/GNUmakefile.preamble    | 5 +----
 UI/Common/UIxPageFrame.m          | 5 +++--
 UI/Templates/UIxPageFrame.wox     | 7 ++++---
 UI/WebServerResources/generic.css | 4 ++--
 UI/common.make                    | 9 +--------
 6 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 689003ee9..2b51fa54b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-02-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Common/UIxPageFrame.m (-userIdentification): ancient
+	"userEmail" method, with a more generic name. Also we now return
+	the user's complete name.
+
 	* SoObjects/Mailer/SOGoMailAccount.m (-imapAclConformsToIMAPExt:)
 	now based on the server's capability string.
 
diff --git a/UI/Common/GNUmakefile.preamble b/UI/Common/GNUmakefile.preamble
index eaf1c03cc..1de916bd7 100644
--- a/UI/Common/GNUmakefile.preamble
+++ b/UI/Common/GNUmakefile.preamble
@@ -15,7 +15,4 @@ ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
 
 CommonUI_BUNDLE_LIBS += \
 	-lSOGoUI	\
-	-lNGObjWeb	\
-	-lNGMime	\
-	-lNGStreams -lNGExtensions -lEOControl	\
-	-lXmlRpc -lDOM -lSaxObjC -lWOExtensions
+	-lNGObjWeb
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index a9208f303..1cc77b685 100644
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -400,9 +400,10 @@
 	  && [user isSuperUser]);
 }
 
-- (NSString *) userEmail
+- (NSString *) userIdentification
 {
-  return [[context activeUser] systemEmail];
+  /* The "identification" term is used in the human sense here. */
+  return [[context activeUser] cn];
 }
 
 - (BOOL) canLogoff
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 9c59e8324..48f76ddfb 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -48,9 +48,10 @@
 	    <div id="linkBanner" class="linkbanner">
               <var:if condition="canLogoff"
                 ><a id="logoff" var:href="logoffPath"
-                  ><var:string label:value="Disconnect" /> </a
-                  ><span id="userEmailDisplay">
-                  <var:string var:value="userEmail" /> | </span></var:if>
+                  ><var:string label:value="Disconnect"/> </a
+                  ><span id="userIdentificationDisplay">
+                  <var:string var:value="userIdentification"/> | </span
+                  ></var:if>
 	      <var:if condition="userHasCalendarAccess">
 		<var:if condition="isCalendar">
 		  <span class="active"><var:string label:value="Calendar"
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index 033248c10..d926b9e9b 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -157,13 +157,13 @@ DIV.linkbanner SPAN
 DIV.linkbanner A:hover
 { color: #dd5; }
 
-DIV.linkbanner A#logoff, DIV.linkbanner SPAN#userEmailDisplay
+DIV.linkbanner A#logoff, DIV.linkbanner SPAN#userIdentificationDisplay
 { float: right;
   margin: 0px;
   padding: 0px;
   padding-right: .5em; }
 
-DIV.linkbanner SPAN#userEmailDisplay
+DIV.linkbanner SPAN#userIdentificationDisplay
 { color: #DDDDDD; }
 
 .linkbannerlinks
diff --git a/UI/common.make b/UI/common.make
index 9a84e9625..4de72e898 100644
--- a/UI/common.make
+++ b/UI/common.make
@@ -44,11 +44,4 @@ SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
 BUNDLE_LIBS += \
 	-lSOGoUI				\
-	-lSOGo					\
-	-lOGoContentStore			\
-	-lGDLContentStore			\
-	-lGDLAccess				\
-	-lNGObjWeb				\
-	-lNGMime -lNGCards -lNGLdap		\
-	-lNGStreams -lNGExtensions -lEOControl	\
-	-lXmlRpc -lDOM -lSaxObjC
+	-lSOGo