Hello community,
here is the log from the commit of package kde4-print-manager for
openSUSE:Factory checked in at 2013-04-18 10:19:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kde4-print-manager (Old)
and /work/SRC/openSUSE:Factory/.kde4-print-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kde4-print-manager", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/kde4-print-manager/kde4-print-manager.changes
2013-03-14 11:27:17.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.kde4-print-manager.new/kde4-print-manager.changes
2013-04-18 10:19:20.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Apr 1 19:45:32 UTC 2013 - [email protected]
+
+- Update to 4.10.2 \n * Bugfixes
+
+-------------------------------------------------------------------
Old:
----
print-manager-4.10.1.tar.xz
New:
----
print-manager-4.10.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kde4-print-manager.spec ++++++
--- /var/tmp/diff_new_pack.pM0ZzX/_old 2013-04-18 10:19:21.000000000 +0200
+++ /var/tmp/diff_new_pack.pM0ZzX/_new 2013-04-18 10:19:21.000000000 +0200
@@ -30,7 +30,7 @@
Summary: A new print manager for KDE 4
License: GPL-2.0+
Group: System/GUI/KDE
-Version: 4.10.1
+Version: 4.10.2
Release: 0
Source: print-manager-%{version}.tar.xz
Obsoletes: kde4-printer-applet < 4.9.80
++++++ print-manager-4.10.1.tar.xz -> print-manager-4.10.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.1/add-printer/AddPrinterInterface.cpp
new/print-manager-4.10.2/add-printer/AddPrinterInterface.cpp
--- old/print-manager-4.10.1/add-printer/AddPrinterInterface.cpp
2013-03-01 08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/add-printer/AddPrinterInterface.cpp
2013-03-29 08:05:57.000000000 +0100
@@ -74,27 +74,28 @@
void AddPrinterInterface::ChangePPD(qulonglong wid, const QString &name)
{
// Fist we need to get the printer attributes
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
QStringList attr;
attr << KCUPS_PRINTER_TYPE; // needed to know if it's a remote printer
attr << KCUPS_PRINTER_MAKE_AND_MODEL;
attr << KCUPS_DEVICE_URI;
request->getPrinterAttributes(name, false, attr);
request->waitTillFinished();
-
- if (!request->hasError() && request->printers().size() == 1) {
- KCupsPrinter printer = request->printers().first();
- if (printer.type() & CUPS_PRINTER_REMOTE) {
- kWarning() << "Ignoring request, can not change PPD of remote
printer" << name;
+ if (request) {
+ if (!request->hasError() && request->printers().size() == 1) {
+ KCupsPrinter printer = request->printers().first();
+ if (printer.type() & CUPS_PRINTER_REMOTE) {
+ kWarning() << "Ignoring request, can not change PPD of remote
printer" << name;
+ } else {
+ AddPrinterAssistant *wizard = new AddPrinterAssistant();
+ wizard->initChangePPD(name, printer.deviceUri(),
printer.makeAndModel());
+ show(wizard, wid);
+ }
} else {
- AddPrinterAssistant *wizard = new AddPrinterAssistant();
- wizard->initChangePPD(name, printer.deviceUri(),
printer.makeAndModel());
- show(wizard, wid);
+ kWarning() << "Ignoring request, printer not found" << name <<
request->errorMsg();
}
- } else {
- kWarning() << "Ignoring request, printer not found" << name <<
request->errorMsg();
+ request->deleteLater();
}
- request->deleteLater();
}
void AddPrinterInterface::NewPrinterFromDevice(qulonglong wid, const QString
&name, const QString &device_id)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/print-manager-4.10.1/add-printer/PageAddPrinter.cpp
new/print-manager-4.10.2/add-printer/PageAddPrinter.cpp
--- old/print-manager-4.10.1/add-printer/PageAddPrinter.cpp 2013-03-01
08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/add-printer/PageAddPrinter.cpp 2013-03-29
08:05:57.000000000 +0100
@@ -124,7 +124,7 @@
QString destName = args[KCUPS_PRINTER_NAME].toString();
QString filename = args.take(FILENAME).toString();
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
if (isClass) {
args[KCUPS_PRINTER_IS_ACCEPTING_JOBS] = true;
args[KCUPS_PRINTER_STATE] = IPP_PRINTER_IDLE;
@@ -132,22 +132,23 @@
} else {
request->addOrModifyPrinter(destName, args, filename);
}
-
request->waitTillFinished();
- if (request->hasError()) {
- kDebug() << request->error() << request->errorMsg();
- QString message;
- if (isClass) {
- message = i18nc("@info", "Failed to add class: '%1'",
request->errorMsg());
+ if (request) {
+ if (request->hasError()) {
+ kDebug() << request->error() << request->errorMsg();
+ QString message;
+ if (isClass) {
+ message = i18nc("@info", "Failed to add class: '%1'",
request->errorMsg());
+ } else {
+ message = i18nc("@info", "Failed to configure printer: '%1'",
request->errorMsg());
+ }
+ ui->messageWidget->setText(message);
+ ui->messageWidget->animatedShow();
} else {
- message = i18nc("@info", "Failed to configure printer: '%1'",
request->errorMsg());
+ ret = true;
}
- ui->messageWidget->setText(message);
- ui->messageWidget->animatedShow();
- } else {
- ret = true;
+ request->deleteLater();
}
- request->deleteLater();
return ret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.1/configure-printer/ConfigureDialog.cpp
new/print-manager-4.10.2/configure-printer/ConfigureDialog.cpp
--- old/print-manager-4.10.1/configure-printer/ConfigureDialog.cpp
2013-03-01 08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/configure-printer/ConfigureDialog.cpp
2013-03-29 08:05:57.000000000 +0100
@@ -33,6 +33,8 @@
#include <KDebug>
#include <QList>
+#include <QPointer>
+
Q_DECLARE_METATYPE(QList<int>)
ConfigureDialog::ConfigureDialog(const QString &destName, bool isClass,
QWidget *parent) :
@@ -58,9 +60,12 @@
attr << KCUPS_PRINTER_MAKE_AND_MODEL;
KCupsPrinter printer;
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
request->getPrinterAttributes(destName, isClass, attr);
request->waitTillFinished();
+ if (!request) {
+ return;
+ }
if (!request->hasError() && !request->printers().isEmpty()){
printer = request->printers().first();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.1/configure-printer/ConfigurePrinterInterface.cpp
new/print-manager-4.10.2/configure-printer/ConfigurePrinterInterface.cpp
--- old/print-manager-4.10.1/configure-printer/ConfigurePrinterInterface.cpp
2013-03-01 08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/configure-printer/ConfigurePrinterInterface.cpp
2013-03-29 08:05:57.000000000 +0100
@@ -67,9 +67,12 @@
att << KCUPS_PRINTER_NAME;
att << KCUPS_PRINTER_TYPE;
// Get destinations with these attributes
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
request->getPrinters(att);
request->waitTillFinished();
+ if (!request) {
+ return;
+ }
bool found = false;
KCupsPrinter printer;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.1/configure-printer/ModifyPrinter.cpp
new/print-manager-4.10.2/configure-printer/ModifyPrinter.cpp
--- old/print-manager-4.10.1/configure-printer/ModifyPrinter.cpp
2013-03-01 08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/configure-printer/ModifyPrinter.cpp
2013-03-29 08:05:57.000000000 +0100
@@ -260,33 +260,34 @@
}
kDebug() << fileName;
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
if (m_isClass) {
request->addOrModifyClass(m_destName, args);
} else {
request->addOrModifyPrinter(m_destName, args, fileName);
}
request->waitTillFinished();
+ if (request) {
+ if (!request->hasError()) {
+ if (m_changedValues.contains("ppd-name")) {
+ emit ppdChanged();
+ }
+ request->getPrinterAttributes(m_destName, m_isClass,
neededValues());
+ request->waitTillFinished();
- if (!request->hasError()) {
- if (m_changedValues.contains("ppd-name")) {
- emit ppdChanged();
+ if (!request->hasError() && !request->printers().isEmpty()) {
+ KCupsPrinter printer = request->printers().first();
+ setValues(printer);
+ }
+ } else {
+ KMessageBox::detailedSorry(this,
+ m_isClass ? i18nc("@info", "Failed
to configure class") :
+ i18nc("@info", "Failed
to configure printer"),
+ request->errorMsg(),
+ i18nc("@title:window", "Failed"));
}
- request->getPrinterAttributes(m_destName, m_isClass,
neededValues());
- request->waitTillFinished();
-
- if (!request->hasError() && !request->printers().isEmpty()) {
- KCupsPrinter printer = request->printers().first();
- setValues(printer);
- }
- } else {
- KMessageBox::detailedSorry(this,
- m_isClass ? i18nc("@info", "Failed to
configure class") :
- i18nc("@info", "Failed to
configure printer"),
- request->errorMsg(),
- i18nc("@title:window", "Failed"));
+ request->deleteLater();
}
- request->deleteLater();
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.1/configure-printer/PrinterBehavior.cpp
new/print-manager-4.10.2/configure-printer/PrinterBehavior.cpp
--- old/print-manager-4.10.1/configure-printer/PrinterBehavior.cpp
2013-03-01 08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/configure-printer/PrinterBehavior.cpp
2013-03-29 08:05:57.000000000 +0100
@@ -269,22 +269,24 @@
}
}
}
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
if (m_isClass) {
request->addOrModifyClass(m_destName, changedValues);
} else {
request->addOrModifyPrinter(m_destName, changedValues);
}
request->waitTillFinished();
- if (!request->hasError()) {
- request->getPrinterAttributes(m_destName, m_isClass,
neededValues());
- request->waitTillFinished();
- if (!request->hasError() && !request->printers().isEmpty()){
- KCupsPrinter printer = request->printers().first();
- setValues(printer);
+ if (request) {
+ if (!request->hasError()) {
+ request->getPrinterAttributes(m_destName, m_isClass,
neededValues());
+ request->waitTillFinished();
+ if (request && !request->hasError() &&
!request->printers().isEmpty()){
+ KCupsPrinter printer = request->printers().first();
+ setValues(printer);
+ }
}
+ request->deleteLater();
}
- request->deleteLater();
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.1/configure-printer/PrinterOptions.cpp
new/print-manager-4.10.2/configure-printer/PrinterOptions.cpp
--- old/print-manager-4.10.1/configure-printer/PrinterOptions.cpp
2013-03-01 08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/configure-printer/PrinterOptions.cpp
2013-03-29 08:05:57.000000000 +0100
@@ -64,10 +64,12 @@
void PrinterOptions::on_autoConfigurePB_clicked()
{
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
request->printCommand(m_destName, "AutoConfigure", i18n("Set Default
Options"));
request->waitTillFinished();
- request->deleteLater();
+ if (request) {
+ request->deleteLater();
+ }
}
void PrinterOptions::reloadPPD()
@@ -97,9 +99,12 @@
m_customValues.clear();
emit changed(false);
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
request->getPrinterPPD(m_destName);
request->waitTillFinished();
+ if (!request) {
+ return;
+ }
m_filename = request->printerPPD();
m_ppd = ppdOpenFile(m_filename.toUtf8());
request->deleteLater();
@@ -758,7 +763,7 @@
}
QVariantHash values; // we need null values
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
if (m_isClass) {
request->addOrModifyClass(m_destName, values);
} else {
@@ -771,28 +776,31 @@
// finishes we will set the current options as default
setEnabled(false);
request->waitTillFinished();
- setEnabled(true);
- if (!request->hasError()) {
- // if we succefully save the new ppd we need now to
- // clear our changes
- QHash<QString, QObject*>::const_iterator i =
m_customValues.constBegin();
- while (i != m_customValues.constEnd()) {
- QString currentChoice;
- currentChoice = i.value()->property("currentChoice").toString();
- // Store the current choice as the default one
- i.value()->setProperty(DEFAULT_CHOICE, currentChoice);
- i.value()->setProperty("currentChoice", QVariant());
- i.value()->setProperty("different", false);
- ++i;
- }
- m_changes = 0;
- m_customValues.clear();
- emit changed(false);
- }
- request->deleteLater();
// unlink the file
unlink(tempfile);
+
+ if (request) {
+ setEnabled(true);
+ if (!request->hasError()) {
+ // if we succefully save the new ppd we need now to
+ // clear our changes
+ QHash<QString, QObject*>::const_iterator i =
m_customValues.constBegin();
+ while (i != m_customValues.constEnd()) {
+ QString currentChoice;
+ currentChoice =
i.value()->property("currentChoice").toString();
+ // Store the current choice as the default one
+ i.value()->setProperty(DEFAULT_CHOICE, currentChoice);
+ i.value()->setProperty("currentChoice", QVariant());
+ i.value()->setProperty("different", false);
+ ++i;
+ }
+ m_changes = 0;
+ m_customValues.clear();
+ emit changed(false);
+ }
+ request->deleteLater();
+ }
}
bool PrinterOptions::hasChanges()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.1/plasmoid-package/metadata.desktop
new/print-manager-4.10.2/plasmoid-package/metadata.desktop
--- old/print-manager-4.10.1/plasmoid-package/metadata.desktop 2013-03-01
08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/plasmoid-package/metadata.desktop 2013-03-29
08:05:57.000000000 +0100
@@ -34,6 +34,7 @@
Name[sr@ijekavianlatin]=Upravljanje poslovima štampanja
Name[sr@latin]=Upravljanje poslovima štampanja
Name[sv]=Hantera skrivarjobb
+Name[tr]=Yazdırma Görevlerini Yönet
Name[uk]=Керування завданнями з друку
Name[x-test]=xxManage Print Jobsxx
Name[zh_CN]=管理打印任务
@@ -71,6 +72,7 @@
Comment[sr@ijekavianlatin]=Pregledajte i upravljajte poslovima štampanja
Comment[sr@latin]=Pregledajte i upravljajte poslovima štampanja
Comment[sv]=Lista skrivarjobb och hantera dem
+Comment[tr]=Yazdırma görevlerini listele ve bunları yönet
Comment[uk]=Показ списку завдань і керування ними
Comment[x-test]=xxList print jobs and manage themxx
Comment[zh_CN]=显示和管理打印任务
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.1/print-manager-kded/NewPrinterNotification.cpp
new/print-manager-4.10.2/print-manager-kded/NewPrinterNotification.cpp
--- old/print-manager-4.10.1/print-manager-kded/NewPrinterNotification.cpp
2013-03-01 08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/print-manager-kded/NewPrinterNotification.cpp
2013-03-29 08:05:57.000000000 +0100
@@ -130,9 +130,12 @@
attr << KCUPS_PRINTER_MAKE_AND_MODEL;
// Get the new printer attributes
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
request->getPrinterAttributes(name, false, attr);
request->waitTillFinished();
+ if (!request) {
+ return;
+ }
QString driver;
// Get the new printer driver
@@ -146,6 +149,9 @@
request = new KCupsRequest;
request->getPrinterPPD(name);
request->waitTillFinished();
+ if (!request) {
+ return;
+ }
ppdFileName = request->printerPPD();
request->deleteLater();
@@ -238,10 +244,12 @@
void NewPrinterNotification::printTestPage()
{
kDebug();
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
request->printTestPage(sender()->property(PRINTER_NAME).toString(), false);
request->waitTillFinished();
- request->deleteLater();
+ if (request) {
+ request->deleteLater();
+ }
}
void NewPrinterNotification::findDriver()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.1/print-manager-kded/printmanager.desktop
new/print-manager-4.10.2/print-manager-kded/printmanager.desktop
--- old/print-manager-4.10.1/print-manager-kded/printmanager.desktop
2013-03-01 08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/print-manager-kded/printmanager.desktop
2013-03-29 08:05:57.000000000 +0100
@@ -41,6 +41,7 @@
Name[sr@ijekavianlatin]=Menadžer štampanja
Name[sr@latin]=Menadžer štampanja
Name[sv]=Utskriftshanterare
+Name[tr]=Yazdırma Yöneticisi
Name[uk]=Керування друком
Name[x-test]=xxPrint Managerxx
Name[zh_CN]=打印机管理器
@@ -78,6 +79,7 @@
Comment[sr@ijekavianlatin]=Obaveštava kada se otkrije novi štampač i ispisuje
probleme
Comment[sr@latin]=Obaveštava kada se otkrije novi štampač i ispisuje probleme
Comment[sv]=Informera om när en ny skrivare detekteras, och om utskriftsproblem
+Comment[tr]=Yeni bir yazıcı algılandığında ve yazdırma sorunlarında bilgilendir
Comment[uk]=Повідомлення щодо виявлення принтера та щодо проблем з принтером
Comment[x-test]=xxInform when a new printer is detected, and print problemsxx
Comment[zh_CN]=提示新检测到的打印机，并显示存在打问题
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.1/print-manager-kded/printmanager.notifyrc
new/print-manager-4.10.2/print-manager-kded/printmanager.notifyrc
--- old/print-manager-4.10.1/print-manager-kded/printmanager.notifyrc
2013-03-01 08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/print-manager-kded/printmanager.notifyrc
2013-03-29 08:05:57.000000000 +0100
@@ -35,6 +35,7 @@
Name[sr@ijekavianlatin]=Menadžer štampanja
Name[sr@latin]=Menadžer štampanja
Name[sv]=Utskriftshanterare
+Name[tr]=printmanager
Name[uk]=керування друком
Name[x-test]=xxprintmanagerxx
Name[zh_CN]=打印管理器
@@ -72,6 +73,7 @@
Comment[sr@ijekavianlatin]=Obaveštava kada se doda novi štampač
Comment[sr@latin]=Obaveštava kada se doda novi štampač
Comment[sv]=Underrättar om när en ny skrivare detekteras
+Comment[tr]=Yeni bir yazıcı tespit edildiğinde bildirir
Comment[uk]=Сповіщає про виявлення нового принтера
Comment[x-test]=xxNotifies when a new printer is detectedxx
Comment[zh_CN]=提示新检测到的打印机
@@ -112,6 +114,7 @@
Name[sr@ijekavianlatin]=Otkriven je novi štampač
Name[sr@latin]=Otkriven je novi štampač
Name[sv]=En ny skrivare detekterades
+Name[tr]=Yeni Bir Yazıcı tespit edildi
Name[uk]=Виявлено новий принтер
Name[x-test]=xxA New Printer was detectedxx
Name[zh_CN]=检测到一个新的打印机
@@ -153,6 +156,7 @@
Name[sr@ijekavianlatin]=Dodat je novi štampač
Name[sr@latin]=Dodat je novi štampač
Name[sv]=Den nya skrivaren har lagts till
+Name[tr]=Yeni Yazıcı eklendi
Name[uk]=Додано новий принтер
Name[x-test]=xxThe New Printer was addedxx
Name[zh_CN]=添加了新打印机
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.1/printer-manager-kcm/PrintKCM.cpp
new/print-manager-4.10.2/printer-manager-kcm/PrintKCM.cpp
--- old/print-manager-4.10.1/printer-manager-kcm/PrintKCM.cpp 2013-03-01
08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/printer-manager-kcm/PrintKCM.cpp 2013-03-29
08:05:57.000000000 +0100
@@ -298,10 +298,12 @@
}
resp = KMessageBox::warningYesNo(this, msg, title);
if (resp == KMessageBox::Yes) {
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
request->deletePrinter(index.data(PrinterModel::DestName).toString());
request->waitTillFinished();
- request->deleteLater();
+ if (request) {
+ request->deleteLater();
+ }
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.1/printer-manager-kcm/PrinterDescription.cpp
new/print-manager-4.10.2/printer-manager-kcm/PrinterDescription.cpp
--- old/print-manager-4.10.1/printer-manager-kcm/PrinterDescription.cpp
2013-03-01 08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/printer-manager-kcm/PrinterDescription.cpp
2013-03-29 08:05:57.000000000 +0100
@@ -91,28 +91,32 @@
void PrinterDescription::on_defaultCB_clicked()
{
bool isDefault = ui->defaultCB->isChecked();
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
request->setDefaultPrinter(m_destName);
request->waitTillFinished();
- setIsDefault(request->hasError() ? !isDefault : isDefault);
- request->deleteLater();
+ if (request) {
+ setIsDefault(request->hasError() ? !isDefault : isDefault);
+ request->deleteLater();
+ }
}
void PrinterDescription::on_sharedCB_clicked()
{
bool shared = ui->sharedCB->isChecked();
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
request->setShared(m_destName, m_isClass, shared);
request->waitTillFinished();
- setIsShared(request->hasError() ? !shared : shared);
- request->deleteLater();
+ if (request) {
+ setIsShared(request->hasError() ? !shared : shared);
+ request->deleteLater();
+ }
}
void PrinterDescription::on_rejectPrintJobsCB_clicked()
{
bool accepting = !ui->rejectPrintJobsCB->isChecked();
kDebug() << accepting;
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
if (accepting) {
request->acceptJobs(m_destName);
} else {
@@ -120,8 +124,10 @@
}
request->waitTillFinished();
- setAcceptingJobs(request->hasError() ? !accepting : accepting);
- request->deleteLater();
+ if (request) {
+ setAcceptingJobs(request->hasError() ? !accepting : accepting);
+ request->deleteLater();
+ }
}
void PrinterDescription::setPrinterIcon(const QIcon &icon)
@@ -239,28 +245,34 @@
Q_UNUSED(checked)
// TODO Show a msg box if failed
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
request->printTestPage(m_destName, m_isClass);
request->waitTillFinished();
- request->deleteLater();
+ if (request) {
+ request->deleteLater();
+ }
}
void PrinterDescription::on_actionCleanPrintHeads_triggered(bool checked)
{
Q_UNUSED(checked)
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
request->printCommand(m_destName, "Clean all", i18n("Clean Print Heads"));
request->waitTillFinished();
- request->deleteLater();
+ if (request) {
+ request->deleteLater();
+ }
}
void PrinterDescription::on_actionPrintSelfTestPage_triggered(bool checked)
{
Q_UNUSED(checked)
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
request->printCommand(m_destName, "PrintSelfTestPage", i18n("Print
Self-Test Page"));
request->waitTillFinished();
- request->deleteLater();
+ if (request) {
+ request->deleteLater();
+ }
}
QString PrinterDescription::destName() const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.1/printer-manager-kcm/kcm_printer_manager.desktop
new/print-manager-4.10.2/printer-manager-kcm/kcm_printer_manager.desktop
--- old/print-manager-4.10.1/printer-manager-kcm/kcm_printer_manager.desktop
2013-03-01 08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/printer-manager-kcm/kcm_printer_manager.desktop
2013-03-29 08:05:57.000000000 +0100
@@ -4,7 +4,7 @@
Exec=kcmshell4 kcm_printer_manager
X-KDE-Library=kcm_printer_manager
-X-KDE-ServiceTypes=KCModule,KCModuleInit
+X-KDE-ServiceTypes=KCModule
X-KDE-System-Settings-Parent-Category=hardware
X-KDE-System-Settings-Parent-Category-V2=hardware
X-KDE-ParentApp=kcontrol
@@ -92,6 +92,7 @@
Comment[sr@ijekavianlatin]=Podesite štampače
Comment[sr@latin]=Podesite štampače
Comment[sv]=Anpassa skrivare
+Comment[tr]=Yazıcılarınızı yapılandırın
Comment[uk]=Налаштування ваших принтерів
Comment[x-test]=xxConfigure your printersxx
Comment[zh_CN]=配置打印机
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.1/printqueue/PrintQueueInterface.cpp
new/print-manager-4.10.2/printqueue/PrintQueueInterface.cpp
--- old/print-manager-4.10.1/printqueue/PrintQueueInterface.cpp 2013-03-01
08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/printqueue/PrintQueueInterface.cpp 2013-03-29
08:05:57.000000000 +0100
@@ -62,9 +62,12 @@
attr << KCUPS_PRINTER_NAME;
attr << KCUPS_PRINTER_TYPE;
// Get destinations with these attributes
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
request->getPrinters(attr);
request->waitTillFinished();
+ if (!request) {
+ return;
+ }
bool found = false;
KCupsPrinter printer;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/print-manager-4.10.1/printqueue/PrintQueueModel.cpp
new/print-manager-4.10.2/printqueue/PrintQueueModel.cpp
--- old/print-manager-4.10.1/printqueue/PrintQueueModel.cpp 2013-03-01
08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/printqueue/PrintQueueModel.cpp 2013-03-29
08:05:57.000000000 +0100
@@ -26,6 +26,8 @@
#include <QDateTime>
#include <QMimeData>
+#include <QPointer>
+
#include <KUser>
#include <KDebug>
#include <KLocale>
@@ -394,21 +396,22 @@
continue;
}
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
request->moveJob(fromDestName, jobId, m_destName);
request->waitTillFinished();
- request->deleteLater(); // TODO can it be deleted here?
- if (request->hasError()) {
- // failed to move one job
- // we return here to avoid more password tries
- KMessageBox::detailedSorryWId(m_parentId,
- i18n("Failed to move '%1' to '%2'",
- displayName, m_destName),
- request->errorMsg(),
- i18n("Failed"));
- return false;
+ if (request) {
+ if (request->hasError()) {
+ // failed to move one job
+ // we return here to avoid more password tries
+ KMessageBox::detailedSorryWId(m_parentId,
+ i18n("Failed to move '%1' to
'%2'",
+ displayName, m_destName),
+ request->errorMsg(),
+ i18n("Failed"));
+ }
+ request->deleteLater();
+ ret = !request->hasError();
}
- ret = true;
}
return ret;
}
@@ -481,6 +484,7 @@
void PrintQueueModel::setWhichJobs(int whichjobs)
{
m_whichjobs = whichjobs;
+ getJobs();
}
Qt::ItemFlags PrintQueueModel::flags(const QModelIndex &index) const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/print-manager-4.10.1/printqueue/PrintQueueUi.cpp
new/print-manager-4.10.2/printqueue/PrintQueueUi.cpp
--- old/print-manager-4.10.1/printqueue/PrintQueueUi.cpp 2013-03-01
08:06:22.000000000 +0100
+++ new/print-manager-4.10.2/printqueue/PrintQueueUi.cpp 2013-03-29
08:05:57.000000000 +0100
@@ -301,12 +301,15 @@
QMenu *moveToMenu = new QMenu(i18n("Move to"), this);
// get printers we can move to
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
QStringList attr;
attr << KCUPS_PRINTER_NAME;
attr << KCUPS_PRINTER_INFO;
request->getPrinters(attr);
request->waitTillFinished();
+ if (!request) {
+ return;
+ }
KCupsPrinters printers = request->printers();
request->deleteLater();
@@ -519,7 +522,7 @@
void PrintQueueUi::pausePrinter()
{
// STOP and RESUME printer
- KCupsRequest *request = new KCupsRequest;
+ QPointer<KCupsRequest> request = new KCupsRequest;
if (m_printerPaused) {
kDebug() << m_destName << "m_printerPaused";
request->resumePrinter(m_destName);
@@ -528,7 +531,9 @@
request->pausePrinter(m_destName);
}
request->waitTillFinished();
- request->deleteLater();
+ if (request) {
+ request->deleteLater();
+ }
}
void PrintQueueUi::configurePrinter()
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
