colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

system-settings: fix issues with system settings service property types

Browse Source
This commit is contained in:
Dan Williams
2009-08-10 23:52:03 -05:00
parent 155f19cb2a
commit 71507c9fa3
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libnm-glib/nm-settings-system-interface.c
View File

@@ -75,10 +75,10 @@ nm_settings_system_interface_init (gpointer g_iface)
g_object_interface_install_property g_object_interface_install_property
(g_iface, (g_iface,
g_param_spec_string (NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY, g_param_spec_boolean (NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY,
"CanModify", "CanModify",
"Can modify anything (hostname, connections, etc)", "Can modify anything (hostname, connections, etc)",
NULL, FALSE,
G_PARAM_READABLE)); G_PARAM_READABLE));
initialized = TRUE; initialized = TRUE;

6
src/system-settings/nm-sysconfig-settings.c
View File

@@ -104,8 +104,6 @@ static guint signals[LAST_SIGNAL] = { 0 };
enum { enum {
PROP_0, PROP_0,
PROP_UNMANAGED_SPECS, PROP_UNMANAGED_SPECS,
PROP_HOSTNAME,
PROP_CAN_MODIFY,
LAST_PROP LAST_PROP
}; };
@@ -1133,14 +1131,14 @@ get_property (GObject *object, guint prop_id,
copy = g_slist_append (copy, g_strdup (iter->data)); copy = g_slist_append (copy, g_strdup (iter->data));
g_value_take_boxed (value, copy); g_value_take_boxed (value, copy);
break; break;
case PROP_HOSTNAME: case NM_SETTINGS_SYSTEM_INTERFACE_PROP_HOSTNAME:
g_value_take_string (value, nm_sysconfig_settings_get_hostname (self)); g_value_take_string (value, nm_sysconfig_settings_get_hostname (self));
/* Don't ever pass NULL through D-Bus */ /* Don't ever pass NULL through D-Bus */
if (!g_value_get_string (value)) if (!g_value_get_string (value))
g_value_set_static_string (value, ""); g_value_set_static_string (value, "");
break; 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)); g_value_set_boolean (value, !!get_plugin (self, NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_CONNECTIONS));
break; break;
default: default: