Merging branches/0.2/@r857 with trunk

diff --git a/src/common/ircuser.cpp b/src/common/ircuser.cpp
index eee29a8..22df0c9 100644 (file)
--- a/src/common/ircuser.cpp
+++ b/src/common/ircuser.cpp
@@ -232,7 +232,7 @@ void IrcUser::partChannel(IrcChannel *channel) {
     disconnect(channel, 0, this, 0);
     channel->part(this);
     emit channelParted(channel->name());
     disconnect(channel, 0, this, 0);
     channel->part(this);
     emit channelParted(channel->name());

-    if(_channels.isEmpty() && network()->isMe(this))
+    if(_channels.isEmpty() && !network()->isMe(this))

       deleteLater();
   }
 }
       deleteLater();
   }
 }

diff --git a/version.inc b/version.inc
index 4dd69ac..38bb553 100644 (file)
--- a/version.inc
+++ b/version.inc
@@ -4,8 +4,8 @@
 { using namespace Global;
 
   quasselVersion = "0.3.0-pre";
 { using namespace Global;
 
   quasselVersion = "0.3.0-pre";

-  quasselDate = "2008-05-22";
-  quasselBuild = 850;
+  quasselDate = "2008-05-23";
+  quasselBuild = 858;

 
   //! Minimum client build number the core needs
   clientBuildNeeded = 731;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 731;