aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Ivov <emcho@jitsi.org>2006-10-03 15:38:55 +0000
committerEmil Ivov <emcho@jitsi.org>2006-10-03 15:38:55 +0000
commit44337fa915997ec5c80dd2c1179f348bea8696d0 (patch)
tree80eb76788532afc2dbafd4f4a63fffe1cd4d6bdf
parent6c6166dd2143389e2d9d7bf9fd0cd293692889a6 (diff)
downloadjitsi-44337fa915997ec5c80dd2c1179f348bea8696d0.zip
jitsi-44337fa915997ec5c80dd2c1179f348bea8696d0.tar.gz
jitsi-44337fa915997ec5c80dd2c1179f348bea8696d0.tar.bz2
Started working on media and fixed meta contact list contact merge and contact remove
do not exit on close
-rwxr-xr-xsrc/net/java/sip/communicator/impl/gui/main/MainFrame.java4
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
index ad3b5a3..2e611ce 100755
--- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
+++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
@@ -92,7 +92,7 @@ public class MainFrame
this.addWindowListener(new MainFrameWindowAdapter());
- this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
this.setInitialBounds();
this.setTitle(Messages.getString("sipCommunicator"));
@@ -562,7 +562,7 @@ public class MainFrame
public void outgoingCallCreated(CallEvent event)
{
// TODO Auto-generated method stub
-
+
}
}
diff --git a/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java b/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java
index 0790e37..355ad1c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java
@@ -88,7 +88,7 @@ public class WelcomeWindow extends JDialog
this.windowBackground.setBorder(BorderFactory.createEmptyBorder(5, 10,
5, 5));
- this.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE);
+ this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
this.addWindowListener(new WindowAdapter(){
public void windowClosing(WindowEvent e) {