author | zautrix <zautrix> | 2004-09-07 23:33:23 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-07 23:33:23 (UTC) |
commit | 199025628054eef739a261437a51a98f5218ab0f (patch) (unidiff) | |
tree | 75ec5c537ee789dbd3e1a87a2e7db9b29d44c626 /libkdepim | |
parent | 2676646d4744ccceab1063dc02d772a26a203c61 (diff) | |
download | kdepimpi-199025628054eef739a261437a51a98f5218ab0f.zip kdepimpi-199025628054eef739a261437a51a98f5218ab0f.tar.gz kdepimpi-199025628054eef739a261437a51a98f5218ab0f.tar.bz2 |
Fixed default settings
-rw-r--r-- | libkdepim/externalapphandler.cpp | 3 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index 6100097..5ba32b6 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp | |||
@@ -347,13 +347,12 @@ ExternalAppHandler::~ExternalAppHandler() | |||
347 | } | 347 | } |
348 | 348 | ||
349 | void ExternalAppHandler::loadConfig() | 349 | void ExternalAppHandler::loadConfig() |
350 | { | 350 | { |
351 | 351 | ||
352 | mDefaultItems.clear(); | 352 | mDefaultItems.clear(); |
353 | |||
354 | mEmailAppAvailable = UNDEFINED; | 353 | mEmailAppAvailable = UNDEFINED; |
355 | mPhoneAppAvailable = UNDEFINED; | 354 | mPhoneAppAvailable = UNDEFINED; |
356 | mFaxAppAvailable = UNDEFINED; | 355 | mFaxAppAvailable = UNDEFINED; |
357 | mSMSAppAvailable = UNDEFINED; | 356 | mSMSAppAvailable = UNDEFINED; |
358 | mPagerAppAvailable = UNDEFINED; | 357 | mPagerAppAvailable = UNDEFINED; |
359 | 358 | ||
@@ -417,13 +416,13 @@ ExternalAppHandler *ExternalAppHandler::instance() | |||
417 | return sInstance; | 416 | return sInstance; |
418 | } | 417 | } |
419 | 418 | ||
420 | void ExternalAppHandler::addDefaultAppItem(Types type, int id, const QString& label, const QString& channel, const QString& message, const QString& parameter, const QString& message2, const QString& parameter2) | 419 | void ExternalAppHandler::addDefaultAppItem(Types type, int id, const QString& label, const QString& channel, const QString& message, const QString& parameter, const QString& message2, const QString& parameter2) |
421 | { | 420 | { |
422 | DefaultAppItem* dai = new DefaultAppItem(type, id, label, channel, message, parameter, message2, parameter2); | 421 | DefaultAppItem* dai = new DefaultAppItem(type, id, label, channel, message, parameter, message2, parameter2); |
423 | 422 | // qDebug("%d %d %s %s ", type, id, label.latin1(), channel.latin1() ); | |
424 | mDefaultItems.append(dai); | 423 | mDefaultItems.append(dai); |
425 | } | 424 | } |
426 | 425 | ||
427 | 426 | ||
428 | QList<DefaultAppItem> ExternalAppHandler::getAvailableDefaultItems(Types type) | 427 | QList<DefaultAppItem> ExternalAppHandler::getAvailableDefaultItems(Types type) |
429 | { | 428 | { |
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index 4790980..7f683a8 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp | |||
@@ -42,20 +42,20 @@ static KStaticDeleter<KPimGlobalPrefs> staticDeleter; | |||
42 | 42 | ||
43 | KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) | 43 | KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) |
44 | : KPrefs("kkdepimrc") | 44 | : KPrefs("kkdepimrc") |
45 | { | 45 | { |
46 | KPrefs::setCurrentGroup( "ExternalApplications" ); | 46 | KPrefs::setCurrentGroup( "ExternalApplications" ); |
47 | 47 | ||
48 | addItemInt( "EmailChannelType", &mEmailClient, NONE_EMC ); | 48 | addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC ); |
49 | addItemString( "EmailChannel", &mEmailOtherChannel, "" ); | 49 | addItemString( "EmailChannel", &mEmailOtherChannel, "" ); |
50 | addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" ); | 50 | addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" ); |
51 | addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" ); | 51 | addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" ); |
52 | addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" ); | 52 | addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" ); |
53 | addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" ); | 53 | addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" ); |
54 | 54 | ||
55 | addItemInt( "PhoneChannelType", &mPhoneClient, NONE_PHC ); | 55 | addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC ); |
56 | addItemString( "PhoneChannel", &mPhoneOtherChannel, "" ); | 56 | addItemString( "PhoneChannel", &mPhoneOtherChannel, "" ); |
57 | addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" ); | 57 | addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" ); |
58 | addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" ); | 58 | addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" ); |
59 | 59 | ||
60 | addItemInt( "FaxChannelType", &mFaxClient, NONE_FAC ); | 60 | addItemInt( "FaxChannelType", &mFaxClient, NONE_FAC ); |
61 | addItemString( "FaxChannel", &mFaxOtherChannel, "" ); | 61 | addItemString( "FaxChannel", &mFaxOtherChannel, "" ); |