Imported Upstream version 1.0.2 upstream/1.0.2

1 files changed, 8 insertions, 3 deletions

diff --git a/src/nm-properties-changed-signal.c b/src/nm-properties-changed-signal.c
index 7ba62aa2..c6dbb3d5 100644
--- a/src/nm-properties-changed-signal.c
+++ b/src/nm-properties-changed-signal.c
@@ -148,8 +148,8 @@ notify (GObject *object, GParamSpec *pspec)
 			break;
 	}
 	if (!dbus_property_name) {
-		nm_log_dbg (LOGD_DBUS_PROPS, "ignoring notification for prop %s on type %s",
-		            pspec->name, G_OBJECT_TYPE_NAME (object));
+		nm_log_trace (LOGD_DBUS_PROPS, "ignoring notification for prop %s on type %s",
+		              pspec->name, G_OBJECT_TYPE_NAME (object));
 		return;
 	}
 
@@ -228,16 +228,21 @@ nm_properties_changed_signal_add_property (GType       type,
 	if (!classinfo)
 		classinfo = nm_properties_changed_signal_setup_type (type);
 
+	g_assert (!g_hash_table_contains (classinfo->exported_props, (char *) gobject_property_name));
 	g_hash_table_insert (classinfo->exported_props,
 	                     (char *) gobject_property_name,
 	                     (char *) dbus_property_name);
 
+	if (!strchr (gobject_property_name, '_'))
+		return;
 	hyphen_name = g_strdup (gobject_property_name);
 	for (p = hyphen_name; *p; p++) {
 		if (*p == '_')
 			*p = '-';
 	}
+	g_assert (!g_hash_table_contains (classinfo->exported_props, hyphen_name));
 	g_hash_table_insert (classinfo->exported_props,
-	                     hyphen_name,
+	                     (char *) g_intern_string (hyphen_name),
 	                     (char *) dbus_property_name);
+	g_free (hyphen_name);
 }