[krb5-auth-dialog] Reindent plugins
- From: Guido Günther <guidog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [krb5-auth-dialog] Reindent plugins
- Date: Wed, 7 Jul 2010 18:55:00 +0000 (UTC)
commit 6ec57fd83f9b5604dc377d319e847e02c3bb76a0
Author: Guido Günther <agx sigxcpu org>
Date: Wed Jul 7 17:28:12 2010 +0200
Reindent plugins
plugins/ka-plugin-dummy.c | 67 ++++++++++++++++------------------
plugins/ka-plugin-dummy.h | 13 ++-----
plugins/ka-plugin-pam.c | 88 ++++++++++++++++++++++----------------------
plugins/ka-plugin-pam.h | 15 ++------
4 files changed, 82 insertions(+), 101 deletions(-)
---
diff --git a/plugins/ka-plugin-dummy.c b/plugins/ka-plugin-dummy.c
index 6485c0d..99bd739 100644
--- a/plugins/ka-plugin-dummy.c
+++ b/plugins/ka-plugin-dummy.c
@@ -20,17 +20,16 @@
#include <gmodule.h>
G_DEFINE_TYPE (KaPluginDummy, ka_plugin_dummy, KA_TYPE_PLUGIN)
-
#define GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), KA_TYPE_PLUGIN_DUMMY, KaPluginDummyPrivate))
int ka_plugin_major_version = KA_PLUGIN_MAJOR_VERSION;
int ka_plugin_minor_version = KA_PLUGIN_MINOR_VERSION;
-G_MODULE_EXPORT KaPlugin*
+G_MODULE_EXPORT KaPlugin *
ka_plugin_create (void)
{
- return KA_PLUGIN (ka_plugin_dummy_new());
+ return KA_PLUGIN (ka_plugin_dummy_new ());
}
typedef struct _KaPluginDummyPrivate KaPluginDummyPrivate;
@@ -39,57 +38,55 @@ struct _KaPluginDummyPrivate {
gulong handlers[3];
};
-event_cb (gpointer* applet, gchar* princ, guint when, gpointer user_data)
+static void
+event_cb (gpointer *applet, gchar *princ, guint when, gpointer user_data)
{
- g_message("%s %s @%d", user_data, princ, when);
+ g_message ("%s %s @%d", user_data, princ, when);
}
static void
ka_plugin_dummy_finalize (GObject *object)
{
- G_OBJECT_CLASS (ka_plugin_dummy_parent_class)->finalize (object);
+ G_OBJECT_CLASS (ka_plugin_dummy_parent_class)->finalize (object);
}
static void
-ka_plugin_dummy_activate (KaPlugin *self, KaApplet* applet)
+ka_plugin_dummy_activate (KaPlugin *self, KaApplet *applet)
{
- KaPluginDummyPrivate *priv = GET_PRIVATE (self);
-
- priv->handlers[0] = g_signal_connect (applet,
- "krb-tgt-expired",
- G_CALLBACK (event_cb),
- "Expired");
- priv->handlers[1] = g_signal_connect (applet,
- "krb-tgt-acquired",
- G_CALLBACK (event_cb),
- "Acquired");
- priv->handlers[2] = g_signal_connect (applet,
- "krb-tgt-renewed",
- G_CALLBACK (event_cb),
- "Renewed");
+ KaPluginDummyPrivate *priv = GET_PRIVATE (self);
+
+ priv->handlers[0] = g_signal_connect (applet,
+ "krb-tgt-expired",
+ G_CALLBACK (event_cb), "Expired");
+ priv->handlers[1] = g_signal_connect (applet,
+ "krb-tgt-acquired",
+ G_CALLBACK (event_cb), "Acquired");
+ priv->handlers[2] = g_signal_connect (applet,
+ "krb-tgt-renewed",
+ G_CALLBACK (event_cb), "Renewed");
}
static void
-ka_plugin_dummy_deactivate (KaPlugin *self, KaApplet* applet)
+ka_plugin_dummy_deactivate (KaPlugin *self, KaApplet *applet)
{
- int i;
- KaPluginDummyPrivate *priv = GET_PRIVATE (self);
+ int i;
+ KaPluginDummyPrivate *priv = GET_PRIVATE (self);
- for (i = 0; i < G_N_ELEMENTS(priv->handlers); i++)
- g_signal_handler_disconnect (applet, priv->handlers[i]);
+ for (i = 0; i < G_N_ELEMENTS (priv->handlers); i++)
+ g_signal_handler_disconnect (applet, priv->handlers[i]);
}
static void
ka_plugin_dummy_class_init (KaPluginDummyClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- KaPluginClass *plugin_class = KA_PLUGIN_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ KaPluginClass *plugin_class = KA_PLUGIN_CLASS (klass);
- g_type_class_add_private (klass, sizeof (KaPluginDummyPrivate));
+ g_type_class_add_private (klass, sizeof (KaPluginDummyPrivate));
- plugin_class->activate = ka_plugin_dummy_activate;
- plugin_class->deactivate = ka_plugin_dummy_deactivate;
- object_class->finalize = ka_plugin_dummy_finalize;
+ plugin_class->activate = ka_plugin_dummy_activate;
+ plugin_class->deactivate = ka_plugin_dummy_deactivate;
+ object_class->finalize = ka_plugin_dummy_finalize;
}
static void
@@ -97,9 +94,9 @@ ka_plugin_dummy_init (KaPluginDummy *self)
{
}
-KaPluginDummy*
+KaPluginDummy *
ka_plugin_dummy_new (void)
{
- return g_object_new (KA_TYPE_PLUGIN_DUMMY, KA_PLUGIN_PROP_NAME,
- "dummy", NULL);
+ return g_object_new (KA_TYPE_PLUGIN_DUMMY, KA_PLUGIN_PROP_NAME,
+ "dummy", NULL);
}
diff --git a/plugins/ka-plugin-dummy.h b/plugins/ka-plugin-dummy.h
index 311861a..460d64a 100644
--- a/plugins/ka-plugin-dummy.h
+++ b/plugins/ka-plugin-dummy.h
@@ -22,36 +22,29 @@
#include "ka-plugin.h"
G_BEGIN_DECLS
-
#define KA_TYPE_PLUGIN_DUMMY ka_plugin_dummy_get_type()
-
#define KA_PLUGIN_DUMMY(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), KA_TYPE_PLUGIN_DUMMY, KaPluginDummy))
-
#define KA_PLUGIN_DUMMY_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), KA_TYPE_PLUGIN_DUMMY, KaPluginDummyClass))
-
#define KA_IS_PLUGIN_DUMMY(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), KA_TYPE_PLUGIN_DUMMY))
-
#define KA_IS_PLUGIN_DUMMY_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), KA_TYPE_PLUGIN_DUMMY))
-
#define KA_PLUGIN_DUMMY_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), KA_TYPE_PLUGIN_DUMMY, KaPluginDummyClass))
typedef struct {
- KaPlugin parent;
+ KaPlugin parent;
} KaPluginDummy;
typedef struct {
- KaPluginClass parent_class;
+ KaPluginClass parent_class;
} KaPluginDummyClass;
GType ka_plugin_dummy_get_type (void);
-KaPluginDummy* ka_plugin_dummy_new (void);
+KaPluginDummy *ka_plugin_dummy_new (void);
G_END_DECLS
-
#endif /* _KA_PLUGIN_DUMMY */
diff --git a/plugins/ka-plugin-pam.c b/plugins/ka-plugin-pam.c
index 53d1f06..b700854 100644
--- a/plugins/ka-plugin-pam.c
+++ b/plugins/ka-plugin-pam.c
@@ -22,7 +22,6 @@
#include <security/pam_appl.h>
G_DEFINE_TYPE (KaPluginPam, ka_plugin_pam, KA_TYPE_PLUGIN)
-
#define GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), KA_TYPE_PLUGIN_PAM, KaPluginPamPrivate))
@@ -31,10 +30,10 @@ typedef struct _KaPluginPamPrivate KaPluginPamPrivate;
int ka_plugin_major_version = KA_PLUGIN_MAJOR_VERSION;
int ka_plugin_minor_version = KA_PLUGIN_MINOR_VERSION;
-G_MODULE_EXPORT KaPlugin*
+G_MODULE_EXPORT KaPlugin *
ka_plugin_create (void)
{
- return KA_PLUGIN (ka_plugin_pam_new());
+ return KA_PLUGIN (ka_plugin_pam_new ());
}
struct _KaPluginPamPrivate {
@@ -44,76 +43,77 @@ struct _KaPluginPamPrivate {
static void
ka_plugin_pam_finalize (GObject *object)
{
- G_OBJECT_CLASS (ka_plugin_pam_parent_class)->finalize (object);
+ G_OBJECT_CLASS (ka_plugin_pam_parent_class)->finalize (object);
}
-static int simple_conv( int n, const struct pam_message **msg, struct pam_response **resp, void *data)
+static int
+simple_conv (int n, const struct pam_message **msg, struct pam_response **resp,
+ void *data)
{
- return (PAM_CONV_ERR);
+ return (PAM_CONV_ERR);
}
static struct pam_conv simplepamconv = { simple_conv, NULL };
static void
-renewed_event_cb (gpointer* applet, gchar* princ, guint when, gpointer user_data)
+renewed_event_cb (gpointer *applet, gchar *princ, guint when,
+ gpointer user_data)
{
- const char *user;
- pam_handle_t *pamh = NULL;
- int retval = 0;
+ const char *user;
+ pam_handle_t *pamh = NULL;
+ int retval = 0;
- user = g_get_user_name ();
- retval = pam_start("ka-plugin-pam", user, &simplepamconv, &pamh);
- if (retval)
- goto out;
+ user = g_get_user_name ();
+ retval = pam_start ("ka-plugin-pam", user, &simplepamconv, &pamh);
+ if (retval)
+ goto out;
- retval = pam_setcred(pamh, PAM_ESTABLISH_CRED);
- if (retval)
- goto out;
+ retval = pam_setcred (pamh, PAM_ESTABLISH_CRED);
+ if (retval)
+ goto out;
out:
- if (retval)
- g_warning("PAM plugin: %s", pam_strerror(pamh, retval));
+ if (retval)
+ g_warning ("PAM plugin: %s", pam_strerror (pamh, retval));
- if (pamh)
- pam_end(pamh, PAM_SUCCESS);
+ if (pamh)
+ pam_end (pamh, PAM_SUCCESS);
}
static void
-ka_plugin_pam_activate (KaPlugin *self, KaApplet* applet)
+ka_plugin_pam_activate (KaPlugin *self, KaApplet *applet)
{
- KaPluginPamPrivate *priv = GET_PRIVATE (self);
-
- priv->handlers[1] = g_signal_connect (applet,
- "krb-tgt-acquired",
- G_CALLBACK (renewed_event_cb),
- NULL);
- priv->handlers[0] = g_signal_connect (applet,
- "krb-tgt-renewed",
- G_CALLBACK (renewed_event_cb),
- NULL);
+ KaPluginPamPrivate *priv = GET_PRIVATE (self);
+
+ priv->handlers[1] = g_signal_connect (applet,
+ "krb-tgt-acquired",
+ G_CALLBACK (renewed_event_cb), NULL);
+ priv->handlers[0] = g_signal_connect (applet,
+ "krb-tgt-renewed",
+ G_CALLBACK (renewed_event_cb), NULL);
}
static void
-ka_plugin_pam_deactivate (KaPlugin *self, KaApplet* applet)
+ka_plugin_pam_deactivate (KaPlugin *self, KaApplet *applet)
{
- KaPluginPamPrivate *priv = GET_PRIVATE (self);
+ KaPluginPamPrivate *priv = GET_PRIVATE (self);
- g_signal_handler_disconnect (applet, priv->handlers[0]);
- g_signal_handler_disconnect (applet, priv->handlers[1]);
+ g_signal_handler_disconnect (applet, priv->handlers[0]);
+ g_signal_handler_disconnect (applet, priv->handlers[1]);
}
static void
ka_plugin_pam_class_init (KaPluginPamClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- KaPluginClass *plugin_class = KA_PLUGIN_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ KaPluginClass *plugin_class = KA_PLUGIN_CLASS (klass);
- g_type_class_add_private (klass, sizeof (KaPluginPamPrivate));
+ g_type_class_add_private (klass, sizeof (KaPluginPamPrivate));
- plugin_class->activate = ka_plugin_pam_activate;
- plugin_class->deactivate = ka_plugin_pam_deactivate;
- object_class->finalize = ka_plugin_pam_finalize;
+ plugin_class->activate = ka_plugin_pam_activate;
+ plugin_class->deactivate = ka_plugin_pam_deactivate;
+ object_class->finalize = ka_plugin_pam_finalize;
}
static void
@@ -121,8 +121,8 @@ ka_plugin_pam_init (KaPluginPam *self)
{
}
-KaPluginPam*
+KaPluginPam *
ka_plugin_pam_new (void)
{
- return g_object_new (KA_TYPE_PLUGIN_PAM, KA_PLUGIN_PROP_NAME, "pam", NULL);
+ return g_object_new (KA_TYPE_PLUGIN_PAM, KA_PLUGIN_PROP_NAME, "pam", NULL);
}
diff --git a/plugins/ka-plugin-pam.h b/plugins/ka-plugin-pam.h
index c693121..5f9b34a 100644
--- a/plugins/ka-plugin-pam.h
+++ b/plugins/ka-plugin-pam.h
@@ -22,38 +22,29 @@
#include <ka-plugin.h>
G_BEGIN_DECLS
-
#define KA_TYPE_PLUGIN_PAM ka_plugin_pam_get_type()
-
#define KA_PLUGIN_PAM(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), KA_TYPE_PLUGIN_PAM, KaPluginPam))
-
#define KA_PLUGIN_PAM_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), KA_TYPE_PLUGIN_PAM, KaPluginPamClass))
-
#define KA_IS_PLUGIN_PAM(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), KA_TYPE_PLUGIN_PAM))
-
#define KA_IS_PLUGIN_PAM_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), KA_TYPE_PLUGIN_PAM))
-
#define KA_PLUGIN_PAM_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), KA_TYPE_PLUGIN_PAM, KaPluginPamClass))
typedef struct {
- KaPlugin parent;
+ KaPlugin parent;
} KaPluginPam;
typedef struct {
- KaPluginClass parent_class;
+ KaPluginClass parent_class;
} KaPluginPamClass;
GType ka_plugin_pam_get_type (void);
-KaPluginPam* ka_plugin_pam_new (void);
+KaPluginPam *ka_plugin_pam_new (void);
G_END_DECLS
-
#endif /* _KA_PLUGIN_PAM */
-
-/* ka-plugin-pam.c */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]