[krb5-auth-dialog] Remove ka_pwdialog_create



commit f47460db49e3ec5cb7bf8b0ba44a1d4d5c46d1dc
Author: Guido Günther <agx sigxcpu org>
Date:   Thu Oct 23 23:05:26 2014 +0200

    Remove ka_pwdialog_create
    
    and use ka_pwdialog_new instead

 src/ka-applet.c   |    2 +-
 src/ka-pwdialog.c |   76 ++++++++++++++++++++++++++--------------------------
 src/ka-pwdialog.h |    2 +-
 3 files changed, 40 insertions(+), 40 deletions(-)
---
diff --git a/src/ka-applet.c b/src/ka-applet.c
index d63cd35..610663d 100644
--- a/src/ka-applet.c
+++ b/src/ka-applet.c
@@ -1198,7 +1198,7 @@ ka_applet_create ()
     }
     gtk_builder_connect_signals (applet->priv->uixml, NULL);
 
-    applet->priv->pwdialog = ka_pwdialog_create ();
+    applet->priv->pwdialog = ka_pwdialog_new ();
     g_return_val_if_fail (applet->priv->pwdialog != NULL, NULL);
 
     applet->priv->settings = ka_settings_init (applet);
diff --git a/src/ka-pwdialog.c b/src/ka-pwdialog.c
index 5242eca..4cd7eb4 100644
--- a/src/ka-pwdialog.c
+++ b/src/ka-pwdialog.c
@@ -124,12 +124,48 @@ ka_pwdialog_class_init (KaPwDialogClass * klass)
     gtk_widget_class_bind_template_child_private (widget_class, KaPwDialog, entry_hbox);
 }
 
-static KaPwDialog *
+
+static void add_password_entry (KaPwDialogPrivate *priv)
+{
+    KaEntryBuffer *buffer = ka_entry_buffer_new ();
+
+    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);
+
+    gtk_container_add (GTK_CONTAINER (priv->entry_hbox), priv->pw_entry);
+    gtk_entry_set_activates_default (GTK_ENTRY (priv->pw_entry), TRUE);
+    gtk_widget_show (priv->pw_entry);
+}
+
+
+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;
+}
+
+
+KaPwDialog *
 ka_pwdialog_new (void)
 {
-    return g_object_new (KA_TYPE_PWDIALOG, NULL);
+    KaPwDialog *pwdialog = g_object_new (KA_TYPE_PWDIALOG, NULL);
+    KaPwDialogPrivate *priv = pwdialog->priv;
+
+    priv->error_dialog = ka_error_dialog_new ();
+    add_password_entry (priv);
+    return pwdialog;
 }
 
+
 static GdkGrabStatus
 for_each_keyboard (GdkWindow *window, GdkEvent *event,
                    GdkGrabStatus (*func)(GdkDevice*,
@@ -373,39 +409,3 @@ ka_pwdialog_setup (KaPwDialog *pwdialog, const gchar *krb5prompt,
     g_free (wrong_markup);
     g_free (prompt);
 }
-
-
-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;
-}
-
-
-KaPwDialog *
-ka_pwdialog_create (void)
-{
-    KaPwDialog *pwdialog = ka_pwdialog_new ();
-    KaEntryBuffer *buffer = ka_entry_buffer_new ();
-    KaPwDialogPrivate *priv = pwdialog->priv;
-
-    priv->error_dialog = ka_error_dialog_new ();
-
-    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);
-
-    gtk_container_add (GTK_CONTAINER (priv->entry_hbox), priv->pw_entry);
-    gtk_entry_set_activates_default (GTK_ENTRY (priv->pw_entry), TRUE);
-    gtk_widget_show (priv->pw_entry);
-
-    return pwdialog;
-}
diff --git a/src/ka-pwdialog.h b/src/ka-pwdialog.h
index e874bf0..a69c351 100644
--- a/src/ka-pwdialog.h
+++ b/src/ka-pwdialog.h
@@ -45,7 +45,7 @@ typedef struct _KaPwDialogPrivate KaPwDialogPrivate;
 GType ka_pwdialog_get_type (void);
 
 /* public functions */
-KaPwDialog *ka_pwdialog_create (void);
+KaPwDialog *ka_pwdialog_new (void);
 
 /* setup everything for the next prompting */
 void ka_pwdialog_setup (KaPwDialog *pwdialog, const gchar *krb5prompt,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]