1 files changed, 210 insertions, 193 deletions

diff --git a/src/ka-pwdialog.c b/src/ka-pwdialog.c
index 0570ac2..49ed2e4 100644
--- a/src/ka-pwdialog.c
+++ b/src/ka-pwdialog.c
@@ -28,281 +28,298 @@
 #include "ka-entry-buffer.h"
 
 struct _KaPwDialog {
-  GObject parent;
+    GObject parent;
 
-  KaPwDialogPrivate *priv;
+    KaPwDialogPrivate *priv;
 };
 
 struct _KaPwDialogClass {
-  GObjectClass parent;
+    GObjectClass parent;
 };
 
-G_DEFINE_TYPE(KaPwDialog, ka_pwdialog, G_TYPE_OBJECT);
-
-struct _KaPwDialogPrivate
-{
-	/* The password dialog */
-	GtkWidget* dialog;		/* the password dialog itself */
-	GtkWidget* status_label;	/* the wrong password/timeout label */
-	GtkWidget* krb_label;		/* krb5 passwort prompt label */
-	GtkWidget* pw_entry;		/* password entry field */
-	gboolean   persist;		/* don't hide the dialog when creds are still valid */
-	gboolean   grabbed;		/* keyboard grabbed? */
-	GtkWidget* error_dialog;	/* error dialog */
+G_DEFINE_TYPE (KaPwDialog, ka_pwdialog, G_TYPE_OBJECT);
+
+struct _KaPwDialogPrivate {
+    /* The password dialog */
+    GtkWidget *dialog;          /* the password dialog itself */
+    GtkWidget *status_label;    /* the wrong password/timeout label */
+    GtkWidget *krb_label;       /* krb5 passwort prompt label */
+    GtkWidget *pw_entry;        /* password entry field */
+    gboolean persist;           /* don't hide the dialog when creds are still valid */
+    gboolean grabbed;           /* keyboard grabbed? */
+    GtkWidget *error_dialog;    /* error dialog */
 };
 
 
 static void
-ka_pwdialog_init(KaPwDialog *pwdialog)
+ka_pwdialog_init (KaPwDialog *pwdialog)
 {
-	pwdialog->priv = G_TYPE_INSTANCE_GET_PRIVATE(pwdialog,
-						   KA_TYPE_PWDIALOG,
-						   KaPwDialogPrivate);
+    pwdialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (pwdialog,
+                                                  KA_TYPE_PWDIALOG,
+                                                  KaPwDialogPrivate);
 }
 
 static void
-ka_pwdialog_finalize(GObject *object)
+ka_pwdialog_finalize (GObject *object)
 {
-	KaPwDialog* pwdialog = KA_PWDIALOG (object);
-	GObjectClass *parent_class = G_OBJECT_CLASS (ka_pwdialog_parent_class);
+    KaPwDialog *pwdialog = KA_PWDIALOG (object);
+    GObjectClass *parent_class = G_OBJECT_CLASS (ka_pwdialog_parent_class);
 
-	gtk_widget_destroy (pwdialog->priv->error_dialog);
-	pwdialog->priv->error_dialog = NULL;
+    gtk_widget_destroy (pwdialog->priv->error_dialog);
+    pwdialog->priv->error_dialog = NULL;
 
-	if (parent_class->finalize != NULL)
-		parent_class->finalize (object);
+    if (parent_class->finalize != NULL)
+        parent_class->finalize (object);
 }
 
 static void
-ka_pwdialog_class_init(KaPwDialogClass *klass)
+ka_pwdialog_class_init (KaPwDialogClass * klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS(klass);
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	object_class->finalize = ka_pwdialog_finalize;
-	g_type_class_add_private(klass, sizeof(KaPwDialogPrivate));
+    object_class->finalize = ka_pwdialog_finalize;
+    g_type_class_add_private (klass, sizeof (KaPwDialogPrivate));
 
 }
 
-static KaPwDialog*
-ka_pwdialog_new(void)
+static KaPwDialog *
+ka_pwdialog_new (void)
 {
-	return g_object_new (KA_TYPE_PWDIALOG, NULL);
+    return g_object_new (KA_TYPE_PWDIALOG, NULL);
 }
 
 
 static gboolean
-grab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
+grab_keyboard (GtkWidget *win, GdkEvent * event, gpointer data)
 {
-	KaPwDialog* pwdialog = KA_PWDIALOG(data);
-
-	GdkGrabStatus status;
-	if (!pwdialog->priv->grabbed) {
-		status = gdk_keyboard_grab (gtk_widget_get_window (win),
-					    FALSE, gdk_event_get_time (event));
-		if (status == GDK_GRAB_SUCCESS)
-			pwdialog->priv->grabbed = TRUE;
-		else
-			g_message ("could not grab keyboard: %d", (int)status);
-	}
-	return FALSE;
+    KaPwDialog *pwdialog = KA_PWDIALOG (data);
+
+    GdkGrabStatus status;
+
+    if (!pwdialog->priv->grabbed) {
+        status = gdk_keyboard_grab (gtk_widget_get_window (win),
+                                    FALSE, gdk_event_get_time (event));
+        if (status == GDK_GRAB_SUCCESS)
+            pwdialog->priv->grabbed = TRUE;
+        else
+            g_message ("could not grab keyboard: %d", (int) status);
+    }
+    return FALSE;
 }
 
 
 static gboolean
 ungrab_keyboard (GtkWidget *win G_GNUC_UNUSED,
-                 GdkEvent *event,
-                 gpointer data)
+                 GdkEvent * event, gpointer data)
 {
-	KaPwDialog* pwdialog = KA_PWDIALOG(data);
+    KaPwDialog *pwdialog = KA_PWDIALOG (data);
 
-	if (pwdialog->priv->grabbed)
-		gdk_keyboard_ungrab (gdk_event_get_time (event));
-	pwdialog->priv->grabbed = FALSE;
-	return FALSE;
+    if (pwdialog->priv->grabbed)
+        gdk_keyboard_ungrab (gdk_event_get_time (event));
+    pwdialog->priv->grabbed = FALSE;
+    return FALSE;
 }
 
 
 static gboolean
