From 71507c9fa3be2be587816061f5f08bd97c228268 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Mon, 10 Aug 2009 23:52:03 -0500
Subject: [PATCH] system-settings: fix issues with system settings service
 property types

---
 libnm-glib/nm-settings-system-interface.c   | 10 +++++-----
 src/system-settings/nm-sysconfig-settings.c |  6 ++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/libnm-glib/nm-settings-system-interface.c b/libnm-glib/nm-settings-system-interface.c
index c563eb17a7..07114c0fc0 100644
--- a/libnm-glib/nm-settings-system-interface.c
+++ b/libnm-glib/nm-settings-system-interface.c
@@ -75,11 +75,11 @@ nm_settings_system_interface_init (gpointer g_iface)
 
 	g_object_interface_install_property
 		(g_iface,
-		 g_param_spec_string (NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY,
-							  "CanModify",
-							  "Can modify anything (hostname, connections, etc)",
-							  NULL,
-							  G_PARAM_READABLE));
+		 g_param_spec_boolean (NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY,
+		                       "CanModify",
+		                       "Can modify anything (hostname, connections, etc)",
+		                       FALSE,
+		                       G_PARAM_READABLE));
 
 	initialized = TRUE;
 }
diff --git a/src/system-settings/nm-sysconfig-settings.c b/src/system-settings/nm-sysconfig-settings.c
index e586669df4..ceef21b36d 100644
--- a/src/system-settings/nm-sysconfig-settings.c
+++ b/src/system-settings/nm-sysconfig-settings.c
@@ -104,8 +104,6 @@ static guint signals[LAST_SIGNAL] = { 0 };
 enum {
 	PROP_0,
 	PROP_UNMANAGED_SPECS,
-	PROP_HOSTNAME,
-	PROP_CAN_MODIFY,
 
 	LAST_PROP
 };
@@ -1133,14 +1131,14 @@ get_property (GObject *object, guint prop_id,
 			copy = g_slist_append (copy, g_strdup (iter->data));
 		g_value_take_boxed (value, copy);
 		break;
-	case PROP_HOSTNAME:
+	case NM_SETTINGS_SYSTEM_INTERFACE_PROP_HOSTNAME:
 		g_value_take_string (value, nm_sysconfig_settings_get_hostname (self));
 
 		/* Don't ever pass NULL through D-Bus */
 		if (!g_value_get_string (value))
 			g_value_set_static_string (value, "");
 		break;
-	case PROP_CAN_MODIFY:
+	case NM_SETTINGS_SYSTEM_INTERFACE_PROP_CAN_MODIFY:
 		g_value_set_boolean (value, !!get_plugin (self, NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_CONNECTIONS));
 		break;
 	default: