Imported Upstream version 0.16~rc1

3 files changed, 54 insertions, 49 deletions

diff --git a/preferences/Makefile.am b/preferences/Makefile.am
index fafb357..8a7187d 100644
--- a/preferences/Makefile.am
+++ b/preferences/Makefile.am
@@ -4,11 +4,11 @@ bin_PROGRAMS = krb5-auth-dialog-preferences
 man_MANS = krb5-auth-dialog-preferences.1
 
 krb5_auth_dialog_preferences_SOURCES = \
-	krb5-auth-dialog-preferences.c \
-	$(top_srcdir)/src/krb5-auth-gconf-tools.c \
-	$(top_srcdir)/src/krb5-auth-gconf-tools.h \
-	$(top_srcdir)/src/krb5-auth-tools.c \
-	$(top_srcdir)/src/krb5-auth-tools.h \
+	ka-preferences.c \
+	$(top_srcdir)/src/ka-gconf-tools.c \
+	$(top_srcdir)/src/ka-gconf-tools.h \
+	$(top_srcdir)/src/ka-tools.c \
+	$(top_srcdir)/src/ka-tools.h \
 	$(NULL)
 
 krb5_auth_dialog_preferences_CPPFLAGS = \
diff --git a/preferences/Makefile.in b/preferences/Makefile.in
index 053e45a..a95522f 100644
--- a/preferences/Makefile.in
+++ b/preferences/Makefile.in
@@ -52,9 +52,10 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(pkgdatadir)"
 PROGRAMS = $(bin_PROGRAMS)
 am__objects_1 =
-am_krb5_auth_dialog_preferences_OBJECTS = krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.$(OBJEXT) \
-	krb5_auth_dialog_preferences-krb5-auth-gconf-tools.$(OBJEXT) \
-	krb5_auth_dialog_preferences-krb5-auth-tools.$(OBJEXT) \
+am_krb5_auth_dialog_preferences_OBJECTS =  \
+	krb5_auth_dialog_preferences-ka-preferences.$(OBJEXT) \
+	krb5_auth_dialog_preferences-ka-gconf-tools.$(OBJEXT) \
+	krb5_auth_dialog_preferences-ka-tools.$(OBJEXT) \
 	$(am__objects_1)
 krb5_auth_dialog_preferences_OBJECTS =  \
 	$(am_krb5_auth_dialog_preferences_OBJECTS)
@@ -168,6 +169,8 @@ GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
 GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
 GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
@@ -185,6 +188,7 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+KA_PLUGINS_DIR = @KA_PLUGINS_DIR@
 KRB5_CFLAGS = @KRB5_CFLAGS@
 KRB5_CONFIG = @KRB5_CONFIG@
 KRB5_LIBS = @KRB5_LIBS@
@@ -225,6 +229,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PAM_LIBS = @PAM_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
@@ -302,11 +307,11 @@ top_srcdir = @top_srcdir@
 NULL = 
 man_MANS = krb5-auth-dialog-preferences.1
 krb5_auth_dialog_preferences_SOURCES = \
-	krb5-auth-dialog-preferences.c \
-	$(top_srcdir)/src/krb5-auth-gconf-tools.c \
-	$(top_srcdir)/src/krb5-auth-gconf-tools.h \
-	$(top_srcdir)/src/krb5-auth-tools.c \
-	$(top_srcdir)/src/krb5-auth-tools.h \
+	ka-preferences.c \
+	$(top_srcdir)/src/ka-gconf-tools.c \
+	$(top_srcdir)/src/ka-gconf-tools.h \
+	$(top_srcdir)/src/ka-tools.c \
+	$(top_srcdir)/src/ka-tools.h \
 	$(NULL)
 
 krb5_auth_dialog_preferences_CPPFLAGS = \
@@ -435,9 +440,9 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog_preferences-ka-gconf-tools.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog_preferences-ka-preferences.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog_preferences-ka-tools.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -463,53 +468,53 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.o: krb5-auth-dialog-preferences.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.o `test -f 'krb5-auth-dialog-preferences.c' || echo '$(srcdir)/'`krb5-auth-dialog-preferences.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Po
+krb5_auth_dialog_preferences-ka-preferences.o: ka-preferences.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-ka-preferences.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-ka-preferences.Tpo -c -o krb5_auth_dialog_preferences-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_preferences-ka-preferences.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-ka-preferences.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='krb5-auth-dialog-preferences.c' object='krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-preferences.c' object='krb5_auth_dialog_preferences-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_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.o `test -f 'krb5-auth-dialog-preferences.c' || echo '$(srcdir)/'`krb5-auth-dialog-preferences.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-ka-preferences.o `test -f 'ka-preferences.c' || echo '$(srcdir)/'`ka-preferences.c
 
-krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.obj: krb5-auth-dialog-preferences.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.obj `if test -f 'krb5-auth-dialog-preferences.c'; then $(CYGPATH_W) 'krb5-auth-dialog-preferences.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-dialog-preferences.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Po
+krb5_auth_dialog_preferences-ka-preferences.obj: ka-preferences.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-ka-preferences.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-ka-preferences.Tpo -c -o krb5_auth_dialog_preferences-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_preferences-ka-preferences.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-ka-preferences.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='krb5-auth-dialog-preferences.c' object='krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-preferences.c' object='krb5_auth_dialog_preferences-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_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.obj `if test -f 'krb5-auth-dialog-preferences.c'; then $(CYGPATH_W) 'krb5-auth-dialog-preferences.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-dialog-preferences.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-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_preferences-krb5-auth-gconf-tools.o: $(top_srcdir)/src/krb5-auth-gconf-tools.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-krb5-auth-gconf-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-gconf-tools.o `test -f '$(top_srcdir)/src/krb5-auth-gconf-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/krb5-auth-gconf-tools.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Po
+krb5_auth_dialog_preferences-ka-gconf-tools.o: $(top_srcdir)/src/ka-gconf-tools.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-ka-gconf-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-ka-gconf-tools.Tpo -c -o krb5_auth_dialog_preferences-ka-gconf-tools.o `test -f '$(top_srcdir)/src/ka-gconf-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/ka-gconf-tools.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-ka-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-ka-gconf-tools.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/src/krb5-auth-gconf-tools.c' object='krb5_auth_dialog_preferences-krb5-auth-gconf-tools.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/src/ka-gconf-tools.c' object='krb5_auth_dialog_preferences-ka-gconf-tools.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_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-krb5-auth-gconf-tools.o `test -f '$(top_srcdir)/src/krb5-auth-gconf-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/krb5-auth-gconf-tools.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-ka-gconf-tools.o `test -f '$(top_srcdir)/src/ka-gconf-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/ka-gconf-tools.c
 
-krb5_auth_dialog_preferences-krb5-auth-gconf-tools.obj: $(top_srcdir)/src/krb5-auth-gconf-tools.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-krb5-auth-gconf-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-gconf-tools.obj `if test -f '$(top_srcdir)/src/krb5-auth-gconf-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/krb5-auth-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/krb5-auth-gconf-tools.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Po
+krb5_auth_dialog_preferences-ka-gconf-tools.obj: $(top_srcdir)/src/ka-gconf-tools.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-ka-gconf-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-ka-gconf-tools.Tpo -c -o krb5_auth_dialog_preferences-ka-gconf-tools.obj `if test -f '$(top_srcdir)/src/ka-gconf-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/ka-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/ka-gconf-tools.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-ka-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-ka-gconf-tools.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/src/krb5-auth-gconf-tools.c' object='krb5_auth_dialog_preferences-krb5-auth-gconf-tools.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/src/ka-gconf-tools.c' object='krb5_auth_dialog_preferences-ka-gconf-tools.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_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-krb5-auth-gconf-tools.obj `if test -f '$(top_srcdir)/src/krb5-auth-gconf-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/krb5-auth-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/krb5-auth-gconf-tools.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-ka-gconf-tools.obj `if test -f '$(top_srcdir)/src/ka-gconf-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/ka-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/ka-gconf-tools.c'; fi`
 
-krb5_auth_dialog_preferences-krb5-auth-tools.o: $(top_srcdir)/src/krb5-auth-tools.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-krb5-auth-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-tools.o `test -f '$(top_srcdir)/src/krb5-auth-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/krb5-auth-tools.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Po
+krb5_auth_dialog_preferences-ka-tools.o: $(top_srcdir)/src/ka-tools.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-ka-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-ka-tools.Tpo -c -o krb5_auth_dialog_preferences-ka-tools.o `test -f '$(top_srcdir)/src/ka-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/ka-tools.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-ka-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-ka-tools.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/src/krb5-auth-tools.c' object='krb5_auth_dialog_preferences-krb5-auth-tools.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/src/ka-tools.c' object='krb5_auth_dialog_preferences-ka-tools.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_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-krb5-auth-tools.o `test -f '$(top_srcdir)/src/krb5-auth-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/krb5-auth-tools.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-ka-tools.o `test -f '$(top_srcdir)/src/ka-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/ka-tools.c
 
-krb5_auth_dialog_preferences-krb5-auth-tools.obj: $(top_srcdir)/src/krb5-auth-tools.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-krb5-auth-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-tools.obj `if test -f '$(top_srcdir)/src/krb5-auth-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/krb5-auth-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/krb5-auth-tools.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Po
+krb5_auth_dialog_preferences-ka-tools.obj: $(top_srcdir)/src/ka-tools.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-ka-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-ka-tools.Tpo -c -o krb5_auth_dialog_preferences-ka-tools.obj `if test -f '$(top_srcdir)/src/ka-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/ka-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/ka-tools.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-ka-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-ka-tools.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/src/krb5-auth-tools.c' object='krb5_auth_dialog_preferences-krb5-auth-tools.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/src/ka-tools.c' object='krb5_auth_dialog_preferences-ka-tools.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_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-krb5-auth-tools.obj `if test -f '$(top_srcdir)/src/krb5-auth-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/krb5-auth-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/krb5-auth-tools.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-ka-tools.obj `if test -f '$(top_srcdir)/src/ka-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/ka-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/ka-tools.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/preferences/krb5-auth-dialog-preferences.c b/preferences/ka-preferences.c
index 0b5ff13..f925b7e 100644
--- a/preferences/krb5-auth-dialog-preferences.c
+++ b/preferences/ka-preferences.c
@@ -21,7 +21,7 @@
  * based on the vino capplet which is:
  *
  * 	Copyright (C) 2003 Sun Microsystems, Inc.
- * 	Copyright (C) 2006 Jonh Wendell <wendell@bani.com.br> 
+ * 	Copyright (C) 2006 Jonh Wendell <wendell@bani.com.br>
  *
  * 	Authors:
  *      	Mark McLoughlin <mark@skynet.ie>
@@ -33,8 +33,8 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "krb5-auth-gconf-tools.h"
-#include "krb5-auth-tools.h"
+#include "ka-gconf-tools.h"
+#include "ka-tools.h"
 
 #define PKINIT_SMARTCARD "PKCS11:" SC_PKCS11
 #define PKINIT_FILE "FILE:"