diff options
| author | Michael Biebl <biebl@debian.org> | 2018-02-07 02:40:03 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-02-07 02:40:03 +0100 |
| commit | 77dfac263f463c1cdb8afb9b8c79a4e83bf08cd8 (patch) | |
| tree | e5288440b22e159a601450c2e5d40b013bdb4aa0 /src/settings/nm-settings.c | |
| parent | 3d9525cb641ac53c6d36bf5312710c22ae4bd926 (diff) | |
| parent | 50f6b47074e01dffb8dc536c0a20961dcf28ae9b (diff) | |
Update upstream source from tag 'upstream/1.10.4'
Update to upstream version '1.10.4' with Debian dir d2c0f877c591b3125f4e0cfcc711c04669d8d62b
Diffstat (limited to 'src/settings/nm-settings.c')
| -rw-r--r-- | src/settings/nm-settings.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 21fdf9e0..51b7bea7 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -89,21 +89,6 @@ EXPORT(nm_settings_connection_update) /*****************************************************************************/ static NM_CACHED_QUARK_FCN ("plugin-module-path", plugin_module_path_quark) - -#if (defined(HOSTNAME_PERSIST_SUSE) + defined(HOSTNAME_PERSIST_SLACKWARE) + defined(HOSTNAME_PERSIST_GENTOO)) > 1 -#error "Can only define one of HOSTNAME_PERSIST_*" -#endif - -#if defined(HOSTNAME_PERSIST_SUSE) -#define HOSTNAME_FILE HOSTNAME_FILE_UCASE_HOSTNAME -#elif defined(HOSTNAME_PERSIST_SLACKWARE) -#define HOSTNAME_FILE HOSTNAME_FILE_UCASE_HOSTNAME -#elif defined(HOSTNAME_PERSIST_GENTOO) -#define HOSTNAME_FILE HOSTNAME_FILE_GENTOO -#else -#define HOSTNAME_FILE HOSTNAME_FILE_DEFAULT -#endif - static NM_CACHED_QUARK_FCN ("default-wired-connection", _default_wired_connection_quark) static NM_CACHED_QUARK_FCN ("default-wired-device", _default_wired_device_quark) @@ -1004,6 +989,8 @@ claim_connection (NMSettings *self, NMSettingsConnection *connection) /* Exported D-Bus signal */ g_signal_emit (self, signals[NEW_CONNECTION], 0, connection); } + + nm_settings_connection_added (connection); } static gboolean |