Commits work in progress on improving, stabalising audio and video telephony conferencing.

2 files changed, 16 insertions, 22 deletions

diff --git a/src/net/java/sip/communicator/plugin/generalconfig/ConfigurationManager.java b/src/net/java/sip/communicator/plugin/generalconfig/ConfigurationManager.java
index dfa19ec..847a13a 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/ConfigurationManager.java
+++ b/src/net/java/sip/communicator/plugin/generalconfig/ConfigurationManager.java
@@ -250,16 +250,16 @@ public class ConfigurationManager
             "impl.gui.NORMALIZE_PHONE_NUMBER";
 
         isNormalizePhoneNumber
-            = GeneralConfigPluginActivator.getConfigurationService()
-                .getBoolean(normalizePhoneNumberProperty, true);
+            = configService.getBoolean(normalizePhoneNumberProperty, true);
 
         // Load the "ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS" property.
         String acceptPhoneNumberWithAlphaCharsProperty =
                 "impl.gui.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS";
 
         acceptPhoneNumberWithAlphaChars
-            = GeneralConfigPluginActivator.getConfigurationService()
-                .getBoolean(acceptPhoneNumberWithAlphaCharsProperty, true);
+            = configService.getBoolean(
+                    acceptPhoneNumberWithAlphaCharsProperty,
+                    true);
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/loggingutils/LoggingConfigForm.java b/src/net/java/sip/communicator/plugin/loggingutils/LoggingConfigForm.java
index 8f22216..e5db2e6 100644
--- a/src/net/java/sip/communicator/plugin/loggingutils/LoggingConfigForm.java
+++ b/src/net/java/sip/communicator/plugin/loggingutils/LoggingConfigForm.java
@@ -273,24 +273,18 @@ public class LoggingConfigForm
      */
     private void loadValues()
     {
-        PacketLoggingService packetLogging =
-                LoggingUtilsActivator.getPacketLoggingService();
-
-        enableCheckBox.setSelected(
-                packetLogging.getConfiguration().isGlobalLoggingEnabled());
-
-        sipProtocolCheckBox.setSelected(
-                packetLogging.getConfiguration().isSipLoggingEnabled());
-        jabberProtocolCheckBox.setSelected(
-                packetLogging.getConfiguration().isJabberLoggingEnabled());
-        rtpProtocolCheckBox.setSelected(
-                packetLogging.getConfiguration().isRTPLoggingEnabled());
-        ice4jProtocolCheckBox.setSelected(
-                packetLogging.getConfiguration().isIce4JLoggingEnabled());
-        fileCountField.setText(String.valueOf(
-                packetLogging.getConfiguration().getLogfileCount()));
-        fileSizeField.setText(String.valueOf(
-                packetLogging.getConfiguration().getLimit()/1000));
+        PacketLoggingService packetLogging
+            = LoggingUtilsActivator.getPacketLoggingService();
+        PacketLoggingConfiguration cfg = packetLogging.getConfiguration();
+
+        enableCheckBox.setSelected(cfg.isGlobalLoggingEnabled());
+
+        sipProtocolCheckBox.setSelected(cfg.isSipLoggingEnabled());
+        jabberProtocolCheckBox.setSelected(cfg.isJabberLoggingEnabled());
+        rtpProtocolCheckBox.setSelected(cfg.isRTPLoggingEnabled());
+        ice4jProtocolCheckBox.setSelected(cfg.isIce4JLoggingEnabled());
+        fileCountField.setText(String.valueOf(cfg.getLogfileCount()));
+        fileSizeField.setText(String.valueOf(cfg.getLimit() / 1000));
 
         updateButtonsState();
     }