From d56674b147c9244907019c3a09f83a49aa87bbf2 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 24 Aug 2009 15:57:11 -0500 Subject: [PATCH] libnm-glib: NMSettingsSystemPermission -> NMSettingsSystemPermissions --- libnm-glib/nm-remote-settings-system.c | 3 ++- libnm-glib/nm-settings-system-interface.h | 4 ++-- src/system-settings/nm-sysconfig-settings.c | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libnm-glib/nm-remote-settings-system.c b/libnm-glib/nm-remote-settings-system.c index 34a810d2e2..270e43cb2c 100644 --- a/libnm-glib/nm-remote-settings-system.c +++ b/libnm-glib/nm-remote-settings-system.c @@ -44,6 +44,7 @@ typedef struct { char *hostname; gboolean can_modify; + NMSettingsSystemPermissions permissions; gboolean disposed; } NMRemoteSettingsSystemPrivate; @@ -121,7 +122,7 @@ get_permissions_cb (DBusGProxy *proxy, gpointer user_data) { GetPermissionsInfo *info = user_data; - NMSettingsSystemPermission permissions = NM_SETTINGS_SYSTEM_PERMISSION_NONE; + NMSettingsSystemPermissions permissions = NM_SETTINGS_SYSTEM_PERMISSION_NONE; GError *error = NULL; dbus_g_proxy_end_call (proxy, call, &error, diff --git a/libnm-glib/nm-settings-system-interface.h b/libnm-glib/nm-settings-system-interface.h index b4ea39e30b..0905402e9f 100644 --- a/libnm-glib/nm-settings-system-interface.h +++ b/libnm-glib/nm-settings-system-interface.h @@ -32,7 +32,7 @@ typedef enum { NM_SETTINGS_SYSTEM_PERMISSION_WIFI_SHARE_PROTECTED = 0x2, NM_SETTINGS_SYSTEM_PERMISSION_WIFI_SHARE_OPEN = 0x4, NM_SETTINGS_SYSTEM_PERMISSION_HOSTNAME_MODIFY = 0x8 -} NMSettingsSystemPermission; +} NMSettingsSystemPermissions; #define NM_TYPE_SETTINGS_SYSTEM_INTERFACE (nm_settings_system_interface_get_type ()) #define NM_SETTINGS_SYSTEM_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTINGS_SYSTEM_INTERFACE, NMSettingsSystemInterface)) @@ -60,7 +60,7 @@ typedef void (*NMSettingsSystemSaveHostnameFunc) (NMSettingsSystemInterface *set gpointer user_data); typedef void (*NMSettingsSystemGetPermissionsFunc) (NMSettingsSystemInterface *settings, - NMSettingsSystemPermission permissions, + NMSettingsSystemPermissions permissions, GError *error, gpointer user_data); diff --git a/src/system-settings/nm-sysconfig-settings.c b/src/system-settings/nm-sysconfig-settings.c index 6f925de135..0f50364091 100644 --- a/src/system-settings/nm-sysconfig-settings.c +++ b/src/system-settings/nm-sysconfig-settings.c @@ -523,7 +523,7 @@ typedef struct { char *hostname; - NMSettingsSystemPermission permissions; + NMSettingsSystemPermissions permissions; guint32 permissions_calls; } PolkitCall; @@ -781,7 +781,7 @@ pk_authority_changed_cb (GObject *object, gpointer user_data) typedef struct { PolkitCall *pk_call; const char *pk_action; - NMSettingsSystemPermission permission; + NMSettingsSystemPermissions permission; } PermissionsCall; static void @@ -835,7 +835,7 @@ static void start_permission_check (NMSysconfigSettings *self, PolkitCall *pk_call, const char *pk_action, - NMSettingsSystemPermission permission) + NMSettingsSystemPermissions permission) { NMSysconfigSettingsPrivate *priv = NM_SYSCONFIG_SETTINGS_GET_PRIVATE (self); PermissionsCall *call; @@ -901,7 +901,7 @@ get_permissions (NMSettingsSystemInterface *settings, gpointer user_data) { NMSysconfigSettings *self = NM_SYSCONFIG_SETTINGS (settings); - NMSettingsSystemPermission permissions = NM_SETTINGS_SYSTEM_PERMISSION_NONE; + NMSettingsSystemPermissions permissions = NM_SETTINGS_SYSTEM_PERMISSION_NONE; /* Local caller (ie, NM) gets full permissions by default because it doesn't * need authorization. However, permissions are still subject to plugin's