Merge remote branch 'origin/master' into rm-userset

This commit is contained in:
Dan Williams
2010-09-27 10:30:46 -05:00
55 changed files with 5555 additions and 1700 deletions

View File

@@ -565,6 +565,12 @@ update_system_hostname(NMInotifyHelper *inotify_helper,
priv->hostname = g_strstrip(hostname_file);
/* We shouldn't return a zero-length hostname, but NULL */
if (priv->hostname && !strlen (priv->hostname)) {
g_free (priv->hostname);
priv->hostname = NULL;
}
g_object_notify (G_OBJECT (config), NM_SYSTEM_CONFIG_INTERFACE_HOSTNAME);
}