fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 16:58:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: suppress error message when user settings service is not active

Browse source 
Don't bother trying to initialize the user settings proxy when it
isn't even active.  Would trigger a warning to syslog if PolicyKit
permissions changed via changes to /usr/share/polkit-1/actions/.
This commit is contained in:
Dan Williams 2010-11-23 22:17:21 -06:00
parent 40bbd4e2f2
commit 4b37101ef4
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/nm-manager.c
View file

@ -1356,6 +1356,12 @@ user_proxy_init (NMManager *self)
g_return_if_fail (self != NULL); g_return_if_fail (self != NULL);
g_return_if_fail (priv->user_proxy == NULL); g_return_if_fail (priv->user_proxy == NULL);
/* Don't try to initialize the user settings proxy if the user
* settings service doesn't actually exist.
*/
if (!nm_dbus_manager_name_has_owner (priv->dbus_mgr, NM_DBUS_SERVICE_USER_SETTINGS))
return;
bus = nm_dbus_manager_get_connection (priv->dbus_mgr); bus = nm_dbus_manager_get_connection (priv->dbus_mgr);
priv->user_proxy = dbus_g_proxy_new_for_name_owner (bus, priv->user_proxy = dbus_g_proxy_new_for_name_owner (bus,
NM_DBUS_SERVICE_USER_SETTINGS, NM_DBUS_SERVICE_USER_SETTINGS,
@ -3975,8 +3981,7 @@ nm_manager_start (NMManager *self)
* they will be queried when the user settings service shows up on the * they will be queried when the user settings service shows up on the
* bus in nm_manager_name_owner_changed(). * bus in nm_manager_name_owner_changed().
*/ */
if (nm_dbus_manager_name_has_owner (priv->dbus_mgr, NM_DBUS_SERVICE_USER_SETTINGS)) user_proxy_init (self);
user_proxy_init (self);
nm_udev_manager_query_devices (priv->udev_mgr); nm_udev_manager_query_devices (priv->udev_mgr);
bluez_manager_resync_devices (self); bluez_manager_resync_devices (self);