LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge of '5f7a29adfa72a5c2257226be59358d6ef7642557'

Browse source 
and 'add28d9d67adcd6d59ae80bdec669e2794e55fc3'

Monotone-Parent: 5f7a29adfa72a5c2257226be59358d6ef7642557
Monotone-Parent: add28d9d67adcd6d59ae80bdec669e2794e55fc3
Monotone-Revision: f14f194e02808a128112c1844ba759925e48c6e7

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-10-21T21:59:43
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle 2008-10-21 21:59:43 +00:00
parent c99479eece 6d1aa93998
commit ddfba84ebe
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-10-21 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView
-contactSearchAction]): fixed typing of "contacts", which actually
is an NSArray.
2008-10-17 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Common/UIxPageFrame.m ([NSString userLanguage]): returns the

5
UI/Contacts/UIxContactFoldersView.m
View file

@ -141,7 +141,7 @@ withSearchOn: (NSString *) contact
return email;
}
- (NSDictionary *) _responseForResults: (NSArray *) results
- (NSArray *) _responseForResults: (NSArray *) results
{
NSEnumerator *contacts;
NSString *email, *infoKey, *info;
@ -255,7 +255,8 @@ withSearchOn: (NSString *) contact
- (id <WOActionResults>) contactSearchAction
{
NSDictionary *contacts, *data;
NSDictionary *data;
NSArray *contacts;
NSString *searchText;
id <WOActionResults> result;
LDAPUserManager *um;

6
UI/Templates/MailerUI/UIxMailListView.wox
View file

@ -11,14 +11,14 @@
><var:foreach list="columnsDisplayOrder" item="currentColumn">
<td var:class="currentColumn.headerClass" var:id="currentColumn.headerId">
<var:if condition="currentColumn.value" const:value="Invisible">
<img rsrc:src="empty.gif" width="100%" height="100%" label:title="void" />
<img rsrc:src="empty.gif" width="100%" height="100%" const:title="" />
</var:if>
<var:if condition="currentColumn.value" const:value="Attachment">
<img rsrc:src="title_attachment_14x14.png" var:title="currentColumn.value" width="14"
<img rsrc:src="title_attachment_14x14.png" label:title="$currentColumn.value" width="14"
height="14"/>
</var:if>
<var:if condition="currentColumn.value" const:value="Unread">
<img rsrc:src="title_read_14x14.png" var:title="currentColumn.value" />
<img rsrc:src="title_read_14x14.png" label:title="$currentColumn.value" />
</var:if>
<var:if condition="currentColumn.value" const:value="Invisible" const:negate="YES">
<var:if condition="currentColumn.value" const:value="Attachment" const:negate="YES">