[kde-print-manager] fix cups renew spam (#885541)
Rex Dieter
rdieter at fedoraproject.org
Fri Dec 14 13:56:58 UTC 2012
commit cf88f56db5e5fd158f55ed5bb3704dd5e45ae794
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Dec 14 07:56:56 2012 -0600
fix cups renew spam (#885541)
kde-print-manager.spec | 11 ++++++++++-
print-manager-0.2.0-cups_renew_spam.patch | 21 +++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/kde-print-manager.spec b/kde-print-manager.spec
index 5be5d77..e268188 100644
--- a/kde-print-manager.spec
+++ b/kde-print-manager.spec
@@ -11,7 +11,7 @@
Summary: Printer management for KDE
Name: kde-print-manager
Version: 0.2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2+
URL: https://projects.kde.org/projects/playground/base/print-manager
@@ -19,6 +19,10 @@ Source0: http://download.kde.org/stable/print-manager/%{version}/src/print-manag
# Plasma init/upgrade script
Source1: 01-fedora-print-manager.js
+## upstreamable patches
+# http://bugzilla.redhat.com/885541
+Patch50: print-manager-0.2.0-cups_renew_spam.patch
+
BuildRequires: gettext
BuildRequires: kdelibs4-devel
BuildRequires: cups-devel%{?cups16: >= 1:1.6}%{!?cups16: < 1:1.6}
@@ -40,6 +44,8 @@ Printer management for KDE.
%prep
%setup -q -n print-manager-%{version}
+%patch50 -p1 -b .cups_renew_spam
+
%build
if [ -x %{_bindir}/plasma-dataengine-depextractor ] ; then
plasma-dataengine-depextractor plasmoid-package
@@ -95,6 +101,9 @@ ln %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-print-manager.js %
%changelog
+* Fri Dec 14 2012 Rex Dieter <rdieter at fedoraproject.org> 0.2.0-7
+- fix cups renew spam (#885541)
+
* Fri Nov 09 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.2.0-6
- Requires: system-config-printer-libs (for com.redhat.NewPrinterNotification)
diff --git a/print-manager-0.2.0-cups_renew_spam.patch b/print-manager-0.2.0-cups_renew_spam.patch
new file mode 100644
index 0000000..41ce0ad
--- /dev/null
+++ b/print-manager-0.2.0-cups_renew_spam.patch
@@ -0,0 +1,21 @@
+diff -up print-manager-0.2.0/libkcups/KCupsConnection.cpp.debug_spam print-manager-0.2.0/libkcups/KCupsConnection.cpp
+--- print-manager-0.2.0/libkcups/KCupsConnection.cpp.debug_spam 2012-08-22 11:13:44.000000000 -0500
++++ print-manager-0.2.0/libkcups/KCupsConnection.cpp 2012-12-14 07:39:37.572451279 -0600
+@@ -247,7 +247,7 @@ void KCupsConnection::run()
+
+ // Creates the timer that will renew the DBus subscription
+ m_renewTimer = new QTimer;
+- m_renewTimer->setInterval(RENEW_INTERVAL);
++ m_renewTimer->setInterval(RENEW_INTERVAL*1000);
+ m_renewTimer->moveToThread(this);
+ connect(m_renewTimer, SIGNAL(timeout()), this, SLOT(renewDBusSubscription()), Qt::DirectConnection);
+
+@@ -476,7 +476,7 @@ int KCupsConnection::renewDBusSubscripti
+ #endif // HAVE_CUPS_1_6
+ }
+ } else {
+- kWarning() << "Request failed" << lastError();
++ kDebug() << "Request failed" << lastError();
+ ret = -1;
+ }
+
More information about the scm-commits
mailing list