[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=14b0651

The following commit has been merged in the master branch:
commit 14b0651de397e1e80d88a5c834f19812d7dd508c
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Apr 11 16:26:31 2013 +0200

    Add 'Ok' button to the notifications config dialog
    
    Reviewed-by: David Edmundson
    BUG: 316919
    FIXED-IN: 0.6.1
---
 KTp/Widgets/notificationconfigdialog.cpp | 10 +++++++++-
 KTp/Widgets/notificationconfigdialog.h   |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/KTp/Widgets/notificationconfigdialog.cpp b/KTp/Widgets/notificationconfigdialog.cpp
index 17c2986..33c43e3 100644
--- a/KTp/Widgets/notificationconfigdialog.cpp
+++ b/KTp/Widgets/notificationconfigdialog.cpp
@@ -42,7 +42,7 @@ KTp::NotificationConfigDialog::NotificationConfigDialog(const Tp::ContactPtr &co
     m_currentSelection = 0;
     setCaption(i18n("Configure notifications for %1", m_contact.data()->alias()));
     setAttribute(Qt::WA_DeleteOnClose);
-    setButtons(KDialog::Apply | KDialog::Cancel | KDialog::Default );
+    setButtons(KDialog::Ok | KDialog::Apply | KDialog::Cancel | KDialog::Default );
     enableButtonApply(false);
 
     QWidget *centralWidget = new QWidget(this);
@@ -65,6 +65,8 @@ KTp::NotificationConfigDialog::NotificationConfigDialog(const Tp::ContactPtr &co
                                    QLatin1String("contact"),
                                    m_contact.data()->id());
 
+    connect(this, SIGNAL(okClicked()),
+            SLOT(onOkClicked()));
     connect(this, SIGNAL(applyClicked()),
             SLOT(saveConfig()));
     connect(comboBox, SIGNAL(currentIndexChanged(int)),
@@ -130,3 +132,9 @@ void KTp::NotificationConfigDialog::defaults()
     }
     updateNotifyWidget(m_currentSelection);
 }
+
+void KTp::NotificationConfigDialog::onOkClicked()
+{
+    m_notifyWidget->save();
+    accept();
+}
diff --git a/KTp/Widgets/notificationconfigdialog.h b/KTp/Widgets/notificationconfigdialog.h
index 0ed1bc1..6692f87 100644
--- a/KTp/Widgets/notificationconfigdialog.h
+++ b/KTp/Widgets/notificationconfigdialog.h
@@ -44,6 +44,7 @@ private Q_SLOTS:
     void saveConfig();
     void updateNotifyWidget(const int selection);
     void defaults();
+    void onOkClicked();
 };
 
 }

-- 
ktp-common-internals packaging