diff options
author | Eric Hameleers <alien@slackware.com> | 2015-10-14 13:50:17 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2015-10-14 13:50:17 +0200 |
commit | 44bc0883d1fa8009f873f475ca794010309745cd (patch) | |
tree | 94628a81399ccd2349af1cbfef22aa9f148db8a9 /kde/patch | |
parent | 5fde630b0d57e97be63494818bddbb3f623b4f43 (diff) | |
download | ktown-44bc0883d1fa8009f873f475ca794010309745cd.tar.gz ktown-44bc0883d1fa8009f873f475ca794010309745cd.tar.xz |
Apply patch to fix KDEBUG #351785: crashes in the KDE Telepathy tray icon.
According to https://bugs.kde.org/show_bug.cgi?id=351785 this should have
gone into ktp-accounts-kcm-15.08.2 but in fact it is missing from the source
tarball.
Diffstat (limited to 'kde/patch')
-rw-r--r-- | kde/patch/ktp-accounts-kcm.patch | 4 | ||||
-rw-r--r-- | kde/patch/ktp-accounts-kcm/ktp-accounts-kcm_kdebug_351785.patch | 32 |
2 files changed, 36 insertions, 0 deletions
diff --git a/kde/patch/ktp-accounts-kcm.patch b/kde/patch/ktp-accounts-kcm.patch new file mode 100644 index 0000000..8d1c0da --- /dev/null +++ b/kde/patch/ktp-accounts-kcm.patch @@ -0,0 +1,4 @@ +# Fix a crash in KDE Telepathy which was supposed to be fixed in 15.08.2: +# See also https://bugs.kde.org/show_bug.cgi?id=351785 +cat $CWD/patch/ktp-accounts-kcm/ktp-accounts-kcm_kdebug_351785.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/ktp-accounts-kcm/ktp-accounts-kcm_kdebug_351785.patch b/kde/patch/ktp-accounts-kcm/ktp-accounts-kcm_kdebug_351785.patch new file mode 100644 index 0000000..aa77aae --- /dev/null +++ b/kde/patch/ktp-accounts-kcm/ktp-accounts-kcm_kdebug_351785.patch @@ -0,0 +1,32 @@ +From: Martin Klapetek <mklapetek@kde.org> +Date: Thu, 17 Sep 2015 16:11:30 +0000 +Subject: [kaccounts] Emit configUiReady() when config UI is ready +X-Git-Url: http://quickgit.kde.org/?p=ktp-accounts-kcm.git&a=commitdiff&h=07c7cc5309e11171b2e552678d58257ccfc44e42 +--- +[kaccounts] Emit configUiReady() when config UI is ready + +Should prevent the crash when clicking the Configure button + +(requires kaccounts-integration 15.08.2) + +BUG: 351785 +FIXED-IN: 15.08.2 +--- + + +--- a/plugins/kaccounts/kaccounts-ui-provider.cpp ++++ b/plugins/kaccounts/kaccounts-ui-provider.cpp +@@ -106,10 +106,10 @@ + + if (d->type == KAccountsUiPlugin::ConfigureAccountDialog) { + if (d->accountManager->isReady()) { +- Q_EMIT uiReady(); ++ Q_EMIT configUiReady(); + } else { + // let's wait for AM to become ready first +- connect(d->accountManager->becomeReady(), &Tp::PendingOperation::finished, this, &KAccountsUiProvider::uiReady); ++ connect(d->accountManager->becomeReady(), &Tp::PendingOperation::finished, this, &KAccountsUiProvider::configUiReady); + } + } + } + |