Contents of /trunk/networkmanager/patches/networkmanager-0.9.4.0-fix-nmremote-setting.patch
Parent Directory
| 
Revision Log
Revision 1769 -
(show annotations)
(download)
Tue May 8 21:18:24 2012 UTC (11 years, 11 months ago) by niro
File size: 1029 byte(s)
Tue May 8 21:18:24 2012 UTC (11 years, 11 months ago) by niro
File size: 1029 byte(s)
-added another upstream patch
| 1 | From dd0460697c4e281fe277b53916d5251332e1aafc Mon Sep 17 00:00:00 2001 |
| 2 | From: Jiří Klimeš <jklimes@redhat.com> |
| 3 | Date: Tue, 27 Mar 2012 20:36:55 +0000 |
| 4 | Subject: libnm-glib: initialize NMRemoteSettings in nm_remote_settings_new() (rh #806664) |
| 5 | |
| 6 | The object was not initialized after creation in nm_remote_settings_new(). This |
| 7 | was a regression caused by 762df85234e7a042a2a5d31053e6cc273ae3e2ec. |
| 8 | --- |
| 9 | diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c |
| 10 | index 8f213f9..b6b6c18 100644 |
| 11 | --- a/libnm-glib/nm-remote-settings.c |
| 12 | +++ b/libnm-glib/nm-remote-settings.c |
| 13 | @@ -728,7 +728,12 @@ properties_changed_cb (DBusGProxy *proxy, |
| 14 | NMRemoteSettings * |
| 15 | nm_remote_settings_new (DBusGConnection *bus) |
| 16 | { |
| 17 | - return g_object_new (NM_TYPE_REMOTE_SETTINGS, NM_REMOTE_SETTINGS_BUS, bus, NULL); |
| 18 | + NMRemoteSettings *settings; |
| 19 | + |
| 20 | + settings = g_object_new (NM_TYPE_REMOTE_SETTINGS, NM_REMOTE_SETTINGS_BUS, bus, NULL); |
| 21 | + |
| 22 | + _nm_remote_settings_ensure_inited (settings); |
| 23 | + return settings; |
| 24 | } |
| 25 | |
| 26 | static void |
| 27 | -- |
| 28 | cgit v0.9.0.2-2-gbebe |