summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-08-17 19:54:28 (UTC)
committer zautrix <zautrix>2005-08-17 19:54:28 (UTC)
commit7b85cd21eac504f2004df9f3c2b818cbc1478fc0 (patch) (side-by-side diff)
tree8b99349eb4ddb9fb10e44618a03f17a80810a392
parent39f1119563e038a029fd23c4b3af03eda02fe308 (diff)
downloadkdepimpi-7b85cd21eac504f2004df9f3c2b818cbc1478fc0.zip
kdepimpi-7b85cd21eac504f2004df9f3c2b818cbc1478fc0.tar.gz
kdepimpi-7b85cd21eac504f2004df9f3c2b818cbc1478fc0.tar.bz2
uuu
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt2
-rw-r--r--korganizer/calendarview.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index fd5e4f9..944ee1e 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -2,12 +2,14 @@ Info about the changes in new versions of KDE-Pim/Pi
********** VERSION 2.2.1 ************
KO/Pi:
Fixed a problem displaying very long allday events in agenda view in single day mode.
Fixed a problem with the default settings for new todos.
+Added an error message dialog if saving of calendar files is not possible.
+Made it impossible to close KO/Pi if saving fails.
KA/Pi:
Added a config option to turn on asking before a contact is deleted.
Fixed a problem with the default view and view selection at startup.
Formatted name is now set on import, if formatted name is empty.
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index ca071b2..26323b1 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2544,13 +2544,12 @@ bool CalendarView::saveCalendars()
else
saveError += cal->mName + "\n";
}
cal = calendars.next();
}
restoreCalendarSettings();
-
if ( !saveError.isEmpty() ) {
saveError = KGlobal::formatMessage( i18n("Calendar(s) not saved:"),0 )+"\n" + saveError;
KMessageBox::error(this, saveError, i18n("Error saving data"));
return false;
}
return true;