[Pkg-utopia-commits] r2736 - in /packages/unstable/knetworkmanager/debian: changelog patches/07-indicate_manual_config.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jan 14 07:22:06 2009
New Revision: 2736

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2736
Log:
* debian/patches/07-indicate_manual_config.patch
  - manual-means-online: If there are interfaces that are not managed by
    NetworkManager because they have custom configuration in
    /etc/network/interfaces, we assume to be online and show a wired network
    icon indicating manual network configuration.

Added:
    packages/unstable/knetworkmanager/debian/patches/07-indicate_manual_config.patch
Modified:
    packages/unstable/knetworkmanager/debian/changelog

Modified: packages/unstable/knetworkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/changelog?rev=2736&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/changelog (original)
+++ packages/unstable/knetworkmanager/debian/changelog Wed Jan 14 07:22:06 2009
@@ -1,5 +1,10 @@
 knetworkmanager (1:0.2.2-2) UNRELEASED; urgency=low
 
+  * debian/patches/07-indicate_manual_config.patch
+    - manual-means-online: If there are interfaces that are not managed by
+      NetworkManager because they have custom configuration in
+      /etc/network/interfaces, we assume to be online and show a wired network
+      icon indicating manual network configuration.
   * debian/control
     - Add Build-Depends on pkg-config.
 

Added: packages/unstable/knetworkmanager/debian/patches/07-indicate_manual_config.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/patches/07-indicate_manual_config.patch?rev=2736&op=file
==============================================================================
--- packages/unstable/knetworkmanager/debian/patches/07-indicate_manual_config.patch (added)
+++ packages/unstable/knetworkmanager/debian/patches/07-indicate_manual_config.patch Wed Jan 14 07:22:06 2009
@@ -1,0 +1,36 @@
+diff -Nur -x '*.orig' -x '*~' knetworkmanager-0.2.2/knetworkmanager/src/knetworkmanager-tray.cpp knetworkmanager-0.2.2.new/knetworkmanager/src/knetworkmanager-tray.cpp
+--- knetworkmanager-0.2.2/knetworkmanager/src/knetworkmanager-tray.cpp	2008-04-06 14:59:40.000000000 +0200
++++ knetworkmanager-0.2.2.new/knetworkmanager/src/knetworkmanager-tray.cpp	2008-04-06 15:00:04.000000000 +0200
+@@ -200,6 +200,8 @@
+ 					if (net)
+ 						_tooltip += ": " + net->getEssid () + " (" + dev->getInterface () + ")";
+ 				}
++			} else {
++				_tooltip = i18n ("Manual network configuration");
+ 			}
+ 		} else if (state->isDialupActive ()) {
+ 			_tooltip = i18n ("Dial-Up Network"); 
+@@ -761,7 +763,7 @@
+ 		}
+ 
+ 		/* if we don't have any network devices make this clear */
+-		if (!devicesFound) {
++		if (!state->isConnected() && !devicesFound) {
+ 			QLabel* noDeviceFound = new QLabel (i18n ("No network device found."), 0);
+ 			noDeviceFound->setAlignment (Qt::AlignHCenter | Qt::AlignVCenter);
+ 			contextMenu ()->insertItem (noDeviceFound);
+@@ -926,9 +928,11 @@
+ 	{
+ 		case NM_STATE_CONNECTED:
+ 			//FIXME: correct connected icon
+-			if ( !dev )
+-				pixmap = m_disconnected;
+-			else if ( dev->isWireless( ) )
++			if ( !dev ) {
++				//if it's reported as connected and there's no device it means /etc/network/interfaces is being used
++				//show a wired icon and tooltip as Manual Config
++				pixmap = m_wired;
++			} else if ( dev->isWireless( ) )
+ 			{
+ 				int strength;
+ 				Network* net = _ctx->getDeviceStore()->getActiveNetwork (dev);