~ubuntu-branches/ubuntu/precise/network-manager/precise

« back to all changes in this revision

Viewing changes to debian/patches/avoid-periodic-disk-wakeups.patch

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-02-09 16:45:41 UTC
  • mfrom: (1.1.53)
  • Revision ID: package-import@ubuntu.com-20120209164541-4h90zknlsfdb7x35
Tags: 0.9.2.0+git201202091925.c721477-0ubuntu1
* upstream snapshot 2012-02-09 19:25:59 (GMT)
  + c721477d11d4fe144111d6d2eec8f93f2e9186c9
* debian/patches/avoid-periodic-disk-wakeups.patch: refreshed.
* debian/patches/nl3-default-ip6-route.patch: refreshed.
* debian/libnm-glib4.symbols: add symbols:
  + nm_active_connection_get_master@Base
  + nm_client_new_async@Base
  + nm_client_new_finish@Base
  + nm_remote_settings_new_async@Base
  + nm_remote_settings_new_finish@Base
  + nm_device_get_state_reason@Base
* debian/libnm-util2.symbols: add symbols:
  + nm_setting_802_1x_get_pac_file@Base
  + nm_setting_infiniband_get_transport_mode@Base

Show diffs side-by-side

added added

removed removed

Lines of Context:
10
10
For VPNs, do just a little more work: update the timestamp also when the
11
11
connection is deactivated.
12
12
 
13
 
Index: network-manager-0.9.2.0+git201112151936.6b31828/src/nm-manager.c
 
13
Index: network-manager-0.9.2.0+git201202060518.95b0b72/src/nm-manager.c
14
14
===================================================================
15
 
--- network-manager-0.9.2.0+git201112151936.6b31828.orig/src/nm-manager.c       2012-01-10 12:57:10.397285730 +0100
16
 
+++ network-manager-0.9.2.0+git201112151936.6b31828/src/nm-manager.c    2012-01-10 12:57:49.121284000 +0100
17
 
@@ -409,6 +409,9 @@
 
15
--- network-manager-0.9.2.0+git201202060518.95b0b72.orig/src/nm-manager.c       2012-02-06 12:45:41.540712506 -0500
 
16
+++ network-manager-0.9.2.0+git201202060518.95b0b72/src/nm-manager.c    2012-02-06 12:52:27.640694401 -0500
 
17
@@ -406,6 +406,9 @@
18
18
                                        NMVPNConnectionStateReason reason,
19
19
                                        gpointer user_data)
20
20
 {
24
24
        g_object_notify (G_OBJECT (user_data), NM_MANAGER_ACTIVE_CONNECTIONS);
25
25
 }
26
26
 
27
 
@@ -3510,39 +3513,6 @@
 
27
@@ -3695,39 +3698,6 @@
28
28
        }
29
29
 }
30
30
 
64
64
 static void
65
65
 nm_manager_init (NMManager *manager)
66
66
 {
67
 
@@ -3661,9 +3631,6 @@
68
 
                nm_log_warn (LOGD_CORE, "failed to monitor kernel firmware directory '%s'.",
69
 
                             KERNEL_FIRMWARE_DIR);
 
67
@@ -3848,9 +3818,6 @@
70
68
        }
 
69
 
 
70
        load_device_factories (manager);
71
71
-
72
72
-       /* Update timestamps in active connections */
73
73
-       priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, manager);