[Pkg-utopia-commits] r2738 - in /packages/unstable/network-manager-applet/debian: changelog patches/08-manual_means_always_online.patch patches/09-fix_assertion_because_of_unmanaged_devices.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed Jan 14 07:44:31 UTC 2009
Author: biebl
Date: Wed Jan 14 07:44:31 2009
New Revision: 2738
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2738
Log:
* debian/patches/08-manual_means_always_online.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/patches/09-fix_assertion_because_of_unmanaged_devices.patch
- Fix assertion failures for unmanaged devices.
Added:
packages/unstable/network-manager-applet/debian/patches/08-manual_means_always_online.patch
packages/unstable/network-manager-applet/debian/patches/09-fix_assertion_because_of_unmanaged_devices.patch
Modified:
packages/unstable/network-manager-applet/debian/changelog
Modified: packages/unstable/network-manager-applet/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-applet/debian/changelog?rev=2738&op=diff
==============================================================================
--- packages/unstable/network-manager-applet/debian/changelog (original)
+++ packages/unstable/network-manager-applet/debian/changelog Wed Jan 14 07:44:31 2009
@@ -1,3 +1,15 @@
+network-manager-applet (0.6.6-4) UNRELEASED; urgency=low
+
+ * debian/patches/08-manual_means_always_online.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/patches/09-fix_assertion_because_of_unmanaged_devices.patch
+ - Fix assertion failures for unmanaged devices.
+
+ -- Michael Biebl <biebl at debian.org> Fri, 05 Dec 2008 20:24:48 +0100
+
network-manager-applet (0.6.6-3) unstable; urgency=low
* debian/patches/04-autostart.patch
Added: packages/unstable/network-manager-applet/debian/patches/08-manual_means_always_online.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-applet/debian/patches/08-manual_means_always_online.patch?rev=2738&op=file
==============================================================================
--- packages/unstable/network-manager-applet/debian/patches/08-manual_means_always_online.patch (added)
+++ packages/unstable/network-manager-applet/debian/patches/08-manual_means_always_online.patch Wed Jan 14 07:44:31 2009
@@ -1,0 +1,51 @@
+---
+ src/applet.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+Index: network-manager-applet-0.6.6~rc2/src/applet.c
+===================================================================
+--- network-manager-applet-0.6.6~rc2.orig/src/applet.c
++++ network-manager-applet-0.6.6~rc2/src/applet.c
+@@ -857,19 +857,18 @@
+
+
+ static GdkPixbuf *nma_get_connected_icon (NMApplet *applet, NetworkDevice *dev)
+ {
+ int strength = 0;
+ GdkPixbuf *pixbuf = NULL;
+
+ g_return_val_if_fail (applet != NULL, NULL);
+- g_return_val_if_fail (dev != NULL, NULL);
+
+- if (network_device_is_wireless (dev))
++ if (dev && network_device_is_wireless (dev))
+ {
+ if (applet->is_adhoc)
+ pixbuf = applet->adhoc_icon;
+ else
+ {
+ strength = CLAMP ((int)network_device_get_strength (dev), 0, 100);
+ if (strength > 80)
+ pixbuf = applet->wireless_100_icon;
+@@ -1092,17 +1091,20 @@
+ break;
+
+ case NM_STATE_DISCONNECTED:
+ pixbuf = applet->no_connection_icon;
+ tip = g_strdup (_("No network connection"));
+ break;
+
+ case NM_STATE_CONNECTED:
+- if (network_device_is_wired (act_dev)) {
++ if (! act_dev)
++ tip = g_strdup (_("Manual network configuration"));
++ else if (network_device_is_wired (act_dev))
++ {
+ const char *str_addr = network_device_get_ip4_address (act_dev);
+
+ if (str_addr && !strncmp (str_addr, LL_ADDR_PREFIX, strlen (LL_ADDR_PREFIX)))
+ tip = g_strdup (_("Wired network connection with a self-assigned address"));
+ else
+ tip = g_strdup (_("Wired network connection"));
+ } else if (network_device_is_wireless (act_dev)) {
+ if (applet->is_adhoc)
Added: packages/unstable/network-manager-applet/debian/patches/09-fix_assertion_because_of_unmanaged_devices.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-applet/debian/patches/09-fix_assertion_because_of_unmanaged_devices.patch?rev=2738&op=file
==============================================================================
--- packages/unstable/network-manager-applet/debian/patches/09-fix_assertion_because_of_unmanaged_devices.patch (added)
+++ packages/unstable/network-manager-applet/debian/patches/09-fix_assertion_because_of_unmanaged_devices.patch Wed Jan 14 07:44:31 2009
@@ -1,0 +1,59 @@
+---
+ src/applet.c | 4 +++-
+ src/nm-device.c | 2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+Index: network-manager-applet-0.6.6/src/applet.c
+===================================================================
+--- network-manager-applet-0.6.6.orig/src/applet.c
++++ network-manager-applet-0.6.6/src/applet.c
+@@ -903,23 +903,25 @@
+ pixbuf = applet->wireless_75_icon;
+ else if (strength > 30)
+ pixbuf = applet->wireless_50_icon;
+ else if (strength > 5)
+ pixbuf = applet->wireless_25_icon;
+ else
+ pixbuf = applet->wireless_00_icon;
+ }
+- } else {
++ } else if (dev) {
+ const char *str_addr = network_device_get_ip4_address (dev);
+
+ if (str_addr && !strncmp (str_addr, LL_ADDR_PREFIX, strlen (LL_ADDR_PREFIX)))
+ pixbuf = applet->wired_autoip_icon;
+ else
+ pixbuf = applet->wired_icon;
++ } else {
++ pixbuf = applet->wired_icon;
+ }
+
+ return pixbuf;
+ }
+
+
+ static GdkPixbuf * nma_act_stage_to_pixbuf (NMApplet *applet, NetworkDevice *dev, WirelessNetwork *net, char **tip)
+ {
+Index: network-manager-applet-0.6.6/src/nm-device.c
+===================================================================
+--- network-manager-applet-0.6.6.orig/src/nm-device.c
++++ network-manager-applet-0.6.6/src/nm-device.c
+@@ -513,17 +513,17 @@
+ {
+ g_return_val_if_fail (dev != NULL, NULL);
+
+ return (dev->ip4addr);
+ }
+
+ void network_device_set_ip4_address (NetworkDevice *dev, const char *addr)
+ {
+- g_return_if_fail (dev != NULL);
++ if (!dev) return;
+
+ if (dev->ip4addr)
+ g_free (dev->ip4addr);
+ dev->ip4addr = addr ? g_strdup (addr) : NULL;
+ }
+
+ /*
+ * Accessors for default route
More information about the Pkg-utopia-commits
mailing list