/[gentoo-x86]/net-misc/networkmanager/files/networkmanager-0.8.2-fix-shutdown.patch
Gentoo

Contents of /net-misc/networkmanager/files/networkmanager-0.8.2-fix-shutdown.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Tue Aug 23 23:17:09 2011 UTC (2 years, 7 months ago) by nirbheek
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Bump for the 0.9.0 release, go forth and test. Also, remove old ebuilds and unused patches.

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

1 diff --git a/src/nm-manager.c b/src/nm-manager.c
2 index afcc6ad..9bd5354 100644
3 --- a/src/nm-manager.c
4 +++ b/src/nm-manager.c
5 @@ -4364,10 +4364,11 @@ dispose (GObject *object)
6
7 /* Unregister property filter */
8 bus = nm_dbus_manager_get_connection (priv->dbus_mgr);
9 - g_assert (bus);
10 - dbus_connection = dbus_g_connection_get_connection (bus);
11 - g_assert (dbus_connection);
12 - dbus_connection_remove_filter (dbus_connection, prop_filter, manager);
13 + if (bus) {
14 + dbus_connection = dbus_g_connection_get_connection (bus);
15 + g_assert (dbus_connection);
16 + dbus_connection_remove_filter (dbus_connection, prop_filter, manager);
17 + }
18 g_object_unref (priv->dbus_mgr);
19
20 if (priv->bluez_mgr)
21 --
22 cgit v0.8.3-6-g21f6
23
24 diff --git a/src/nm-policy.c b/src/nm-policy.c
25 index b5c2129..5355703 100644
26 --- a/src/nm-policy.c
27 +++ b/src/nm-policy.c
28 @@ -1222,15 +1222,6 @@ nm_policy_destroy (NMPolicy *policy)
29 }
30 g_slist_free (policy->dev_signal_ids);
31
32 - /* Rewrite /etc/hosts on exit to ensure we don't leave stale IP addresses
33 - * lying around. FIXME: this will take out a valid IP address of an
34 - * ethernet device we're leaving active (ie, a connection we can "assume"
35 - * when NM starts again).
36 - */
37 - policy->default_device4 = NULL;
38 - policy->default_device6 = NULL;
39 - update_system_hostname (policy, NULL, NULL);
40 -
41 g_free (policy->orig_hostname);
42 g_free (policy->cur_hostname);
43
44 --
45 cgit v0.8.3-6-g21f6

  ViewVC Help
Powered by ViewVC 1.1.20