commit kde4-print-manager for openSUSE:Factory
Hello community,
here is the log from the commit of package kde4-print-manager for openSUSE:Factory checked in at 2013-12-19 13:19:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kde4-print-manager (Old)
and /work/SRC/openSUSE:Factory/.kde4-print-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kde4-print-manager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kde4-print-manager/kde4-print-manager.changes 2013-12-11 14:36:47.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kde4-print-manager.new/kde4-print-manager.changes 2013-12-19 13:19:34.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Dec 14 18:33:35 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.12.0
+ * KDE 4.12.0 release
+ * See http://www.kde.org/announcements/4.12.php
+
+-------------------------------------------------------------------
Old:
----
print-manager-4.11.97.tar.xz
New:
----
print-manager-4.12.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kde4-print-manager.spec ++++++
--- /var/tmp/diff_new_pack.W5adJx/_old 2013-12-19 13:19:35.000000000 +0100
+++ /var/tmp/diff_new_pack.W5adJx/_new 2013-12-19 13:19:35.000000000 +0100
@@ -30,7 +30,7 @@
Summary: A new print manager for KDE 4
License: GPL-2.0+
Group: System/GUI/KDE
-Version: 4.11.97
+Version: 4.12.0
Release: 0
Source: print-manager-%{version}.tar.xz
Obsoletes: kde4-printer-applet < 4.9.80
++++++ print-manager-4.11.97.tar.xz -> print-manager-4.12.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-4.11.97/configure-printer/ConfigureDialog.cpp new/print-manager-4.12.0/configure-printer/ConfigureDialog.cpp
--- old/print-manager-4.11.97/configure-printer/ConfigureDialog.cpp 2013-09-08 06:23:10.000000000 +0200
+++ new/print-manager-4.12.0/configure-printer/ConfigureDialog.cpp 2013-12-04 23:52:46.000000000 +0100
@@ -52,7 +52,7 @@
QStringList attr;
KPageWidgetItem *page;
- modifyPrinter = new ModifyPrinter(destName, isClass, true, this);
+ modifyPrinter = new ModifyPrinter(destName, isClass, this);
PrinterBehavior *printerBehavior = new PrinterBehavior(destName, isClass, this);
attr << modifyPrinter->neededValues();
attr << printerBehavior->neededValues();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-4.11.97/configure-printer/ModifyPrinter.cpp new/print-manager-4.12.0/configure-printer/ModifyPrinter.cpp
--- old/print-manager-4.11.97/configure-printer/ModifyPrinter.cpp 2013-09-08 06:23:10.000000000 +0200
+++ new/print-manager-4.12.0/configure-printer/ModifyPrinter.cpp 2013-12-04 23:52:46.000000000 +0100
@@ -32,7 +32,7 @@
#include <KDebug>
-ModifyPrinter::ModifyPrinter(const QString &destName, bool isClass, bool isModify, QWidget *parent) :
+ModifyPrinter::ModifyPrinter(const QString &destName, bool isClass, QWidget *parent) :
PrinterPage(parent),
ui(new Ui::ModifyPrinter),
m_destName(destName),
@@ -41,13 +41,7 @@
{
ui->setupUi(this);
- if (isModify) {
- // we are modifying the printer/class so
- // the user cannot change it.
- ui->nameLE->setText(destName);
- ui->nameLE->setReadOnly(true);
- }
-
+ ui->nameL->setText(destName);
ui->connectionL->setVisible(!isClass);
ui->connectionLE->setVisible(!isClass);
ui->driverL->setVisible(!isClass);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-4.11.97/configure-printer/ModifyPrinter.h new/print-manager-4.12.0/configure-printer/ModifyPrinter.h
--- old/print-manager-4.11.97/configure-printer/ModifyPrinter.h 2013-09-08 06:23:10.000000000 +0200
+++ new/print-manager-4.12.0/configure-printer/ModifyPrinter.h 2013-12-04 23:52:46.000000000 +0100
@@ -43,7 +43,7 @@
PPDList,
PPDName = Qt::UserRole + 1
} Role;
- explicit ModifyPrinter(const QString &destName, bool isClass, bool isModify, QWidget *parent = 0);
+ explicit ModifyPrinter(const QString &destName, bool isClass, QWidget *parent = 0);
~ModifyPrinter();
bool hasChanges();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-4.11.97/configure-printer/ModifyPrinter.ui new/print-manager-4.12.0/configure-printer/ModifyPrinter.ui
--- old/print-manager-4.11.97/configure-printer/ModifyPrinter.ui 2013-09-08 06:23:10.000000000 +0200
+++ new/print-manager-4.12.0/configure-printer/ModifyPrinter.ui 2013-12-04 23:52:46.000000000 +0100
@@ -24,16 +24,6 @@
<property name="text">
<string>Name:</string>
</property>
- <property name="buddy">
- <cstring>nameLE</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="KLineEdit" name="nameLE">
- <property name="toolTip">
- <string>May contain any printable characters except "/", "#", and space</string>
- </property>
</widget>
</item>
<item row="1" column="0">
@@ -150,6 +140,19 @@
</property>
</widget>
</item>
+ <item row="0" column="1">
+ <widget class="QLabel" name="nameL">
+ <property name="text">
+ <string notr="true">name</string>
+ </property>
+ <property name="textFormat">
+ <enum>Qt::PlainText</enum>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>
@@ -172,7 +175,6 @@
</customwidget>
</customwidgets>
<tabstops>
- <tabstop>nameLE</tabstop>
<tabstop>descriptionLE</tabstop>
<tabstop>locationLE</tabstop>
<tabstop>connectionLE</tabstop>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-4.11.97/libkcups/JobModel.cpp new/print-manager-4.12.0/libkcups/JobModel.cpp
--- old/print-manager-4.11.97/libkcups/JobModel.cpp 2013-09-08 06:23:10.000000000 +0200
+++ new/print-manager-4.12.0/libkcups/JobModel.cpp 2013-12-04 23:52:46.000000000 +0100
@@ -541,6 +541,12 @@
KCupsRequest* JobModel::modifyJob(int row, JobAction action, const QString &newDestName, const QModelIndex &parent)
{
Q_UNUSED(parent)
+
+ if (row < 0 || row >= rowCount()) {
+ kWarning() << "Row number is invalid:" << row;
+ return 0;
+ }
+
QStandardItem *job = item(row, ColStatus);
int jobId = job->data(RoleJobId).toInt();
QString destName = job->data(RoleJobPrinter).toString();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-4.11.97/libkcups/KCupsConnection.cpp new/print-manager-4.12.0/libkcups/KCupsConnection.cpp
--- old/print-manager-4.11.97/libkcups/KCupsConnection.cpp 2013-09-08 06:23:10.000000000 +0200
+++ new/print-manager-4.12.0/libkcups/KCupsConnection.cpp 2013-12-04 23:52:46.000000000 +0100
@@ -331,7 +331,7 @@
} while (retry(request.resource().toUtf8(), request.operation()));
if (response && groupTag != IPP_TAG_ZERO) {
- ret = parseIPPVars(response, groupTag, true);
+ ret = parseIPPVars(response, groupTag);
}
ippDelete(response);
@@ -577,14 +577,12 @@
m_subscriptionId = -1;
}
-ReturnArguments KCupsConnection::parseIPPVars(ipp_t *response, ipp_tag_t group_tag, bool needDestName)
+ReturnArguments KCupsConnection::parseIPPVars(ipp_t *response, ipp_tag_t group_tag)
{
ipp_attribute_t *attr;
ReturnArguments ret;
#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
- Q_UNUSED(needDestName)
-
QVariantHash destAttributes;
for (attr = ippFirstAttribute(response); attr != NULL; attr = ippNextAttribute(response)) {
// We hit an attribute sepparator
@@ -655,17 +653,6 @@
destAttributes[QString::fromUtf8(attr->name)] = ippAttrToVariant(attr);
}
- /*
- * See if we have everything needed...
- */
- if (needDestName && destAttributes[QLatin1String(KCUPS_PRINTER_NAME)].toString().isEmpty()) {
- if (attr == NULL) {
- break;
- } else {
- continue;
- }
- }
-
ret << destAttributes;
if (attr == NULL) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-4.11.97/libkcups/KCupsConnection.h new/print-manager-4.12.0/libkcups/KCupsConnection.h
--- old/print-manager-4.11.97/libkcups/KCupsConnection.h 2013-09-08 06:23:10.000000000 +0200
+++ new/print-manager-4.12.0/libkcups/KCupsConnection.h 2013-12-04 23:52:46.000000000 +0100
@@ -385,8 +385,7 @@
void notifierConnect(const QString &signal, QObject *receiver, const char *slot);
static ReturnArguments parseIPPVars(ipp_t *response,
- ipp_tag_t group_tag,
- bool needDestName);
+ ipp_tag_t group_tag);
static QVariant ippAttrToVariant(ipp_attribute_t *attr);
static KCupsConnection* m_instance;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-4.11.97/libkcups/KCupsRequest.cpp new/print-manager-4.12.0/libkcups/KCupsRequest.cpp
--- old/print-manager-4.11.97/libkcups/KCupsRequest.cpp 2013-09-08 06:23:10.000000000 +0200
+++ new/print-manager-4.12.0/libkcups/KCupsRequest.cpp 2013-12-04 23:52:46.000000000 +0100
@@ -168,7 +168,7 @@
void KCupsRequest::getPrinterAttributes(const QString &printerName, bool isClass, QStringList attributes)
{
if (m_connection->readyToStart()) {
- KIppRequest request(IPP_GET_PRINTER_ATTRIBUTES, "/admin/");
+ KIppRequest request(IPP_GET_PRINTER_ATTRIBUTES, "/");
request.addPrinterUri(printerName, isClass);
request.addInteger(IPP_TAG_OPERATION, IPP_TAG_ENUM, KCUPS_PRINTER_TYPE, CUPS_PRINTER_LOCAL);
@@ -226,7 +226,7 @@
void KCupsRequest::getJobAttributes(int jobId, const QString &printerUri, QStringList attributes)
{
if (m_connection->readyToStart()) {
- KIppRequest request(IPP_GET_JOB_ATTRIBUTES, "/admin/");
+ KIppRequest request(IPP_GET_JOB_ATTRIBUTES, "/");
request.addString(IPP_TAG_OPERATION, IPP_TAG_URI, KCUPS_PRINTER_URI, printerUri);
request.addInteger(IPP_TAG_OPERATION, IPP_TAG_ENUM, KCUPS_PRINTER_TYPE, CUPS_PRINTER_LOCAL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-4.11.97/libkcups/PrinterModel.cpp new/print-manager-4.12.0/libkcups/PrinterModel.cpp
--- old/print-manager-4.11.97/libkcups/PrinterModel.cpp 2013-09-08 06:23:10.000000000 +0200
+++ new/print-manager-4.12.0/libkcups/PrinterModel.cpp 2013-12-04 23:52:46.000000000 +0100
@@ -149,57 +149,54 @@
void PrinterModel::getDestsFinished()
{
KCupsRequest *request = qobject_cast
participants (1)
-
root@hilbert.suse.de