[SCM] Kingston update notifier (update-notifier-kde) branch, master, updated. efbab98db231bf152f1f6e6342d3e0668c8726b2

[Kai Wasserbäch]

The following commit has been merged in the master branch:
commit 9e23b71291e81c86b8ad208255ef003cb995e533
Author: Kai Wasserbäch <curan at debian.org>
Date:   Fri Mar 18 15:58:04 2011 +0100

    src/notifier.cpp: Move the "Reboot" button into the right notification.
---
 debian/changelog |    1 +
 src/notifier.cpp |    8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9d085e..d09e0e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ kingston-update-notifier (1.2.3) UNRELEASED; urgency=low
     of:
     - po/hu.po
     - Updates to kingston-update-notifier.{desktop,notifyrc}
+  * src/notifier.cpp: Move the "Reboot" button into the right notification.
 
  -- Kai Wasserbäch <curan at debian.org>  Sat, 26 Feb 2011 12:45:54 +0100
 
diff --git a/src/notifier.cpp b/src/notifier.cpp
index 6dfd243..218f4da 100644
--- a/src/notifier.cpp
+++ b/src/notifier.cpp
@@ -80,8 +80,8 @@ void notifier_t::show_update_notification(const QString& title, const QString& m
   note->setText(message);
   note->setPixmap(KIcon(iconname).pixmap(QSize(32,32)));
   note->setComponentData(m_component_data);
-  note->setActions(QStringList() << i18nc("Do the proposed action (upgrade, reboot, etc) later", "Later")
-    << i18nc("Reboot the system", "Reboot"));
+  note->setActions(QStringList()
+    << i18nc("Do the proposed action (upgrade, reboot, etc) later", "Later"));
   note->sendEvent();
   m_upgrade_notification=note;
   return;
@@ -93,7 +93,9 @@ void notifier_t::notify_reboot() {
   note->setText(i18n("In order to complete this upgrade, you need to reboot your system."));
   note->setPixmap(KIcon("system-reboot").pixmap(QSize(32,32)));
   note->setComponentData(m_component_data);
-  note->setActions(QStringList() << i18nc("Do the proposed action (upgrade, reboot, etc) later", "Later"));
+  note->setActions(QStringList()
+    << i18nc("Do the proposed action (upgrade, reboot, etc) later", "Later")
+    << i18nc("Reboot the system", "Reboot"));
   connect(note,SIGNAL(closed()),m_reboot_nagger,SLOT(start()));
   connect(note,SIGNAL(action1Activated()),m_reboot_nagger,SLOT(start()));
   connect(note,SIGNAL(action2Activated()),SLOT(reboot()));

-- 
Kingston update notifier (update-notifier-kde)