-window_state_changed (GtkWidget *win, GdkEventWindowState *event, gpointer data)
+window_state_changed (GtkWidget *win, GdkEventWindowState *event,
+                      gpointer data)
 {
-	GdkWindowState state = gdk_window_get_state (gtk_widget_get_window (win));
+    GdkWindowState state = gdk_window_get_state (gtk_widget_get_window (win));
 
-	if (state & GDK_WINDOW_STATE_WITHDRAWN ||
-	    state & GDK_WINDOW_STATE_ICONIFIED ||
-	    state & GDK_WINDOW_STATE_FULLSCREEN ||
-	    state & GDK_WINDOW_STATE_MAXIMIZED)
-		ungrab_keyboard (win, (GdkEvent*)event, data);
-	else
-		grab_keyboard (win, (GdkEvent*)event, data);
+    if (state & GDK_WINDOW_STATE_WITHDRAWN ||
+        state & GDK_WINDOW_STATE_ICONIFIED ||
+        state & GDK_WINDOW_STATE_FULLSCREEN ||
+        state & GDK_WINDOW_STATE_MAXIMIZED)
+        ungrab_keyboard (win, (GdkEvent *) event, data);
+    else
+        grab_keyboard (win, (GdkEvent *) event, data);
 
-	return FALSE;
+    return FALSE;
 }
 
 
 gint
