X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=c813ebbc54ed9d25dee4058c5f9149e407d5a3d7;hp=ead100d8e5f208ac31620ba3c86a065bc58f9fb1;hb=98e2e99d0441ffd1988095473048519593b1a701;hpb=a33e42aee121185f479667b2104a15fc2033762e

diff --git a/src/common/network.cpp b/src/common/network.cpp
index ead100d8..c813ebbc 100644
--- a/src/common/network.cpp
+++ b/src/common/network.cpp
@@ -208,7 +208,6 @@ void Network::ircUserDestroyed() {
   QHash<QString, IrcUser *>::iterator ircUserIter = _ircUsers.begin();
   while(ircUserIter != _ircUsers.end()) {
     if(ircUser == *ircUserIter) {
-      emit deletedIrcUserRemoved(ircUserIter.key());
       ircUserIter = _ircUsers.erase(ircUserIter);
       break;
     }
@@ -216,30 +215,6 @@ void Network::ircUserDestroyed() {
   }
 }
 
-void Network::removeDeletedIrcUser(const QString &username) {
-  // DO NOT CALL THIS SLOT EVER!!!
-  
-  // this slots purpose is only to remove deleted users that haven't been synced yet.
-  // Reason:
-  // as a user parting a channel results in it's deletion if it is no longer in any known channel
-  // this action can only be communicated if the slaves are allready in sync.
-  // so if such a deleted user isn't synced in slave mode, we kill and remove it.
-
-  Q_ASSERT(proxy());
-
-  if(!_ircUsers.contains(username))
-    return;
-
-  IrcUser *ircUser = _ircUsers[username];
-
-  if(ircUser->isInitialized())
-    return;
-
-  _ircUsers.remove(username);
-  emit ircUserRemoved(username);
-  emit ircUserRemoved(ircUser);
-}
-
 void Network::removeIrcUser(IrcUser *ircuser) {
   QString nick = _ircUsers.key(ircuser);
   if(nick.isNull())
@@ -710,6 +685,12 @@ void Network::determinePrefixes() {
     QString defaultPrefixes("~&@%+");
     QString defaultPrefixModes("qaohv");
 
+    if(PREFIX.isEmpty()) {
+      _prefixes = defaultPrefixes;
+      _prefixModes = defaultPrefixModes;
+      return;
+    }
+
     // we just assume that in PREFIX are only prefix chars stored
     for(int i = 0; i < defaultPrefixes.size(); i++) {
       if(PREFIX.contains(defaultPrefixes[i])) {