From cad52f1568298c1a91e58b54ae88e2f6b09cef86 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 9 Feb 2013 03:24:21 +0100 Subject: Refresh patch --- .../patches/05-force-online-with-unmanaged-devices.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/patches/05-force-online-with-unmanaged-devices.patch b/debian/patches/05-force-online-with-unmanaged-devices.patch index c542457e..dbb3d5dd 100644 --- a/debian/patches/05-force-online-with-unmanaged-devices.patch +++ b/debian/patches/05-force-online-with-unmanaged-devices.patch @@ -6,8 +6,8 @@ Author: Michael Biebl Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 Index: network-manager/src/nm-manager.c =================================================================== ---- network-manager.orig/src/nm-manager.c 2013-01-29 20:15:17.955873772 +0100 -+++ network-manager/src/nm-manager.c 2013-01-29 20:15:17.951873729 +0100 +--- network-manager.orig/src/nm-manager.c 2013-02-09 03:23:39.166501824 +0100 ++++ network-manager/src/nm-manager.c 2013-02-09 03:23:39.158501727 +0100 @@ -80,6 +80,8 @@ #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd" #define NM_AUTOIP_DBUS_IFACE "org.freedesktop.nm_avahi_autoipd" @@ -17,7 +17,7 @@ Index: network-manager/src/nm-manager.c static gboolean impl_manager_get_devices (NMManager *manager, GPtrArray **devices, GError **err); -@@ -242,6 +244,11 @@ +@@ -244,6 +246,11 @@ guint fw_monitor_id; guint fw_changed_id; @@ -28,8 +28,8 @@ Index: network-manager/src/nm-manager.c + guint timestamp_update_id; - gboolean disposed; -@@ -533,6 +540,14 @@ + GHashTable *nm_bridges; +@@ -537,6 +544,14 @@ break; } @@ -44,7 +44,7 @@ Index: network-manager/src/nm-manager.c if (nm_device_is_activating (dev)) new_state = NM_STATE_CONNECTING; else if (new_state != NM_STATE_CONNECTING) { -@@ -3717,6 +3732,65 @@ +@@ -3859,6 +3874,65 @@ } } @@ -110,7 +110,7 @@ Index: network-manager/src/nm-manager.c #define NM_PERM_DENIED_ERROR "org.freedesktop.NetworkManager.PermissionDenied" #define DEV_PERM_DENIED_ERROR "org.freedesktop.NetworkManager.Device.PermissionDenied" -@@ -4115,6 +4189,17 @@ +@@ -4267,6 +4341,17 @@ g_object_unref (priv->fw_monitor); } @@ -128,7 +128,7 @@ Index: network-manager/src/nm-manager.c g_slist_free (priv->factories); if (priv->timestamp_update_id) { -@@ -4443,6 +4528,23 @@ +@@ -4595,6 +4680,23 @@ KERNEL_FIRMWARE_DIR); } -- cgit 1.3.0-6-gf8a5