-ka_pwdialog_run(KaPwDialog* self)
+ka_pwdialog_run (KaPwDialog *self)
 {
-	GtkWidget *dialog = self->priv->dialog;
-
-	/* cleanup old error dialog, if present (e.g. user didn't acknowledge
-	 * the error but clicked the tray icon again) */
-	if (self->priv->error_dialog)
-		gtk_widget_hide (self->priv->error_dialog);
-
-	/* make sure we pop up on top */
-	gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE);
-
-	/*
-	 * grab the keyboard so that people don't accidentally type their
-	 * passwords in other windows.
-	 */
-	g_signal_connect (dialog, "map-event", G_CALLBACK (grab_keyboard), self);
-	g_signal_connect (dialog, "unmap-event", G_CALLBACK (ungrab_keyboard), self);
-	g_signal_connect (dialog, "window-state-event", G_CALLBACK (window_state_changed), self);
-
-	gtk_widget_grab_focus (self->priv->pw_entry);
-	gtk_widget_show(dialog);
-	return gtk_dialog_run (GTK_DIALOG(dialog));
+    GtkWidget *dialog = self->priv->dialog;
+
+    /* cleanup old error dialog, if present (e.g. user didn't acknowledge
+     * the error but clicked the tray icon again) */
+    if (self->priv->error_dialog)
+        gtk_widget_hide (self->priv->error_dialog);
+
+    /* make sure we pop up on top */
+    gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE);
+
+    /*
+     * grab the keyboard so that people don't accidentally type their
+     * passwords in other windows.
+     */
+    g_signal_connect (dialog, "map-event", G_CALLBACK (grab_keyboard), self);
+    g_signal_connect (dialog, "unmap-event", G_CALLBACK (ungrab_keyboard),
+                      self);
+    g_signal_connect (dialog, "window-state-event",
+                      G_CALLBACK (window_state_changed), self);
+
+    gtk_widget_grab_focus (self->priv->pw_entry);
+    gtk_widget_show (dialog);
+    return gtk_dialog_run (GTK_DIALOG (dialog));
 }
 
 
 void
-ka_pwdialog_error(KaPwDialog* self, const char *msg)
+ka_pwdialog_error (KaPwDialog *self, const char *msg)
 {
-	GtkWidget *dialog = self->priv->error_dialog;
-
-	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-				  _("Couldn't acquire kerberos ticket: '%s'"),
-				  _(msg));
-	gtk_widget_show (GTK_WIDGET(dialog));
-	gtk_dialog_run (GTK_DIALOG(dialog));
-	gtk_widget_hide(dialog);
+    GtkWidget *dialog = self->priv->error_dialog;
+
+    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                              _
+                                              ("Couldn't acquire kerberos ticket: '%s'"),
+                                              _(msg));
+    gtk_widget_show (GTK_WIDGET (dialog));
+    gtk_dialog_run (GTK_DIALOG (dialog));
+    gtk_widget_hide (dialog);
 }
 
 
 void
-ka_pwdialog_set_persist (KaPwDialog* pwdialog, gboolean persist)
+ka_pwdialog_set_persist (KaPwDialog *pwdialog, gboolean persist)
 {
-	pwdialog->priv->persist = persist;
+    pwdialog->priv->persist = persist;
 }
 
 void
-ka_pwdialog_hide (const KaPwDialog* pwdialog, gboolean force)
+ka_pwdialog_hide (const KaPwDialog *pwdialog, gboolean force)
 {
-	KA_DEBUG("PW Dialog persist: %d", pwdialog->priv->persist);
-	if (!pwdialog->priv->persist || force)
-		gtk_widget_hide(pwdialog->priv->dialog);
+    KA_DEBUG ("PW Dialog persist: %d", pwdialog->priv->persist);
+    if (!pwdialog->priv->persist || force)
+        gtk_widget_hide (pwdialog->priv->dialog);
 }
 
-const gchar*
-ka_pwdialog_get_password(KaPwDialog *pwdialog)
+const gchar *
+ka_pwdialog_get_password (KaPwDialog *pwdialog)
 {
-	return gtk_entry_get_text (GTK_ENTRY(pwdialog->priv->pw_entry));
+    return gtk_entry_get_text (GTK_ENTRY (pwdialog->priv->pw_entry));
 }
 
 gboolean
