Suppress fax number (for example retrieved from VCard) from call menu.

7 files changed, 94 insertions, 13 deletions

diff --git a/.classpath b/.classpath
index 9a97ae2..a38ea4b 100644
--- a/.classpath
+++ b/.classpath
@@ -91,5 +91,5 @@
 	<classpathentry kind="lib" path="lib/installer-exclude/cglib-nodep.osgi-2.1_3.jar"/>

 	<classpathentry kind="lib" path="lib/installer-exclude/easymock-3.1.jar"/>

 	<classpathentry kind="lib" path="lib/installer-exclude/objenesis-1.2.jar"/>

-	<classpathentry kind="output" path="classes"/>

+	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/src/native/libjunbound/readme.txt b/src/native/libjunbound/readme.txt
index e04f0a9..36dc864 100644
--- a/src/native/libjunbound/readme.txt
+++ b/src/native/libjunbound/readme.txt
@@ -13,7 +13,7 @@ make -f makefile.linux
 

 Linux (libunbound statically linked, lcrypto shared):

 ----------------------------------------------------

-Install libexpoat, libldns and unbound to a separate directory ($libdir)

+Install libexpat, libldns and unbound to a separate directory ($libdir)

 

 expat:

 ./configure --with-pic --prefix=$libdir && make && make install

@@ -54,6 +54,70 @@ cp libssl.a lib
 

 Mac:

 ---

-Same as Linux, except:

+

+Download libexpat, ldns and unbound.

+

+Untar them in the same repository:

+mkdir repos

+tar -xzvf expat-2.0.1.tar.gz

+tar -xzvf unbound-1.4.14.tar.gz

+tar -xzvf ldns-1.6.11.tar.gz

+

+Create prefix for i386, x86_64 and ppc:

+mkdir prefix32 prefix64 prefixppc

+

+First compile for i386:

+

+libdir=/path/to/prefix32

+

+cd expat-2.0.1

+CC="gcc -arch i386" ./configure --with-pic --prefix=$libdir && make && make install

+

+cd ../ldns-1.6.11

+CC="gcc -arch i386" ./configure --disable-gost --with-pic --prefix=$libdir && make && make install

+

+cd ../unbound-1.4.14

+CC="gcc -arch i386" ./configure --with-pic --prefix=$libdir && make && make install

+

+Then for x86_64:

+

+libdir=/path/to/prefix64

+

+cd expat-2.0.1

+make clean

+CC="gcc -arch x86_64" ./configure --with-pic --prefix=$libdir && make && make install

+

+cd ../ldns-1.6.11

+make clean

+CC="gcc -arch x86_64" ./configure --disable-gost --with-pic --prefix=$libdir && make && make install

+

+cd ../unbound-1.4.14

+make clean

+CC="gcc -arch x86_64" ./configure --with-pic --prefix=$libdir && make && make install

+

+Finally for ppc:

+

+libdir=/path/to/prefixppc

+

+cd expat-2.0.1

+make clean

+CC="gcc -arch ppc" ./configure --with-pic --prefix=$libdir && make && make install

+

+cd ../ldns-1.6.11

+make clean

+CC="gcc -arch ppc" ./configure --disable-gost --with-pic --prefix=$libdir && make && make install

+

+cd ../unbound-1.4.14

+make clean

+CC="gcc -arch ppc" ./configure --with-pic --prefix=$libdir && make && make install

+

+Combine the libraries:

+mkdir -p prefixuniversal/lib

+

+lipo -create prefix32/lib/libexpat.a prefix64/lib/libexpat.a prefixppc/lib/libexpat.a -output prefixuniversal/lib/libexpat.a

+lipo -create prefix32/lib/libldns.a prefix64/lib/libldns.a prefixppc/lib/libldns.a -output prefixuniversal/lib/libldns.a

+lipo -create prefix32/lib/libunbound.a prefix64/lib/libunbound.a prefixppc/lib/libunbound.a -output prefixuniversal/lib/libunbound.a

+cp -r prefix32/include prefixuniversal/

+

 libjunbound:

-g++ src/net_java_sip_communicator_util_dns_UnboundApi.cpp -fpic -shared -o libjunbound.jnilib -I/System/Library/Frameworks/JavaVM.framework/Version/CurrentJDK/Home/include -I$libdir/include -L$libdir/lib -lunbound -lldns -lcrypto

+g++ -arch x86_64 -arch i386 -arch ppc src/net_java_sip_communicator_util_dns_UnboundApi.cpp -fpic -shared -o libjunbound.jnilib -I/System/Library/Frameworks/JavaVM.framework/Version/CurrentJDK/Home/include -I$libdir/include -L$libdir/lib -lunbound -lldns -lcrypto

diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
index 3f195a1..8a3bfc5 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
@@ -575,6 +575,11 @@ public class MainToolBar
         return historyButton;
     }
 
+    /**
+     * Get the smileys box.
+     * 
+     * @return the smileys box
+     */
     public SmileysSelectorBox getSmileysBox()
     {
         return smileysBox;
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
index 3287313..b13831f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
@@ -763,7 +763,9 @@ public class ContactListTreeCellRenderer
                     while(details.hasNext())
                     {
                         GenericDetail d = details.next();
-                        if(d instanceof PhoneNumberDetail)
+                        if(d instanceof PhoneNumberDetail && 
+                            !(d instanceof PagerDetail) && 
+                            !(d instanceof FaxDetail))
                         {
                             PhoneNumberDetail pnd = (PhoneNumberDetail)d;
                             if(pnd.getNumber() != null &&
@@ -988,7 +990,9 @@ public class ContactListTreeCellRenderer
                     while(details.hasNext())
                     {
                         GenericDetail d = details.next();
-                        if(d instanceof PhoneNumberDetail)
+                        if(d instanceof PhoneNumberDetail && 
+                            !(d instanceof PagerDetail) && 
+                            !(d instanceof FaxDetail))
                         {
                             PhoneNumberDetail pnd = (PhoneNumberDetail)d;
                             if(pnd.getNumber() != null &&
@@ -998,7 +1002,8 @@ public class ContactListTreeCellRenderer
                                 UIContactDetail cd =
                                     new UIContactDetail(
                                         pnd.getNumber(),
-                                        pnd.getNumber(),
+                                        pnd.getNumber() + 
+                                        " (" + pnd.getDetailDisplayName() + ")",
                                         null,
                                         new ArrayList<String>(),
                                         null,
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java
index 9641b63..d10a540 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java
@@ -409,13 +409,16 @@ public class MetaContactRightButtonMenu
                 while(details.hasNext())
                 {
                     GenericDetail d = details.next();
-                    if(d instanceof PhoneNumberDetail)
+                    if(d instanceof PhoneNumberDetail && 
+                        !(d instanceof PagerDetail) && 
+                        !(d instanceof FaxDetail))
                     {
                         PhoneNumberDetail pnd = (PhoneNumberDetail)d;
                         if(pnd.getNumber() != null &&
                             pnd.getNumber().length() > 0)
                         {
-                            phones.add(pnd.getNumber());
+                            phones.add(pnd.getNumber() 
+                                + " (" + pnd.getDetailDisplayName() + ")");
                             hasPhones = true;
                         }
                     }
@@ -493,10 +496,11 @@ public class MetaContactRightButtonMenu
 
             for(String phone : phones)
             {
+                String p = phone.substring(0, phone.lastIndexOf("(") - 1);
                 if(providers.size() > 0)
                 {
                     JMenuItem menu = createMenuItem(phone,
-                        callPhonePrefix + phone,
+                        callPhonePrefix + p,
                         null);
                     callContactMenu.add(menu);
                     separator = true;
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/UIContactDetail.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/UIContactDetail.java
index a87039f..2667089 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/UIContactDetail.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/UIContactDetail.java
@@ -187,7 +187,7 @@ public abstract class UIContactDetail
     /**
      * Sets the prefix to be used when calling this contact detail.
      *
-     * @param the prefix to be used when calling this contact detail
+     * @param prefix the prefix to be used when calling this contact detail
      */
     public void setPrefix(String prefix)
     {
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/MetaUIContact.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/MetaUIContact.java
index f1ca680..3a36ca5 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/MetaUIContact.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/MetaUIContact.java
@@ -419,13 +419,16 @@ public class MetaUIContact
                 while(details.hasNext())
                 {
                     GenericDetail d = details.next();
-                    if(d instanceof PhoneNumberDetail)
+                    if(d instanceof PhoneNumberDetail &&
+                        !(d instanceof FaxDetail) && 
+                        !(d instanceof PagerDetail))
                     {
                         PhoneNumberDetail pnd = (PhoneNumberDetail)d;
                         if(pnd.getNumber() != null &&
                             pnd.getNumber().length() > 0)
                         {
-                            tip.addLine(null, pnd.getNumber());
+                            tip.addLine(null, pnd.getNumber() + 
+                                " (" + pnd.getDetailDisplayName() + ")");
                         }
                      }
                 }