diff options
| author | Yana Stamcheva <yana@jitsi.org> | 2012-07-27 05:50:12 +0000 |
|---|---|---|
| committer | Yana Stamcheva <yana@jitsi.org> | 2012-07-27 05:50:12 +0000 |
| commit | 501fe9d6a2919662c381c8ca53315a030a16019a (patch) | |
| tree | 69d3084575246ffadfaded624714677ffd68bab1 /src/net | |
| parent | 114f31268c41cc10366c0f02a94013d2748a832a (diff) | |
| download | jitsi-501fe9d6a2919662c381c8ca53315a030a16019a.zip jitsi-501fe9d6a2919662c381c8ca53315a030a16019a.tar.gz jitsi-501fe9d6a2919662c381c8ca53315a030a16019a.tar.bz2 | |
Fixes "Remove contact" message when the account is not logged in.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java | 3 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactListManager.java | 14 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java index 24367a3..d0061e3 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java @@ -385,8 +385,7 @@ public class AddContactDialog GuiActivator.getResources().getI18NString( "service.gui.ADD_CONTACT_ERROR_TITLE"), GuiActivator.getResources().getI18NString( - "service.gui.ADD_CONTACT_NOT_CONNECTED", - new String[]{contactAddress}), + "service.gui.ADD_CONTACT_NOT_CONNECTED"), ErrorDialog.WARNING) .showDialog(); diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactListManager.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactListManager.java index ae174c8..eb074c5 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactListManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactListManager.java @@ -380,6 +380,20 @@ public class MetaContactListManager public void run() { + if (!contact.getProtocolProvider().isRegistered()) + { + new ErrorDialog( + GuiActivator.getUIService().getMainFrame(), + GuiActivator.getResources().getI18NString( + "service.gui.ADD_CONTACT_ERROR_TITLE"), + GuiActivator.getResources().getI18NString( + "service.gui.REMOVE_CONTACT_NOT_CONNECTED"), + ErrorDialog.WARNING) + .showDialog(); + + return; + } + try { if(Constants.REMOVE_CONTACT_ASK) |