[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=29c5c9f

The following commit has been merged in the master branch:
commit 29c5c9fc593c3972a13e49234814bc7d5c73291f
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Mar 14 00:59:19 2013 +0100

    Use warning icon instead of question mark in 'Delete logs' dialogs
    
    And put 'Clear Contact Logs' action above account logs
---
 logviewer/log-viewer.cpp | 4 ++--
 logviewer/log-viewer.rc  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/logviewer/log-viewer.cpp b/logviewer/log-viewer.cpp
index 5f7a3f2..1d0e2d7 100644
--- a/logviewer/log-viewer.cpp
+++ b/logviewer/log-viewer.cpp
@@ -283,7 +283,7 @@ void LogViewer::slotClearAccountHistory()
         return;
     }
 
-    if (KMessageBox::questionYesNo(
+    if (KMessageBox::warningYesNo(
             this, i18n("Are you sure you want to remove all logs from account %1?", account->displayName()),
             i18n("Clear account history"), KStandardGuiItem::del(), KStandardGuiItem::cancel(),
             QString(), KMessageBox::Dangerous) == KMessageBox::No) {
@@ -309,7 +309,7 @@ void LogViewer::slotClearContactHistory()
     }
 
     QString name = index.data(Qt::DisplayRole).toString();
-    if (KMessageBox::questionYesNo(
+    if (KMessageBox::warningYesNo(
             this, i18n("Are you sure you want to remove history of all conversations with %1?", name),
             i18n("Clear contact history"), KStandardGuiItem::del(), KStandardGuiItem::cancel(),
             QString(), KMessageBox::Dangerous) == KMessageBox::No) {
diff --git a/logviewer/log-viewer.rc b/logviewer/log-viewer.rc
index c85a39f..82df425 100644
--- a/logviewer/log-viewer.rc
+++ b/logviewer/log-viewer.rc
@@ -8,8 +8,8 @@
  <MenuBar>
   <Menu name="file"/>
   <Menu name="logs"><text>L&ogs</text>
-    <Action name="clear-account-logs"/>
     <Action name="clear-contact-logs"/>
+    <Action name="clear-account-logs"/>
     <Separator />
     <Action name="import-kopete-logs"/>
   </Menu>

-- 
ktp-text-ui packaging