From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 25 Dec 2008 00:08:52 +0000 (+0100)
Subject: Fixes
X-Git-Tag: 0.4.0~328
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=44797cbb82853f2f5a9013cf31dd489bb52f5ae5

Fixes
---

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 1f556240..207b672b 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -39,6 +39,7 @@
 #include "quassel.h"
 
 int main(int argc, char **argv) {
+  Q_INIT_RESOURCE(i18n);
 
   // Setup build information and version string
   # include "version.gen"
@@ -50,8 +51,8 @@ int main(int argc, char **argv) {
 
 #ifdef HAVE_KDE
   // We need to init KCmdLineArgs first
-  // TODO: build an AboutData class to replace our aboutDlg strings
-  KAboutData aboutData(argv[0], 0, ki18n("Quassel IRC"), Quassel::buildInfo().plainVersionString.toUtf8());
+  // TODO: build an AboutData compat class to replace our aboutDlg strings
+  KAboutData aboutData("quassel", 0, ki18n("Quassel IRC"), Quassel::buildInfo().plainVersionString.toUtf8());
   aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8());
   KCmdLineArgs::init(argc, argv, &aboutData);
 #endif
diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index 788fb372..1e6e1ed8 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -42,8 +42,6 @@ bool Quassel::DEBUG = false;
 QString Quassel::_coreDumpFileName;
 
 Quassel::Quassel() {
-  Q_INIT_RESOURCE(i18n);
-
   // We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
   signal(SIGTERM, handleSignal);
   signal(SIGINT, handleSignal);
@@ -73,10 +71,6 @@ bool Quassel::init() {
 
   registerMetaTypes();
 
-  QCoreApplication::setApplicationName(buildInfo().applicationName);
-  QCoreApplication::setOrganizationName(buildInfo().organizationName);
-  QCoreApplication::setOrganizationDomain(buildInfo().organizationDomain);
-
   Network::setDefaultCodecForServer("ISO-8859-1");
   Network::setDefaultCodecForEncoding("UTF-8");
   Network::setDefaultCodecForDecoding("ISO-8859-15");
diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 9eb74d44..56f8f1ad 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -168,7 +168,7 @@ MainWin::~MainWin() {
   QtUiSettings s;
   s.setValue("MainWinSize", size());
   s.setValue("MainWinPos", pos());
-  s.setValue("MainWinState", saveState()); qDebug() << "fini!";
+  s.setValue("MainWinState", saveState());
 }
 
 void MainWin::updateIcon() {