summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2016-08-04 20:46:49 +0200
committerMontel Laurent <[email protected]>2016-08-04 20:47:08 +0200
commit3e2d10cf001d9552540a221e7b4cc60c6f0ac00f (patch)
tree9002df575f93ea98c9a40fb7bd8250e689222e03
parentb2afc9ee0432b54464076726ab2bc9a9eecb22cb (diff)
When we cancel create resource don't keep it in systemv16.07.90
-rw-r--r--resources/tomboynotes/o2/o1.h2
-rw-r--r--resources/tomboynotes/tomboynotesresource.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/resources/tomboynotes/o2/o1.h b/resources/tomboynotes/o2/o1.h
index a4395ba..9b697fc 100644
--- a/resources/tomboynotes/o2/o1.h
+++ b/resources/tomboynotes/o2/o1.h
@@ -48,7 +48,7 @@ public:
void setAccessTokenUrl(const QUrl &value);
/// Constructor.
- explicit O1(QObject *parent = 0);
+ explicit O1(QObject *parent = Q_NULLPTR);
/// Parse a URL-encoded response string.
static QMap<QString, QString> parseResponse(const QByteArray &response);
diff --git a/resources/tomboynotes/tomboynotesresource.cpp b/resources/tomboynotes/tomboynotesresource.cpp
index da3f1e2..27c4ab1 100644
--- a/resources/tomboynotes/tomboynotesresource.cpp
+++ b/resources/tomboynotes/tomboynotesresource.cpp
@@ -227,6 +227,7 @@ void TomboyNotesResource::configure(WId windowId)
// Run the configuration dialog an save settings if accepted
if (dialog.exec() != QDialog::Accepted) {
+ Q_EMIT configurationDialogRejected();
return;
}
@@ -242,6 +243,7 @@ void TomboyNotesResource::configure(WId windowId)
} else {
synchronize();
}
+ Q_EMIT configurationDialogAccepted();
}
void TomboyNotesResource::itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection)