diff options
Diffstat (limited to 'src/net/java/sip/communicator/util')
| -rw-r--r-- | src/net/java/sip/communicator/util/ConfigurationUtils.java | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/net/java/sip/communicator/util/ConfigurationUtils.java b/src/net/java/sip/communicator/util/ConfigurationUtils.java index dcb72e3..99546a7 100644 --- a/src/net/java/sip/communicator/util/ConfigurationUtils.java +++ b/src/net/java/sip/communicator/util/ConfigurationUtils.java @@ -162,6 +162,11 @@ public class ConfigurationUtils private static boolean isAddContactDisabled; /** + * Indicates if the merge contact functionality is disabled. + */ + private static boolean isMergeContactDisabled; + + /** * Indicates if the go to chatroom functionality is disabled. */ private static boolean isGoToChatroomDisabled; @@ -644,6 +649,13 @@ public class ConfigurationUtils "CONTACT_ADD_DISABLED", false); + // Load the "MERGE_CONTACT_DISABLED" property. + isMergeContactDisabled + = configService.getBoolean( + "net.java.sip.communicator.impl.gui.main.contactlist." + + "CONTACT_MERGE_DISABLED", + false); + // Load the "CREATE_GROUP_DISABLED" property. isCreateGroupDisabled = configService.getBoolean( @@ -1185,6 +1197,17 @@ public class ConfigurationUtils } /** + * Returns <code>true</code> if the "MERGE_CONTACT_DISABLED" property is + * true, otherwise - returns <code>false</code>. + * @return <code>true</code> if the "MERGE_CONTACT_DISABLED" property is + * true, otherwise - returns <code>false</code>. + */ + public static boolean isMergeContactDisabled() + { + return isMergeContactDisabled; + } + + /** * Returns <code>true</code> if the "CREATE_GROUP_DISABLED" property is * true, otherwise - returns <code>false</code>.. * @return <code>true</code> if the "CREATE_GROUP_DISABLED" property is |