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

libnm-glib: fix indentation in nm-vpn-plugin.[ch]

Browse Source
This commit is contained in:
Dan Winship
2012-05-04 09:53:19 -04:00
parent f306989734
commit c8812563dd
2 changed files with 124 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

214
libnm-glib/nm-vpn-plugin.c
View File

@@ -30,24 +30,24 @@
#include "nm-dbus-glib-types.h" #include "nm-dbus-glib-types.h"
static gboolean impl_vpn_plugin_connect (NMVPNPlugin *plugin, static gboolean impl_vpn_plugin_connect (NMVPNPlugin *plugin,
GHashTable *connection, GHashTable *connection,
GError **err); GError **err);
static gboolean impl_vpn_plugin_need_secrets (NMVPNPlugin *plugin, static gboolean impl_vpn_plugin_need_secrets (NMVPNPlugin *plugin,
GHashTable *connection, GHashTable *connection,
char **service_name, char **service_name,
GError **err); GError **err);
static gboolean impl_vpn_plugin_disconnect (NMVPNPlugin *plugin, static gboolean impl_vpn_plugin_disconnect (NMVPNPlugin *plugin,
GError **err); GError **err);
static gboolean impl_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin, static gboolean impl_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin,
GHashTable *config, GHashTable *config,
GError **err); GError **err);
static gboolean impl_vpn_plugin_set_failure (NMVPNPlugin *plugin, static gboolean impl_vpn_plugin_set_failure (NMVPNPlugin *plugin,
char *reason, char *reason,
GError **err); GError **err);
#include "nm-vpn-plugin-glue.h" #include "nm-vpn-plugin-glue.h"
@@ -108,7 +108,7 @@ nm_vpn_plugin_error_quark (void)
static void static void
nm_vpn_plugin_set_connection (NMVPNPlugin *plugin, nm_vpn_plugin_set_connection (NMVPNPlugin *plugin,
DBusGConnection *connection) DBusGConnection *connection)
{ {
NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin);
@@ -143,7 +143,7 @@ nm_vpn_plugin_get_state (NMVPNPlugin *plugin)
void void
nm_vpn_plugin_set_state (NMVPNPlugin *plugin, nm_vpn_plugin_set_state (NMVPNPlugin *plugin,
NMVPNServiceState state) NMVPNServiceState state)
{ {
NMVPNPluginPrivate *priv; NMVPNPluginPrivate *priv;
@@ -158,7 +158,7 @@ nm_vpn_plugin_set_state (NMVPNPlugin *plugin,
void void
nm_vpn_plugin_set_login_banner (NMVPNPlugin *plugin, nm_vpn_plugin_set_login_banner (NMVPNPlugin *plugin,
const char *banner) const char *banner)
{ {
g_return_if_fail (NM_IS_VPN_PLUGIN (plugin)); g_return_if_fail (NM_IS_VPN_PLUGIN (plugin));
g_return_if_fail (banner != NULL); g_return_if_fail (banner != NULL);
@@ -168,7 +168,7 @@ nm_vpn_plugin_set_login_banner (NMVPNPlugin *plugin,
void void
nm_vpn_plugin_failure (NMVPNPlugin *plugin, nm_vpn_plugin_failure (NMVPNPlugin *plugin,
NMVPNPluginFailure reason) NMVPNPluginFailure reason)
{ {
g_return_if_fail (NM_IS_VPN_PLUGIN (plugin)); g_return_if_fail (NM_IS_VPN_PLUGIN (plugin));
@@ -187,17 +187,17 @@ nm_vpn_plugin_disconnect (NMVPNPlugin *plugin, GError **err)
switch (state) { switch (state) {
case NM_VPN_SERVICE_STATE_STOPPING: case NM_VPN_SERVICE_STATE_STOPPING:
g_set_error (err, g_set_error (err,
NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS, NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS,
"%s", "%s",
"Could not process the request because the VPN connection is already being stopped."); "Could not process the request because the VPN connection is already being stopped.");
break; break;
case NM_VPN_SERVICE_STATE_STOPPED: case NM_VPN_SERVICE_STATE_STOPPED:
g_set_error (err, g_set_error (err,
NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED, NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED,
"%s", "%s",
"Could not process the request because no VPN connection was active."); "Could not process the request because no VPN connection was active.");
break; break;
case NM_VPN_SERVICE_STATE_STARTING: case NM_VPN_SERVICE_STATE_STARTING:
case NM_VPN_SERVICE_STATE_STARTED: case NM_VPN_SERVICE_STATE_STARTED:
@@ -261,8 +261,8 @@ fail_stop (gpointer data)
static gboolean static gboolean
nm_vpn_plugin_connect (NMVPNPlugin *plugin, nm_vpn_plugin_connect (NMVPNPlugin *plugin,
NMConnection *connection, NMConnection *connection,
GError **err) GError **err)
{ {
NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin);
gboolean ret = FALSE; gboolean ret = FALSE;
@@ -274,24 +274,24 @@ nm_vpn_plugin_connect (NMVPNPlugin *plugin,
switch (state) { switch (state) {
case NM_VPN_SERVICE_STATE_STARTING: case NM_VPN_SERVICE_STATE_STARTING:
g_set_error (err, g_set_error (err,
NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS, NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS,
"%s", "%s",
"Could not process the request because the VPN connection is already being started."); "Could not process the request because the VPN connection is already being started.");
break; break;
case NM_VPN_SERVICE_STATE_STARTED: case NM_VPN_SERVICE_STATE_STARTED:
g_set_error (err, g_set_error (err,
NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_ALREADY_STARTED, NM_VPN_PLUGIN_ERROR_ALREADY_STARTED,
"%s", "%s",
"Could not process the request because a VPN connection was already active."); "Could not process the request because a VPN connection was already active.");
break; break;
case NM_VPN_SERVICE_STATE_STOPPING: case NM_VPN_SERVICE_STATE_STOPPING:
g_set_error (err, g_set_error (err,
NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS, NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS,
"%s", "%s",
"Could not process the request because the VPN connection is being stopped."); "Could not process the request because the VPN connection is being stopped.");
break; break;
case NM_VPN_SERVICE_STATE_STOPPED: case NM_VPN_SERVICE_STATE_STOPPED:
case NM_VPN_SERVICE_STATE_INIT: case NM_VPN_SERVICE_STATE_INIT:
@@ -317,7 +317,7 @@ nm_vpn_plugin_connect (NMVPNPlugin *plugin,
void void
nm_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin, nm_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin,
GHashTable *ip4_config) GHashTable *ip4_config)
{ {
g_return_if_fail (NM_IS_VPN_PLUGIN (plugin)); g_return_if_fail (NM_IS_VPN_PLUGIN (plugin));
g_return_if_fail (ip4_config != NULL); g_return_if_fail (ip4_config != NULL);
@@ -330,8 +330,8 @@ nm_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin,
static gboolean static gboolean
impl_vpn_plugin_connect (NMVPNPlugin *plugin, impl_vpn_plugin_connect (NMVPNPlugin *plugin,
GHashTable *properties, GHashTable *properties,
GError **error) GError **error)
{ {
NMConnection *connection; NMConnection *connection;
gboolean success = FALSE; gboolean success = FALSE;
@@ -407,15 +407,15 @@ out:
static gboolean static gboolean
impl_vpn_plugin_disconnect (NMVPNPlugin *plugin, impl_vpn_plugin_disconnect (NMVPNPlugin *plugin,
GError **err) GError **err)
{ {
return nm_vpn_plugin_disconnect (plugin, err); return nm_vpn_plugin_disconnect (plugin, err);
} }
static gboolean static gboolean
impl_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin, impl_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin,
GHashTable *config, GHashTable *config,
GError **err) GError **err)
{ {
nm_vpn_plugin_set_ip4_config (plugin, config); nm_vpn_plugin_set_ip4_config (plugin, config);
@@ -424,8 +424,8 @@ impl_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin,
static gboolean static gboolean
impl_vpn_plugin_set_failure (NMVPNPlugin *plugin, impl_vpn_plugin_set_failure (NMVPNPlugin *plugin,
char *reason, char *reason,
GError **err) GError **err)
{ {
nm_vpn_plugin_failure (plugin, NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG); nm_vpn_plugin_failure (plugin, NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG);
@@ -458,7 +458,7 @@ setup_unix_signal_handler (void)
static void static void
one_plugin_destroyed (gpointer data, one_plugin_destroyed (gpointer data,
GObject *object) GObject *object)
{ {
active_plugins = g_slist_remove (active_plugins, object); active_plugins = g_slist_remove (active_plugins, object);
} }
@@ -474,8 +474,8 @@ nm_vpn_plugin_init (NMVPNPlugin *plugin)
static GObject * static GObject *
constructor (GType type, constructor (GType type,
guint n_construct_params, guint n_construct_params,
GObjectConstructParam *construct_params) GObjectConstructParam *construct_params)
{ {
GObject *object; GObject *object;
NMVPNPlugin *plugin; NMVPNPlugin *plugin;
@@ -500,16 +500,16 @@ constructor (GType type,
goto err; goto err;
proxy = dbus_g_proxy_new_for_name (connection, proxy = dbus_g_proxy_new_for_name (connection,
"org.freedesktop.DBus", "org.freedesktop.DBus",
"/org/freedesktop/DBus", "/org/freedesktop/DBus",
"org.freedesktop.DBus"); "org.freedesktop.DBus");
if (!dbus_g_proxy_call (proxy, "RequestName", &err, if (!dbus_g_proxy_call (proxy, "RequestName", &err,
G_TYPE_STRING, priv->dbus_service_name, G_TYPE_STRING, priv->dbus_service_name,
G_TYPE_UINT, 0, G_TYPE_UINT, 0,
G_TYPE_INVALID, G_TYPE_INVALID,
G_TYPE_UINT, &request_name_result, G_TYPE_UINT, &request_name_result,
G_TYPE_INVALID)) { G_TYPE_INVALID)) {
g_object_unref (proxy); g_object_unref (proxy);
goto err; goto err;
} }
@@ -517,8 +517,8 @@ constructor (GType type,
g_object_unref (proxy); g_object_unref (proxy);
dbus_g_connection_register_g_object (connection, dbus_g_connection_register_g_object (connection,
NM_VPN_DBUS_PLUGIN_PATH, NM_VPN_DBUS_PLUGIN_PATH,
object); object);
plugin = NM_VPN_PLUGIN (object); plugin = NM_VPN_PLUGIN (object);
@@ -541,7 +541,7 @@ constructor (GType type,
static void static void
set_property (GObject *object, guint prop_id, set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec) const GValue *value, GParamSpec *pspec)
{ {
NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (object); NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (object);
@@ -552,7 +552,7 @@ set_property (GObject *object, guint prop_id,
break; break;
case PROP_STATE: case PROP_STATE:
nm_vpn_plugin_set_state (NM_VPN_PLUGIN (object), nm_vpn_plugin_set_state (NM_VPN_PLUGIN (object),
(NMVPNServiceState) g_value_get_uint (value)); (NMVPNServiceState) g_value_get_uint (value));
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -684,7 +684,7 @@ nm_vpn_plugin_class_init (NMVPNPluginClass *plugin_class)
g_type_class_add_private (object_class, sizeof (NMVPNPluginPrivate)); g_type_class_add_private (object_class, sizeof (NMVPNPluginPrivate));
dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (plugin_class), dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (plugin_class),
&dbus_glib_nm_vpn_plugin_object_info); &dbus_glib_nm_vpn_plugin_object_info);
/* virtual methods */ /* virtual methods */
object_class->constructor = constructor; object_class->constructor = constructor;
@@ -699,75 +699,75 @@ nm_vpn_plugin_class_init (NMVPNPluginClass *plugin_class)
g_object_class_install_property g_object_class_install_property
(object_class, PROP_DBUS_SERVICE_NAME, (object_class, PROP_DBUS_SERVICE_NAME,
g_param_spec_string (NM_VPN_PLUGIN_DBUS_SERVICE_NAME, g_param_spec_string (NM_VPN_PLUGIN_DBUS_SERVICE_NAME,
"DBus service name", "DBus service name",
"DBus service name", "DBus service name",
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property g_object_class_install_property
(object_class, PROP_STATE, (object_class, PROP_STATE,
g_param_spec_uint (NM_VPN_PLUGIN_STATE, g_param_spec_uint (NM_VPN_PLUGIN_STATE,
"State", "State",
"Current VPN service state", "Current VPN service state",
NM_VPN_SERVICE_STATE_UNKNOWN, NM_VPN_SERVICE_STATE_UNKNOWN,
NM_VPN_SERVICE_STATE_STOPPED, NM_VPN_SERVICE_STATE_STOPPED,
NM_VPN_SERVICE_STATE_INIT, NM_VPN_SERVICE_STATE_INIT,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
/* signals */ /* signals */
signals[STATE_CHANGED] = signals[STATE_CHANGED] =
g_signal_new ("state-changed", g_signal_new ("state-changed",
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (NMVPNPluginClass, state_changed), G_STRUCT_OFFSET (NMVPNPluginClass, state_changed),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__UINT, g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
G_TYPE_UINT); G_TYPE_UINT);
signals[IP4_CONFIG] = signals[IP4_CONFIG] =
g_signal_new ("ip4-config", g_signal_new ("ip4-config",
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (NMVPNPluginClass, ip4_config), G_STRUCT_OFFSET (NMVPNPluginClass, ip4_config),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__BOXED, g_cclosure_marshal_VOID__BOXED,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
DBUS_TYPE_G_MAP_OF_VARIANT); DBUS_TYPE_G_MAP_OF_VARIANT);
signals[LOGIN_BANNER] = signals[LOGIN_BANNER] =
g_signal_new ("login-banner", g_signal_new ("login-banner",
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (NMVPNPluginClass, login_banner), G_STRUCT_OFFSET (NMVPNPluginClass, login_banner),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__STRING, g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
G_TYPE_STRING); G_TYPE_STRING);
signals[FAILURE] = signals[FAILURE] =
g_signal_new ("failure", g_signal_new ("failure",
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (NMVPNPluginClass, failure), G_STRUCT_OFFSET (NMVPNPluginClass, failure),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__UINT, g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
G_TYPE_UINT); G_TYPE_UINT);
signals[QUIT] = signals[QUIT] =
g_signal_new ("quit", g_signal_new ("quit",
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (NMVPNPluginClass, quit), G_STRUCT_OFFSET (NMVPNPluginClass, quit),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0, G_TYPE_NONE, 0,
G_TYPE_NONE); G_TYPE_NONE);
dbus_g_error_domain_register (NM_VPN_PLUGIN_ERROR, dbus_g_error_domain_register (NM_VPN_PLUGIN_ERROR,
NULL, NULL,
NM_TYPE_VPN_PLUGIN_ERROR); NM_TYPE_VPN_PLUGIN_ERROR);
setup_unix_signal_handler (); setup_unix_signal_handler ();
} }

34
libnm-glib/nm-vpn-plugin.h
View File

@@ -64,30 +64,30 @@ typedef struct {
GObjectClass parent; GObjectClass parent;
/* virtual methods */ /* virtual methods */
gboolean (*connect) (NMVPNPlugin *plugin, gboolean (*connect) (NMVPNPlugin *plugin,
NMConnection *connection, NMConnection *connection,
GError **err); GError **err);
gboolean (*need_secrets) (NMVPNPlugin *plugin, gboolean (*need_secrets) (NMVPNPlugin *plugin,
NMConnection *connection, NMConnection *connection,
char **setting_name, char **setting_name,
GError **error); GError **error);
gboolean (*disconnect) (NMVPNPlugin *plugin, gboolean (*disconnect) (NMVPNPlugin *plugin,
GError **err); GError **err);
/* Signals */ /* Signals */
void (*state_changed) (NMVPNPlugin *plugin, void (*state_changed) (NMVPNPlugin *plugin,
NMVPNServiceState state); NMVPNServiceState state);
void (*ip4_config) (NMVPNPlugin *plugin, void (*ip4_config) (NMVPNPlugin *plugin,
GHashTable *ip4_config); GHashTable *ip4_config);
void (*login_banner) (NMVPNPlugin *plugin, void (*login_banner) (NMVPNPlugin *plugin,
const char *banner); const char *banner);
void (*failure) (NMVPNPlugin *plugin, void (*failure) (NMVPNPlugin *plugin,
NMVPNPluginFailure reason); NMVPNPluginFailure reason);
void (*quit) (NMVPNPlugin *plugin); void (*quit) (NMVPNPlugin *plugin);
@@ -107,19 +107,19 @@ GType nm_vpn_plugin_error_get_type (void);
DBusGConnection *nm_vpn_plugin_get_connection (NMVPNPlugin *plugin); DBusGConnection *nm_vpn_plugin_get_connection (NMVPNPlugin *plugin);
NMVPNServiceState nm_vpn_plugin_get_state (NMVPNPlugin *plugin); NMVPNServiceState nm_vpn_plugin_get_state (NMVPNPlugin *plugin);
void nm_vpn_plugin_set_state (NMVPNPlugin *plugin, void nm_vpn_plugin_set_state (NMVPNPlugin *plugin,
NMVPNServiceState state); NMVPNServiceState state);
void nm_vpn_plugin_set_login_banner (NMVPNPlugin *plugin, void nm_vpn_plugin_set_login_banner (NMVPNPlugin *plugin,
const char *banner); const char *banner);
void nm_vpn_plugin_failure (NMVPNPlugin *plugin, void nm_vpn_plugin_failure (NMVPNPlugin *plugin,
NMVPNPluginFailure reason); NMVPNPluginFailure reason);
void nm_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin, void nm_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin,
GHashTable *ip4_config); GHashTable *ip4_config);
gboolean nm_vpn_plugin_disconnect (NMVPNPlugin *plugin, gboolean nm_vpn_plugin_disconnect (NMVPNPlugin *plugin,
GError **err); GError **err);
G_END_DECLS G_END_DECLS