-ka_pwdialog_status_update (KaPwDialog* pwdialog)
+ka_pwdialog_status_update (KaPwDialog *pwdialog)
 {
-	gchar *expiry_text;
-	gchar *expiry_markup;
-	int minutes_left = ka_tgt_valid_seconds() / 60;
-
-	g_return_val_if_fail (pwdialog != NULL, FALSE);
-	if (minutes_left > 0) {
-		expiry_text = g_strdup_printf (ngettext("Your credentials expire in %d minute",
-		                                        "Your credentials expire in %d minutes",
-		                                        minutes_left), minutes_left);
-	} else {
-		expiry_text = g_strdup_printf ("<span foreground=\"red\">%s</span>",
-				               _("Your credentials have expired"));
-	}
-	expiry_markup = g_strdup_printf ("<span size=\"smaller\" style=\"italic\">%s</span>", expiry_text);
-	gtk_label_set_markup (GTK_LABEL(pwdialog->priv->status_label), expiry_markup);
-	g_free (expiry_text);
-	g_free (expiry_markup);
-
-	return TRUE;
+    gchar *expiry_text;
+    gchar *expiry_markup;
+    int minutes_left = ka_tgt_valid_seconds () / 60;
+
+    g_return_val_if_fail (pwdialog != NULL, FALSE);
+    if (minutes_left > 0) {
+        expiry_text =
+            g_strdup_printf (ngettext
+                             ("Your credentials expire in %d minute",
+                              "Your credentials expire in %d minutes",
+                              minutes_left), minutes_left);
+    } else {
+        expiry_text = g_strdup_printf ("<span foreground=\"red\">%s</span>",
+                                       _("Your credentials have expired"));
+    }
+    expiry_markup =
+        g_strdup_printf ("<span size=\"smaller\" style=\"italic\">%s</span>",
+                         expiry_text);
+    gtk_label_set_markup (GTK_LABEL (pwdialog->priv->status_label),
+                          expiry_markup);
+    g_free (expiry_text);
+    g_free (expiry_markup);
+
+    return TRUE;
 }
 
 void
-ka_pwdialog_setup (KaPwDialog* pwdialog, const gchar *krb5prompt,
+ka_pwdialog_setup (KaPwDialog *pwdialog, const gchar *krb5prompt,
                    gboolean invalid_auth)
 {
-	KaPwDialogPrivate *priv = pwdialog->priv;
-	gchar *wrong_markup = NULL;
-	gchar *prompt;
-	int pw4len;
-
-	if (krb5prompt == NULL) {
-		prompt = g_strdup (_("Please enter your Kerberos password:"));
-	} else {
-		/* Kerberos's prompts are a mess, and basically impossible to
-		 * translate.  There's basically no way short of doing a lot of
-		 * string parsing to translate them.  The most common prompt is
-		 * "Password for $uid:".  We special case that one at least.  We
-		 * cannot do any of the fancier strings (like challenges),
-		 * though. */
-		pw4len = strlen ("Password for ");
-		if (strncmp (krb5prompt, "Password for ", pw4len) == 0) {
-			gchar *uid = (gchar *) (krb5prompt + pw4len);
-			prompt = g_strdup_printf (_("Please enter the password for '%s':"), uid);
-		} else {
-			prompt = g_strdup (krb5prompt);
-		}
-	}
-
-	/* Clear the password entry field */
-	gtk_entry_set_text (GTK_ENTRY (priv->pw_entry), "");
-
-	/* Use the prompt label that krb5 provides us */
-	gtk_label_set_text (GTK_LABEL (priv->krb_label), prompt);
-
-	/* Add our extra message hints */
-	if (invalid_auth) {
-		wrong_markup = g_strdup_printf ("<span size=\"smaller\" style=\"italic\">%s</span>",
-		                                _("The password you entered is invalid"));
-		gtk_label_set_markup (GTK_LABEL (priv->status_label), wrong_markup);
-	} else
-		ka_pwdialog_status_update (pwdialog);
-
-	g_free(wrong_markup);
-	g_free (prompt);
+    KaPwDialogPrivate *priv = pwdialog->priv;
+    gchar *wrong_markup = NULL;
+    gchar *prompt;
+    int pw4len;
+
+    if (krb5prompt == NULL) {
+        prompt = g_strdup (_("Please enter your Kerberos password:"));
+    } else {
+        /* Kerberos's prompts are a mess, and basically impossible to
+         * translate.  There's basically no way short of doing a lot of
+         * string parsing to translate them.  The most common prompt is
+         * "Password for $uid:".  We special case that one at least.  We
+         * cannot do any of the fancier strings (like challenges),
+         * though. */
+        pw4len = strlen ("Password for ");
+        if (strncmp (krb5prompt, "Password for ", pw4len) == 0) {
+            gchar *uid = (gchar *) (krb5prompt + pw4len);
+
+            prompt =
+                g_strdup_printf (_("Please enter the password for '%s':"),
+                                 uid);
+        } else {
+            prompt = g_strdup (krb5prompt);
+        }
+    }
+
+    /* Clear the password entry field */
+    gtk_entry_set_text (GTK_ENTRY (priv->pw_entry), "");
+
+    /* Use the prompt label that krb5 provides us */
+    gtk_label_set_text (GTK_LABEL (priv->krb_label), prompt);
+
+    /* Add our extra message hints */
+    if (invalid_auth) {
+        wrong_markup =
+            g_strdup_printf
+            ("<span size=\"smaller\" style=\"italic\">%s</span>",
+             _("The password you entered is invalid"));
+        gtk_label_set_markup (GTK_LABEL (priv->status_label), wrong_markup);
+    } else
+        ka_pwdialog_status_update (pwdialog);
+
+    g_free (wrong_markup);
+    g_free (prompt);
 }
 
 
-static GtkWidget*
-ka_error_dialog_new(void)
+static GtkWidget *
+ka_error_dialog_new (void)
 {
-	GtkWidget *dialog = gtk_message_dialog_new (
-				NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
-				GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-				_("%s Error"), KA_NAME);
-	gtk_window_set_title(GTK_WINDOW(dialog), _(KA_NAME));
-	gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), FALSE);
-	return dialog;
+    GtkWidget *dialog =
+        gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
+                                GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+                                _("%s Error"), KA_NAME);
+
+    gtk_window_set_title (GTK_WINDOW (dialog), _(KA_NAME));
+    gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
+    return dialog;
 }
 
 
