summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2007-07-10 22:34:31 (UTC)
committer Michael Krelin <hacker@klever.net>2007-07-10 22:34:31 (UTC)
commit8822b171906831b7de71e24f66ca2b07bc3ef92e (patch) (unidiff)
tree31c36a1390b3b557969568ca82f211c094d7e689
parent399974b248bf037ff8da6b91d74208acfcde779c (diff)
downloadkdepimpi-8822b171906831b7de71e24f66ca2b07bc3ef92e.zip
kdepimpi-8822b171906831b7de71e24f66ca2b07bc3ef92e.tar.gz
kdepimpi-8822b171906831b7de71e24f66ca2b07bc3ef92e.tar.bz2
korganizer: make it look into proper locations
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/main.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 211fde6..04fb234 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -21,16 +21,17 @@
21#include <stdio.h> 21#include <stdio.h>
22#include "mainwindow.h" 22#include "mainwindow.h"
23#include <libkdepim/kpimglobalprefs.h> 23#include <libkdepim/kpimglobalprefs.h>
24void dumpMissing(); 24void dumpMissing();
25 25
26 26
27int main( int argc, char **argv ) 27int main( int argc, char **argv )
28{ 28{
29 if(!getenv("KDEPIMPIDIR")) putenv("KDEPIMPIDIR=/usr/lib/kdepimpi");
29 if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi"); 30 if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi");
30#ifndef DESKTOP_VERSION 31#ifndef DESKTOP_VERSION
31 QPEApplication a( argc, argv ); 32 QPEApplication a( argc, argv );
32 a.setKeepRunning (); 33 a.setKeepRunning ();
33#else 34#else
34 QApplication a( argc, argv ); 35 QApplication a( argc, argv );
35#ifdef _WIN32_ 36#ifdef _WIN32_
36 QString hdir ( getenv( "HOME") ); 37 QString hdir ( getenv( "HOME") );
@@ -74,17 +75,21 @@ int main( int argc, char **argv )
74 } 75 }
75 if ( ! exitHelp ) { 76 if ( ! exitHelp ) {
76 KGlobal::setAppName( "korganizer" ); 77 KGlobal::setAppName( "korganizer" );
77 QString fileName ; 78 QString fileName ;
78#ifndef DESKTOP_VERSION 79#ifndef DESKTOP_VERSION
79 fileName = getenv("QPEDIR"); 80 fileName = getenv("QPEDIR");
80 KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/korganizer/"); 81 KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/korganizer/");
81#else 82#else
82 fileName = qApp->applicationDirPath () + "/kdepim/korganizer/"; 83 const char *kpd = ::getenv("KDEPIMPIDIR");
84 if(kpd)
85 fileName = QString(kpd) + "/korganizer/";
86 else
87 fileName = qApp->applicationDirPath () + "/kdepim/korganizer/";
83 KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); 88 KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
84#endif 89#endif
85 KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "korganizer"))); 90 KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "korganizer")));
86 91
87 QApplication::setFont( KPimGlobalPrefs::instance()->mApplicationFont ); 92 QApplication::setFont( KPimGlobalPrefs::instance()->mApplicationFont );
88 KPimGlobalPrefs::instance()->setGlobalConfig(); 93 KPimGlobalPrefs::instance()->setGlobalConfig();
89 MainWindow m; 94 MainWindow m;
90#ifndef DESKTOP_VERSION 95#ifndef DESKTOP_VERSION