X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorealiasmanager.cpp;h=78044db81f6734df004f38cd6c392244476a785b;hp=8fcdb022148114049dac6b9ff3f5cf1b9f375405;hb=dc2aa39d20b60e7cd8e0ba66ca6c9ed729add008;hpb=6579cd49c867ce3fb6c99127851a881ea82d1b1b

diff --git a/src/core/corealiasmanager.cpp b/src/core/corealiasmanager.cpp
index 8fcdb022..78044db8 100644
--- a/src/core/corealiasmanager.cpp
+++ b/src/core/corealiasmanager.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -34,11 +34,9 @@ CoreAliasManager::CoreAliasManager(CoreSession *parent)
   }
 
   QVariantMap aliases = Core::getUserSetting(session->user(), "Aliases").toMap();
-  if(aliases.isEmpty()) {
+  initSetAliases(Core::getUserSetting(session->user(), "Aliases").toMap());
+  if(isEmpty())
     loadDefaults();
-  } else {
-    initSetAliases(aliases);
-  }
 }
 
 
@@ -52,7 +50,9 @@ CoreAliasManager::~CoreAliasManager() {
   Core::setUserSetting(session->user(), "Aliases", initAliases());
 }
 
+
 void CoreAliasManager::loadDefaults() {
-  // Default Aliases:
-  addAlias("j", "/join $1");
+  foreach(Alias alias, AliasManager::defaults()) {
+    addAlias(alias.name, alias.expansion);
+  }
 }