Fixes a problem with creating two instances ot NetworkConfigurationWatcher.

3 files changed, 24 insertions, 8 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
index f124ec6..14cd330 100644
--- a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
@@ -610,6 +610,9 @@ public class UIServiceImpl
             = GuiActivator.getContactListService()
                 .findMetaContactByContact(contact);
 
+        if(metaContact == null)
+            return null;
+
         return chatWindowManager.getContactChat(metaContact, true);
     }
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomTableDialog.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomTableDialog.java
index d23b2c6..a90a2c8 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomTableDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomTableDialog.java
@@ -168,6 +168,19 @@ public class ChatRoomTableDialog
             }
         });
 
+        // if a room is selected enable buttons
+        roomsCombo.addItemListener(new ItemListener(){
+            public void itemStateChanged(ItemEvent e)
+            {
+                if(e.getStateChange() == ItemEvent.SELECTED
+                    && roomsCombo.getSelectedIndex() != -1)
+                {
+                    okButton.setEnabled(true);
+                    addButton.setEnabled(true);
+                }
+            }
+        });
+
         valuesPanel.add(providersCombo);
         valuesPanel.add(roomsCombo);
 
@@ -213,6 +226,12 @@ public class ChatRoomTableDialog
         editor.addKeyListener(new KeyListener() {
 
             public void keyTyped(KeyEvent e)
+            {}
+
+            public void keyPressed(KeyEvent e)
+            {}
+
+            public void keyReleased(KeyEvent e)
             {
                 chatRoomsTableUI.clearSelection();
 
@@ -227,12 +246,6 @@ public class ChatRoomTableDialog
                     addButton.setEnabled(false);
                 }
             }
-
-            public void keyPressed(KeyEvent e)
-            {}
-
-            public void keyReleased(KeyEvent e)
-            {}
         });
         // when we select a room from the available ones we clear anything
         // typed for the room name and set the room we selected
diff --git a/src/net/java/sip/communicator/impl/netaddr/NetworkAddressManagerServiceImpl.java b/src/net/java/sip/communicator/impl/netaddr/NetworkAddressManagerServiceImpl.java
index d8238c9..92ae80f 100644
--- a/src/net/java/sip/communicator/impl/netaddr/NetworkAddressManagerServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/netaddr/NetworkAddressManagerServiceImpl.java
@@ -542,7 +542,7 @@ public class NetworkAddressManagerServiceImpl
       *
       * @param listener the listener.
       */
-     public void addNetworkConfigurationChangeListener(
+     public synchronized void addNetworkConfigurationChangeListener(
          NetworkConfigurationChangeListener listener)
      {
          if(networkConfigurationWatcher == null)
@@ -557,7 +557,7 @@ public class NetworkAddressManagerServiceImpl
       *
       * @param listener the listener.
       */
-     public void removeNetworkConfigurationChangeListener(
+     public synchronized void removeNetworkConfigurationChangeListener(
          NetworkConfigurationChangeListener listener)
      {
         if(networkConfigurationWatcher != null)