New upstream version 3.2.0

author: Guido Günther <agx@sigxcpu.org> 2011-09-26 22:20:52 +0200
committer: Guido Günther <agx@sigxcpu.org> 2011-09-26 22:20:52 +0200
commit: 85df09c7a65dab7c54e1e35b0685f8677355710c (patch)
tree: 49c3d1ae8ceea68ad29185c40403c0add4b68f28 /src
parent: New upstream version 3.0.1 (diff)
download: krb5-auth-dialog-85df09c7a65dab7c54e1e35b0685f8677355710c.tar.gz
krb5-auth-dialog-85df09c7a65dab7c54e1e35b0685f8677355710c.tar.bz2
krb5-auth-dialog-85df09c7a65dab7c54e1e35b0685f8677355710c.zip
16 files changed, 2055 insertions, 310 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 65d2a92..9c22dcf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,8 +25,8 @@ $(service_DATA): $(service_in_files) Makefile
 	sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@
 
 krb5_auth_dialog_SOURCES =	\
-	ka-dialog.c      	\
-	ka-dialog.h      	\
+	ka-kerberos.c      	\
+	ka-kerberos.h      	\
 	ka-applet.c		\
 	ka-applet-priv.h	\
 	ka-applet.h		\
@@ -40,12 +40,14 @@ krb5_auth_dialog_SOURCES =	\
 	ka-dbus.h		\
 	ka-tools.c		\
 	ka-tools.h		\
-	ka-tickets.c		\
-	ka-tickets.h		\
+	ka-main-window.c	\
+	ka-main-window.h	\
 	ka-plugin.c		\
 	ka-plugin.h		\
 	ka-plugin-loader.c	\
 	ka-plugin-loader.h	\
+	ka-preferences.c	\
+	ka-preferences.h	\
 	ka-closures.h		\
 	ka-closures.c		\
 	ka-entry-buffer.h	\
diff --git a/src/Makefile.in b/src/Makefile.in
index b67314b..f4a24be 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -54,16 +54,17 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(servicedir)"
 PROGRAMS = $(bin_PROGRAMS)
 am__objects_1 =
-am_krb5_auth_dialog_OBJECTS = krb5_auth_dialog-ka-dialog.$(OBJEXT) \
+am_krb5_auth_dialog_OBJECTS = krb5_auth_dialog-ka-kerberos.$(OBJEXT) \
 	krb5_auth_dialog-ka-applet.$(OBJEXT) \
 	krb5_auth_dialog-ka-pwdialog.$(OBJEXT) \
 	krb5_auth_dialog-ka-gconf.$(OBJEXT) \
 	krb5_auth_dialog-ka-gconf-tools.$(OBJEXT) \
 	krb5_auth_dialog-ka-dbus.$(OBJEXT) \
 	krb5_auth_dialog-ka-tools.$(OBJEXT) \
-	krb5_auth_dialog-ka-tickets.$(OBJEXT) \
+	krb5_auth_dialog-ka-main-window.$(OBJEXT) \
 	krb5_auth_dialog-ka-plugin.$(OBJEXT) \
 	krb5_auth_dialog-ka-plugin-loader.$(OBJEXT) \
+	krb5_auth_dialog-ka-preferences.$(OBJEXT) \
 	krb5_auth_dialog-ka-closures.$(OBJEXT) \
 	krb5_auth_dialog-ka-entry-buffer.$(OBJEXT) \
 	krb5_auth_dialog-dummy-strings.$(OBJEXT) $(am__objects_1)
@@ -155,8 +156,6 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 COMPILER_FLAGS = @COMPILER_FLAGS@
-CONTROL_CENTER_CFLAGS = @CONTROL_CENTER_CFLAGS@
-CONTROL_CENTER_LIBS = @CONTROL_CENTER_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -244,7 +243,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PAM_LIBS = @PAM_LIBS@
-PANELS_DIR = @PANELS_DIR@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
@@ -336,8 +334,8 @@ servicedir = $(datadir)/dbus-1/services
 service_in_files = org.gnome.KrbAuthDialog.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 krb5_auth_dialog_SOURCES = \
-	ka-dialog.c      	\
-	ka-dialog.h      	\
+	ka-kerberos.c      	\
+	ka-kerberos.h      	\
 	ka-applet.c		\
 	ka-applet-priv.h	\
 	ka-applet.h		\
@@ -351,12 +349,14 @@ krb5_auth_dialog_SOURCES = \
 	ka-dbus.h		\
 	ka-tools.c		\
 	ka-tools.h		\
-	ka-tickets.c		\
-	ka-tickets.h		\
+	ka-main-window.c	\
+	ka-main-window.h	\
 	ka-plugin.c		\
 	ka-plugin.h		\
 	ka-plugin-loader.c	\
 	ka-plugin-loader.h	\
+	ka-preferences.c	\
+	ka-preferences.h	\
 	ka-closures.h		\
 	ka-closures.c		\
 	ka-entry-buffer.h	\
@@ -512,14 +512,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-applet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-closures.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-dbus.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-dialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-entry-buffer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-gconf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-kerberos.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-main-window.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-plugin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-preferences.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-tickets.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-tools.Po@am__quote@
 
 .c.o:
@@ -546,21 +547,21 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-krb5_auth_dialog-ka-dialog.o: ka-dialog.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-dialog.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-dialog.Tpo -c -o krb5_auth_dialog-ka-dialog.o `test -f 'ka-dialog.c' || echo '$(srcdir)/'`ka-dialog.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-dialog.Tpo $(DEPDIR)/krb5_auth_dialog-ka-dialog.Po
+krb5_auth_dialog-ka-kerberos.o: ka-kerberos.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-kerberos.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Tpo -c -o krb5_auth_dialog-ka-kerberos.o `test -f 'ka-kerberos.c' || echo '$(srcdir)/'`ka-kerberos.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Tpo $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-dialog.c' object='krb5_auth_dialog-ka-dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-kerberos.c' object='krb5_auth_dialog-ka-kerberos.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-dialog.o `test -f 'ka-dialog.c' || echo '$(srcdir)/'`ka-dialog.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-kerberos.o `test -f 'ka-kerberos.c' || echo '$(srcdir)/'`ka-kerberos.c
 
-krb5_auth_dialog-ka-dialog.obj: ka-dialog.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-dialog.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-dialog.Tpo -c -o krb5_auth_dialog-ka-dialog.obj `if test -f 'ka-dialog.c'; then $(CYGPATH_W) 'ka-dialog.c'; else $(CYGPATH_W) '$(srcdir)/ka-dialog.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-dialog.Tpo $(DEPDIR)/krb5_auth_dialog-ka-dialog.Po
+krb5_auth_dialog-ka-kerberos.obj: ka-kerberos.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-kerberos.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Tpo -c -o krb5_auth_dialog-ka-kerberos.obj `if test -f 'ka-kerberos.c'; then $(CYGPATH_W) 'ka-kerberos.c'; else $(CYGPATH_W) '$(srcdir)/ka-kerberos.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Tpo $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-dialog.c' object='krb5_auth_dialog-ka-dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-kerberos.c' object='krb5_auth_dialog-ka-kerberos.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-dialog.obj `if test -f 'ka-dialog.c'; then $(CYGPATH_W) 'ka-dialog.c'; else $(CYGPATH_W) '$(srcdir)/ka-dialog.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-kerberos.obj `if test -f 'ka-kerberos.c'; then $(CYGPATH_W) 'ka-kerberos.c'; else $(CYGPATH_W) '$(srcdir)/ka-kerberos.c'; fi`
 
 krb5_auth_dialog-ka-applet.o: ka-applet.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-applet.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-applet.Tpo -c -o krb5_auth_dialog-ka-applet.o `test -f 'ka-applet.c' || echo '$(srcdir)/'`ka-applet.c
@@ -658,21 +659,21 @@ krb5_auth_dialog-ka-tools.obj: ka-tools.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-tools.obj `if test -f 'ka-tools.c'; then $(CYGPATH_W) 'ka-tools.c'; else $(CYGPATH_W) '$(srcdir)/ka-tools.c'; fi`
 
-krb5_auth_dialog-ka-tickets.o: ka-tickets.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-tickets.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-tickets.Tpo -c -o krb5_auth_dialog-ka-tickets.o `test -f 'ka-tickets.c' || echo '$(srcdir)/'`ka-tickets.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-tickets.Tpo $(DEPDIR)/krb5_auth_dialog-ka-tickets.Po
+krb5_auth_dialog-ka-main-window.o: ka-main-window.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-main-window.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-main-window.Tpo -c -o krb5_auth_dialog-ka-main-window.o `test -f 'ka-main-window.c' || echo '$(srcdir)/'`ka-main-window.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-main-window.Tpo $(DEPDIR)/krb5_auth_dialog-ka-main-window.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-tickets.c' object='krb5_auth_dialog-ka-tickets.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-main-window.c' object='krb5_auth_dialog-ka-main-window.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-tickets.o `test -f 'ka-tickets.c' || echo '$(srcdir)/'`ka-tickets.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-main-window.o `test -f 'ka-main-window.c' || echo '$(srcdir)/'`ka-main-window.c
 
-krb5_auth_dialog-ka-tickets.obj: ka-tickets.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-tickets.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-tickets.Tpo -c -o krb5_auth_dialog-ka-tickets.obj `if test -f 'ka-tickets.c'; then $(CYGPATH_W) 'ka-tickets.c'; else $(CYGPATH_W) '$(srcdir)/ka-tickets.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-tickets.Tpo $(DEPDIR)/krb5_auth_dialog-ka-tickets.Po
+krb5_auth_dialog-ka-main-window.obj: ka-main-window.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-main-window.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-main-window.Tpo -c -o krb5_auth_dialog-ka-main-window.obj `if test -f 'ka-main-window.c'; then $(CYGPATH_W) 'ka-main-window.c'; else $(CYGPATH_W) '$(srcdir)/ka-main-window.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-main-window.Tpo $(DEPDIR)/krb5_auth_dialog-ka-main-window.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-tickets.c' object='krb5_auth_dialog-ka-tickets.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-main-window.c' object='krb5_auth_dialog-ka-main-window.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-tickets.obj `if test -f 'ka-tickets.c'; then $(CYGPATH_W) 'ka-tickets.c'; else $(CYGPATH_W) '$(srcdir)/ka-tickets.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-main-window.obj `if test -f 'ka-main-window.c'; then $(CYGPATH_W) 'ka-main-window.c'; else $(CYGPATH_W) '$(srcdir)/ka-main-window.c'; fi`
 
 krb5_auth_dialog-ka-plugin.o: ka-plugin.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-plugin.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-plugin.Tpo -c -o krb5_auth_dialog-ka-plugin.o `test -f 'ka-plugin.c' || echo '$(srcdir)/'`ka-plugin.c
