From d911517dc2f9c4c3ce57529ac4d64c17185544e9 Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Mon, 25 May 2009 18:39:27 +0200
Subject: Imported Upstream version 0.10

---
 src/krb5-auth-dialog.c | 38 ++++++--------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

(limited to 'src/krb5-auth-dialog.c')

diff --git a/src/krb5-auth-dialog.c b/src/krb5-auth-dialog.c
index 08f1c12..56a3a8c 100644
--- a/src/krb5-auth-dialog.c
+++ b/src/krb5-auth-dialog.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <glade/glade.h>
+#include <gio/gio.h>
 
 #include "gtksecentry.h"
 #include "secmem-util.h"
@@ -39,7 +39,6 @@
 #include "krb5-auth-dialog.h"
 #include "krb5-auth-applet.h"
 #include "krb5-auth-pwdialog.h"
-#include "krb5-auth-gconf.h"
 #include "krb5-auth-dbus.h"
 
 #ifdef ENABLE_NETWORK_MANAGER
@@ -810,7 +809,7 @@ ka_error_dialog(int err)
 				GTK_DIALOG_DESTROY_WITH_PARENT,
 				GTK_MESSAGE_ERROR,
 				GTK_BUTTONS_CLOSE,
-				_("Couldn't acquire kerberos ticket: '%s'"), msg);
+				_("Couldn't acquire kerberos ticket: '%s'"), _(msg));
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
 }
@@ -934,36 +933,13 @@ ka_nm_init(void)
 }
 
 
-static GtkWidget*
-ka_create_gtk_secure_entry (GladeXML *xml G_GNUC_UNUSED,
-			    gchar *func_name G_GNUC_UNUSED,
-			    gchar *name,
-			    gchar *s1 G_GNUC_UNUSED,
-			    gchar *s2 G_GNUC_UNUSED,
-			    gint i1 G_GNUC_UNUSED,
-			    gint i2 G_GNUC_UNUSED,
-			    gpointer user_data G_GNUC_UNUSED)
-{
-	GtkWidget* entry = NULL;
-
-	if (!strcmp(name, "krb5_entry")) {
-		entry = gtk_secure_entry_new ();
-		gtk_secure_entry_set_activates_default(GTK_SECURE_ENTRY(entry), TRUE);
-		gtk_widget_show (entry);
-	} else {
-		g_warning("Don't know anything about widget %s", name);
-	}
-	return entry;
-}
-
-
 int
 main (int argc, char *argv[])
 {
 	KaApplet *applet;
 	GOptionContext *context;
 	GError *error = NULL;
-	GladeXML *xml;
+	GtkBuilder *xml;
 
 	guint status = 0;
 	gboolean run_auto = FALSE, run_always = FALSE;
@@ -1002,14 +978,12 @@ main (int argc, char *argv[])
 	if (using_krb5 () || always_run) {
 		g_set_application_name (_("Network Authentication"));
 
-		glade_set_custom_handler (&ka_create_gtk_secure_entry, NULL);
-		xml = glade_xml_new (KA_DATA_DIR G_DIR_SEPARATOR_S
-				     PACKAGE ".glade", NULL, NULL);
+		xml = gtk_builder_new();
+		g_assert(gtk_builder_add_from_file(xml, KA_DATA_DIR G_DIR_SEPARATOR_S
+				                   PACKAGE ".xml", NULL));
 		applet = ka_applet_create (xml);
 		if (!applet)
 			return 1;
-		if (!ka_gconf_init (applet, argc, argv))
-			return 1;
 		ka_nm_init();
 
 		if (credentials_expiring ((gpointer)applet)) {
-- 
cgit