-KaPwDialog*
-ka_pwdialog_create(GtkBuilder* xml)
+KaPwDialog *
+ka_pwdialog_create (GtkBuilder *xml)
 {
-	KaPwDialog *pwdialog = ka_pwdialog_new();
-	KaEntryBuffer *buffer = ka_entry_buffer_new ();
-	KaPwDialogPrivate *priv = pwdialog->priv;
-	GtkWidget *entry_hbox = NULL;
-
-	priv->dialog = GTK_WIDGET (gtk_builder_get_object (xml, "krb5_dialog"));
-	priv->status_label = GTK_WIDGET (gtk_builder_get_object (xml, "krb5_status_label"));
-	priv->krb_label = GTK_WIDGET (gtk_builder_get_object (xml, "krb5_message_label"));
-	priv->pw_entry = GTK_WIDGET (gtk_entry_new_with_buffer (GTK_ENTRY_BUFFER(buffer)));
-	gtk_entry_set_visibility(GTK_ENTRY(priv->pw_entry), FALSE);
-	g_object_unref (buffer);
-	priv->error_dialog = ka_error_dialog_new();
-
-	entry_hbox = GTK_WIDGET (gtk_builder_get_object (xml, "entry_hbox"));
-	gtk_container_add (GTK_CONTAINER (entry_hbox), priv->pw_entry);
-	gtk_entry_set_activates_default (GTK_ENTRY (priv->pw_entry), TRUE);
-	gtk_widget_show (priv->pw_entry);
-
-	return pwdialog;
+    KaPwDialog *pwdialog = ka_pwdialog_new ();
+    KaEntryBuffer *buffer = ka_entry_buffer_new ();
+    KaPwDialogPrivate *priv = pwdialog->priv;
+    GtkWidget *entry_hbox = NULL;
+
+    priv->dialog = GTK_WIDGET (gtk_builder_get_object (xml, "krb5_dialog"));
+    priv->status_label =
+        GTK_WIDGET (gtk_builder_get_object (xml, "krb5_status_label"));
+    priv->krb_label =
+        GTK_WIDGET (gtk_builder_get_object (xml, "krb5_message_label"));
+    priv->pw_entry =
+        GTK_WIDGET (gtk_entry_new_with_buffer (GTK_ENTRY_BUFFER (buffer)));
+    gtk_entry_set_visibility (GTK_ENTRY (priv->pw_entry), FALSE);
+    g_object_unref (buffer);
+    priv->error_dialog = ka_error_dialog_new ();
+
+    entry_hbox = GTK_WIDGET (gtk_builder_get_object (xml, "entry_hbox"));
+    gtk_container_add (GTK_CONTAINER (entry_hbox), priv->pw_entry);
+    gtk_entry_set_activates_default (GTK_ENTRY (priv->pw_entry), TRUE);
+    gtk_widget_show (priv->pw_entry);
+
+    return pwdialog;
 }