@@ -706,6 +707,22 @@ krb5_auth_dialog-ka-plugin-loader.obj: ka-plugin-loader.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin-loader.obj `if test -f 'ka-plugin-loader.c'; then $(CYGPATH_W) 'ka-plugin-loader.c'; else $(CYGPATH_W) '$(srcdir)/ka-plugin-loader.c'; fi`
 
+krb5_auth_dialog-ka-preferences.o: ka-preferences.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-preferences.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-preferences.Tpo -c -o krb5_auth_dialog-ka-preferences.o `test -f 'ka-preferences.c' || echo '$(srcdir)/'`ka-preferences.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-preferences.Tpo $(DEPDIR)/krb5_auth_dialog-ka-preferences.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-preferences.c' object='krb5_auth_dialog-ka-preferences.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-preferences.o `test -f 'ka-preferences.c' || echo '$(srcdir)/'`ka-preferences.c
+
+krb5_auth_dialog-ka-preferences.obj: ka-preferences.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-preferences.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-preferences.Tpo -c -o krb5_auth_dialog-ka-preferences.obj `if test -f 'ka-preferences.c'; then $(CYGPATH_W) 'ka-preferences.c'; else $(CYGPATH_W) '$(srcdir)/ka-preferences.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-preferences.Tpo $(DEPDIR)/krb5_auth_dialog-ka-preferences.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-preferences.c' object='krb5_auth_dialog-ka-preferences.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-preferences.obj `if test -f 'ka-preferences.c'; then $(CYGPATH_W) 'ka-preferences.c'; else $(CYGPATH_W) '$(srcdir)/ka-preferences.c'; fi`
+
 krb5_auth_dialog-ka-closures.o: ka-closures.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-closures.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-closures.Tpo -c -o krb5_auth_dialog-ka-closures.o `test -f 'ka-closures.c' || echo '$(srcdir)/'`ka-closures.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-closures.Tpo $(DEPDIR)/krb5_auth_dialog-ka-closures.Po
diff --git a/src/ka-applet-priv.h b/src/ka-applet-priv.h
index bd55996..d571230 100644
--- a/src/ka-applet-priv.h
+++ b/src/ka-applet-priv.h
@@ -34,11 +34,13 @@
 
 G_BEGIN_DECLS
 #define KA_NAME _("Kerberos Authentication")
+
 /* signals emitted by KaApplet */
-    typedef enum {
+typedef enum {
     KA_SIGNAL_ACQUIRED_TGT,     /* New TGT acquired */
     KA_SIGNAL_RENEWED_TGT,      /* TGT got renewed */
     KA_SIGNAL_EXPIRED_TGT,      /* TGT expired or ticket cache got destroyed */
+    KA_CCACHE_CHANGED,          /* The credential cache changed */
     KA_SIGNAL_COUNT
 } KaAppletSignalNumber;
 
diff --git a/src/ka-applet.c b/src/ka-applet.c
index 441ed94..f1fffbf 100644
--- a/src/ka-applet.c
+++ b/src/ka-applet.c
@@ -23,12 +23,14 @@
 #include <glib/gi18n.h>
 
 #include "ka-applet-priv.h"
-#include "ka-dialog.h"
+#include "ka-dbus.h"
+#include "ka-kerberos.h"
 #include "ka-gconf-tools.h"
 #include "ka-gconf.h"
 #include "ka-tools.h"
-#include "ka-tickets.h"
+#include "ka-main-window.h"
 #include "ka-plugin-loader.h"
+#include "ka-preferences.h"
 #include "ka-closures.h"
 #include <libnotify/notify.h>
 
@@ -56,22 +58,23 @@ const gchar *ka_signal_names[KA_SIGNAL_COUNT] = {
     "krb-tgt-acquired",
     "krb-tgt-renewed",
     "krb-tgt-expired",
+    "krb-ccache-changed",
 };
 
 
 struct _KaApplet {
-    GObject parent;
+    GtkApplication parent;
 
     KaAppletPrivate *priv;
 };
 
 struct _KaAppletClass {
-    GObjectClass parent;
+    GtkApplicationClass parent;
 
     guint signals[KA_SIGNAL_COUNT];
 };
 
-G_DEFINE_TYPE (KaApplet, ka_applet, G_TYPE_OBJECT);
+G_DEFINE_TYPE (KaApplet, ka_applet, GTK_TYPE_APPLICATION);
 
 struct _KaAppletPrivate {
     GtkBuilder *uixml;
@@ -84,6 +87,11 @@ struct _KaAppletPrivate {
     int pw_prompt_secs;         /* when to start sending notifications */
     KaPluginLoader *loader;     /* Plugin loader */
 
+    /* command line handling */
+    gboolean startup_ccache;    /* ccache found on startup */
+    gboolean auto_run;          /* only start with valid ccache */
+
+    /* GConf optins */
     NotifyNotification *notification;   /* notification messages */
     char *krb_msg;              /* Additional banner delivered by Kerberos */
     const char *notify_gconf_key;       /* disable notification gconf key */
@@ -98,7 +106,96 @@ struct _KaAppletPrivate {
     GConfClient *gconf;         /* gconf client */
 };
 
+
 static void ka_close_notification (KaApplet *self);
+static gboolean is_initialized;
+
+static void 
+ka_applet_activate (GApplication *application G_GNUC_UNUSED)
+{
+    if (is_initialized) {
+        KA_DEBUG ("Main window activated");
+        ka_main_window_show ();
+    } else
+        is_initialized = TRUE;
+}
+
+
+static int
+ka_applet_command_line (GApplication            *application,
+                        GApplicationCommandLine *cmdline G_GNUC_UNUSED)
+{
+    KaApplet *self = KA_APPLET(application);
+    KA_DEBUG ("Evaluating command line");
+    
+    if (!self->priv->startup_ccache &&
+        self->priv->auto_run)
+        ka_applet_destroy (self);
+    else
+        ka_applet_activate (application);
+    return 0;
+}
+
+
+
+static gint
+ka_applet_local_command_line (GApplication *application,
+                              gchar ***argv,
+                              gint *exit_status)
+{
+    KaApplet *self = KA_APPLET(application);
+    GOptionContext *context;
+    GError *error = NULL;
+
+    gint argc = g_strv_length (*argv);
+    gboolean auto_run = FALSE;
+
+    const char *help_msg =
+        "Run '" PACKAGE
+        " --help' to see a full list of available command line options";
+    const GOptionEntry options[] = {
+        {"auto", 'a', 0, G_OPTION_ARG_NONE, &auto_run,
+         "Only run if an initialized ccache is found", NULL},
+        {NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL}
+    };
+
+    KA_DEBUG ("Parsing local command line");
+    
+    context = g_option_context_new ("- Kerberos 5 credential checking");
+    g_option_context_add_main_entries (context, options, NULL);
+    g_option_context_add_group (context, gtk_get_option_group (TRUE));
+    g_option_context_parse (context, &argc, argv, &error);
+
+    if (error) {
+        g_print ("%s\n%s\n", error->message, help_msg);
+        g_clear_error (&error);
+        *exit_status = 1;
+    } else {
+        self->priv->auto_run = auto_run;
+        *exit_status = 0;
+    }
+
+    g_option_context_free (context);
+    return FALSE;
+}
+
+static void
+ka_applet_startup (GApplication *application)
+{
+    KaApplet *self = KA_APPLET (application);
+    GtkWindow *main_window;
+
+    KA_DEBUG ("Primary application");
+
+    self->priv->startup_ccache = ka_kerberos_init (self);
+    if (!ka_dbus_connect (self)) {
+        ka_applet_destroy (self);
+    }
+
+    main_window = ka_main_window_create (self, self->priv->uixml);
+    gtk_application_add_window (GTK_APPLICATION(self), main_window);
+    ka_preferences_window_create (self, self->priv->uixml);
+}
 
 static void
 ka_applet_set_property (GObject *object,
@@ -266,6 +363,11 @@ ka_applet_class_init (KaAppletClass *klass)
     object_class->finalize = ka_applet_finalize;
     g_type_class_add_private (klass, sizeof (KaAppletPrivate));
 
+    G_APPLICATION_CLASS (klass)->local_command_line =   \
+        ka_applet_local_command_line;
+    G_APPLICATION_CLASS (klass)->command_line = ka_applet_command_line;
+    G_APPLICATION_CLASS (klass)->startup = ka_applet_startup;
+
     object_class->set_property = ka_applet_set_property;
     object_class->get_property = ka_applet_get_property;
 
@@ -318,8 +420,7 @@ ka_applet_class_init (KaAppletClass *klass)
                                   G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
     g_object_class_install_property (object_class,
                                      KA_PROP_TGT_RENEWABLE, pspec);
-
-    for (i = 0; i < KA_SIGNAL_COUNT; i++) {
+    for (i=0; i < KA_SIGNAL_COUNT-1; i++) {
         guint signalId;
 
         signalId = g_signal_new (ka_signal_names[i], G_OBJECT_CLASS_TYPE (klass),
@@ -329,13 +430,21 @@ ka_applet_class_init (KaAppletClass *klass)
                                  G_TYPE_STRING, G_TYPE_UINT);
         klass->signals[i] = signalId;
     }
+    klass->signals[KA_CCACHE_CHANGED] = g_signal_new (
+        ka_signal_names[KA_CCACHE_CHANGED], 
+        G_OBJECT_CLASS_TYPE (klass),
+        G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+        g_cclosure_marshal_VOID__VOID,
+        G_TYPE_NONE, 0);
 }
 
 
 static KaApplet *
 ka_applet_new (void)
 {
-    return g_object_new (KA_TYPE_APPLET, NULL);
+    return g_object_new (KA_TYPE_APPLET, 
+                         "application-id", "org.gnome.KrbAuthDialog",
+                         NULL);
 }
 
 
@@ -456,8 +565,8 @@ ka_notify_ticket_action_cb (NotifyNotification *notification G_GNUC_UNUSED,
         KA_DEBUG ("Removing ccache");
         ka_destroy_ccache (self);
     } else if (strcmp (action, "ka-list-tickets") == 0) {
-        KA_DEBUG ("Listing tickets");
-        ka_tickets_dialog_run ();
+        KA_DEBUG ("Showing main window");
+        ka_main_window_show ();
     } else {
         g_warning ("unkonwn action for callback");
     }
@@ -680,37 +789,10 @@ ka_applet_menu_add_separator_item (GtkWidget *menu)
     gtk_widget_show (menu_item);
 }
 
-static void
-ka_applet_cb_preferences (GtkWidget *menuitem G_GNUC_UNUSED,
-                          gpointer user_data G_GNUC_UNUSED)
-{
-    GError *error = NULL;
-
-    g_spawn_command_line_async (BIN_DIR
-                                G_DIR_SEPARATOR_S
-                                "gnome-control-center ka-panel", &error);
-    if (error) {
-        GtkWidget *message_dialog;
-
-        message_dialog = gtk_message_dialog_new (NULL,
-                                                 GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                 GTK_MESSAGE_ERROR,
-                                                 GTK_BUTTONS_CLOSE,
-                                                 _("There was an error launching the preferences dialog: %s"),
-                                                 error->message);
-        gtk_window_set_resizable (GTK_WINDOW (message_dialog), FALSE);
-
-        g_signal_connect (message_dialog, "response",
-                          G_CALLBACK (gtk_widget_destroy), NULL);
-        gtk_widget_show (message_dialog);
-        g_clear_error (&error);
-    }
-}
-
 
 /* Free all resources and quit */
 static void
-ka_applet_cb_quit (GtkMenuItem *menuitem G_GNUC_UNUSED, gpointer user_data)
+ka_applet_quit_cb (GtkMenuItem *menuitem G_GNUC_UNUSED, gpointer user_data)
 {
     KaApplet *applet = KA_APPLET (user_data);
 
@@ -719,36 +801,7 @@ ka_applet_cb_quit (GtkMenuItem *menuitem G_GNUC_UNUSED, gpointer user_data)
 
 
 static void
-ka_applet_cb_about_dialog (GtkMenuItem *menuitem G_GNUC_UNUSED,
-                           gpointer user_data G_GNUC_UNUSED)
-{
-    const gchar *authors[] = {
-        "Christopher Aillon <caillon@redhat.com>",
-        "Jonathan Blandford <jrb@redhat.com>",
-        "Colin Walters <walters@verbum.org>",
-        "Guido Günther <agx@sigxcpu.org>",
-        NULL
-    };
-
-    gtk_show_about_dialog (NULL,
-                           "authors", authors,
-                           "version", VERSION,
-                           "logo-icon-name", "krb-valid-ticket",
-                           "copyright",
-                           "Copyright (C) 2004,2005,2006 Red Hat, Inc.,\n"
-                           "2008-2011 Guido Günther",
-                           "website-label", PACKAGE " website",
-                           "website",
-                           "https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/",
-                           "license", "GNU General Public License Version 2",
-                           /* Translators: add the translators of your language here */
-                           "translator-credits", _("translator-credits"),
-                           NULL);
-}
-
-
-static void
-ka_applet_cb_show_help (GtkMenuItem *menuitem G_GNUC_UNUSED,
+ka_applet_show_help_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
                         gpointer user_data)
 {
     KaApplet *applet = KA_APPLET (user_data);
@@ -759,7 +812,7 @@ ka_applet_cb_show_help (GtkMenuItem *menuitem G_GNUC_UNUSED,
 
 
 static void
-ka_applet_cb_destroy_ccache (GtkMenuItem *menuitem G_GNUC_UNUSED,
+ka_applet_destroy_ccache_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
                              gpointer user_data)
 {
     KaApplet *applet = KA_APPLET (user_data);
@@ -768,10 +821,10 @@ ka_applet_cb_destroy_ccache (GtkMenuItem *menuitem G_GNUC_UNUSED,
 }
 
 static void
-ka_applet_cb_show_tickets (GtkMenuItem *menuitem G_GNUC_UNUSED,
+ka_applet_show_tickets_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
                            gpointer user_data G_GNUC_UNUSED)
 {
-    ka_tickets_dialog_run ();
+    ka_main_window_show ();
 }
 
 
@@ -789,7 +842,7 @@ ka_applet_create_context_menu (KaApplet *applet)
     menu_item =
         gtk_image_menu_item_new_with_mnemonic (_("Remove Credentials _Cache"));
     g_signal_connect (G_OBJECT (menu_item), "activate",
-                      G_CALLBACK (ka_applet_cb_destroy_ccache), applet);
+                      G_CALLBACK (ka_applet_destroy_ccache_cb), applet);
     image = gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_MENU);
     gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
@@ -799,26 +852,13 @@ ka_applet_create_context_menu (KaApplet *applet)
     /* Ticket dialog */
     menu_item = gtk_image_menu_item_new_with_mnemonic (_("_List Tickets"));
     g_signal_connect (G_OBJECT (menu_item), "activate",
-                      G_CALLBACK (ka_applet_cb_show_tickets), applet);
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-
-    /* Preferences */
-    menu_item =
-        gtk_image_menu_item_new_from_stock (GTK_STOCK_PREFERENCES, NULL);
-    g_signal_connect (G_OBJECT (menu_item), "activate",
-                      G_CALLBACK (ka_applet_cb_preferences), applet);
+                      G_CALLBACK (ka_applet_show_tickets_cb), applet);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 
-    /* About item */
+    /* Help item */
     menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_HELP, NULL);
     g_signal_connect (G_OBJECT (menu_item), "activate",
-                      G_CALLBACK (ka_applet_cb_show_help), applet);
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-
-    /* About item */
-    menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ABOUT, NULL);
-    g_signal_connect (G_OBJECT (menu_item), "activate",
-                      G_CALLBACK (ka_applet_cb_about_dialog), applet);
+                      G_CALLBACK (ka_applet_show_help_cb), applet);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 
     ka_applet_menu_add_separator_item (menu);
@@ -826,7 +866,7 @@ ka_applet_create_context_menu (KaApplet *applet)
     /* Quit */
     menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_QUIT, NULL);
     g_signal_connect (G_OBJECT (menu_item), "activate",
-                      G_CALLBACK (ka_applet_cb_quit), applet);
+                      G_CALLBACK (ka_applet_quit_cb), applet);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 
     gtk_widget_show_all (menu);
@@ -984,12 +1024,21 @@ ka_ns_check_persistence (KaApplet *self)
 }
 
 
-/* destroy the applet and quit */
+/* undo what was done on startup() */
 void
-ka_applet_destroy (KaApplet* applet)
+ka_applet_destroy (KaApplet* self)
 {
-    g_object_unref (applet);
-    gtk_main_quit ();
+    GList *windows, *first;
+
+    ka_dbus_disconnect ();
+    windows = gtk_application_get_windows (GTK_APPLICATION(self));
+    if (windows) {
+        first = g_list_first (windows);
+        gtk_application_remove_window(GTK_APPLICATION (self), 
+                                      GTK_WINDOW (first->data));
+    }
+
+    ka_kerberos_destroy ();
 }
 
 
@@ -1020,19 +1069,42 @@ ka_applet_create ()
         g_assert (error->message);
         g_error ("Failed to load UI XML: %s", error->message);
     }
+    gtk_builder_connect_signals (applet->priv->uixml, NULL);
+
     applet->priv->pwdialog = ka_pwdialog_create (applet->priv->uixml);
     g_return_val_if_fail (applet->priv->pwdialog != NULL, NULL);
 
     applet->priv->gconf = ka_gconf_init (applet);
     g_return_val_if_fail (applet->priv->gconf != NULL, NULL);
 
-    ka_tickets_dialog_create (applet->priv->uixml);
     applet->priv->loader = ka_plugin_loader_create (applet);
     g_return_val_if_fail (applet->priv->loader != NULL, NULL);
 
     return applet;
 }
 
+int
+main (int argc, char *argv[])
+{
+    KaApplet *applet;
+    int ret = 0;
+
+    textdomain (PACKAGE);
+    bind_textdomain_codeset (PACKAGE, "UTF-8");
+    bindtextdomain (PACKAGE, LOCALE_DIR);
+
+    g_set_application_name (KA_NAME);
+
+    gtk_init (&argc, &argv);
+    applet = ka_applet_create ();
+    if (!applet)
+        return 1;
+
+    ret = g_application_run (G_APPLICATION(applet), argc, argv);
+    g_object_unref (applet);
+    return ret;
+}
+
 /*
  * vim:ts:sts=4:sw=4:et:
  */
diff --git a/src/ka-dbus.c b/src/ka-dbus.c
index a79f85f..2b84adc 100644
--- a/src/ka-dbus.c
+++ b/src/ka-dbus.c
@@ -21,10 +21,9 @@
 #include "config.h"
 
 #include "ka-applet-priv.h"
-#include "ka-dialog.h"
+#include "ka-kerberos.h"
 #include "ka-dbus.h"
 
-static guint dbus_owner_id;
 static GDBusConnection *dbus_connection;
 static const char *dbus_object_path = "/org/gnome/KrbAuthDialog";
 static const char *dbus_interface_name = "org.gnome.KrbAuthDialog";
@@ -156,7 +155,7 @@ ka_dbus_connect_signals(KaApplet *applet)
 {
     int i;
 
-    for (i = 0; i < KA_SIGNAL_COUNT; i++) {
+    for (i = 0; i < KA_SIGNAL_COUNT-1; i++) {
         g_signal_connect (applet, ka_signal_names[i],
                           G_CALLBACK (ka_dbus_signal_cb),
                           (gpointer)ka_signal_names[i]);
@@ -171,18 +170,19 @@ static const GDBusInterfaceVTable interface_vtable =
 
 
 static void
-ka_dbus_on_bus_acquired (GDBusConnection *connection,
-                         const gchar     *name G_GNUC_UNUSED,
-                         gpointer         user_data)
+ka_dbus_on_get_bus_cb (GObject *source_object G_GNUC_UNUSED,
+                       GAsyncResult *res,
+                       gpointer      user_data)
 {
     KaApplet *applet = user_data;
     guint id;
 
+    dbus_connection = g_bus_get_finish (res, NULL);
     introspection_data = g_dbus_node_info_new_for_xml (
         ka_dbus_introspection_xml,
         NULL);
 
-    id = g_dbus_connection_register_object (connection,
+    id = g_dbus_connection_register_object (dbus_connection,
                                         "/org/gnome/KrbAuthDialog",
                                         introspection_data->interfaces[0],
                                         &interface_vtable,
@@ -190,22 +190,8 @@ ka_dbus_on_bus_acquired (GDBusConnection *connection,
                                         NULL,  /* user_data_free_func */
                                         NULL); /* GError** */
     if (!id)
-        g_error ("Failed to regiester DBus object");
+        g_error ("Failed to register DBus object");
     ka_dbus_connect_signals (applet);
-
-    dbus_connection = connection;
-}
-
-
-static void
-ka_dbus_on_name_lost (GDBusConnection *connection G_GNUC_UNUSED,
-                      const gchar *name G_GNUC_UNUSED,
-                      gpointer user_data)
-{
-    KaApplet *applet = user_data;
-
-    g_warning ("Cannot acquire DBUS name");
-    ka_applet_destroy (applet);
 }
 
 
@@ -217,10 +203,6 @@ ka_dbus_disconnect ()
         introspection_data = NULL;
     }
 
-    if (dbus_owner_id) {
-        g_bus_unown_name (dbus_owner_id);
-        dbus_owner_id = 0;
-    }
     dbus_connection = NULL;
 }
 
@@ -230,17 +212,12 @@ ka_dbus_connect (KaApplet *applet)
 {
     g_return_val_if_fail (applet != 0, FALSE);
 
-    dbus_owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
-                                    "org.gnome.KrbAuthDialog",
-                                    G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT,
-                                    ka_dbus_on_bus_acquired,
-                                    NULL,
-                                    ka_dbus_on_name_lost,
-                                    applet,
-                                    NULL);
+    g_bus_get (G_BUS_TYPE_SESSION, NULL, ka_dbus_on_get_bus_cb,
+               applet);
     return TRUE;
 }
 
 /*
  * vim:ts=4:sts=4:sw=4:et:
  */
+
diff --git a/src/ka-dialog.c b/src/ka-kerberos.c
index fffd2fd..e131286 100644
--- a/src/ka-dialog.c
+++ b/src/ka-kerberos.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004,2005,2006 Red Hat, Inc.
  * Authored by Christopher Aillon <caillon@redhat.com>
  *
- * Copyright (C) 2008,2009,2010 Guido Guenther <agx@sigxcpu.org>
+ * Copyright (C) 2008,2009,2010,2011 Guido Guenther <agx@sigxcpu.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,12 +35,11 @@
 #include "secmem-util.h"
 #include "memory.h"
 
-#include "ka-dialog.h"
+#include "ka-kerberos.h"
 #include "ka-applet-priv.h"
 #include "ka-pwdialog.h"
-#include "ka-dbus.h"
 #include "ka-tools.h"
-#include "ka-tickets.h"
+#include "ka-main-window.h"
 
 #ifdef ENABLE_NETWORK_MANAGER
 #include <nm-client.h>
@@ -60,8 +59,9 @@ static krb5_timestamp creds_expiry;
 static krb5_timestamp canceled_creds_expiry;
 static gboolean canceled;
 static gboolean invalid_auth;
-static gboolean always_run;
 static gboolean is_online = TRUE;
+static gboolean kcontext_valid;
+GFileMonitor *ccache_monitor;
 
 static int grab_credentials (KaApplet *applet);
 static int ka_renew_credentials (KaApplet *applet);
@@ -315,8 +315,6 @@ ka_get_service_tickets (GtkListStore * tickets)
             gtk_list_store_append (tickets, &iter);
             gtk_list_store_set (tickets, &iter,
                                 PRINCIPAL_COLUMN, _("Your ticket cache is currently empty"),
-                                START_TIME_COLUMN, 0,
-                                END_TIME_COLUMN, 0,
                                 FORWARDABLE_COLUMN, FALSE,
                                 RENEWABLE_COLUMN, FALSE,
                                 PROXIABLE_COLUMN, FALSE, -1);
@@ -677,9 +675,9 @@ ka_unparse_name ()
 
 
 static void
-ccache_changed_cb (GFileMonitor * monitor G_GNUC_UNUSED,
-                   GFile * file,
-                   GFile * other_file G_GNUC_UNUSED,
+ccache_changed_cb (GFileMonitor *monitor G_GNUC_UNUSED,
+                   GFile *file,
+                   GFile *other_file G_GNUC_UNUSED,
                    GFileMonitorEvent event_type, gpointer data)
 {
     KaApplet *applet = KA_APPLET (data);
@@ -691,6 +689,7 @@ ccache_changed_cb (GFileMonitor * monitor G_GNUC_UNUSED,
     case G_FILE_MONITOR_EVENT_CHANGED:
         KA_DEBUG ("%s changed", ccache_name);
         credentials_expiring ((gpointer) applet);
+        g_signal_emit_by_name(applet, "krb-ccache-changed");
         break;
     default:
         KA_DEBUG ("%s unhandled event: %d", ccache_name, event_type);
@@ -898,7 +897,7 @@ ka_get_tgt_from_ccache (krb5_context context, krb5_creds *creds)
 }
 
 static gboolean
-using_krb5 (void)
+ka_krb5_context_init ()
 {
     krb5_error_code err;
     gboolean have_tgt = FALSE;
@@ -907,6 +906,8 @@ using_krb5 (void)
     err = krb5_init_context (&kcontext);
     if (err)
         return FALSE;
+    else
+        kcontext_valid = TRUE;
 
     have_tgt = ka_get_tgt_from_ccache (kcontext, &creds);
     if (have_tgt) {
@@ -917,6 +918,17 @@ using_krb5 (void)
 }
 
 
+static gboolean
+ka_krb5_context_free ()
+{
+    if (kcontext_valid) {
+        krb5_free_context (kcontext);
+        kcontext_valid = FALSE;
+    }
+    return TRUE;
+}
+
+
 gboolean
 ka_destroy_ccache (KaApplet *applet)
 {
@@ -1069,68 +1081,32 @@ ka_nm_init (void)
 }
 
 
-int
-main (int argc, char *argv[])
+gboolean
+ka_kerberos_init (KaApplet *applet)
 {
-    KaApplet *applet;
-    GOptionContext *context;
-    GError *error = NULL;
-
-    gboolean run_auto = FALSE;
-
-    const char *help_msg =
-        "Run '" PACKAGE
-        " --help' to see a full list of available command line options";
-    const GOptionEntry options[] = {
-        {"auto", 'a', 0, G_OPTION_ARG_NONE, &run_auto,
-         "Only run if an initialized ccache is found", NULL},
-        {NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL}
-    };
-    GFileMonitor *monitor = NULL;
-
-    context = g_option_context_new ("- Kerberos 5 credential checking");
-    g_option_context_add_main_entries (context, options, NULL);
-    g_option_context_add_group (context, gtk_get_option_group (TRUE));
-    g_option_context_parse (context, &argc, &argv, &error);
+    gboolean ret;
 
-    if (error) {
-        g_print ("%s\n%s\n", error->message, help_msg);
-        g_clear_error (&error);
-        return 1;
-    }
-    g_option_context_free (context);
-
-    textdomain (PACKAGE);
-    bind_textdomain_codeset (PACKAGE, "UTF-8");
-    bindtextdomain (PACKAGE, LOCALE_DIR);
     ka_secmem_init ();
+    ret = ka_krb5_context_init (applet);
+    ka_nm_init ();
+    g_timeout_add_seconds (CREDENTIAL_CHECK_INTERVAL,
+                           (GSourceFunc) credentials_expiring, applet);
+    g_idle_add ((GSourceFunc) credentials_expiring_once, applet);
+    ccache_monitor = monitor_ccache (applet);
+    return ret;
+}
 
-    always_run = !run_auto;
-    if (using_krb5 () || always_run) {
-        g_set_application_name (KA_NAME);
-
-        applet = ka_applet_create ();
-        if (!applet)
-            return 1;
 
-        if (!ka_dbus_connect (applet)) {
-            ka_applet_destroy (applet);
-            return 1;
-        }
-        ka_nm_init ();
+gboolean
+ka_kerberos_destroy ()
+{
+    ka_nm_shutdown ();
 
-        g_timeout_add_seconds (CREDENTIAL_CHECK_INTERVAL,
-                               (GSourceFunc) credentials_expiring, applet);
-        g_idle_add ((GSourceFunc) credentials_expiring_once, applet);
-        monitor = monitor_ccache (applet);
+    if (ccache_monitor)
+        g_object_unref (ccache_monitor);
 
-        gtk_main ();
-    }
-    ka_dbus_disconnect ();
-    ka_nm_shutdown ();
-    if (monitor)
-        g_object_unref (monitor);
-    return 0;
+    ka_krb5_context_free ();
+    return TRUE;
 }
 
 /*
diff --git a/src/ka-dialog.h b/src/ka-kerberos.h
index c62acb3..504cc14 100644
--- a/src/ka-dialog.h
+++ b/src/ka-kerberos.h
@@ -23,6 +23,9 @@
 
 #include "ka-applet-priv.h"
 
+gboolean ka_kerberos_init (KaApplet *applet);
+gboolean ka_kerberos_destroy (void);
+
 gboolean ka_destroy_ccache (KaApplet* applet);
 gboolean ka_grab_credentials(KaApplet* applet);
 gboolean ka_check_credentials (KaApplet *applet, const char* principal);
diff --git a/src/ka-tickets.c b/src/ka-main-window.c
index ce01fce..b841b3e 100644
--- a/src/ka-tickets.c
+++ b/src/ka-main-window.c
@@ -1,6 +1,8 @@
-/* Krb5 Auth Applet -- Acquire and release kerberos tickets
+/* -*- c-file-style: "linux"; c-basic-offset: 4; indent-tabs-mode: nil; -*- *
  *
- * (C) 2009 Guido Guenther <agx@sigxcpu.org>
+ * Krb5 Auth Applet -- Acquire and release kerberos tickets
+ *
+ * (C) 2009,2011 Guido Guenther <agx@sigxcpu.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,14 +25,75 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "ka-tickets.h"
-#include "ka-dialog.h"
+#include "ka-main-window.h"
+#include "ka-kerberos.h"
+#include "ka-tools.h"
+#include "ka-preferences.h"
 
 static GtkListStore *tickets;
-static GtkWidget *tickets_dialog;
+static GtkWindow *main_window;
+
+static void
+ccache_changed_cb (KaApplet* applet G_GNUC_UNUSED,
+                   gpointer user_data G_GNUC_UNUSED)
+{
+    KA_DEBUG("Refreshing ticket list");
+    ka_get_service_tickets (tickets);
+}
+
+static void
+menuitem_close_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
+                   gpointer user_data G_GNUC_UNUSED)
+{
+    ka_main_window_hide();
+}
+
+static void
+menuitem_preferences_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
+                         gpointer user_data G_GNUC_UNUSED)
+{
+    ka_preferences_window_show (main_window);
+}
+
+static void
+menuitem_about_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
+                   gpointer user_data G_GNUC_UNUSED)
+{
+    ka_show_about ();
+}
+
+static void
+menuitem_help_contents_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
+                   gpointer user_data G_GNUC_UNUSED)
+{
+    ka_show_help (gtk_window_get_screen (main_window), NULL, NULL);
+}
 
-GtkWidget *
-ka_tickets_dialog_create (GtkBuilder *xml)
+
+static void
+ka_main_window_create_menu (KaApplet *applet, GtkBuilder *xml)
+{
+    GtkMenuItem *item;
+
+#define CONNECT_MENU(name)                                              \
+    item = GTK_MENU_ITEM (gtk_builder_get_object (xml,                  \
+                                                  "menuitem_" #name));  \
+    g_signal_connect (item,                                             \
+                      "activate",                                       \
+                      G_CALLBACK(menuitem_ ##name## _cb),               \
+                      applet)
+
+    CONNECT_MENU(close);
+    CONNECT_MENU(preferences);
+    CONNECT_MENU(about);
+    CONNECT_MENU(help_contents);
+
+#undef CONNECT_MENU  
+}
+
+
+GtkWindow *
+ka_main_window_create (KaApplet *applet, GtkBuilder *xml)
 {
     GtkCellRenderer *text_renderer, *toggle_renderer;
     GtkTreeView *tickets_view;
@@ -42,8 +105,8 @@ ka_tickets_dialog_create (GtkBuilder *xml)
                                   G_TYPE_BOOLEAN,
                                   G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
 
-    tickets_dialog =
-        GTK_WIDGET (gtk_builder_get_object (xml, "krb5_tickets_dialog"));
+    main_window =
+        GTK_WINDOW (gtk_builder_get_object (xml, "krb5_main_window"));
     tickets_view =
         GTK_TREE_VIEW (gtk_builder_get_object (xml, "krb5_tickets_treeview"));
     gtk_tree_view_set_model (GTK_TREE_VIEW (tickets_view),
@@ -71,36 +134,43 @@ ka_tickets_dialog_create (GtkBuilder *xml)
                                                 END_TIME_COLUMN,
                                                 NULL);
     gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1,
+                      /* Translators: this is an abbreviation for forwardable */
                                                 _("Fwd"),
                                                 toggle_renderer,
                                                 "active",
                                                 FORWARDABLE_COLUMN,
                                                 NULL);
     gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1,
+                        /* Translators: this is an abbreviation for proxiable */
                                                 _("Proxy"),
                                                 toggle_renderer,
                                                 "active",
                                                 PROXIABLE_COLUMN,
                                                 NULL);
     gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1,
+                        /* Translators: this is an abbreviation for renewable */
                                                 _("Renew"),
                                                 toggle_renderer,
                                                 "active",
                                                 RENEWABLE_COLUMN,
                                                 NULL);
-    return tickets_dialog;
+
+    g_signal_connect (applet, "krb-ccache-changed",
+                      G_CALLBACK(ccache_changed_cb),
+                      NULL);
+
+    ka_main_window_create_menu(applet, xml);
+    return main_window;
 }
 
 void
-ka_tickets_dialog_run ()
+ka_main_window_show ()
 {
     if (ka_get_service_tickets (tickets)) {
-        gtk_window_present (GTK_WINDOW (tickets_dialog));
-        gtk_dialog_run (GTK_DIALOG (tickets_dialog));
-        gtk_widget_hide (tickets_dialog);
+        gtk_window_present (main_window);
     } else {
         GtkWidget *message_dialog;
-
+        
         message_dialog = gtk_message_dialog_new (NULL,
                                                  GTK_DIALOG_DESTROY_WITH_PARENT,
                                                  GTK_MESSAGE_ERROR,
@@ -108,9 +178,16 @@ ka_tickets_dialog_run ()
                                                  _
                                                  ("Error displaying service ticket information"));
         gtk_window_set_resizable (GTK_WINDOW (message_dialog), FALSE);
-
+        
         g_signal_connect (message_dialog, "response",
                           G_CALLBACK (gtk_widget_destroy), NULL);
         gtk_widget_show (message_dialog);
     }
 }
+
+void
+ka_main_window_hide ()
+{
+    KA_DEBUG("Hiding main window");
+    gtk_widget_hide (GTK_WIDGET(main_window));
+}
diff --git a/src/ka-tickets.h b/src/ka-main-window.h
index 2a8aa3f..bc5b191 100644
--- a/src/ka-tickets.h
+++ b/src/ka-main-window.h
@@ -21,6 +21,8 @@
 #ifndef KA_TICKETS_H
 #define KA_TICKETS_H
 
+#include "ka-applet.h"
+
 enum ticket_columns {
     PRINCIPAL_COLUMN,
     START_TIME_COLUMN,
@@ -32,8 +34,9 @@ enum ticket_columns {
 };
 
 
-GtkWidget *ka_tickets_dialog_create (GtkBuilder *xml);
-void ka_tickets_dialog_run (void);
+GtkWindow *ka_main_window_create (KaApplet *applet, GtkBuilder *xml);
+void ka_main_window_show (void);
+void ka_main_window_hide (void);
 
 
 #endif
diff --git a/src/ka-preferences.c b/src/ka-preferences.c
new file mode 100644
index 0000000..a80f6d9
--- /dev/null
+++ b/src/ka-preferences.c
@@ -0,0 +1,689 @@
+/*
+ * Copyright (C) 2011 Guido Guenther <agx@sigxcpu.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.        See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "config.h"
+#include "ka-preferences.h"
+
+#include "ka-gconf-tools.h"
+#include "ka-tools.h"
+
+#include <glib/gi18n.h>
+
+#define WID(b, w) (GtkWidget *) gtk_builder_get_object (b, w)
+
+#define PKINIT_SMARTCARD "PKCS11:" SC_PKCS11
+#define PKINIT_FILE "FILE:"
+
+#define N_LISTENERS 7
+
+struct _KaPreferencesPrivate {
+    GtkBuilder *builder;
+
+    GConfClient *client;
+
+    GtkWidget *dialog;
+    GtkWidget *notebook;
+    GtkWidget *principal_entry;
+    GtkWidget *pkuserid_entry;
+    GtkWidget *pkuserid_button;
+    GtkWidget *smartcard_toggle;
+    GtkWidget *pkanchors_entry;
+    GtkWidget *pkanchors_button;
+    GtkWidget *forwardable_toggle;
+    GtkWidget *proxiable_toggle;
+    GtkWidget *renewable_toggle;
+    GtkWidget *prompt_mins_entry;
+
+    guint     listeners [N_LISTENERS];
+    int       n_listeners;
+} prefs;
+
+
+static void
+ka_preferences_principal_notify (GConfClient *client G_GNUC_UNUSED,
+                                 guint cnx_id G_GNUC_UNUSED,
+                                 GConfEntry *entry,
+                                 gpointer userdata G_GNUC_UNUSED)
+{
+    const char *principal;
+
+    if (!entry->value || entry->value->type != GCONF_VALUE_STRING)
+      return;
+
+    principal = gconf_value_get_string (entry->value);
+
+    if (!principal || !strlen(principal))
+        gtk_entry_set_text (GTK_ENTRY (prefs.principal_entry), "");
+    else {
+        const char *old_principal;
+
+        old_principal = gtk_entry_get_text (GTK_ENTRY (prefs.principal_entry));
+        if (!old_principal || (old_principal && strcmp (old_principal, principal)))
+            gtk_entry_set_text (GTK_ENTRY (prefs.principal_entry), principal);
+    }
+}
+
+static void
+ka_preferences_principal_changed (GtkEntry *entry,
+                                  gpointer userdata G_GNUC_UNUSED)
+{
+    const char *principal;
+
+    principal = gtk_entry_get_text (entry);
+
+    if (!principal || !strlen(principal))
+        gconf_client_unset (prefs.client, KA_GCONF_KEY_PRINCIPAL, NULL);
+    else
+        gconf_client_set_string (prefs.client, KA_GCONF_KEY_PRINCIPAL, principal, NULL);
+}
+
+
+static void
+ka_preferences_setup_principal_entry ()
+{
+    char     *principal = NULL;
+
+    prefs.principal_entry = WID (prefs.builder, "principal_entry");
+    g_assert (prefs.principal_entry != NULL);
+
+    if (!ka_gconf_get_string (prefs.client, KA_GCONF_KEY_PRINCIPAL, &principal))
+        g_warning ("Getting principal failed");
+
+    if (principal && strlen(principal))
+        gtk_entry_set_text (GTK_ENTRY (prefs.principal_entry), principal);
+    if (principal)
+        g_free (principal);
+
+    g_signal_connect (prefs.principal_entry, "changed",
+                      G_CALLBACK (ka_preferences_principal_changed), NULL);
+
+    if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_PRINCIPAL, NULL)) {
+        gtk_widget_set_sensitive (prefs.principal_entry, FALSE);
+    }
+
+    prefs.listeners [prefs.n_listeners] =
+        gconf_client_notify_add (prefs.client,
+                                 KA_GCONF_KEY_PRINCIPAL,
+                                 (GConfClientNotifyFunc) ka_preferences_principal_notify,
+                                 NULL, NULL, NULL);
+    prefs.n_listeners++;
+}
+
+
+static void
+ka_preferences_pkuserid_notify (GConfClient *client G_GNUC_UNUSED,
+                                guint cnx_id G_GNUC_UNUSED,
+                                GConfEntry *entry,
+                                gpointer *userdata G_GNUC_UNUSED)
+{
+    const char *pkuserid;
+
+    if (!entry->value || entry->value->type != GCONF_VALUE_STRING)
+        return;
+
+    pkuserid = gconf_value_get_string (entry->value);
+
+    if (!pkuserid || !strlen(pkuserid))
+        gtk_entry_set_text (GTK_ENTRY (prefs.pkuserid_entry), "");
+    else {
+        const char *old_pkuserid;
+
+        old_pkuserid = gtk_entry_get_text (GTK_ENTRY (prefs.pkuserid_entry));
+        if (!old_pkuserid || (old_pkuserid && strcmp (old_pkuserid, pkuserid)))
+            gtk_entry_set_text (GTK_ENTRY (prefs.pkuserid_entry), pkuserid);
+    }
+}
+
+
+static void
+ka_preferences_pkuserid_changed (GtkEntry *entry,
+                                 gpointer *user_data G_GNUC_UNUSED)
+{
+    const char *pkuserid;
+
+    pkuserid = gtk_entry_get_text (entry);
+
+    if (!pkuserid || !strlen(pkuserid))
+        gconf_client_unset (prefs.client, KA_GCONF_KEY_PK_USERID, NULL);
+    else
+        gconf_client_set_string (prefs.client, KA_GCONF_KEY_PK_USERID, pkuserid, NULL);
+}
+
+
+static void
+ka_preferences_setup_pkuserid_entry ()
+{
+    char     *pkuserid = NULL;
+
+    prefs.pkuserid_entry = WID(prefs.builder, "pkuserid_entry");
+    g_assert (prefs.pkuserid_entry != NULL);
+
+    if (!ka_gconf_get_string (prefs.client, KA_GCONF_KEY_PK_USERID, &pkuserid))
+        g_warning ("Getting pkuserid failed");
+
+    if (pkuserid && strlen(pkuserid))
+        gtk_entry_set_text (GTK_ENTRY (prefs.pkuserid_entry), pkuserid);
+    if (pkuserid)
+        g_free (pkuserid);
+
+    g_signal_connect (prefs.pkuserid_entry, "changed",
+                      G_CALLBACK (ka_preferences_pkuserid_changed), NULL);
+    if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_PK_USERID, NULL)) {
+        gtk_widget_set_sensitive (prefs.pkuserid_entry, FALSE);
+    }
+
+    prefs.listeners [prefs.n_listeners] =
+        gconf_client_notify_add (prefs.client,
+                                 KA_GCONF_KEY_PK_USERID,
+                                 (GConfClientNotifyFunc) ka_preferences_pkuserid_notify,
+                                 NULL, NULL, NULL);
+    prefs.n_listeners++;
+}
+
+
+static void
+ka_preferences_pkanchors_notify (GConfClient *client G_GNUC_UNUSED,
+                                 guint cnx_id G_GNUC_UNUSED,
+                                 GConfEntry *entry,
+                                 gpointer userdata G_GNUC_UNUSED)
+{
+    const char *pkanchors;
+
+    if (!entry->value || entry->value->type != GCONF_VALUE_STRING)
+        return;
+
+    pkanchors = gconf_value_get_string (entry->value);
+
+    if (!pkanchors || !strlen(pkanchors))
+        gtk_entry_set_text (GTK_ENTRY (prefs.pkanchors_entry), "");
+    else {
+        const char *old_pkanchors;
+
+        old_pkanchors = gtk_entry_get_text (GTK_ENTRY (prefs.pkanchors_entry));
+        if (!old_pkanchors || (old_pkanchors && strcmp (old_pkanchors, pkanchors)))
+            gtk_entry_set_text (GTK_ENTRY (prefs.pkanchors_entry), pkanchors);
+    }
+}
+
+
+static void
+ka_preferences_pkanchors_changed (GtkEntry *entry,
+                                  gpointer userdata G_GNUC_UNUSED)
+{
+    const char *pkanchors;
+
+    pkanchors = gtk_entry_get_text (entry);
+
+    if (!pkanchors || !strlen(pkanchors))
+        gconf_client_unset (prefs.client, KA_GCONF_KEY_PK_ANCHORS, NULL);
+    else
+        gconf_client_set_string (prefs.client, KA_GCONF_KEY_PK_ANCHORS,
+                                 pkanchors, NULL);
+}
+
+
+static void
+ka_preferences_setup_pkanchors_entry ()
+{
+    char *pkanchors = NULL;
+
+    prefs.pkanchors_entry = WID(prefs.builder, "pkanchors_entry");
+    g_assert (prefs.pkanchors_entry != NULL);
+
+    if (!ka_gconf_get_string (prefs.client, KA_GCONF_KEY_PK_ANCHORS, &pkanchors))
+        g_warning ("Getting pkanchors failed");
+
+    if (pkanchors && strlen(pkanchors))
+        gtk_entry_set_text (GTK_ENTRY (prefs.pkanchors_entry), pkanchors);
+    if (pkanchors)
+        g_free (pkanchors);
+
+    g_signal_connect (prefs.pkanchors_entry, "changed",
+                      G_CALLBACK (ka_preferences_pkanchors_changed), NULL);
+    if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_PK_ANCHORS, NULL)) {
+        gtk_widget_set_sensitive (prefs.pkanchors_entry, FALSE);
+    }
+
+    prefs.listeners [prefs.n_listeners] =
+        gconf_client_notify_add (prefs.client,
+                                 KA_GCONF_KEY_PK_ANCHORS,
+                                 (GConfClientNotifyFunc) ka_preferences_pkanchors_notify,
+                                 NULL, NULL, NULL);
+    prefs.n_listeners++;
+}
+
+
+static void
+ka_preferences_toggle_pkuserid_entry (gboolean state, gpointer userdata G_GNUC_UNUSED)
+{
+    gtk_widget_set_sensitive (prefs.pkuserid_entry, state);
+    gtk_widget_set_sensitive (prefs.pkuserid_button, state);
+}
+
+
+static void
+ka_preferences_smartcard_toggled (GtkToggleButton *toggle,
+                                  gpointer userdata G_GNUC_UNUSED)
+{
+    gboolean smartcard = gtk_toggle_button_get_active (toggle);
+    static gchar *old_path = NULL;
+
+    if (smartcard) {
+        const char *path;
+
+        path = gtk_entry_get_text (GTK_ENTRY(prefs.pkuserid_entry));
+        if (g_strcmp0 (path, PKINIT_SMARTCARD)) {
+            g_free (old_path);
+            old_path = g_strdup (path);
+        }
+        ka_preferences_toggle_pkuserid_entry (FALSE, NULL);
+        gconf_client_set_string (prefs.client, KA_GCONF_KEY_PK_USERID, PKINIT_SMARTCARD, NULL);
+    } else {
+        ka_preferences_toggle_pkuserid_entry (TRUE, NULL);
+        if (old_path)
+            gconf_client_set_string (prefs.client, KA_GCONF_KEY_PK_USERID, old_path, NULL);
+        else
+            gconf_client_unset (prefs.client, KA_GCONF_KEY_PK_USERID, NULL);
+    }
+}
+
+
+static void
+ka_preferences_setup_smartcard_toggle ()
+{
+    char *pkuserid = NULL;
+
+    prefs.smartcard_toggle = WID (prefs.builder, "smartcard_toggle");
+    g_assert (prefs.smartcard_toggle != NULL);
+
+    if (!ka_gconf_get_string (prefs.client, KA_GCONF_KEY_PK_USERID, &pkuserid))
+        g_warning ("Getting pkanchors failed");
+
+    g_signal_connect (prefs.smartcard_toggle, "toggled",
+                      G_CALLBACK (ka_preferences_smartcard_toggled), NULL);
+
+    if (!g_strcmp0 (pkuserid, PKINIT_SMARTCARD))
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.smartcard_toggle), TRUE);
+    else
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.smartcard_toggle), FALSE);
+
+    if (pkuserid)
+        g_free (pkuserid);
+}
+
+
+static void
+ka_preferences_browse_certs (GtkEntry *entry)
+{
+    GtkWidget *filechooser;
+    GtkFileFilter *cert_filter, *all_filter;
+    gchar *filename = NULL;
+    const gchar *current;
+    gint ret;
+
+    filechooser = gtk_file_chooser_dialog_new(_("Choose Certificate"),
+                                              GTK_WINDOW (prefs.dialog),
+                                              GTK_FILE_CHOOSER_ACTION_OPEN,
+                                              GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                              GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                              NULL);
+
+    current = gtk_entry_get_text (entry);
+    if (current && g_str_has_prefix (current, PKINIT_FILE) &&
+        strlen(current) > strlen (PKINIT_FILE)) {
+        gtk_file_chooser_select_filename (GTK_FILE_CHOOSER(filechooser),
+                                          (const gchar*)&current[strlen(PKINIT_FILE)]);
+    }
+
+    cert_filter = g_object_ref_sink (gtk_file_filter_new ());
+    gtk_file_filter_add_mime_type (cert_filter, "application/x-x509-ca-cert");
+    gtk_file_filter_set_name (cert_filter, _("X509 Certificates"));
+    gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filechooser), cert_filter);
+    all_filter = g_object_ref_sink (gtk_file_filter_new ());
+    gtk_file_filter_add_pattern (all_filter, "*");
+    gtk_file_filter_set_name (all_filter, _("all files"));
+    gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filechooser), all_filter);
+
+    ret = gtk_dialog_run (GTK_DIALOG(filechooser));
+    if (ret == GTK_RESPONSE_ACCEPT)
+        filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(filechooser));
+    gtk_widget_destroy (GTK_WIDGET(filechooser));
+
+    if (filename) {
+        gchar *cert = g_strconcat( PKINIT_FILE, filename, NULL);
+        gtk_entry_set_text (entry, cert);
+        g_free (filename);
+        g_free (cert);
+  }
+    g_object_unref (cert_filter);
+    g_object_unref (all_filter);
+}
+
+static void
+ka_preferences_browse_pkuserids (GtkButton *button G_GNUC_UNUSED,
+                                 gpointer userdata G_GNUC_UNUSED)
+{
+    ka_preferences_browse_certs (GTK_ENTRY(prefs.pkuserid_entry));
+}
+
+static void
+ka_preferences_browse_pkanchors(GtkButton *button G_GNUC_UNUSED,
+                                gpointer userdata G_GNUC_UNUSED)
+{
+    ka_preferences_browse_certs (GTK_ENTRY(prefs.pkanchors_entry));
+}
+
+static void
+ka_preferences_setup_pkuserid_button ()
+{
+    prefs.pkuserid_button = WID (prefs.builder, "pkuserid_button");
+    g_assert (prefs.pkuserid_button != NULL);
+
+    g_signal_connect (prefs.pkuserid_button, "clicked",
+                      G_CALLBACK (ka_preferences_browse_pkuserids), NULL);
+
+}
+
+static void
+ka_preferences_setup_pkanchors_button ()
+{
+    prefs.pkanchors_button = WID (prefs.builder, "pkanchors_button");
+    g_assert (prefs.pkanchors_button != NULL);
+
+    g_signal_connect (prefs.pkanchors_button, "clicked",
+                      G_CALLBACK (ka_preferences_browse_pkanchors), NULL);
+
+}
+
+
+static void
+ka_preferences_forwardable_toggled (GtkToggleButton *toggle,
+                                    gpointer userdata G_GNUC_UNUSED)
+{
+    gboolean forwardable;
+
+    forwardable = gtk_toggle_button_get_active (toggle);
+
+    gconf_client_set_bool (prefs.client, KA_GCONF_KEY_FORWARDABLE, forwardable, NULL);
+}
+
+
+static void
+ka_preferences_forwardable_notify (GConfClient *client G_GNUC_UNUSED,
+                                   guint cnx_id G_GNUC_UNUSED,
+                                   GConfEntry *entry,
+                                   gpointer userdata G_GNUC_UNUSED)
+{
+    gboolean forwardable;
+
+    if (!entry->value || entry->value->type != GCONF_VALUE_BOOL)
+      return;
+
+    forwardable = gconf_value_get_bool (entry->value) != FALSE;
+
+    if (forwardable != gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs.forwardable_toggle)))
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.forwardable_toggle), forwardable);
+}
+
+
+static gboolean
+ka_preferences_setup_forwardable_toggle ()
+{
+    gboolean forwardable;
+
+    prefs.forwardable_toggle = WID (prefs.builder, "forwardable_toggle");
+    g_assert (prefs.forwardable_toggle != NULL);
+
+    forwardable = gconf_client_get_bool (prefs.client, KA_GCONF_KEY_FORWARDABLE, NULL);
+
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.forwardable_toggle), forwardable);
+
+    g_signal_connect (prefs.forwardable_toggle, "toggled",
+                      G_CALLBACK (ka_preferences_forwardable_toggled), NULL);
+
+    if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_FORWARDABLE, NULL)) {
+        gtk_widget_set_sensitive (prefs.forwardable_toggle, FALSE);
+    }
+
+    prefs.listeners [prefs.n_listeners] =
+        gconf_client_notify_add (prefs.client,
+                                 KA_GCONF_KEY_FORWARDABLE,
+                                 (GConfClientNotifyFunc) ka_preferences_forwardable_notify,
+                                 NULL, NULL, NULL);
+    prefs.n_listeners++;
+    return forwardable;
+}
+
+
+static void
+ka_preferences_proxiable_toggled (GtkToggleButton *toggle,
+                                  gpointer userdata G_GNUC_UNUSED)
+{
+    gboolean proxiable;
+
+    proxiable = gtk_toggle_button_get_active (toggle);
+
+    gconf_client_set_bool (prefs.client, KA_GCONF_KEY_PROXIABLE, proxiable, NULL);
+}
+
+
+static void
+ka_preferences_proxiable_notify (GConfClient *client G_GNUC_UNUSED,
+                                 guint cnx_id G_GNUC_UNUSED,
+                                 GConfEntry *entry,
+                                 gpointer userdata G_GNUC_UNUSED)
+{
+    gboolean proxiable;
+
+    if (!entry->value || entry->value->type != GCONF_VALUE_BOOL)
+        return;
+
+    proxiable = gconf_value_get_bool (entry->value) != FALSE;
+
+    if (proxiable != gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs.proxiable_toggle)))
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.proxiable_toggle), proxiable);
+}
+
+
+static gboolean
+ka_preferences_setup_proxiable_toggle ()
+{
+    gboolean proxiable;
+
+    prefs.proxiable_toggle = WID (prefs.builder, "proxiable_toggle");
+    g_assert (prefs.proxiable_toggle != NULL);
+
+    proxiable = gconf_client_get_bool (prefs.client, KA_GCONF_KEY_PROXIABLE, NULL);
+
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.proxiable_toggle), proxiable);
+
+    g_signal_connect (prefs.proxiable_toggle, "toggled",
+                      G_CALLBACK (ka_preferences_proxiable_toggled), NULL);
+
+    if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_PROXIABLE, NULL)) {
+        gtk_widget_set_sensitive (prefs.proxiable_toggle, FALSE);
+    }
+
+    prefs.listeners [prefs.n_listeners] =
+        gconf_client_notify_add (prefs.client,
+                                 KA_GCONF_KEY_PROXIABLE,
+                                 (GConfClientNotifyFunc) ka_preferences_proxiable_notify,
+                                 NULL, NULL, NULL);
+    prefs.n_listeners++;
+    return proxiable;
+}
+
+
+static void
+ka_preferences_renewable_toggled (GtkToggleButton *toggle,
+                                  gpointer userdata G_GNUC_UNUSED)
+{
+    gboolean renewable;
+
+    renewable = gtk_toggle_button_get_active (toggle);
+
+    gconf_client_set_bool (prefs.client, KA_GCONF_KEY_RENEWABLE, renewable, NULL);
+}
+
+
+static void
+ka_preferences_renewable_notify (GConfClient *client G_GNUC_UNUSED,
+                                 guint cnx_id G_GNUC_UNUSED,
+                                 GConfEntry *entry,
+                                 gpointer userdata G_GNUC_UNUSED)
+{
+    gboolean renewable;
+
+    if (!entry->value || entry->value->type != GCONF_VALUE_BOOL)
+        return;
+
+    renewable = gconf_value_get_bool (entry->value) != FALSE;
+
+    if (renewable != gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs.renewable_toggle)))
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.renewable_toggle), renewable);
+}
+
+
+static gboolean
+ka_preferences_setup_renewable_toggle ()
+{
+    gboolean renewable;
+
+    prefs.renewable_toggle = WID (prefs.builder, "renewable_toggle");
+    g_assert (prefs.renewable_toggle != NULL);
+
+    renewable = gconf_client_get_bool (prefs.client, KA_GCONF_KEY_RENEWABLE, NULL);
+
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.renewable_toggle), renewable);
+
+    g_signal_connect (prefs.renewable_toggle, "toggled",
+                      G_CALLBACK (ka_preferences_renewable_toggled), NULL);
+
+    if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_RENEWABLE, NULL)) {
+        gtk_widget_set_sensitive (prefs.renewable_toggle, FALSE);
+    }
+
+    prefs.listeners [prefs.n_listeners] =
+        gconf_client_notify_add (prefs.client,
+                                 KA_GCONF_KEY_RENEWABLE,
+                                 (GConfClientNotifyFunc) ka_preferences_renewable_notify,
+                                 NULL, NULL, NULL);
+    prefs.n_listeners++;
+    return renewable;
+}
+
+
+static void
+ka_preferences_prompt_mins_changed (GtkSpinButton *button,
+                                    gpointer userdata G_GNUC_UNUSED)
+{
+    gint prompt_mins;
+
+    prompt_mins = gtk_spin_button_get_value_as_int (button);
+    gconf_client_set_int (prefs.client, KA_GCONF_KEY_PROMPT_MINS, prompt_mins, NULL);
+}
+
+
+static void
+ka_preferences_prompt_mins_notify (GConfClient *client G_GNUC_UNUSED,
+                                   guint cnx_id G_GNUC_UNUSED,
+                                   GConfEntry *entry,
+                                   gpointer userdata G_GNUC_UNUSED)
+{
+    gint prompt_mins;
+
+    if (!entry->value || entry->value->type != GCONF_VALUE_INT)
+        return;
+
+    prompt_mins = gconf_value_get_int (entry->value);
+
+    if (prompt_mins != gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (prefs.prompt_mins_entry)))
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON (prefs.prompt_mins_entry), prompt_mins);
+}
+
+
+static gint
+ka_preferences_setup_prompt_mins_entry ()
+{
+    gint prompt_mins;
+
+    prefs.prompt_mins_entry = WID (prefs.builder, "prompt_mins_entry");
+    g_assert (prefs.prompt_mins_entry != NULL);
+
+    prompt_mins = gconf_client_get_int (prefs.client, KA_GCONF_KEY_PROMPT_MINS, NULL);
+
+    gtk_spin_button_set_value (GTK_SPIN_BUTTON (prefs.prompt_mins_entry), prompt_mins);
+
+    g_signal_connect (prefs.prompt_mins_entry, "value-changed",
+                      G_CALLBACK (ka_preferences_prompt_mins_changed), NULL);
+
+    if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_PROMPT_MINS, NULL)) {
+        gtk_widget_set_sensitive (prefs.prompt_mins_entry, FALSE);
+    }
+
+    prefs.listeners [prefs.n_listeners] =
+        gconf_client_notify_add (prefs.client,
+                                 KA_GCONF_KEY_PROMPT_MINS,
+                                 (GConfClientNotifyFunc) ka_preferences_prompt_mins_notify,
+                                 NULL, NULL, NULL);
+    prefs.n_listeners++;
+    return prompt_mins;
+}
+
+
+void
+ka_preferences_window_create (KaApplet *applet G_GNUC_UNUSED,
+                              GtkBuilder *xml)
+{
+    prefs.client = gconf_client_get_default ();
+    gconf_client_add_dir (prefs.client, KA_GCONF_PATH,
+                          GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+
+    prefs.builder = xml;
+    ka_preferences_setup_principal_entry (prefs);
+    ka_preferences_setup_pkuserid_entry (prefs);
+    ka_preferences_setup_pkuserid_button (prefs);
+    ka_preferences_setup_smartcard_toggle (prefs);
+    ka_preferences_setup_pkanchors_entry(prefs);
+    ka_preferences_setup_pkanchors_button (prefs);
+    ka_preferences_setup_forwardable_toggle (prefs);
+    ka_preferences_setup_proxiable_toggle (prefs);
+    ka_preferences_setup_renewable_toggle (prefs);
+    ka_preferences_setup_prompt_mins_entry (prefs);
+
+    g_assert (prefs.n_listeners == N_LISTENERS);
+
+    prefs.notebook = WID (xml, "ka_notebook");
+    prefs.dialog = WID (xml, "krb5_preferences_dialog");
+
+}
+
+void
+ka_preferences_window_show (GtkWindow *main_window)
+{
+    if (main_window)
+        gtk_window_set_transient_for (GTK_WINDOW(prefs.dialog), main_window);
+    gtk_window_present (GTK_WINDOW(prefs.dialog));
+    gtk_dialog_run (GTK_DIALOG (prefs.dialog));
+    gtk_widget_hide (prefs.dialog);
+}
+
+/*
+ * vim:ts:sts=4:sw=4:et:
+ */
diff --git a/src/ka-preferences.h b/src/ka-preferences.h
new file mode 100644
index 0000000..7f8e9a2
--- /dev/null
+++ b/src/ka-preferences.h
@@ -0,0 +1,21 @@
+/* ka-preferences.h */
+
+#ifndef KA_PREFERENCES_H
+#define KA_PREFERENCES_H
+
+#include <gtk/gtk.h>
+
+#include "ka-applet.h"
+
+G_BEGIN_DECLS
+
+void ka_preferences_window_create (KaApplet *applet, GtkBuilder *xml);
+void ka_preferences_window_show (GtkWindow *main_window);
+
+G_END_DECLS
+
+#endif /* KA_PREFERENCES */
+
+/*
+ * vim:ts:sts=4:sw=4:et:
+ */
diff --git a/src/ka-pwdialog.c b/src/ka-pwdialog.c
index 49ed2e4..483873a 100644
--- a/src/ka-pwdialog.c
+++ b/src/ka-pwdialog.c
@@ -23,7 +23,7 @@
 #include <glib/gi18n.h>
 
 #include "ka-applet-priv.h"
-#include "ka-dialog.h"
+#include "ka-kerberos.h"
 #include "ka-pwdialog.h"
 #include "ka-entry-buffer.h"
 
diff --git a/src/ka-tools.c b/src/ka-tools.c
index 260d101..227324a 100644
--- a/src/ka-tools.c
+++ b/src/ka-tools.c
@@ -55,3 +55,31 @@ ka_show_help (GdkScreen* screen, const char* chapter, GtkWindow* window)
   }
   g_free (url);
 }
+
+
+void 
+ka_show_about ()
+{
+    const gchar *authors[] = {
+        "Christopher Aillon <caillon@redhat.com>",
+        "Jonathan Blandford <jrb@redhat.com>",
+        "Colin Walters <walters@verbum.org>",
+        "Guido Günther <agx@sigxcpu.org>",
+        NULL
+    };
+
+    gtk_show_about_dialog (NULL,
+                           "authors", authors,
+                           "version", VERSION,
+                           "logo-icon-name", "krb-valid-ticket",
+                           "copyright",
+                           "Copyright (C) 2004,2005,2006 Red Hat, Inc.,\n"
+                           "2008-2011 Guido Günther",
+                           "website-label", PACKAGE " website",
+                           "website",
+                           "https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/",
+                           "license", "GNU General Public License Version 2",
+                           /* Translators: add the translators of your language here */
+                           "translator-credits", _("translator-credits"),
+                           NULL);
+}
diff --git a/src/ka-tools.h b/src/ka-tools.h
index f97791b..4fef541 100644
--- a/src/ka-tools.h
+++ b/src/ka-tools.h
@@ -26,6 +26,7 @@
 G_BEGIN_DECLS
 
 void ka_show_help (GdkScreen* screen, const char* section, GtkWindow* window);
+void ka_show_about (void);
 
 G_END_DECLS
 
diff --git a/src/krb5-auth-dialog.desktop.in b/src/krb5-auth-dialog.desktop.in
index 5569646..6f02571 100644
--- a/src/krb5-auth-dialog.desktop.in
+++ b/src/krb5-auth-dialog.desktop.in
@@ -4,7 +4,6 @@ _Comment=Kerberos Network Authentication Dialog
 Exec=krb5-auth-dialog
 Terminal=false
 Type=Application
-NoDisplay=true
 Icon=krb-valid-ticket
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=krb5-auth-dialog
diff --git a/src/krb5-auth-dialog.ui b/src/krb5-auth-dialog.ui
index f36f537..1da04d7 100644
--- a/src/krb5-auth-dialog.ui
+++ b/src/krb5-auth-dialog.ui
@@ -1,47 +1,106 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkDialog" id="krb5_dialog">
+    <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Kerberos Authentication</property>
     <property name="resizable">False</property>
     <property name="window_position">center-always</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox2">
+      <object class="GtkBox" id="dialog-vbox2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="cancelbutton1">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="krb5_renew_button">
+                <property name="label" translatable="yes">_Renew Ticket</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkHBox" id="hbox1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">6</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkImage" id="image1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="yalign">0</property>
                 <property name="icon_name">krb-valid-ticket</property>
                 <property name="icon-size">6</property>
               </object>
               <packing>
                 <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkAlignment" id="alignment4">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="bottom_padding">10</property>
                 <child>
                   <object class="GtkVBox" id="vbox2">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkVBox" id="vbox1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkLabel" id="krb5_message_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="use_markup">True</property>
                           </object>
@@ -53,28 +112,35 @@
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkVBox" id="vbox3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">3</property>
                         <child>
                           <object class="GtkHBox" id="entry_hbox">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">3</property>
                             <child>
                               <placeholder/>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="krb5_status_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">1</property>
                             <property name="label">&lt;span size="smaller"&gt; &lt;/span&gt;</property>
                             <property name="use_markup">True</property>
@@ -87,6 +153,8 @@
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -94,123 +162,933 @@
                 </child>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area2">
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">cancelbutton1</action-widget>
+      <action-widget response="-5">krb5_renew_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkWindow" id="krb5_main_window">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Service Tickets</property>
+    <signal name="delete-event" handler="ka_main_window_hide" swapped="no"/>
+    <child>
+      <object class="GtkVBox" id="tickets-vbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkMenuBar" id="menubar1">
             <property name="visible">True</property>
-            <property name="layout_style">end</property>
+            <property name="can_focus">False</property>
             <child>
-              <object class="GtkButton" id="cancelbutton1">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkMenuItem" id="menuitem1">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="label" translatable="yes">_File</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menuitem_close">
+                        <property name="label">gtk-close</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkButton" id="krb5_renew_button">
-                <property name="label" translatable="yes">_Renew Ticket</property>
+              <object class="GtkMenuItem" id="menuitem2">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="label" translatable="yes">_Edit</property>
                 <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menuitem_preferences">
+                        <property name="label">gtk-preferences</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="menuitem4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="label" translatable="yes">_Help</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menuitem_help_contents">
+                        <property name="label">gtk-help</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menuitem_about">
+                        <property name="label">gtk-about</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">end</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkTreeView" id="krb5_tickets_treeview">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <child internal-child="selection">
+              <object class="GtkTreeSelection" id="treeview-selection"/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
       </object>
     </child>
-    <action-widgets>
-      <action-widget response="-6">cancelbutton1</action-widget>
-      <action-widget response="-5">krb5_renew_button</action-widget>
-    </action-widgets>
   </object>
-  <object class="GtkDialog" id="krb5_tickets_dialog">
+  <object class="GtkDialog" id="krb5_preferences_dialog">
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Service Tickets</property>
-    <property name="resizable">False</property>
-    <property name="type_hint">normal</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="tickets-vbox2">
-        <property name="visible">True</property>
+      <object class="GtkBox" id="dialog-vbox3">
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <child>
-          <object class="GtkVBox" id="tickets-vbox1">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area3">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
             <child>
-              <object class="GtkTreeView" id="krb5_tickets_treeview">
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="position">0</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="position">1</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area">
+        <child>
+          <object class="GtkNotebook" id="ka_notebook">
             <property name="visible">True</property>
-            <property name="layout_style">end</property>
+            <property name="can_focus">True</property>
             <child>
-              <placeholder/>
+              <object class="GtkVBox" id="vbox_kerberos">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">12</property>
+                <property name="spacing">18</property>
+                <child>
+                  <object class="GtkVBox" id="vbox_kerberos_user">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="label_kerberos_user">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Kerberos User</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkImage" id="access">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="yalign">0</property>
+                            <property name="icon_name">krb-valid-ticket</property>
+                            <property name="icon-size">6</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="vbox5">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkFrame" id="frame_princ">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">none</property>
+                                <child>
+                                  <object class="GtkAlignment" id="alignment1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="top_padding">5</property>
+                                    <property name="left_padding">12</property>
+                                    <child>
+                                      <object class="GtkEntry" id="principal_entry">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="has_tooltip">True</property>
+                                        <property name="tooltip_markup" translatable="yes">The name of your Kerberos account. Leave blank to use your current username.</property>
+                                        <property name="tooltip_text" translatable="yes">The name of your Kerberos account. Leave blank to use your current username.</property>
+                                        <property name="invisible_char">●</property>
+                                        <property name="activates_default">True</property>
+                                        <property name="invisible_char_set">True</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label3">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" translatable="yes">Kerberos principal:</property>
+                                    <property name="use_markup">True</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkVBox" id="vbox_ticket_options">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="label5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Kerberos Ticket Options</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkImage" id="image2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="yalign">0</property>
+                            <property name="stock">gtk-properties</property>
+                            <property name="icon-size">6</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="vbox4">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel" id="label10">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Requested Kerberos tickets should be:</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox4">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkLabel" id="label11">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label">    </property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="forwardable_toggle">
+                                    <property name="label" translatable="yes">forwardable</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="has_tooltip">True</property>
+                                    <property name="tooltip_markup" translatable="yes">If checked, request forwardable tickets</property>
+                                    <property name="tooltip_text" translatable="yes">If checked, request forwardable tickets</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox5">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkLabel" id="label12">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label">    </property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="renewable_toggle">
+                                    <property name="label" translatable="yes">renewable</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="has_tooltip">True</property>
+                                    <property name="tooltip_markup" translatable="yes">If checked, request renewable tickets</property>
+                                    <property name="tooltip_text" translatable="yes">If checked, request renewable tickets</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox11">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkLabel" id="label19">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label">    </property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="proxiable_toggle">
+                                    <property name="label" translatable="yes">proxiable</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="has_tooltip">True</property>
+                                    <property name="tooltip_markup" translatable="yes">If checked, request proxiable tickets</property>
+                                    <property name="tooltip_text" translatable="yes">If checked, request proxiable tickets</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Kerberos</property>
+              </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
             </child>
             <child>
-              <object class="GtkButton" id="krb5_tickets_ok">
-                <property name="label">gtk-close</property>
+              <object class="GtkVBox" id="vbox_pkinit">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">start</property>
+                <property name="border_width">12</property>
+                <property name="spacing">18</property>
+                <child>
+                  <object class="GtkVBox" id="vbox_pkinit_userid">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="label_pkinit_userid">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Userid</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox6">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkImage" id="access1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="yalign">0</property>
+                            <property name="icon_name">krb-valid-ticket</property>
+                            <property name="icon-size">6</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="vbox12">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkVBox" id="vbox11">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkHBox" id="hbox7">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkCheckButton" id="smartcard_toggle">
+                                        <property name="label" translatable="yes">Use Smartcard</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="has_tooltip">True</property>
+                                        <property name="tooltip_markup" translatable="yes">If checked, use a security token (Smartcard) to authenticate.</property>
+                                        <property name="tooltip_text" translatable="yes">If checked, use a security token (Smartcard) to authenticate.</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label4">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" id="hbox13">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkEntry" id="pkuserid_entry">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="has_tooltip">True</property>
+                                        <property name="tooltip_markup" translatable="yes">Certificate and private key used for authentication</property>
+                                        <property name="tooltip_text" translatable="yes">Certificate and private key used for authentication</property>
+                                        <property name="invisible_char">●</property>
+                                        <property name="activates_default">True</property>
+                                        <property name="invisible_char_set">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="pkuserid_button">
+                                        <property name="label" translatable="yes">_Browse...</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="use_underline">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkVBox" id="vbox_anchors">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="label_anchors">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">X509 trust anchors</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox8">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkEntry" id="pkanchors_entry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_markup" translatable="yes">Certificate used to verify digital signatures.</property>
+                            <property name="tooltip_text" translatable="yes">Certificate used to verify digital signatures.</property>
+                            <property name="invisible_char">●</property>
+                            <property name="activates_default">True</property>
+                            <property name="invisible_char_set">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="pkanchors_button">
+                            <property name="label" translatable="yes">_Browse...</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="padding">5</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label_pkinit">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Configure the use of certificates and smartcards for your Kerberos network authentication.</property>
+                <property name="tooltip_text" translatable="yes">Configure the use of certificates and smartcards for your Kerberos network authentication.</property>
+                <property name="label" translatable="yes">PKINIT</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
                 <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox_notifications">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">12</property>
+                <property name="spacing">18</property>
+                <child>
+                  <object class="GtkVBox" id="vbox8">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="label17">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Notifications</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox9">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkImage" id="image_notifications">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="yalign">0</property>
+                            <property name="icon_name">krb-expiring-ticket</property>
+                            <property name="icon-size">6</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="hbox10">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel" id="label14">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label">    </property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label15">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes" comments="Used in combination: 'Warn x minutes before expiry'">Warn</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="prompt_mins_entry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="has_tooltip">True</property>
+                                <property name="tooltip_markup" translatable="yes">Send notification about ticket expiry that many minutes before it finally expires</property>
+                                <property name="tooltip_text" translatable="yes">Send notification about ticket expiry that many minutes before it finally expires</property>
+                                <property name="invisible_char">●</property>
+                                <property name="invisible_char_set">True</property>
+                                <property name="snap_to_ticks">True</property>
+                                <property name="numeric">True</property>
+				<property name="adjustment">adjustment1</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label16">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes" comments="Used in combination: 'Warn x minutes before expiry'">minutes before ticket expiry</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Notifications</property>
+              </object>
+              <packing>
+                <property name="position">2</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">krb5_tickets_ok</action-widget>
+      <action-widget response="0">button1</action-widget>
     </action-widgets>
   </object>
 </interface>
author	Guido Günther <agx@sigxcpu.org>	2011-09-26 22:20:52 +0200
committer	Guido Günther <agx@sigxcpu.org>	2011-09-26 22:20:52 +0200
commit	85df09c7a65dab7c54e1e35b0685f8677355710c (patch)
tree	49c3d1ae8ceea68ad29185c40403c0add4b68f28 /src
parent	New upstream version 3.0.1 (diff)
download	krb5-auth-dialog-85df09c7a65dab7c54e1e35b0685f8677355710c.tar.gz krb5-auth-dialog-85df09c7a65dab7c54e1e35b0685f8677355710c.tar.bz2 krb5-auth-dialog-85df09c7a65dab7c54e1e35b0685f8677355710c.zip