1 files changed, 30 insertions, 30 deletions

diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c
index 5550d4d6c6..002a919a9d 100644
--- a/src/vpn-manager/nm-vpn-manager.c
+++ b/src/vpn-manager/nm-vpn-manager.c
@@ -33,15 +33,15 @@
 
 #define VPN_NAME_FILES_DIR NMCONFDIR "/VPN"
 
-G_DEFINE_TYPE (NMVPNManager, nm_vpn_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE (NMVpnManager, nm_vpn_manager, G_TYPE_OBJECT)
 
-#define NM_VPN_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_MANAGER, NMVPNManagerPrivate))
+#define NM_VPN_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_MANAGER, NMVpnManagerPrivate))
 
 typedef struct {
 	GHashTable *services;
 	GFileMonitor *monitor;
 	guint monitor_id;
-} NMVPNManagerPrivate;
+} NMVpnManagerPrivate;
 
 GQuark
 nm_vpn_manager_error_quark (void)
@@ -53,10 +53,10 @@ nm_vpn_manager_error_quark (void)
 }
 
 
-static NMVPNService *
-get_service_by_namefile (NMVPNManager *self, const char *namefile)
+static NMVpnService *
+get_service_by_namefile (NMVpnManager *self, const char *namefile)
 {
-	NMVPNManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self);
+	NMVpnManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self);
 	GHashTableIter iter;
 	gpointer data;
 
@@ -65,7 +65,7 @@ get_service_by_namefile (NMVPNManager *self, const char *namefile)
 
 	g_hash_table_iter_init (&iter, priv->services);
 	while (g_hash_table_iter_next (&iter, NULL, &data)) {
-		NMVPNService *candidate = NM_VPN_SERVICE (data);
+		NMVpnService *candidate = NM_VPN_SERVICE (data);
 		const char *service_namefile;
 
 		service_namefile = nm_vpn_service_get_name_file (candidate);
@@ -76,13 +76,13 @@ get_service_by_namefile (NMVPNManager *self, const char *namefile)
 }
 
 gboolean
-nm_vpn_manager_activate_connection (NMVPNManager *manager,
-                                    NMVPNConnection *vpn,
+nm_vpn_manager_activate_connection (NMVpnManager *manager,
+                                    NMVpnConnection *vpn,
                                     GError **error)
 {
 	NMConnection *connection;
-	NMSettingVPN *s_vpn;
-	NMVPNService *service;
+	NMSettingVpn *s_vpn;
+	NMVpnService *service;
 	const char *service_name;
 	NMDevice *device;
 
@@ -119,18 +119,18 @@ nm_vpn_manager_activate_connection (NMVPNManager *manager,
 }
 
 gboolean
-nm_vpn_manager_deactivate_connection (NMVPNManager *self,
-                                      NMVPNConnection *connection,
-                                      NMVPNConnectionStateReason reason)
+nm_vpn_manager_deactivate_connection (NMVpnManager *self,
+                                      NMVpnConnection *connection,
+                                      NMVpnConnectionStateReason reason)
 {
 	return nm_vpn_connection_deactivate (connection, reason, FALSE);
 }
 
 static void
-try_add_service (NMVPNManager *self, const char *namefile)
+try_add_service (NMVpnManager *self, const char *namefile)
 {
-	NMVPNManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self);
-	NMVPNService *service = NULL;
+	NMVpnManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self);
+	NMVpnService *service = NULL;
 	GHashTableIter iter;
 	GError *error = NULL;
 	const char *service_name;
@@ -166,9 +166,9 @@ vpn_dir_changed (GFileMonitor *monitor,
                  GFileMonitorEvent event_type,
                  gpointer user_data)
 {
-	NMVPNManager *self = NM_VPN_MANAGER (user_data);
-	NMVPNManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self);
-	NMVPNService *service;
+	NMVpnManager *self = NM_VPN_MANAGER (user_data);
+	NMVpnManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self);
+	NMVpnService *service;
 	char *path;
 
 	path = g_file_get_path (file);
@@ -207,10 +207,10 @@ vpn_dir_changed (GFileMonitor *monitor,
 
 /******************************************************************************/
 
-NMVPNManager *
+NMVpnManager *
 nm_vpn_manager_get (void)
 {
-	static NMVPNManager *singleton = NULL;
+	static NMVpnManager *singleton = NULL;
 
 	if (!singleton)
 		singleton = NM_VPN_MANAGER (g_object_new (NM_TYPE_VPN_MANAGER, NULL));
@@ -222,9 +222,9 @@ nm_vpn_manager_get (void)
 }
 
 static void
-nm_vpn_manager_init (NMVPNManager *self)
+nm_vpn_manager_init (NMVpnManager *self)
 {
-	NMVPNManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self);
+	NMVpnManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self);
 	GFile *file;
 	GDir *dir;
 	const char *fn;
@@ -258,11 +258,11 @@ nm_vpn_manager_init (NMVPNManager *self)
 }
 
 static void
-stop_all_services (NMVPNManager *self)
+stop_all_services (NMVpnManager *self)
 {
-	NMVPNManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self);
+	NMVpnManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self);
 	GHashTableIter iter;
-	NMVPNService *service;
+	NMVpnService *service;
 
 	g_hash_table_iter_init (&iter, priv->services);
 	while (g_hash_table_iter_next (&iter, NULL, (gpointer) &service)) {
@@ -275,7 +275,7 @@ stop_all_services (NMVPNManager *self)
 static void
 dispose (GObject *object)
 {
-	NMVPNManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (object);
+	NMVpnManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (object);
 
 	if (priv->monitor) {
 		if (priv->monitor_id)
@@ -294,11 +294,11 @@ dispose (GObject *object)
 }
 
 static void
-nm_vpn_manager_class_init (NMVPNManagerClass *manager_class)
+nm_vpn_manager_class_init (NMVpnManagerClass *manager_class)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (manager_class);
 
-	g_type_class_add_private (manager_class, sizeof (NMVPNManagerPrivate));
+	g_type_class_add_private (manager_class, sizeof (NMVpnManagerPrivate));
 
 	/* virtual methods */
 	object_class->dispose = dispose;