Merge remote-tracking branch 'debian/debian/master' into ubuntu/master

1 files changed, 11 insertions, 11 deletions

diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 4765891f..e6b80752 100644
--- a/debian/patches/Force-online-state-with-unmanaged-devices.patch
+++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch
@@ -12,7 +12,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
  1 file changed, 115 insertions(+)
 
 diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
-index 6c73d23..9a73a16 100644
+index 5215369..462b887 100644
 --- a/src/core/nm-manager.c
 +++ b/src/core/nm-manager.c
 @@ -51,6 +51,8 @@
@@ -24,7 +24,7 @@ index 6c73d23..9a73a16 100644
  /*****************************************************************************/
  
  typedef struct {
-@@ -186,6 +188,10 @@ typedef struct {
+@@ -191,6 +193,10 @@ typedef struct {
      GFileMonitor *fw_monitor;
      guint         fw_changed_id;
  
@@ -35,7 +35,7 @@ index 6c73d23..9a73a16 100644
      guint timestamp_update_id;
  
      guint devices_inited_id;
-@@ -1477,6 +1483,27 @@ find_best_device_state(NMManager *manager)
+@@ -1491,6 +1497,27 @@ find_best_device_state(NMManager *manager)
      return best_state;
  }
  
@@ -63,7 +63,7 @@ index 6c73d23..9a73a16 100644
  static void
  nm_manager_update_metered(NMManager *self)
  {
-@@ -1523,6 +1550,9 @@ nm_manager_update_state(NMManager *self)
+@@ -1537,6 +1564,9 @@ nm_manager_update_state(NMManager *self)
      else
          new_state = find_best_device_state(self);
  
@@ -73,7 +73,7 @@ index 6c73d23..9a73a16 100644
      if (new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
          new_state = NM_STATE_CONNECTED_GLOBAL;
      }
-@@ -6673,6 +6703,62 @@ impl_manager_get_logging(NMDBusObject                      *obj,
+@@ -6872,6 +6902,62 @@ impl_manager_get_logging(NMDBusObject                      *obj,
          g_variant_new("(ss)", nm_logging_level_to_string(), nm_logging_domains_to_string()));
  }
  
@@ -136,7 +136,7 @@ index 6c73d23..9a73a16 100644
  typedef struct {
      NMManager             *self;
      GDBusMethodInvocation *context;
-@@ -6987,6 +7073,9 @@ nm_manager_start(NMManager *self, GError **error)
+@@ -7182,6 +7268,9 @@ nm_manager_start(NMManager *self, GError **error)
      nm_clear_g_source(&priv->devices_inited_id);
      priv->devices_inited_id = g_idle_add_full(G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL);
  
@@ -146,7 +146,7 @@ index 6c73d23..9a73a16 100644
      return TRUE;
  }
  
-@@ -7984,6 +8073,22 @@ nm_manager_init(NMManager *self)
+@@ -8035,6 +8124,22 @@ nm_manager_init(NMManager *self)
          _LOGW(LOGD_CORE, "failed to monitor kernel firmware directory '%s'.", KERNEL_FIRMWARE_DIR);
      }
  
@@ -166,10 +166,10 @@ index 6c73d23..9a73a16 100644
 +                    IFUPDOWN_STATE_FILE);
 +    }
 +
-     /* Update timestamps in active connections */
-     priv->timestamp_update_id =
-         g_timeout_add_seconds(300,
-@@ -8269,6 +8374,16 @@ dispose(GObject *object)
+     priv->metered       = NM_METERED_UNKNOWN;
+     priv->sleep_devices = g_hash_table_new(nm_direct_hash, NULL);
+ }
+@@ -8317,6 +8422,16 @@ dispose(GObject *object)
          g_clear_object(&priv->fw_monitor);
      }