fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-31 23:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: merge branch 'th/bgo738941_dbus_stop' (bgo #738941)

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=738941

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-10-27 20:47:03 +01:00
commit d0535cafe5
4 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/devices/wifi/nm-device-wifi.c
View file

@ -246,7 +246,7 @@ supplicant_interface_acquire (NMDeviceWifi *self)
}
if (nm_supplicant_interface_get_state (priv->sup_iface) < NM_SUPPLICANT_INTERFACE_STATE_READY)
nm_device_add_pending_action (NM_DEVICE (self), "waiting for supplicant", TRUE);
nm_device_add_pending_action (NM_DEVICE (self), "waiting for supplicant", FALSE);
g_signal_connect (priv->sup_iface,
NM_SUPPLICANT_INTERFACE_STATE,

4
src/main.c
View file

@ -99,6 +99,9 @@ signal_handling_thread (void *arg)
/* Reread config stuff like system config files, VPN service files, etc */
nm_log_info (LOGD_CORE, "caught signal %d, not supported yet.", signo);
break;
case SIGPIPE:
/* silently ignore signal */
break;
default:
nm_log_err (LOGD_CORE, "caught unexpected signal %d", signo);
break;
@ -124,6 +127,7 @@ setup_signals (void)
sigaddset (&signal_set, SIGHUP);
sigaddset (&signal_set, SIGINT);
sigaddset (&signal_set, SIGTERM);
sigaddset (&signal_set, SIGPIPE);
/* Block all signals of interest. */
status = pthread_sigmask (SIG_BLOCK, &signal_set, &old_sig_mask);

6
src/settings/nm-settings.c
View file

@ -650,7 +650,7 @@ load_plugins (NMSettings *self, const char **plugins, GError **error)
plugin = g_module_open (path, G_MODULE_BIND_LOCAL);
if (!plugin) {
g_set_error (error, NM_SETTINGS_ERROR, 0,
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_FAILED,
"Could not load plugin '%s': %s",
pname, g_module_error ());
g_free (full_name);
@ -663,7 +663,7 @@ load_plugins (NMSettings *self, const char **plugins, GError **error)
g_free (path);
if (!g_module_symbol (plugin, "nm_system_config_factory", (gpointer) (&factory_func))) {
g_set_error (error, NM_SETTINGS_ERROR, 0,
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_FAILED,
"Could not find plugin '%s' factory function.",
pname);
success = FALSE;
@ -672,7 +672,7 @@ load_plugins (NMSettings *self, const char **plugins, GError **error)
obj = (*factory_func) ();
if (!obj || !NM_IS_SYSTEM_CONFIG_INTERFACE (obj)) {
g_set_error (error, NM_SETTINGS_ERROR, 0,
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_FAILED,
"Plugin '%s' returned invalid system config object.",
pname);
success = FALSE;

8
src/supplicant-manager/nm-call-store.c
View file

@ -44,7 +44,13 @@ nm_call_store_add (NMCallStore *store,
g_return_if_fail (store != NULL);
g_return_if_fail (proxy != NULL);
g_return_if_fail (call != NULL);
if (!call) {
/* Allow calling nm_call_store_add() with NULL @call for convenience.
* This way you can pass the result of dbus_g_proxy_begin_call() directly
* to nm_call_store_add() without checking for NULL. */
return;
}
calls = g_hash_table_lookup (store, proxy);
if (!calls) {