[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-2/konversation/konversation
From:       Eli MacKenzie <argonel () sympatico ! ca>
Date:       2005-03-23 23:05:00
Message-ID: 20050323230500.3E26C3CF () office ! kde ! org
[Download RAW message or body]

CVS commit by argonel: 

lets not break 3.2 compatibility the day before a release :)


  M +9 -0      logfilereader.cpp   1.16
  M +4 -0      prefspagethemes.cpp   1.33


--- kdeextragear-2/konversation/konversation/logfilereader.cpp  #1.15:1.16
@@ -105,4 +105,12 @@ void LogfileReader::updateView()
 void LogfileReader::clearLog()
 {
+#if !KDE_IS_VERSION(3,3,0)
+  if(KMessageBox::questionYesNo(this,
+                                i18n("Do you really want to permanently discard all \
log information of this file?"), +                                i18n("Clear \
Logfile"), +                                KStdGuiItem::yes(),
+                                KStdGuiItem::no(),
+                                "ClearLogfileQuestion")==KMessageBox::Yes)
+#else
   if(KMessageBox::warningContinueCancel(this,
                                 i18n("Do you really want to permanently discard all \
log information of this file?"), @@ -110,4 +118,5 @@ void LogfileReader::clearLog()
                                 KStdGuiItem::del(),
                                 "ClearLogfileQuestion")==KMessageBox::Continue)
+#endif
   {
     QFile::remove(fileName);

--- kdeextragear-2/konversation/konversation/prefspagethemes.cpp  #1.32:1.33
@@ -164,5 +164,9 @@ void PrefsPageThemes::removeTheme()
                                                   i18n("Do you want to remove %1 \
?").arg(themeName),  i18n("Remove Theme"),
+#if !KDE_IS_VERSION(3,3,0)
+                          KStdGuiItem::cont(),
+#else
                                                   KStdGuiItem::del(),
+#endif
                                                   "warningRemoveTheme"
                                                   );


[prev in list] [next in list] [prev in thread] [next in thread]