permanently ignored (HardStrictness) messages can no longer trigger a buffer creation

[quassel.git] / src / common / quassel.cpp

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index deaf20e..e69d0bd 100644 (file)
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -76,7 +76,7 @@ bool Quassel::init() {
     // we only handle crashes ourselves if coredumps are disabled
     struct rlimit *limit = (rlimit *) malloc(sizeof(struct rlimit));
     int rc = getrlimit(RLIMIT_CORE, limit);
-  
+
     if(rc == -1 || !((long)limit->rlim_cur > 0 || limit->rlim_cur == RLIM_INFINITY)) {
 # endif /* Q_OS_WIN32 */
       signal(SIGABRT, handleSignal);
@@ -246,6 +246,14 @@ void Quassel::logFatalMessage(const char *msg) {
 #endif
 }
 
+Quassel::Features Quassel::features() {
+  Features feats = 0;
+  for(int i = 1; i <= NumFeatures; i<<=1)
+    feats |= (Feature) i;
+
+  return feats;
+}
+
 const QString &Quassel::coreDumpFileName() {
   if(_coreDumpFileName.isEmpty()) {
     QDir configDir(configDirPath());
@@ -393,24 +401,27 @@ void Quassel::loadTranslation(const QLocale &locale) {
   QTranslator *qtTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QtTr");
   QTranslator *quasselTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QuasselTr");
 
-  if(!qtTranslator) {
-    qtTranslator = new QTranslator(qApp);
-    qtTranslator->setObjectName("QtTr");
-    qApp->installTranslator(qtTranslator);
-  }
-  if(!quasselTranslator) {
-    quasselTranslator = new QTranslator(qApp);
-    quasselTranslator->setObjectName("QuasselTr");
-    qApp->installTranslator(quasselTranslator);
-  }
-
-  QLocale::setDefault(locale);
+  if(qtTranslator)
+    qApp->removeTranslator(qtTranslator);
+  if(quasselTranslator)
+    qApp->removeTranslator(quasselTranslator);
 
+  // We use QLocale::C to indicate that we don't want a translation
   if(locale.language() == QLocale::C)
     return;
 
+  qtTranslator = new QTranslator(qApp);
+  qtTranslator->setObjectName("QtTr");
+  qApp->installTranslator(qtTranslator);
+
+  quasselTranslator = new QTranslator(qApp);
+  quasselTranslator->setObjectName("QuasselTr");
+  qApp->installTranslator(quasselTranslator);
+
+  QLocale::setDefault(locale);
+
   bool success = qtTranslator->load(QString("qt_%1").arg(locale.name()), translationDirPath());
   if(!success)
     qtTranslator->load(QString("qt_%1").arg(locale.name()), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-  quasselTranslator->load(QString("quassel_%1").arg(locale.name()), translationDirPath());
+  quasselTranslator->load(QString("%1").arg(locale.name()), translationDirPath());
 }