rev 20231 - in kde-extras/kvpnc/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2016-01-07 21:29:47 +0000 (Thu, 07 Jan 2016)
New Revision: 20231

Added:
   kde-extras/kvpnc/trunk/debian/patches/r1180094.diff
Modified:
   kde-extras/kvpnc/trunk/debian/changelog
   kde-extras/kvpnc/trunk/debian/patches/series
Log:
fix the loading of network status icons (#599094)

backport upstream r1180094


Modified: kde-extras/kvpnc/trunk/debian/changelog
===================================================================
--- kde-extras/kvpnc/trunk/debian/changelog	2016-01-07 21:07:03 UTC (rev 20230)
+++ kde-extras/kvpnc/trunk/debian/changelog	2016-01-07 21:29:47 UTC (rev 20231)
@@ -8,6 +8,8 @@
     and proper debug symbols can be extracted. (Closes: #782626)
     - bump the debhelper build-dependency to >= 9
   * Improve the descriptions of the packages. (Closes: #627465)
+  * Backport upstream r1180094 to fix the loading of network status icons;
+    patch r1180094.diff. (Closes: #599094)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Thu, 07 Jan 2016 21:46:52 +0100
 

Added: kde-extras/kvpnc/trunk/debian/patches/r1180094.diff
===================================================================
--- kde-extras/kvpnc/trunk/debian/patches/r1180094.diff	                        (rev 0)
+++ kde-extras/kvpnc/trunk/debian/patches/r1180094.diff	2016-01-07 21:29:47 UTC (rev 20231)
@@ -0,0 +1,59 @@
+Author: Christoph Feck <cfeck at kde.org>
+Description: Use KIcon to set window icons
+Bug: https://bugs.kde.org/show_bug.cgi?id=246016
+Bug-Debian: https://bugs.debian.org/599094
+Applied-Upstream: commit:1180094
+
+--- a/src/kvpnc.cpp
++++ b/src/kvpnc.cpp
+@@ -320,10 +320,7 @@ KVpnc::~KVpnc()
+ 
+ void KVpnc::initAction()
+ {
+-    disconnectedIcon = KIconLoader::global()->loadIcon("disconnected", KIconLoader::NoGroup);
+-    connectedIcon = KIconLoader::global()->loadIcon("connected", KIconLoader::NoGroup);
+-    connectingIcon = KIconLoader::global()->loadIcon("connecting" , KIconLoader::NoGroup);
+-    setWindowIcon(disconnectedIcon);
++    setWindowIcon(KIcon("disconnected"));
+ 
+     (void*) KStandardAction::quit(this, SLOT(quitCalled()), actionCollection());
+ 
+@@ -17449,7 +17446,7 @@ void KVpnc::setGuiStatus(int status)
+ 	QString ConnectionStatus = i18n("unknown");
+ 	QString Username = "";
+ 	if (status == KVpncEnum::connected) {
+-        setWindowIcon(connectedIcon);
++        setWindowIcon(KIcon("connected"));
+ 
+         durationString = (i18n("%1:%2:%3" , QString().sprintf("%02u", hour) , QString().sprintf("%02u", min) , QString().sprintf("%02u", sec)));
+         QString ConnectMsg = "";
+@@ -17502,7 +17499,7 @@ void KVpnc::setGuiStatus(int status)
+ 
+     }
+     else if (status == KVpncEnum::connecting) {
+-        setWindowIcon(connectingIcon);
++        setWindowIcon(KIcon("connecting"));
+         mw->buttonConnect->setEnabled(false);
+         mw->buttonDisconnect->setEnabled(true);
+         mw->SessionCombo->setEnabled(false);
+@@ -17531,7 +17528,7 @@ void KVpnc::setGuiStatus(int status)
+         connectClicked();
+ 
+ 	} else if (status == KVpncEnum::disconnected) {
+-        setWindowIcon(disconnectedIcon);
++        setWindowIcon(KIcon("disconnected"));
+         mw->buttonConnect->setEnabled(true);
+         mw->buttonDisconnect->setEnabled(false);
+         DisconnectAction->setEnabled(false);
+--- a/src/kvpnc.h
++++ b/src/kvpnc.h
+@@ -286,9 +286,6 @@ private:
+ 
+     int TimeOutProcess; //< for timeout
+     int ConnectingProcess; //< for killing process
+-    QPixmap connectedIcon;
+-    QPixmap disconnectedIcon;
+-    QPixmap connectingIcon;
+     QPixmap connectingStatusPixmap;
+     QPixmap disconnectedStatusPixmap;
+     QPixmap connectedStatusPixmap;

Modified: kde-extras/kvpnc/trunk/debian/patches/series
===================================================================
--- kde-extras/kvpnc/trunk/debian/patches/series	2016-01-07 21:07:03 UTC (rev 20230)
+++ kde-extras/kvpnc/trunk/debian/patches/series	2016-01-07 21:29:47 UTC (rev 20231)
@@ -1,2 +1,3 @@
 10_su-to-root_usage.diff
 fix-ftbfs-gcc-4.7-667233.patch
+r1180094.diff