New upstream version 3.8.0

24 files changed, 887 insertions, 1353 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 9c22dcf..3cf1a7d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,10 +12,11 @@ desktopdir = $(datadir)/applications
 desktop_in_files = krb5-auth-dialog.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = krb5-auth-dialog.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
+gsettings_SCHEMAS = org.gnome.KrbAuthDialog.gschema.xml
+@GSETTINGS_RULES@
+
+convertdir = $(datadir)/GConf/gsettings
+dist_convert_DATA = org.gnome.KrbAuthDialog.convert
 
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.gnome.KrbAuthDialog.service.in
@@ -32,10 +33,8 @@ krb5_auth_dialog_SOURCES =	\
 	ka-applet.h		\
 	ka-pwdialog.c    	\
 	ka-pwdialog.h    	\
-	ka-gconf.c		\
-	ka-gconf.h		\
-	ka-gconf-tools.c	\
-	ka-gconf-tools.h	\
+	ka-settings.c		\
+	ka-settings.h		\
 	ka-dbus.c		\
 	ka-dbus.h		\
 	ka-tools.c		\
@@ -68,7 +67,6 @@ krb5_auth_dialog_CPPFLAGS = \
 krb5_auth_dialog_CFLAGS = \
 	$(GMODULE_CFLAGS) \
 	$(GTK_CFLAGS) \
-	$(GCONF_CFLAGS) \
 	$(KRB5_CFLAGS) \
 	$(NETWORK_MANAGER_CFLAGS) \
 	$(LIBNOTIFY_CFLAGS) \
@@ -82,7 +80,6 @@ krb5_auth_dialog_LDADD = \
 	$(LIBCAP) \
 	$(KRB5_LIBS) \
 	$(LIBNOTIFY_LIBS) \
-	$(GCONF_LIBS) \
 	$(GIO_LIBS) \
 	$(GMODULE_LIBS) \
 	$(GTK_LIBS) \
@@ -103,6 +100,7 @@ EXTRA_DIST = \
 	$(schema_in_files) \
 	$(autostart_in_files) \
 	$(service_in_files) \
+	org.gnome.KrbAuthDialog.gschema.xml \
 	krb5-auth-dialog.1.in \
 	$(NULL)
 
@@ -111,12 +109,3 @@ DISTCLEANFILES = \
 	krb5-auth-dialog.desktop \
 	$(NULL)
 
-install-data-local: $(schema_DATA)
-if GCONF_SCHEMAS_INSTALL
-	if test -z "$(DESTDIR)" ; then \
-	for p in $^ ; do \
-		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
-	done \
-	fi
-endif
-
diff --git a/src/Makefile.in b/src/Makefile.in
index f4a24be..dc2bf38 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +17,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -36,8 +53,8 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = krb5-auth-dialog$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/krb5-auth-dialog.1.in
+DIST_COMMON = $(dist_convert_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/krb5-auth-dialog.1.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/m4/compiler-flags.m4 \
@@ -50,15 +67,14 @@ CONFIG_CLEAN_FILES = krb5-auth-dialog.1
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(desktopdir)" \
-	"$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(schemadir)" \
+	"$(DESTDIR)$(convertdir)" "$(DESTDIR)$(pkgdatadir)" \
 	"$(DESTDIR)$(servicedir)"
 PROGRAMS = $(bin_PROGRAMS)
 am__objects_1 =
 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-settings.$(OBJEXT) \
 	krb5_auth_dialog-ka-dbus.$(OBJEXT) \
 	krb5_auth_dialog-ka-tools.$(OBJEXT) \
 	krb5_auth_dialog-ka-main-window.$(OBJEXT) \
@@ -74,10 +90,9 @@ krb5_auth_dialog_DEPENDENCIES = $(top_builddir)/secmem/libsecmem.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 krb5_auth_dialog_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -93,24 +108,29 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(krb5_auth_dialog_SOURCES)
 DIST_SOURCES = $(krb5_auth_dialog_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -132,11 +152,17 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
-DATA = $(autostart_DATA) $(desktop_DATA) $(pkgdata_DATA) \
-	$(schema_DATA) $(service_DATA)
+DATA = $(autostart_DATA) $(desktop_DATA) $(dist_convert_DATA) \
+	$(pkgdata_DATA) $(service_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -173,19 +199,16 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HELP_DIR = @HELP_DIR@
@@ -200,6 +223,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 KA_PLUGINS_DIR = @KA_PLUGINS_DIR@
 KRB5_CFLAGS = @KRB5_CFLAGS@
 KRB5_CONFIG = @KRB5_CONFIG@
@@ -290,6 +317,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -299,6 +327,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -327,9 +357,9 @@ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 desktopdir = $(datadir)/applications
 desktop_in_files = krb5-auth-dialog.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = krb5-auth-dialog.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+gsettings_SCHEMAS = org.gnome.KrbAuthDialog.gschema.xml
+convertdir = $(datadir)/GConf/gsettings
+dist_convert_DATA = org.gnome.KrbAuthDialog.convert
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.gnome.KrbAuthDialog.service.in
 service_DATA = $(service_in_files:.service.in=.service)
@@ -341,10 +371,8 @@ krb5_auth_dialog_SOURCES = \
 	ka-applet.h		\
 	ka-pwdialog.c    	\
 	ka-pwdialog.h    	\
-	ka-gconf.c		\
-	ka-gconf.h		\
-	ka-gconf-tools.c	\
-	ka-gconf-tools.h	\
+	ka-settings.c		\
+	ka-settings.h		\
 	ka-dbus.c		\
 	ka-dbus.h		\
 	ka-tools.c		\
@@ -377,7 +405,6 @@ krb5_auth_dialog_CPPFLAGS = \
 krb5_auth_dialog_CFLAGS = \
 	$(GMODULE_CFLAGS) \
 	$(GTK_CFLAGS) \
-	$(GCONF_CFLAGS) \
 	$(KRB5_CFLAGS) \
 	$(NETWORK_MANAGER_CFLAGS) \
 	$(LIBNOTIFY_CFLAGS) \
@@ -391,7 +418,6 @@ krb5_auth_dialog_LDADD = \
 	$(LIBCAP) \
 	$(KRB5_LIBS) \
 	$(LIBNOTIFY_LIBS) \
-	$(GCONF_LIBS) \
 	$(GIO_LIBS) \
 	$(GMODULE_LIBS) \
 	$(GTK_LIBS) \
@@ -411,6 +437,7 @@ EXTRA_DIST = \
 	$(schema_in_files) \
 	$(autostart_in_files) \
 	$(service_in_files) \
+	org.gnome.KrbAuthDialog.gschema.xml \
 	krb5-auth-dialog.1.in \
 	$(NULL)
 
@@ -457,8 +484,11 @@ krb5-auth-dialog.1: $(top_builddir)/config.status $(srcdir)/krb5-auth-dialog.1.i
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p || test -f $$p1; \
@@ -498,7 +528,7 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-krb5-auth-dialog$(EXEEXT): $(krb5_auth_dialog_OBJECTS) $(krb5_auth_dialog_DEPENDENCIES) 
+krb5-auth-dialog$(EXEEXT): $(krb5_auth_dialog_OBJECTS) $(krb5_auth_dialog_DEPENDENCIES) $(EXTRA_krb5_auth_dialog_DEPENDENCIES) 
 	@rm -f krb5-auth-dialog$(EXEEXT)
 	$(AM_V_CCLD)$(krb5_auth_dialog_LINK) $(krb5_auth_dialog_OBJECTS) $(krb5_auth_dialog_LDADD) $(LIBS)
 
@@ -513,263 +543,217 @@ distclean-compile:
 @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-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-settings.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-tools.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 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-kerberos.c' object='krb5_auth_dialog-ka-kerberos.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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-kerberos.o `test -f 'ka-kerberos.c' || echo '$(srcdir)/'`ka-kerberos.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-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-kerberos.c' object='krb5_auth_dialog-ka-kerberos.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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-kerberos.obj `if test -f 'ka-kerberos.c'; then $(CYGPATH_W) 'ka-kerberos.c'; else $(CYGPATH_W) '$(srcdir)/ka-kerberos.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-applet.Tpo $(DEPDIR)/krb5_auth_dialog-ka-applet.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-applet.c' object='krb5_auth_dialog-ka-applet.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-applet.c' object='krb5_auth_dialog-ka-applet.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-applet.o `test -f 'ka-applet.c' || echo '$(srcdir)/'`ka-applet.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-applet.o `test -f 'ka-applet.c' || echo '$(srcdir)/'`ka-applet.c
 
 krb5_auth_dialog-ka-applet.obj: 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.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-applet.Tpo -c -o krb5_auth_dialog-ka-applet.obj `if test -f 'ka-applet.c'; then $(CYGPATH_W) 'ka-applet.c'; else $(CYGPATH_W) '$(srcdir)/ka-applet.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-applet.Tpo $(DEPDIR)/krb5_auth_dialog-ka-applet.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-applet.c' object='krb5_auth_dialog-ka-applet.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-applet.c' object='krb5_auth_dialog-ka-applet.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-applet.obj `if test -f 'ka-applet.c'; then $(CYGPATH_W) 'ka-applet.c'; else $(CYGPATH_W) '$(srcdir)/ka-applet.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-applet.obj `if test -f 'ka-applet.c'; then $(CYGPATH_W) 'ka-applet.c'; else $(CYGPATH_W) '$(srcdir)/ka-applet.c'; fi`
 
 krb5_auth_dialog-ka-pwdialog.o: ka-pwdialog.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-pwdialog.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Tpo -c -o krb5_auth_dialog-ka-pwdialog.o `test -f 'ka-pwdialog.c' || echo '$(srcdir)/'`ka-pwdialog.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Tpo $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-pwdialog.c' object='krb5_auth_dialog-ka-pwdialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-pwdialog.c' object='krb5_auth_dialog-ka-pwdialog.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-pwdialog.o `test -f 'ka-pwdialog.c' || echo '$(srcdir)/'`ka-pwdialog.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-pwdialog.o `test -f 'ka-pwdialog.c' || echo '$(srcdir)/'`ka-pwdialog.c
 
 krb5_auth_dialog-ka-pwdialog.obj: ka-pwdialog.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-pwdialog.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Tpo -c -o krb5_auth_dialog-ka-pwdialog.obj `if test -f 'ka-pwdialog.c'; then $(CYGPATH_W) 'ka-pwdialog.c'; else $(CYGPATH_W) '$(srcdir)/ka-pwdialog.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Tpo $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-pwdialog.c' object='krb5_auth_dialog-ka-pwdialog.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-pwdialog.obj `if test -f 'ka-pwdialog.c'; then $(CYGPATH_W) 'ka-pwdialog.c'; else $(CYGPATH_W) '$(srcdir)/ka-pwdialog.c'; fi`
-
-krb5_auth_dialog-ka-gconf.o: ka-gconf.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-gconf.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-gconf.Tpo -c -o krb5_auth_dialog-ka-gconf.o `test -f 'ka-gconf.c' || echo '$(srcdir)/'`ka-gconf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-gconf.Tpo $(DEPDIR)/krb5_auth_dialog-ka-gconf.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-gconf.c' object='krb5_auth_dialog-ka-gconf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-pwdialog.c' object='krb5_auth_dialog-ka-pwdialog.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-gconf.o `test -f 'ka-gconf.c' || echo '$(srcdir)/'`ka-gconf.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-pwdialog.obj `if test -f 'ka-pwdialog.c'; then $(CYGPATH_W) 'ka-pwdialog.c'; else $(CYGPATH_W) '$(srcdir)/ka-pwdialog.c'; fi`
 
-krb5_auth_dialog-ka-gconf.obj: ka-gconf.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-gconf.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-gconf.Tpo -c -o krb5_auth_dialog-ka-gconf.obj `if test -f 'ka-gconf.c'; then $(CYGPATH_W) 'ka-gconf.c'; else $(CYGPATH_W) '$(srcdir)/ka-gconf.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-gconf.Tpo $(DEPDIR)/krb5_auth_dialog-ka-gconf.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-gconf.c' object='krb5_auth_dialog-ka-gconf.obj' libtool=no @AMDEPBACKSLASH@
+krb5_auth_dialog-ka-settings.o: ka-settings.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-settings.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-settings.Tpo -c -o krb5_auth_dialog-ka-settings.o `test -f 'ka-settings.c' || echo '$(srcdir)/'`ka-settings.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-settings.Tpo $(DEPDIR)/krb5_auth_dialog-ka-settings.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-settings.c' object='krb5_auth_dialog-ka-settings.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-gconf.obj `if test -f 'ka-gconf.c'; then $(CYGPATH_W) 'ka-gconf.c'; else $(CYGPATH_W) '$(srcdir)/ka-gconf.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-settings.o `test -f 'ka-settings.c' || echo '$(srcdir)/'`ka-settings.c
 
-krb5_auth_dialog-ka-gconf-tools.o: ka-gconf-tools.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-gconf-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Tpo -c -o krb5_auth_dialog-ka-gconf-tools.o `test -f 'ka-gconf-tools.c' || echo '$(srcdir)/'`ka-gconf-tools.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-gconf-tools.c' object='krb5_auth_dialog-ka-gconf-tools.o' libtool=no @AMDEPBACKSLASH@
+krb5_auth_dialog-ka-settings.obj: ka-settings.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-settings.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-settings.Tpo -c -o krb5_auth_dialog-ka-settings.obj `if test -f 'ka-settings.c'; then $(CYGPATH_W) 'ka-settings.c'; else $(CYGPATH_W) '$(srcdir)/ka-settings.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-settings.Tpo $(DEPDIR)/krb5_auth_dialog-ka-settings.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-settings.c' object='krb5_auth_dialog-ka-settings.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-gconf-tools.o `test -f 'ka-gconf-tools.c' || echo '$(srcdir)/'`ka-gconf-tools.c
-
-krb5_auth_dialog-ka-gconf-tools.obj: ka-gconf-tools.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-gconf-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Tpo -c -o krb5_auth_dialog-ka-gconf-tools.obj `if test -f 'ka-gconf-tools.c'; then $(CYGPATH_W) 'ka-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/ka-gconf-tools.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-gconf-tools.c' object='krb5_auth_dialog-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_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-gconf-tools.obj `if test -f 'ka-gconf-tools.c'; then $(CYGPATH_W) 'ka-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/ka-gconf-tools.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-settings.obj `if test -f 'ka-settings.c'; then $(CYGPATH_W) 'ka-settings.c'; else $(CYGPATH_W) '$(srcdir)/ka-settings.c'; fi`
 
 krb5_auth_dialog-ka-dbus.o: ka-dbus.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-dbus.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-dbus.Tpo -c -o krb5_auth_dialog-ka-dbus.o `test -f 'ka-dbus.c' || echo '$(srcdir)/'`ka-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-dbus.Tpo $(DEPDIR)/krb5_auth_dialog-ka-dbus.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-dbus.c' object='krb5_auth_dialog-ka-dbus.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-dbus.c' object='krb5_auth_dialog-ka-dbus.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-dbus.o `test -f 'ka-dbus.c' || echo '$(srcdir)/'`ka-dbus.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-dbus.o `test -f 'ka-dbus.c' || echo '$(srcdir)/'`ka-dbus.c
 
 krb5_auth_dialog-ka-dbus.obj: ka-dbus.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-dbus.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-dbus.Tpo -c -o krb5_auth_dialog-ka-dbus.obj `if test -f 'ka-dbus.c'; then $(CYGPATH_W) 'ka-dbus.c'; else $(CYGPATH_W) '$(srcdir)/ka-dbus.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-dbus.Tpo $(DEPDIR)/krb5_auth_dialog-ka-dbus.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-dbus.c' object='krb5_auth_dialog-ka-dbus.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-dbus.c' object='krb5_auth_dialog-ka-dbus.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-dbus.obj `if test -f 'ka-dbus.c'; then $(CYGPATH_W) 'ka-dbus.c'; else $(CYGPATH_W) '$(srcdir)/ka-dbus.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-dbus.obj `if test -f 'ka-dbus.c'; then $(CYGPATH_W) 'ka-dbus.c'; else $(CYGPATH_W) '$(srcdir)/ka-dbus.c'; fi`
 
 krb5_auth_dialog-ka-tools.o: ka-tools.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-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-tools.Tpo -c -o krb5_auth_dialog-ka-tools.o `test -f 'ka-tools.c' || echo '$(srcdir)/'`ka-tools.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-tools.Tpo $(DEPDIR)/krb5_auth_dialog-ka-tools.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-tools.c' object='krb5_auth_dialog-ka-tools.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-tools.c' object='krb5_auth_dialog-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_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-tools.o `test -f 'ka-tools.c' || echo '$(srcdir)/'`ka-tools.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-tools.o `test -f 'ka-tools.c' || echo '$(srcdir)/'`ka-tools.c
 
 krb5_auth_dialog-ka-tools.obj: ka-tools.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-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-tools.Tpo -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`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-tools.Tpo $(DEPDIR)/krb5_auth_dialog-ka-tools.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-tools.c' object='krb5_auth_dialog-ka-tools.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-tools.c' object='krb5_auth_dialog-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_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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-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-main-window.c' object='krb5_auth_dialog-ka-main-window.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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-main-window.o `test -f 'ka-main-window.c' || echo '$(srcdir)/'`ka-main-window.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-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-main-window.c' object='krb5_auth_dialog-ka-main-window.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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-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_FALSE@	$(AM_V_CC@am__nodep@)$(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
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-plugin.Tpo $(DEPDIR)/krb5_auth_dialog-ka-plugin.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-plugin.c' object='krb5_auth_dialog-ka-plugin.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-plugin.c' object='krb5_auth_dialog-ka-plugin.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-plugin.o `test -f 'ka-plugin.c' || echo '$(srcdir)/'`ka-plugin.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin.o `test -f 'ka-plugin.c' || echo '$(srcdir)/'`ka-plugin.c
 
 krb5_auth_dialog-ka-plugin.obj: 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.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-plugin.Tpo -c -o krb5_auth_dialog-ka-plugin.obj `if test -f 'ka-plugin.c'; then $(CYGPATH_W) 'ka-plugin.c'; else $(CYGPATH_W) '$(srcdir)/ka-plugin.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-plugin.Tpo $(DEPDIR)/krb5_auth_dialog-ka-plugin.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-plugin.c' object='krb5_auth_dialog-ka-plugin.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-plugin.c' object='krb5_auth_dialog-ka-plugin.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-plugin.obj `if test -f 'ka-plugin.c'; then $(CYGPATH_W) 'ka-plugin.c'; else $(CYGPATH_W) '$(srcdir)/ka-plugin.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin.obj `if test -f 'ka-plugin.c'; then $(CYGPATH_W) 'ka-plugin.c'; else $(CYGPATH_W) '$(srcdir)/ka-plugin.c'; fi`
 
 krb5_auth_dialog-ka-plugin-loader.o: ka-plugin-loader.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-loader.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Tpo -c -o krb5_auth_dialog-ka-plugin-loader.o `test -f 'ka-plugin-loader.c' || echo '$(srcdir)/'`ka-plugin-loader.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Tpo $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-plugin-loader.c' object='krb5_auth_dialog-ka-plugin-loader.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-plugin-loader.c' object='krb5_auth_dialog-ka-plugin-loader.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-plugin-loader.o `test -f 'ka-plugin-loader.c' || echo '$(srcdir)/'`ka-plugin-loader.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin-loader.o `test -f 'ka-plugin-loader.c' || echo '$(srcdir)/'`ka-plugin-loader.c
 
 krb5_auth_dialog-ka-plugin-loader.obj: ka-plugin-loader.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-loader.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Tpo -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`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Tpo $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-plugin-loader.c' object='krb5_auth_dialog-ka-plugin-loader.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-plugin-loader.c' object='krb5_auth_dialog-ka-plugin-loader.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-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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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@	$(AM_V_CC)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
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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@	$(AM_V_CC)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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-closures.c' object='krb5_auth_dialog-ka-closures.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-closures.c' object='krb5_auth_dialog-ka-closures.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-closures.o `test -f 'ka-closures.c' || echo '$(srcdir)/'`ka-closures.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-closures.o `test -f 'ka-closures.c' || echo '$(srcdir)/'`ka-closures.c
 
 krb5_auth_dialog-ka-closures.obj: 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.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-closures.Tpo -c -o krb5_auth_dialog-ka-closures.obj `if test -f 'ka-closures.c'; then $(CYGPATH_W) 'ka-closures.c'; else $(CYGPATH_W) '$(srcdir)/ka-closures.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-closures.Tpo $(DEPDIR)/krb5_auth_dialog-ka-closures.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-closures.c' object='krb5_auth_dialog-ka-closures.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-closures.c' object='krb5_auth_dialog-ka-closures.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-closures.obj `if test -f 'ka-closures.c'; then $(CYGPATH_W) 'ka-closures.c'; else $(CYGPATH_W) '$(srcdir)/ka-closures.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-closures.obj `if test -f 'ka-closures.c'; then $(CYGPATH_W) 'ka-closures.c'; else $(CYGPATH_W) '$(srcdir)/ka-closures.c'; fi`
 
 krb5_auth_dialog-ka-entry-buffer.o: ka-entry-buffer.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-entry-buffer.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-entry-buffer.Tpo -c -o krb5_auth_dialog-ka-entry-buffer.o `test -f 'ka-entry-buffer.c' || echo '$(srcdir)/'`ka-entry-buffer.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-entry-buffer.Tpo $(DEPDIR)/krb5_auth_dialog-ka-entry-buffer.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-entry-buffer.c' object='krb5_auth_dialog-ka-entry-buffer.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-entry-buffer.c' object='krb5_auth_dialog-ka-entry-buffer.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-entry-buffer.o `test -f 'ka-entry-buffer.c' || echo '$(srcdir)/'`ka-entry-buffer.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-entry-buffer.o `test -f 'ka-entry-buffer.c' || echo '$(srcdir)/'`ka-entry-buffer.c
 
 krb5_auth_dialog-ka-entry-buffer.obj: ka-entry-buffer.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-entry-buffer.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-entry-buffer.Tpo -c -o krb5_auth_dialog-ka-entry-buffer.obj `if test -f 'ka-entry-buffer.c'; then $(CYGPATH_W) 'ka-entry-buffer.c'; else $(CYGPATH_W) '$(srcdir)/ka-entry-buffer.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-entry-buffer.Tpo $(DEPDIR)/krb5_auth_dialog-ka-entry-buffer.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-entry-buffer.c' object='krb5_auth_dialog-ka-entry-buffer.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-entry-buffer.c' object='krb5_auth_dialog-ka-entry-buffer.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-entry-buffer.obj `if test -f 'ka-entry-buffer.c'; then $(CYGPATH_W) 'ka-entry-buffer.c'; else $(CYGPATH_W) '$(srcdir)/ka-entry-buffer.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-entry-buffer.obj `if test -f 'ka-entry-buffer.c'; then $(CYGPATH_W) 'ka-entry-buffer.c'; else $(CYGPATH_W) '$(srcdir)/ka-entry-buffer.c'; fi`
 
 krb5_auth_dialog-dummy-strings.o: dummy-strings.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-dummy-strings.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-dummy-strings.Tpo -c -o krb5_auth_dialog-dummy-strings.o `test -f 'dummy-strings.c' || echo '$(srcdir)/'`dummy-strings.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-dummy-strings.Tpo $(DEPDIR)/krb5_auth_dialog-dummy-strings.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dummy-strings.c' object='krb5_auth_dialog-dummy-strings.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dummy-strings.c' object='krb5_auth_dialog-dummy-strings.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-dummy-strings.o `test -f 'dummy-strings.c' || echo '$(srcdir)/'`dummy-strings.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-dummy-strings.o `test -f 'dummy-strings.c' || echo '$(srcdir)/'`dummy-strings.c
 
 krb5_auth_dialog-dummy-strings.obj: dummy-strings.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-dummy-strings.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-dummy-strings.Tpo -c -o krb5_auth_dialog-dummy-strings.obj `if test -f 'dummy-strings.c'; then $(CYGPATH_W) 'dummy-strings.c'; else $(CYGPATH_W) '$(srcdir)/dummy-strings.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-dummy-strings.Tpo $(DEPDIR)/krb5_auth_dialog-dummy-strings.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dummy-strings.c' object='krb5_auth_dialog-dummy-strings.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dummy-strings.c' object='krb5_auth_dialog-dummy-strings.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-dummy-strings.obj `if test -f 'dummy-strings.c'; then $(CYGPATH_W) 'dummy-strings.c'; else $(CYGPATH_W) '$(srcdir)/dummy-strings.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-dummy-strings.obj `if test -f 'dummy-strings.c'; then $(CYGPATH_W) 'dummy-strings.c'; else $(CYGPATH_W) '$(srcdir)/dummy-strings.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -778,11 +762,18 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -811,13 +802,14 @@ uninstall-man1:
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-autostartDATA: $(autostart_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(autostartdir)" || $(MKDIR_P) "$(DESTDIR)$(autostartdir)"
 	@list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(autostartdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(autostartdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -831,13 +823,14 @@ uninstall-autostartDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(autostartdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(autostartdir)" && rm -f $$files
+	dir='$(DESTDIR)$(autostartdir)'; $(am__uninstall_files_from_dir)
 install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -851,53 +844,56 @@ uninstall-desktopDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
-install-pkgdataDATA: $(pkgdata_DATA)
+	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
+install-dist_convertDATA: $(dist_convert_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	@list='$(dist_convert_DATA)'; test -n "$(convertdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(convertdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(convertdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(convertdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(convertdir)" || exit $$?; \
 	done
 
-uninstall-pkgdataDATA:
+uninstall-dist_convertDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	@list='$(dist_convert_DATA)'; test -n "$(convertdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
-install-schemaDATA: $(schema_DATA)
+	dir='$(DESTDIR)$(convertdir)'; $(am__uninstall_files_from_dir)
+install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)"
-	@list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
+	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
 	done
 
-uninstall-schemaDATA:
+uninstall-pkgdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
+	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(schemadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(schemadir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
 	@list='$(service_DATA)'; test -n "$(servicedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -911,9 +907,7 @@ uninstall-serviceDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(service_DATA)'; test -n "$(servicedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(servicedir)" && rm -f $$files
+	dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -1014,7 +1008,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(servicedir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(servicedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -1027,10 +1021,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1066,9 +1065,9 @@ info: info-am
 
 info-am:
 
-install-data-am: install-autostartDATA install-data-local \
-	install-desktopDATA install-man install-pkgdataDATA \
-	install-schemaDATA install-serviceDATA
+install-data-am: install-autostartDATA install-desktopDATA \
+	install-dist_convertDATA install-man install-pkgdataDATA \
+	install-serviceDATA
 
 install-dvi: install-dvi-am
 
@@ -1115,8 +1114,8 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-autostartDATA uninstall-binPROGRAMS \
-	uninstall-desktopDATA uninstall-man uninstall-pkgdataDATA \
-	uninstall-schemaDATA uninstall-serviceDATA
+	uninstall-desktopDATA uninstall-dist_convertDATA uninstall-man \
+	uninstall-pkgdataDATA uninstall-serviceDATA
 
 uninstall-man: uninstall-man1
 
@@ -1127,33 +1126,25 @@ uninstall-man: uninstall-man1
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-autostartDATA install-binPROGRAMS install-data \
-	install-data-am install-data-local install-desktopDATA \
+	install-data-am install-desktopDATA install-dist_convertDATA \
 	install-dvi install-dvi-am install-exec install-exec-am \
 	install-html install-html-am install-info install-info-am \
 	install-man install-man1 install-pdf install-pdf-am \
 	install-pkgdataDATA install-ps install-ps-am \
-	install-schemaDATA install-serviceDATA install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-autostartDATA \
-	uninstall-binPROGRAMS uninstall-desktopDATA uninstall-man \
-	uninstall-man1 uninstall-pkgdataDATA uninstall-schemaDATA \
-	uninstall-serviceDATA
+	install-serviceDATA install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-autostartDATA uninstall-binPROGRAMS \
+	uninstall-desktopDATA uninstall-dist_convertDATA uninstall-man \
+	uninstall-man1 uninstall-pkgdataDATA uninstall-serviceDATA
 
 @INTLTOOL_DESKTOP_RULE@
-@INTLTOOL_SCHEMAS_RULE@
+@GSETTINGS_RULES@
 
 $(service_DATA): $(service_in_files) Makefile
 	sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@
 
-install-data-local: $(schema_DATA)
-@GCONF_SCHEMAS_INSTALL_TRUE@	if test -z "$(DESTDIR)" ; then \
-@GCONF_SCHEMAS_INSTALL_TRUE@	for p in $^ ; do \
-@GCONF_SCHEMAS_INSTALL_TRUE@		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
-@GCONF_SCHEMAS_INSTALL_TRUE@	done \
-@GCONF_SCHEMAS_INSTALL_TRUE@	fi
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/ka-applet-priv.h b/src/ka-applet-priv.h
index d571230..ffcb4a4 100644
--- a/src/ka-applet-priv.h
+++ b/src/ka-applet-priv.h
@@ -25,7 +25,6 @@
 
 #include <glib-object.h>
 #include <glib/gprintf.h>
-#include <gconf/gconf-client.h>
 #include <krb5.h>
 
 #include "config.h"
@@ -52,11 +51,21 @@ void ka_applet_set_tgt_renewable (KaApplet *self, gboolean renewable);
 gboolean ka_applet_get_tgt_renewable (const KaApplet *self);
 guint ka_applet_get_pw_prompt_secs (const KaApplet *self);
 KaPwDialog *ka_applet_get_pwdialog (const KaApplet *self);
-GConfClient *ka_applet_get_gconf_client (const KaApplet *self);
+GSettings *ka_applet_get_settings (const KaApplet *self);
 void ka_applet_signal_emit (KaApplet *self, KaAppletSignalNumber signum,
                             krb5_timestamp expiry);
 void ka_applet_set_msg (KaApplet *self, const char *msg);
+GtkWindow* ka_applet_last_focused_window(KaApplet *self);
 
+/* properties */
+#define KA_PROP_NAME_PRINCIPAL       "principal"
+#define KA_PROP_NAME_PK_USERID       "pk-userid"
+#define KA_PROP_NAME_PK_ANCHORS      "pk-anchors"
+#define KA_PROP_NAME_PW_PROMPT_MINS  "pw-prompt-mins"
+#define KA_PROP_NAME_TGT_FORWARDABLE "tgt-forwardable"
+#define KA_PROP_NAME_TGT_PROXIABLE   "tgt-proxiable"
+#define KA_PROP_NAME_TGT_RENEWABLE   "tgt-renewable"
+#define KA_PROP_NAME_CONF_TICKETS    "conf-tickets"
 
 /* create the applet */
 KaApplet *ka_applet_create (void);
diff --git a/src/ka-applet.c b/src/ka-applet.c
index 56d4b14..2b48825 100644
--- a/src/ka-applet.c
+++ b/src/ka-applet.c
@@ -1,6 +1,6 @@
 /* Krb5 Auth Applet -- Acquire and release kerberos tickets
  *
- * (C) 2008,2009,2010 Guido Guenther <agx@sigxcpu.org>
+ * (C) 2008,2009,2010,2013 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
@@ -25,8 +25,7 @@
 #include "ka-applet-priv.h"
 #include "ka-dbus.h"
 #include "ka-kerberos.h"
-#include "ka-gconf-tools.h"
-#include "ka-gconf.h"
+#include "ka-settings.h"
 #include "ka-tools.h"
 #include "ka-main-window.h"
 #include "ka-plugin-loader.h"
@@ -51,6 +50,7 @@ enum {
     KA_PROP_TGT_FORWARDABLE,
     KA_PROP_TGT_PROXIABLE,
     KA_PROP_TGT_RENEWABLE,
+    KA_PROP_CONF_TICKETS,
 };
 
 
@@ -91,10 +91,10 @@ struct _KaAppletPrivate {
     gboolean startup_ccache;    /* ccache found on startup */
     gboolean auto_run;          /* only start with valid ccache */
 
-    /* GConf optins */
+    /* GSettings options */
     NotifyNotification *notification;   /* notification messages */
     char *krb_msg;              /* Additional banner delivered by Kerberos */
-    const char *notify_gconf_key;       /* disable notification gconf key */
+    const char *notify_key;     /* name of disable notification setting key */
     char *principal;            /* the principal to request */
     gboolean renewable;         /* credentials renewable? */
     char *pk_userid;            /* "userid" for pkint */
@@ -102,20 +102,23 @@ struct _KaAppletPrivate {
     gboolean tgt_forwardable;   /* request a forwardable ticket */
     gboolean tgt_renewable;     /* request a renewable ticket */
     gboolean tgt_proxiable;     /* request a proxiable ticket */
+    gboolean conf_tickets;      /* whether to display configuration tickets */
 
-    GConfClient *gconf;         /* gconf client */
+    GSettings *settings;         /* GSettings client */
 };
 
 
 static void ka_close_notification (KaApplet *self);
 static gboolean is_initialized;
 
-static void 
+static void
 ka_applet_activate (GApplication *application G_GNUC_UNUSED)
 {
+    KaApplet *self = KA_APPLET(application);
+
     if (is_initialized) {
         KA_DEBUG ("Main window activated");
-        ka_main_window_show ();
+        ka_main_window_show (self);
     } else
         is_initialized = TRUE;
 }
@@ -127,7 +130,7 @@ ka_applet_command_line (GApplication            *application,
 {
     KaApplet *self = KA_APPLET(application);
     KA_DEBUG ("Evaluating command line");
-    
+
     if (!self->priv->startup_ccache &&
         self->priv->auto_run)
         ka_applet_destroy (self);
@@ -160,7 +163,7 @@ ka_applet_local_command_line (GApplication *application,
     };
 
     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));
@@ -179,18 +182,102 @@ ka_applet_local_command_line (GApplication *application,
     return FALSE;
 }
 
+GtkWindow *ka_applet_last_focused_window (KaApplet *self)
+{
+    GList *l = gtk_application_get_windows (GTK_APPLICATION(self));
+
+    if (l != NULL )
+        return g_list_first (l)->data;
+
+    return NULL;
+}
+
+static void
+action_preferences (GSimpleAction *action G_GNUC_UNUSED,
+		    GVariant *parameter G_GNUC_UNUSED,
+		    gpointer userdata)
+{
+    KaApplet *self = userdata;
+
+    ka_preferences_window_show (self);
+}
+
+static void
+action_about (GSimpleAction *action G_GNUC_UNUSED,
+              GVariant *parameter G_GNUC_UNUSED,
+              gpointer userdata)
+{
+    KaApplet *self = KA_APPLET(userdata);
+
+    ka_show_about (self);
+}
+
+static void
+action_help (GSimpleAction *action G_GNUC_UNUSED,
+              GVariant *parameter G_GNUC_UNUSED,
+              gpointer userdata)
+{
+    KaApplet *self = KA_APPLET(userdata);
+    GtkWindow *window = ka_applet_last_focused_window (self);
+
+    ka_show_help (gtk_window_get_screen (window), NULL, NULL);
+}
+
+static void
+action_quit (GSimpleAction *action G_GNUC_UNUSED,
+             GVariant *parameter G_GNUC_UNUSED,
+             gpointer userdata)
+{
+    KaApplet *self = KA_APPLET (userdata);
+
+    ka_applet_destroy (self);
+}
+
+static GActionEntry app_entries[] = {
+    { "preferences", action_preferences, NULL, NULL, NULL, {0} },
+    { "about", action_about, NULL, NULL, NULL, {0} },
+    { "help", action_help, NULL, NULL, NULL, {0} },
+    { "quit", action_quit, NULL, NULL, NULL, {0} },
+};
+
+static void
+ka_applet_app_menu_create(KaApplet *self,
+                          GtkBuilder *uixml)
+{
+    const gchar *debug_no_app_menu;
+    GMenuModel *model = G_MENU_MODEL(gtk_builder_get_object (uixml,
+                                                             "app-menu"));
+    g_action_map_add_action_entries (G_ACTION_MAP (self),
+                                     app_entries, G_N_ELEMENTS (app_entries),
+                                     self);
+
+    g_assert (model != NULL);
+    gtk_application_set_app_menu (GTK_APPLICATION(self),
+                                  model);
+
+    debug_no_app_menu = g_getenv ("KRB5_AUTH_DIALOG_DEBUG_NO_APP_MENU");
+    if (debug_no_app_menu) {
+        KA_DEBUG ("Disabling app menu GtkSetting as requested...");
+        g_object_set (gtk_settings_get_default (),
+                      "gtk-shell-shows-app-menu", FALSE,
+                      NULL);
+    }
+}
+
 static void
 ka_applet_startup (GApplication *application)
 {
     KaApplet *self = KA_APPLET (application);
-    GtkWindow *main_window;
 
     KA_DEBUG ("Primary application");
 
+    G_APPLICATION_CLASS (ka_applet_parent_class)->startup (application);
+
     self->priv->startup_ccache = ka_kerberos_init (self);
-    main_window = ka_main_window_create (self, self->priv->uixml);
-    gtk_application_add_window (GTK_APPLICATION(self), main_window);
+    ka_main_window_create (self, self->priv->uixml);
     ka_preferences_window_create (self, self->priv->uixml);
+
+    ka_applet_app_menu_create(self, self->priv->uixml);
 }
 
 static void
@@ -243,6 +330,12 @@ ka_applet_set_property (GObject *object,
                   self->priv->tgt_renewable ? "True" : "False");
         break;
 
+    case KA_PROP_CONF_TICKETS:
+        self->priv->conf_tickets = g_value_get_boolean (value);
+        KA_DEBUG ("%s: %s", pspec->name,
+                  self->priv->tgt_renewable ? "True" : "False");
+        break;
+
     default:
         /* We don't have any other property... */
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -287,6 +380,10 @@ ka_applet_get_property (GObject *object,
         g_value_set_boolean (value, self->priv->tgt_renewable);
         break;
 
+    case KA_PROP_CONF_TICKETS:
+        g_value_set_boolean (value, self->priv->conf_tickets);
+        break;
+
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
         break;
@@ -367,25 +464,25 @@ ka_applet_class_init (KaAppletClass *klass)
     object_class->set_property = ka_applet_set_property;
     object_class->get_property = ka_applet_get_property;
 
-    pspec = g_param_spec_string ("principal",
+    pspec = g_param_spec_string (KA_PROP_NAME_PRINCIPAL,
                                  "Principal",
                                  "Get/Set Kerberos principal",
                                  "", G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
     g_object_class_install_property (object_class, KA_PROP_PRINCIPAL, pspec);
 
-    pspec = g_param_spec_string ("pk-userid",
+    pspec = g_param_spec_string (KA_PROP_NAME_PK_USERID,
                                  "PKinit identifier",
                                  "Get/Set Pkinit identifier",
                                  "", G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
     g_object_class_install_property (object_class, KA_PROP_PK_USERID, pspec);
 
-    pspec = g_param_spec_string ("pk-anchors",
+    pspec = g_param_spec_string (KA_PROP_NAME_PK_ANCHORS,
                                  "PKinit trust anchors",
                                  "Get/Set Pkinit trust anchors",
                                  "", G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
     g_object_class_install_property (object_class, KA_PROP_PK_ANCHORS, pspec);
 
-    pspec = g_param_spec_uint ("pw-prompt-mins",
+    pspec = g_param_spec_uint (KA_PROP_NAME_PW_PROMPT_MINS,
                                "Password prompting interval",
                                "Password prompting interval in minutes",
                                0, G_MAXUINT, MINUTES_BEFORE_PROMPTING,
@@ -393,7 +490,7 @@ ka_applet_class_init (KaAppletClass *klass)
     g_object_class_install_property (object_class,
                                      KA_PROP_PW_PROMPT_MINS, pspec);
 
-    pspec = g_param_spec_boolean ("tgt-forwardable",
+    pspec = g_param_spec_boolean (KA_PROP_NAME_TGT_FORWARDABLE,
                                   "Forwardable ticket",
                                   "wether to request forwardable tickets",
                                   FALSE,
@@ -401,7 +498,7 @@ ka_applet_class_init (KaAppletClass *klass)
     g_object_class_install_property (object_class,
                                      KA_PROP_TGT_FORWARDABLE, pspec);
 
-    pspec = g_param_spec_boolean ("tgt-proxiable",
+    pspec = g_param_spec_boolean (KA_PROP_NAME_TGT_PROXIABLE,
                                   "Proxiable ticket",
                                   "wether to request proxiable tickets",
                                   FALSE,
@@ -409,13 +506,22 @@ ka_applet_class_init (KaAppletClass *klass)
     g_object_class_install_property (object_class,
                                      KA_PROP_TGT_PROXIABLE, pspec);
 
-    pspec = g_param_spec_boolean ("tgt-renewable",
+    pspec = g_param_spec_boolean (KA_PROP_NAME_TGT_RENEWABLE,
                                   "Renewable ticket",
                                   "wether to request renewable tickets",
                                   FALSE,
                                   G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
     g_object_class_install_property (object_class,
                                      KA_PROP_TGT_RENEWABLE, pspec);
+
+    pspec = g_param_spec_boolean (KA_PROP_NAME_CONF_TICKETS,
+                                  "Configuration tickets",
+                                  "wether to show configuration tickets",
+                                  FALSE,
+                                  G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
+    g_object_class_install_property (object_class,
+                                     KA_PROP_CONF_TICKETS, pspec);
+
     for (i=0; i < KA_SIGNAL_COUNT-1; i++) {
         guint signalId;
 
@@ -427,7 +533,7 @@ ka_applet_class_init (KaAppletClass *klass)
         klass->signals[i] = signalId;
     }
     klass->signals[KA_CCACHE_CHANGED] = g_signal_new (
-        ka_signal_names[KA_CCACHE_CHANGED], 
+        ka_signal_names[KA_CCACHE_CHANGED],
         G_OBJECT_CLASS_TYPE (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
         g_cclosure_marshal_VOID__VOID,
@@ -438,7 +544,7 @@ ka_applet_class_init (KaAppletClass *klass)
 static KaApplet *
 ka_applet_new (void)
 {
-    return g_object_new (KA_TYPE_APPLET, 
+    return g_object_new (KA_TYPE_APPLET,
                          "application-id", "org.gnome.KrbAuthDialog",
                          NULL);
 }
@@ -532,15 +638,20 @@ ka_notify_disable_action_cb (NotifyNotification *notification G_GNUC_UNUSED,
                               gpointer user_data)
 {
     KaApplet *self = KA_APPLET (user_data);
+    GSettings *ns = g_settings_get_child (self->priv->settings,
+                                              KA_SETTING_CHILD_NOTIFY);
 
     if (strcmp (action, "dont-show-again") == 0) {
-        KA_DEBUG ("turning of notification %s", self->priv->notify_gconf_key);
-        ka_gconf_set_bool (self->priv->gconf,
-                           self->priv->notify_gconf_key, FALSE);
-        self->priv->notify_gconf_key = NULL;
+        KA_DEBUG ("turning of notification %s", self->priv->notify_key);
+        if (!g_settings_set_boolean (ns,
+                                     self->priv->notify_key, FALSE)) {
+            g_warning("Failed to set %s", self->priv->notify_key);
+        }
+        self->priv->notify_key = NULL;
     } else {
         g_warning ("unkonwn action for callback");
     }
+    g_object_unref (ns);
 }
 
 
@@ -562,7 +673,7 @@ ka_notify_ticket_action_cb (NotifyNotification *notification G_GNUC_UNUSED,
         ka_destroy_ccache (self);
     } else if (strcmp (action, "ka-list-tickets") == 0) {
         KA_DEBUG ("Showing main window");
-        ka_main_window_show ();
+        ka_main_window_show (self);
     } else {
         g_warning ("unkonwn action for callback");
     }
@@ -621,6 +732,12 @@ ka_send_event_notification (KaApplet *self,
         notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL);
     }
 
+#if HAVE_NOTIFY_NOTIFICATION_SET_HINT
+    notify_notification_set_hint (notification,
+                                  "desktop-entry",
+                                  g_variant_new_string (PACKAGE));
+#endif
+
     if (self->priv->ns_persistence) {
         hint = "resident";
         timeout = NOTIFY_EXPIRES_NEVER;
@@ -685,6 +802,18 @@ ka_update_tray_icon (KaApplet *self, const char *icon, const char *tooltip)
     }
 }
 
+/* check whether a given notification is enabled */
+static gboolean
+get_notify_enabled (KaApplet *self, const char *key)
+{
+    gboolean ret;
+    GSettings *ns = g_settings_get_child (self->priv->settings,
+                                          KA_SETTING_CHILD_NOTIFY);
+    ret = g_settings_get_boolean (ns, key);
+    g_object_unref (ns);
+    return ret;
+}
+
 /*
  * update the tray icon's tooltip and icon
  * and notify listeners about acquired/expiring tickets via signals
@@ -705,10 +834,9 @@ ka_applet_update_status (KaApplet *applet, krb5_timestamp expiry)
     if (remaining > 0) {
         if (expiry_notified || initial_notification) {
             const char* msg;
-            ka_gconf_get_bool (applet->priv->gconf,
-                               KA_GCONF_KEY_NOTIFY_VALID, &notify);
+            notify = get_notify_enabled (applet, KA_SETTING_KEY_NOTIFY_VALID);
             if (notify) {
-                applet->priv->notify_gconf_key = KA_GCONF_KEY_NOTIFY_VALID;
+                applet->priv->notify_key = KA_SETTING_KEY_NOTIFY_VALID;
 
                 if (applet->priv->krb_msg)
                     msg = applet->priv->krb_msg;
@@ -732,11 +860,11 @@ ka_applet_update_status (KaApplet *applet, krb5_timestamp expiry)
             if (remaining < applet->priv->pw_prompt_secs
                 && (now - last_warn) > NOTIFY_SECONDS
                 && !applet->priv->renewable) {
-                ka_gconf_get_bool (applet->priv->gconf,
-                                   KA_GCONF_KEY_NOTIFY_EXPIRING, &notify);
+                notify = get_notify_enabled (applet,
+                                             KA_SETTING_KEY_NOTIFY_EXPIRING);
                 if (notify) {
-                    applet->priv->notify_gconf_key =
-                        KA_GCONF_KEY_NOTIFY_EXPIRING;
+                    applet->priv->notify_key =
+                        KA_SETTING_KEY_NOTIFY_EXPIRING;
                     ka_send_event_notification (applet,
                                                 _("Network credentials expiring"),
                                                 tooltip_text,
@@ -751,13 +879,12 @@ ka_applet_update_status (KaApplet *applet, krb5_timestamp expiry)
         }
     } else {
         if (!expiry_notified) {
-            ka_gconf_get_bool (applet->priv->gconf,
-                               KA_GCONF_KEY_NOTIFY_EXPIRED, &notify);
+            notify = get_notify_enabled (applet, KA_SETTING_KEY_NOTIFY_EXPIRED);
             if (notify) {
-                applet->priv->notify_gconf_key = KA_GCONF_KEY_NOTIFY_EXPIRED;
+                applet->priv->notify_key = KA_SETTING_KEY_NOTIFY_EXPIRED;
                 ka_send_event_notification (applet,
                                             _("Network credentials expired"),
-                                            _("Your Kerberos credentails have expired."),
+                                            _("Your Kerberos credentials have expired."),
                                             "krb-no-valid-ticket",
                                             TRUE);
             }
@@ -776,7 +903,7 @@ ka_applet_update_status (KaApplet *applet, krb5_timestamp expiry)
 
 
 static void
-ka_applet_menu_add_separator_item (GtkWidget *menu)
+ka_applet_tray_icon_menu_add_separator_item (GtkWidget *menu)
 {
     GtkWidget *menu_item;
 
@@ -788,7 +915,8 @@ ka_applet_menu_add_separator_item (GtkWidget *menu)
 
 /* Free all resources and quit */
 static void
-ka_applet_quit_cb (GtkMenuItem *menuitem G_GNUC_UNUSED, gpointer user_data)
+ka_applet_tray_icon_quit_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
+                             gpointer user_data)
 {
     KaApplet *applet = KA_APPLET (user_data);
 
@@ -797,8 +925,8 @@ ka_applet_quit_cb (GtkMenuItem *menuitem G_GNUC_UNUSED, gpointer user_data)
 
 
 static void
-ka_applet_show_help_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
-                        gpointer user_data)
+ka_applet_tray_icon_show_help_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
+                                  gpointer user_data)
 {
     KaApplet *applet = KA_APPLET (user_data);
 
@@ -808,8 +936,8 @@ ka_applet_show_help_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
 
 
 static void
-ka_applet_destroy_ccache_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
-                             gpointer user_data)
+ka_applet_tray_icon_destroy_ccache_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
+                                       gpointer user_data)
 {
     KaApplet *applet = KA_APPLET (user_data);
 
@@ -817,10 +945,10 @@ ka_applet_destroy_ccache_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
 }
 
 static void
-ka_applet_show_tickets_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
-                           gpointer user_data G_GNUC_UNUSED)
+ka_applet_tray_icon_show_tickets_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
+                                     gpointer user_data)
 {
-    ka_main_window_show ();
+    ka_main_window_show (KA_APPLET(user_data));
 }
 
 
@@ -838,31 +966,32 @@ 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_destroy_ccache_cb), applet);
+                      G_CALLBACK (ka_applet_tray_icon_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);
 
-    ka_applet_menu_add_separator_item (menu);
+    ka_applet_tray_icon_menu_add_separator_item (menu);
 
     /* 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_show_tickets_cb), applet);
+                      G_CALLBACK (ka_applet_tray_icon_show_tickets_cb), applet);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_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_show_help_cb), applet);
+                      G_CALLBACK (ka_applet_tray_icon_show_help_cb), applet);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 
-    ka_applet_menu_add_separator_item (menu);
+    ka_applet_tray_icon_menu_add_separator_item (menu);
 
     /* 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_quit_cb), applet);
+                      G_CALLBACK (ka_applet_tray_icon_quit_cb), applet);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 
     gtk_widget_show_all (menu);
@@ -957,10 +1086,10 @@ ka_applet_get_pwdialog (const KaApplet *applet)
     return applet->priv->pwdialog;
 }
 
-GConfClient *
-ka_applet_get_gconf_client (const KaApplet *self)
+GSettings *
+ka_applet_get_settings (const KaApplet *self)
 {
-    return self->priv->gconf;
+    return self->priv->settings;
 }
 
 void
@@ -1030,11 +1159,12 @@ ka_applet_destroy (KaApplet* self)
     windows = gtk_application_get_windows (GTK_APPLICATION(self));
     if (windows) {
         first = g_list_first (windows);
-        gtk_application_remove_window(GTK_APPLICATION (self), 
+        gtk_application_remove_window(GTK_APPLICATION (self),
                                       GTK_WINDOW (first->data));
     }
 
     ka_kerberos_destroy ();
+    ka_preferences_window_destroy ();
 }
 
 
@@ -1070,8 +1200,8 @@ ka_applet_create ()
     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);
+    applet->priv->settings = ka_settings_init (applet);
+    g_return_val_if_fail (applet->priv->settings != NULL, NULL);
 
     applet->priv->loader = ka_plugin_loader_create (applet);
     g_return_val_if_fail (applet->priv->loader != NULL, NULL);
diff --git a/src/ka-gconf-tools.c b/src/ka-gconf-tools.c
deleted file mode 100644
index c7cc711..0000000
--- a/src/ka-gconf-tools.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Krb5 Auth Applet -- Acquire and release kerberos tickets
- *
- * (C) 2008,2009 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 of the License, 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 <gconf/gconf-client.h>
-#include <ka-gconf-tools.h>
-
-gboolean
-ka_gconf_get_string (GConfClient* client,
-		     const char* key,
-		     char** value)
-{
-	GError*		error = NULL;
-	gboolean	success = FALSE;
-	GConfValue*	gc_value;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (*value == NULL, FALSE);
-
-	if ((gc_value = gconf_client_get (client, key, &error))) {
-		if (gc_value->type == GCONF_VALUE_STRING) {
-			*value = g_strdup (gconf_value_get_string (gc_value));
-			success = TRUE;
-		} else if (error) {
-				g_warning ("%s", error->message);
-				g_clear_error (&error);
-		}
-		gconf_value_free (gc_value);
-	}
-	return success;
-}
-
-
-gboolean
-ka_gconf_get_string_list (GConfClient* client,
-		          const char* key,
-		          GSList** list)
-{
-	GError*		error = NULL;
-	gboolean	success = FALSE;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (*list == NULL, FALSE);
-
-	if ((*list = gconf_client_get_list (client, key,
-	                                   GCONF_VALUE_STRING, &error))) {
-		if (error) {
-			g_warning ("%s", error->message);
-			g_clear_error (&error);
-		} else
-			success = TRUE;
-	}
-	return success;
-}
-
-
-gboolean
-ka_gconf_get_int (GConfClient* client,
-		    const char* key,
-		    int* value)
-{
-	GError*		error = NULL;
-	gboolean	success = FALSE;
-	GConfValue*	gc_value;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (value != NULL, FALSE);
-
-	if ((gc_value = gconf_client_get (client, key, &error)))
-	{
-		if (gc_value->type == GCONF_VALUE_INT) {
-			*value = gconf_value_get_int (gc_value);
-			success = TRUE;
-		} else if (error) {
-				g_warning("%s", error->message);
-				g_clear_error (&error);
-		}
-		gconf_value_free (gc_value);
-	}
-	return success;
-}
-
-
-gboolean
-ka_gconf_get_bool (GConfClient* client,
-		    const char* key,
-		    gboolean* value)
-{
-	GError*		error = NULL;
-	gboolean	success = FALSE;
-	GConfValue*	gc_value;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (value != NULL, FALSE);
-
-	if ((gc_value = gconf_client_get (client, key, &error))) {
-		if (gc_value->type == GCONF_VALUE_BOOL) {
-			*value = gconf_value_get_bool (gc_value);
-			success = TRUE;
-		} else if (error) {
-				g_warning ("%s", error->message);
-				g_clear_error (&error);
-		}
-		gconf_value_free (gc_value);
-	}
-	return success;
-}
-
-
-gboolean
-ka_gconf_set_bool (GConfClient* client,
-		    const char* key,
-		    gboolean value)
-{
-	GError*		error = NULL;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (key != NULL, FALSE);
-
-	if(!gconf_client_set_bool (client, key, value, &error)) {
-		if (error) {
-			g_warning ("%s", error->message);
-			g_clear_error (&error);
-		}
-		return FALSE;
-	}
-	return TRUE;
-}
diff --git a/src/ka-gconf-tools.h b/src/ka-gconf-tools.h
deleted file mode 100644
index 1d8151d..0000000
--- a/src/ka-gconf-tools.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Krb5 Auth Applet -- Acquire and release kerberos tickets
- *
- * (C) 2008,2009 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 of the License, 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.
- *
- */
-
-#ifndef KA_GCONF_TOOLS_H
-#define KA_GCONF_TOOLS_H
-
-#include "config.h"
-
-#include <gconf/gconf-client.h>
-
-#define KA_GCONF_PATH			"/apps/" PACKAGE
-#define KA_GCONF_KEY_PRINCIPAL		KA_GCONF_PATH "/principal"
-#define KA_GCONF_KEY_PK_USERID		KA_GCONF_PATH "/pk_userid"
-#define KA_GCONF_KEY_PK_ANCHORS		KA_GCONF_PATH "/pk_anchors"
-#define KA_GCONF_KEY_PROMPT_MINS	KA_GCONF_PATH "/prompt_minutes"
-#define KA_GCONF_KEY_SHOW_TRAYICON	KA_GCONF_PATH "/show_trayicon"
-#define KA_GCONF_KEY_FORWARDABLE	KA_GCONF_PATH "/forwardable"
-#define KA_GCONF_KEY_RENEWABLE		KA_GCONF_PATH "/renewable"
-#define KA_GCONF_KEY_PROXIABLE		KA_GCONF_PATH "/proxiable"
-#define KA_GCONF_KEY_NOTIFY_VALID	KA_GCONF_PATH "/notify/valid"
-#define KA_GCONF_KEY_NOTIFY_EXPIRED	KA_GCONF_PATH "/notify/expired"
-#define KA_GCONF_KEY_NOTIFY_EXPIRING	KA_GCONF_PATH "/notify/expiring"
-#define KA_GCONF_KEY_PLUGINS_ENABLED	KA_GCONF_PATH "/plugins/enabled"
-
-gboolean ka_gconf_get_string (GConfClient* client, const char* key, char** value);
-gboolean ka_gconf_get_string_list (GConfClient* client, const char* key, GSList** list);
-gboolean ka_gconf_get_int (GConfClient* client, const char* key, int* value);
-gboolean ka_gconf_get_bool (GConfClient* client, const char* key, gboolean* value);
-gboolean ka_gconf_set_bool (GConfClient* client, const char* key, gboolean value);
-
-#endif
diff --git a/src/ka-gconf.c b/src/ka-gconf.c
deleted file mode 100644
index 0735808..0000000
--- a/src/ka-gconf.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/* Krb5 Auth Applet -- Acquire and release kerberos tickets
- *
- * (C) 2008,2009 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 of the License, 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 <gconf/gconf-client.h>
-#include <string.h>
-
-#include "ka-applet-priv.h"
-#include "ka-gconf-tools.h"
-#include "ka-gconf.h"
-
-static gboolean
-ka_gconf_set_principal (GConfClient* client, KaApplet* applet)
-{
-	gchar* principal = NULL;
-
-	if(!ka_gconf_get_string (client, KA_GCONF_KEY_PRINCIPAL, &principal)
-	   || !strlen(principal)) {
-		g_free (principal);
-		principal = g_strdup (g_get_user_name());
-	}
-	g_object_set(applet, "principal", principal, NULL);
-	g_free (principal);
-	return TRUE;
-}
-
-
-static gboolean
-ka_gconf_set_pk_userid (GConfClient* client, KaApplet* applet)
-{
-	gchar*  pk_userid = NULL;
-
-	if(!ka_gconf_get_string (client, KA_GCONF_KEY_PK_USERID, &pk_userid)) {
-		pk_userid = g_strdup ("");
-	}
-	g_object_set(applet, "pk_userid", pk_userid, NULL);
-	g_free (pk_userid);
-	return TRUE;
-}
-
-
-static gboolean
-ka_gconf_set_pk_anchors (GConfClient* client, KaApplet* applet)
-{
-	gchar*  pk_anchors = NULL;
-
-	if(!ka_gconf_get_string (client, KA_GCONF_KEY_PK_ANCHORS, &pk_anchors)) {
-		pk_anchors = g_strdup ("");
-	}
-	g_object_set(applet, "pk_anchors", pk_anchors, NULL);
-	g_free (pk_anchors);
-	return TRUE;
-}
-
-
-static gboolean
-ka_gconf_set_prompt_mins (GConfClient* client, KaApplet* applet)
-{
-	gint prompt_mins = 0;
-
-	if(!ka_gconf_get_int (client, KA_GCONF_KEY_PROMPT_MINS, &prompt_mins)) {
-		prompt_mins = MINUTES_BEFORE_PROMPTING;
-	}
-	g_object_set(applet, "pw-prompt-mins", prompt_mins, NULL);
-	return TRUE;
-}
-
-
-static gboolean
-ka_gconf_set_tgt_forwardable (GConfClient* client, KaApplet* applet)
-{
-	gboolean forwardable = FALSE;
-
-	if(!ka_gconf_get_bool(client, KA_GCONF_KEY_FORWARDABLE, &forwardable)) {
-		forwardable = FALSE;
-	}
-	g_object_set(applet, "tgt-forwardable", forwardable, NULL);
-	return TRUE;
-}
-
-
-static gboolean
-ka_gconf_set_tgt_renewable (GConfClient* client, KaApplet* applet)
-{
-	gboolean renewable = FALSE;
-
-	if(!ka_gconf_get_bool(client, KA_GCONF_KEY_RENEWABLE, &renewable)) {
-		renewable = FALSE;
-	}
-	g_object_set(applet, "tgt-renewable", renewable, NULL);
-	return TRUE;
-}
-
-
-static gboolean
-ka_gconf_set_tgt_proxiable (GConfClient* client, KaApplet* applet)
-{
-	gboolean proxiable = FALSE;
-
-	if(!ka_gconf_get_bool(client, KA_GCONF_KEY_PROXIABLE, &proxiable)) {
-		proxiable = FALSE;
-	}
-	g_object_set(applet, "tgt-proxiable", proxiable, NULL);
-	return TRUE;
-}
-
-
-static void
-ka_gconf_key_changed_callback (GConfClient* client,
-                               guint cnxn_id G_GNUC_UNUSED,
-                               GConfEntry* entry,
-                               gpointer user_data)
-{
-	const char* key;
-
-	KaApplet* applet = KA_APPLET(user_data);
-	key = gconf_entry_get_key (entry);
-	if (!key)
-		return;
-	KA_DEBUG("Key %s changed", key);
-
-	if (g_strcmp0 (key, KA_GCONF_KEY_PRINCIPAL) == 0) {
-		ka_gconf_set_principal (client, applet);
-	} else if (g_strcmp0 (key, KA_GCONF_KEY_PROMPT_MINS) == 0) {
-		ka_gconf_set_prompt_mins (client, applet);
-	} else if (g_strcmp0 (key, KA_GCONF_KEY_PK_USERID) == 0) {
-		ka_gconf_set_pk_userid (client, applet);
-	} else if (g_strcmp0 (key, KA_GCONF_KEY_PK_ANCHORS) == 0) {
-		ka_gconf_set_pk_anchors(client, applet);
-	} else if (g_strcmp0 (key, KA_GCONF_KEY_FORWARDABLE) == 0) {
-		ka_gconf_set_tgt_forwardable (client, applet);
-	} else if (g_strcmp0 (key, KA_GCONF_KEY_RENEWABLE) == 0) {
-		ka_gconf_set_tgt_renewable (client, applet);
-	} else if (g_strcmp0 (key, KA_GCONF_KEY_PROXIABLE) == 0) {
-		ka_gconf_set_tgt_proxiable (client, applet);
-	} else if (g_strcmp0 (key, KA_GCONF_KEY_NOTIFY_VALID)
-		    || g_strcmp0 (key, KA_GCONF_KEY_NOTIFY_EXPIRING)
-		    || g_strcmp0 (key, KA_GCONF_KEY_NOTIFY_EXPIRED)
-		    || g_strcmp0 (key, KA_GCONF_KEY_PLUGINS_ENABLED)) {
-		/* nothing to do */
-	} else
-		g_warning("Received notification for unknown gconf key %s", key);
-	return;
-}
-
-
-GConfClient*
-ka_gconf_init (KaApplet* applet)
-{
-	GError *error = NULL;
-	GConfClient *client;
-
-	client = gconf_client_get_default ();
-	gconf_client_add_dir (client, KA_GCONF_PATH, GCONF_CLIENT_PRELOAD_ONELEVEL, &error);
-	if (error)
-		goto out;
-
-	gconf_client_notify_add (client, KA_GCONF_PATH,
-				 ka_gconf_key_changed_callback, applet, NULL, &error);
-	if (error)
-		goto out;
-
-	/* setup defaults */
-	ka_gconf_set_principal (client, applet);
-	ka_gconf_set_prompt_mins (client, applet);
-	ka_gconf_set_pk_userid(client, applet);
-	ka_gconf_set_pk_anchors(client, applet);
-	ka_gconf_set_tgt_forwardable(client, applet);
-	ka_gconf_set_tgt_renewable(client, applet);
-	ka_gconf_set_tgt_proxiable(client, applet);
-out:
-	if (error) {
-		client = NULL;
-		g_warning ("%s", error->message);
-		g_clear_error (&error);
-	}
-	return client;
-}
diff --git a/src/ka-kerberos.c b/src/ka-kerberos.c
index e131286..db5cddd 100644
--- a/src/ka-kerberos.c
+++ b/src/ka-kerberos.c
@@ -287,7 +287,7 @@ ka_format_time (time_t t, gchar *ts, size_t len)
 
 /* fill in service tickets data */
 gboolean
-ka_get_service_tickets (GtkListStore * tickets)
+ka_get_service_tickets (GtkListStore * tickets, gboolean hide_conf_tickets)
 {
     krb5_cc_cursor cursor;
     krb5_creds creds;
@@ -325,6 +325,13 @@ ka_get_service_tickets (GtkListStore * tickets)
     while ((ret = krb5_cc_next_cred (kcontext, ccache, &cursor, &creds)) == 0) {
         gboolean renewable, proxiable, forwardable;
 
+
+        if (hide_conf_tickets && krb5_is_config_principal (kcontext,
+                                                           creds.server)) {
+            krb5_free_cred_contents (kcontext, &creds);
+            continue;
+        }
+
         if (creds.times.starttime)
             ka_format_time (creds.times.starttime, start_time,
                             sizeof (start_time));
@@ -531,7 +538,7 @@ credentials_expiring_once (gpointer *data)
 
 
 /*
- * set ticket options by looking at krb5.conf and gconf
+ * set ticket options by looking at krb5.conf and gsettings
  */
 static void
 ka_set_ticket_options (KaApplet *applet, krb5_context context,
@@ -546,13 +553,13 @@ ka_set_ticket_options (KaApplet *applet, krb5_context context,
                                                krb5_principal_get_realm
                                                (context, kprincipal), out);
 #endif
-    g_object_get (applet, "tgt-forwardable", &flag, NULL);
+    g_object_get (applet, KA_PROP_NAME_TGT_FORWARDABLE, &flag, NULL);
     if (flag)
         krb5_get_init_creds_opt_set_forwardable (out, flag);
-    g_object_get (applet, "tgt-proxiable", &flag, NULL);
+    g_object_get (applet, KA_PROP_NAME_TGT_PROXIABLE, &flag, NULL);
     if (flag)
         krb5_get_init_creds_opt_set_proxiable (out, flag);
-    g_object_get (applet, "tgt-renewable", &flag, NULL);
+    g_object_get (applet, KA_PROP_NAME_TGT_RENEWABLE, &flag, NULL);
     if (flag) {
         krb5_deltat r = 3600 * 24 * 30; /* 1 month */
 
@@ -640,7 +647,7 @@ ka_parse_name (KaApplet *applet, krb5_context krbcontext,
     if (*kprinc != NULL)
         krb5_free_principal (krbcontext, *kprinc);
 
-    g_object_get (applet, "principal", &principal, NULL);
+    g_object_get (applet, KA_PROP_NAME_PRINCIPAL, &principal, NULL);
     ret = krb5_parse_name (krbcontext, principal, kprinc);
 
     g_free (principal);
@@ -752,7 +759,7 @@ grab_credentials (KaApplet *applet)
     if (retval)
         goto out2;
 
-    g_object_get (applet, "pk-userid", &pk_userid,
+    g_object_get (applet, KA_PROP_NAME_PK_USERID, &pk_userid,
                   "pk-anchors", &pk_anchors, NULL);
 #if ENABLE_PKINIT && HAVE_HX509_ERR_H && HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PKINIT
     /* pk_userid set: try pkinit */
@@ -960,7 +967,7 @@ ka_check_credentials (KaApplet *applet, const char *newprincipal)
     int retval;
     char *principal;
 
-    g_object_get (applet, "principal", &principal, NULL);
+    g_object_get (applet, KA_PROP_NAME_PRINCIPAL, &principal, NULL);
 
     if (strlen (newprincipal)) {
         krb5_principal knewprinc;
diff --git a/src/ka-kerberos.h b/src/ka-kerberos.h
index 504cc14..aa70c90 100644
--- a/src/ka-kerberos.h
+++ b/src/ka-kerberos.h
@@ -29,7 +29,8 @@ 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);
-gboolean ka_get_service_tickets(GtkListStore *tickets);
+gboolean ka_get_service_tickets(GtkListStore *tickets,
+                                gboolean hide_service_tickets);
 char* ka_unparse_name(void);
 int ka_tgt_valid_seconds(void);
 #endif
diff --git a/src/ka-main-window.c b/src/ka-main-window.c
index b841b3e..efcec63 100644
--- a/src/ka-main-window.c
+++ b/src/ka-main-window.c
@@ -2,7 +2,7 @@
  *
  * Krb5 Auth Applet -- Acquire and release kerberos tickets
  *
- * (C) 2009,2011 Guido Guenther <agx@sigxcpu.org>
+ * (C) 2009,2011,2013 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
@@ -31,68 +31,21 @@
 #include "ka-preferences.h"
 
 static GtkListStore *tickets;
-static GtkWindow *main_window;
+static GtkApplicationWindow *main_window;
 
 static void
-ccache_changed_cb (KaApplet* applet G_GNUC_UNUSED,
+ccache_changed_cb (KaApplet* applet,
                    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();
-}
+    gboolean conf_tickets;
 
-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);
-}
-
-
-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  
+    KA_DEBUG("Refreshing ticket list");
+    g_object_get(applet, KA_PROP_NAME_CONF_TICKETS, &conf_tickets, NULL);
+    ka_get_service_tickets (tickets, !conf_tickets);
 }
 
 
-GtkWindow *
+GtkApplicationWindow *
 ka_main_window_create (KaApplet *applet, GtkBuilder *xml)
 {
     GtkCellRenderer *text_renderer, *toggle_renderer;
@@ -106,7 +59,10 @@ ka_main_window_create (KaApplet *applet, GtkBuilder *xml)
                                   G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
 
     main_window =
-        GTK_WINDOW (gtk_builder_get_object (xml, "krb5_main_window"));
+        GTK_APPLICATION_WINDOW (gtk_builder_get_object (xml,
+                                                        "krb5_main_window"));
+    g_object_set(main_window, "application", applet, NULL);
+
     tickets_view =
         GTK_TREE_VIEW (gtk_builder_get_object (xml, "krb5_tickets_treeview"));
     gtk_tree_view_set_model (GTK_TREE_VIEW (tickets_view),
@@ -159,18 +115,20 @@ ka_main_window_create (KaApplet *applet, GtkBuilder *xml)
                       G_CALLBACK(ccache_changed_cb),
                       NULL);
 
-    ka_main_window_create_menu(applet, xml);
     return main_window;
 }
 
 void
-ka_main_window_show ()
+ka_main_window_show (KaApplet *applet)
 {
-    if (ka_get_service_tickets (tickets)) {
-        gtk_window_present (main_window);
+    gboolean conf_tickets;
+
+    g_object_get(applet, KA_PROP_NAME_CONF_TICKETS, &conf_tickets, NULL);
+    if (ka_get_service_tickets (tickets, !conf_tickets)) {
+        gtk_window_present (GTK_WINDOW(main_window));
     } else {
         GtkWidget *message_dialog;
-        
+
         message_dialog = gtk_message_dialog_new (NULL,
                                                  GTK_DIALOG_DESTROY_WITH_PARENT,
                                                  GTK_MESSAGE_ERROR,
@@ -178,7 +136,7 @@ ka_main_window_show ()
                                                  _
                                                  ("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);
diff --git a/src/ka-main-window.h b/src/ka-main-window.h
index bc5b191..ee1ea46 100644
--- a/src/ka-main-window.h
+++ b/src/ka-main-window.h
@@ -34,8 +34,8 @@ enum ticket_columns {
 };
 
 
-GtkWindow *ka_main_window_create (KaApplet *applet, GtkBuilder *xml);
-void ka_main_window_show (void);
+GtkApplicationWindow *ka_main_window_create (KaApplet *applet, GtkBuilder *xml);
+void ka_main_window_show (KaApplet *applet);
 void ka_main_window_hide (void);
 
 
diff --git a/src/ka-plugin-loader.c b/src/ka-plugin-loader.c
index 2321215..e21a863 100644
--- a/src/ka-plugin-loader.c
+++ b/src/ka-plugin-loader.c
@@ -16,12 +16,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <gconf/gconf-client.h>
-
 #include "ka-plugin-loader.h"
 #include "ka-plugin.h"
+#include "ka-settings.h"
 #include "ka-applet-priv.h"
-#include "ka-gconf-tools.h"
 
 #include <gmodule.h>
 
@@ -98,29 +96,33 @@ load_plugins (KaPluginLoader *self)
 {
 	int i;
 	KaPluginLoaderPrivate *priv = GET_PRIVATE (self);
-	const char *pname;
-	GConfClient *gconf;
-	GSList *plugins = NULL;
+	GSettings *settings;
+	char **plugins = NULL;
 
 	if (!g_module_supported ()) {
 		g_warning ("GModules are not supported on your platform!");
 		return;
 	}
-	gconf = ka_applet_get_gconf_client (priv->applet);
+	settings = g_settings_get_child(ka_applet_get_settings (priv->applet),
+                                        KA_SETTING_CHILD_PLUGINS);
 
 	/* For now we only load the plugins on program startup */
-	ka_gconf_get_string_list(gconf, KA_GCONF_KEY_PLUGINS_ENABLED, &plugins);
+	plugins = g_settings_get_strv(settings,
+                                      KA_SETTING_KEY_PLUGINS_ENABLED);
+
 	if (!plugins) {
 		g_message ("No plugins to load");
-		return ;
+		return;
 	}
 
-	for (i=0; (pname = g_slist_nth_data (plugins, i)) != NULL; i++) {
+	for (i = 0; plugins[i]; i++) {
 		char *path;
 		char *fname;
 		KaPlugin *plugin;
 
-		fname = g_strdup_printf("libka-plugin-%s.%s", pname, G_MODULE_SUFFIX);
+		fname = g_strdup_printf("libka-plugin-%s.%s",
+                                        plugins[i],
+                                        G_MODULE_SUFFIX);
 		path = g_module_build_path (KA_PLUGINS_DIR, fname);
 
 		plugin = load_plugin (path);
@@ -131,7 +133,8 @@ load_plugins (KaPluginLoader *self)
 		g_free (fname);
 		g_free (path);
 	}
-	g_slist_free (plugins);
+	g_strfreev (plugins);
+	g_object_unref (settings);
 }
 
 
diff --git a/src/ka-preferences.c b/src/ka-preferences.c
index a80f6d9..987ef5c 100644
--- a/src/ka-preferences.c
+++ b/src/ka-preferences.c
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "ka-preferences.h"
 
-#include "ka-gconf-tools.h"
+#include "ka-settings.h"
 #include "ka-tools.h"
 
 #include <glib/gi18n.h>
@@ -30,12 +30,12 @@
 #define PKINIT_SMARTCARD "PKCS11:" SC_PKCS11
 #define PKINIT_FILE "FILE:"
 
-#define N_LISTENERS 7
+#define N_BINDINGS 3
 
 struct _KaPreferencesPrivate {
     GtkBuilder *builder;
 
-    GConfClient *client;
+    GSettings *settings;
 
     GtkWidget *dialog;
     GtkWidget *notebook;
@@ -45,28 +45,21 @@ struct _KaPreferencesPrivate {
     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;
+    GBinding* bindings[N_BINDINGS];
+    int       n_bindings;
 } prefs;
 
 
 static void
-ka_preferences_principal_notify (GConfClient *client G_GNUC_UNUSED,
-                                 guint cnx_id G_GNUC_UNUSED,
-                                 GConfEntry *entry,
+ka_preferences_principal_notify (GSettings *settings,
+                                 gchar *key,
                                  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);
+    principal = g_settings_get_string (settings, key);
 
     if (!principal || !strlen(principal))
         gtk_entry_set_text (GTK_ENTRY (prefs.principal_entry), "");
@@ -81,63 +74,48 @@ ka_preferences_principal_notify (GConfClient *client G_GNUC_UNUSED,
 
 static void
 ka_preferences_principal_changed (GtkEntry *entry,
-                                  gpointer userdata G_GNUC_UNUSED)
+                                  gpointer userdata)
 {
     const char *principal;
+    KaApplet *applet = KA_APPLET(userdata);
 
     principal = gtk_entry_get_text (entry);
 
-    if (!principal || !strlen(principal))
-        gconf_client_unset (prefs.client, KA_GCONF_KEY_PRINCIPAL, NULL);
+    if (principal || strlen(principal))
+        g_object_set (applet, KA_PROP_NAME_PRINCIPAL, principal, NULL);
     else
-        gconf_client_set_string (prefs.client, KA_GCONF_KEY_PRINCIPAL, principal, NULL);
+        g_object_set (applet, KA_PROP_NAME_PRINCIPAL, "", NULL);
 }
 
 
 static void
-ka_preferences_setup_principal_entry ()
+ka_preferences_setup_principal_entry (KaApplet *applet)
 {
-    char     *principal = NULL;
+    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_object_get (applet, KA_PROP_NAME_PRINCIPAL, &principal, NULL);
+    if (!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_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++;
+                      G_CALLBACK (ka_preferences_principal_changed), applet);
 }
 
 
 static void
-ka_preferences_pkuserid_notify (GConfClient *client G_GNUC_UNUSED,
-                                guint cnx_id G_GNUC_UNUSED,
-                                GConfEntry *entry,
-                                gpointer *userdata G_GNUC_UNUSED)
+ka_preferences_pkuserid_notify (GSettings *settings,
+                                gchar *key,
+                                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);
+    pkuserid = g_settings_get_string (settings, key);
 
     if (!pkuserid || !strlen(pkuserid))
         gtk_entry_set_text (GTK_ENTRY (prefs.pkuserid_entry), "");
@@ -153,62 +131,47 @@ ka_preferences_pkuserid_notify (GConfClient *client G_GNUC_UNUSED,
 
 static void
 ka_preferences_pkuserid_changed (GtkEntry *entry,
-                                 gpointer *user_data G_GNUC_UNUSED)
+                                 gpointer *userdata)
 {
     const char *pkuserid;
+    KaApplet *applet = KA_APPLET(userdata);
 
     pkuserid = gtk_entry_get_text (entry);
 
     if (!pkuserid || !strlen(pkuserid))
-        gconf_client_unset (prefs.client, KA_GCONF_KEY_PK_USERID, NULL);
+        g_object_set (applet, KA_PROP_NAME_PK_USERID, "", NULL);
     else
-        gconf_client_set_string (prefs.client, KA_GCONF_KEY_PK_USERID, pkuserid, NULL);
+        g_object_set (applet, KA_PROP_NAME_PK_USERID, pkuserid, NULL);
 }
 
-
 static void
-ka_preferences_setup_pkuserid_entry ()
+ka_preferences_setup_pkuserid_entry (KaApplet *applet)
 {
     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_object_get (applet, KA_PROP_NAME_PK_USERID, &pkuserid, NULL);
+    if (!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++;
+                      G_CALLBACK (ka_preferences_pkuserid_changed), applet);
 }
 
-
 static void
-ka_preferences_pkanchors_notify (GConfClient *client G_GNUC_UNUSED,
-                                 guint cnx_id G_GNUC_UNUSED,
-                                 GConfEntry *entry,
+ka_preferences_pkanchors_notify (GSettings *settings,
+                                 gchar *key,
                                  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);
+    pkanchors = g_settings_get_string (settings, key);
 
     if (!pkanchors || !strlen(pkanchors))
         gtk_entry_set_text (GTK_ENTRY (prefs.pkanchors_entry), "");
@@ -216,37 +179,38 @@ ka_preferences_pkanchors_notify (GConfClient *client G_GNUC_UNUSED,
         const char *old_pkanchors;
 
         old_pkanchors = gtk_entry_get_text (GTK_ENTRY (prefs.pkanchors_entry));
-        if (!old_pkanchors || (old_pkanchors && strcmp (old_pkanchors, pkanchors)))
+        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)
+                                  gpointer userdata)
 {
     const char *pkanchors;
+    KaApplet *applet = KA_APPLET(userdata);
 
     pkanchors = gtk_entry_get_text (entry);
 
     if (!pkanchors || !strlen(pkanchors))
-        gconf_client_unset (prefs.client, KA_GCONF_KEY_PK_ANCHORS, NULL);
+        g_object_set (applet, KA_PROP_NAME_PK_ANCHORS, "", NULL);
     else
-        gconf_client_set_string (prefs.client, KA_GCONF_KEY_PK_ANCHORS,
-                                 pkanchors, NULL);
+        g_object_set (applet, KA_PROP_NAME_PK_ANCHORS, pkanchors, NULL);
 }
 
 
 static void
-ka_preferences_setup_pkanchors_entry ()
+ka_preferences_setup_pkanchors_entry (KaApplet *applet)
 {
     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_object_get (applet, KA_PROP_NAME_PK_ANCHORS, &pkanchors, NULL);
+    if (!pkanchors)
         g_warning ("Getting pkanchors failed");
 
     if (pkanchors && strlen(pkanchors))
@@ -255,17 +219,7 @@ ka_preferences_setup_pkanchors_entry ()
         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++;
+                      G_CALLBACK (ka_preferences_pkanchors_changed), applet);
 }
 
 
@@ -279,10 +233,11 @@ ka_preferences_toggle_pkuserid_entry (gboolean state, gpointer userdata G_GNUC_U
 
 static void
 ka_preferences_smartcard_toggled (GtkToggleButton *toggle,
-                                  gpointer userdata G_GNUC_UNUSED)
+                                  gpointer userdata)
 {
     gboolean smartcard = gtk_toggle_button_get_active (toggle);
     static gchar *old_path = NULL;
+    KaApplet *applet = KA_APPLET(userdata);
 
     if (smartcard) {
         const char *path;
@@ -292,31 +247,33 @@ ka_preferences_smartcard_toggled (GtkToggleButton *toggle,
             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);
+        g_object_set (applet, KA_SETTING_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);
+            g_object_set (applet, KA_SETTING_KEY_PK_USERID, old_path, NULL);
         else
-            gconf_client_unset (prefs.client, KA_GCONF_KEY_PK_USERID, NULL);
+            g_object_set (applet, KA_SETTING_KEY_PK_USERID, old_path, "", NULL);
     }
 }
 
 
 static void
-ka_preferences_setup_smartcard_toggle ()
+ka_preferences_setup_smartcard_toggle (KaApplet *applet)
 {
     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_object_get(applet, KA_PROP_NAME_PK_USERID, &pkuserid, NULL);
+    if (!pkuserid)
+        g_warning ("Getting pk userid failed");
 
     g_signal_connect (prefs.smartcard_toggle, "toggled",
-                      G_CALLBACK (ka_preferences_smartcard_toggled), NULL);
+                      G_CALLBACK (ka_preferences_smartcard_toggled), applet);
 
     if (!g_strcmp0 (pkuserid, PKINIT_SMARTCARD))
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.smartcard_toggle), TRUE);
@@ -411,279 +368,172 @@ ka_preferences_setup_pkanchors_button ()
 
 }
 
-
-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)
+ka_preferences_setup_forwardable_toggle (KaApplet *applet)
 {
-    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);
+    GBinding *binding;
+    GtkWidget *toggle;
+
+    toggle = WID (prefs.builder, "forwardable_toggle");
+    g_assert (toggle != NULL);
+
+    binding = g_object_bind_property (applet,
+                                      KA_PROP_NAME_TGT_FORWARDABLE,
+                                      toggle,
+                                      "active",
+                                      G_BINDING_BIDIRECTIONAL);
+    prefs.bindings[prefs.n_bindings] = binding;
+    prefs.n_bindings++;
 }
 
-
-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)
+ka_preferences_setup_proxiable_toggle (KaApplet *applet)
 {
-    gboolean renewable;
-
-    renewable = gtk_toggle_button_get_active (toggle);
-
-    gconf_client_set_bool (prefs.client, KA_GCONF_KEY_RENEWABLE, renewable, NULL);
+    GBinding *binding;
+    GtkWidget *toggle;
+
+    toggle = WID (prefs.builder, "proxiable_toggle");
+    g_assert (toggle != NULL);
+
+    binding = g_object_bind_property (applet,
+                                      KA_PROP_NAME_TGT_PROXIABLE,
+                                      toggle,
+                                      "active",
+                                      G_BINDING_BIDIRECTIONAL);
+    prefs.bindings[prefs.n_bindings] = binding;
+    prefs.n_bindings++;
 }
 
-
 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 ()
+ka_preferences_setup_renewable_toggle (KaApplet *applet)
 {
-    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;
+    GBinding *binding;
+    GtkWidget *toggle;
+
+    toggle = WID (prefs.builder, "renewable_toggle");
+    g_assert (toggle != NULL);
+
+    binding = g_object_bind_property (applet,
+                                      KA_PROP_NAME_TGT_RENEWABLE,
+                                      toggle,
+                                      "active",
+                                      G_BINDING_BIDIRECTIONAL);
+    prefs.bindings[prefs.n_bindings] = binding;
+    prefs.n_bindings++;
 }
 
 
 static void
 ka_preferences_prompt_mins_changed (GtkSpinButton *button,
-                                    gpointer userdata G_GNUC_UNUSED)
+                                    gpointer userdata)
 {
     gint prompt_mins;
+    KaApplet *applet = KA_APPLET(userdata);
 
     prompt_mins = gtk_spin_button_get_value_as_int (button);
-    gconf_client_set_int (prefs.client, KA_GCONF_KEY_PROMPT_MINS, prompt_mins, NULL);
+    g_object_set (applet, KA_PROP_NAME_PW_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,
+ka_preferences_prompt_mins_notify (GSettings *settings,
+                                   gchar *key,
                                    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);
+    prompt_mins = g_settings_get_int (settings, key);
+    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 ()
+static void
+ka_preferences_setup_prompt_mins_entry (KaApplet *applet)
 {
     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);
+    g_object_get (applet, KA_PROP_NAME_PW_PROMPT_MINS, &prompt_mins, NULL);
 
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON (prefs.prompt_mins_entry), prompt_mins);
+    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);
+                      G_CALLBACK (ka_preferences_prompt_mins_changed), applet);
+}
 
-    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;
+static void
+ka_preferences_settings_changed (GSettings *settings,
+                                 gchar *key,
+                                 gpointer userdata)
+{
+    KaApplet *applet = KA_APPLET (userdata);
+
+    if (!g_strcmp0 (key, KA_SETTING_KEY_PRINCIPAL))
+        ka_preferences_principal_notify (settings, key, applet);
+    else if (!g_strcmp0(key, KA_SETTING_KEY_PK_USERID))
+        ka_preferences_pkuserid_notify (settings, key, applet);
+    else if (!g_strcmp0(key, KA_SETTING_KEY_PK_ANCHORS))
+        ka_preferences_pkanchors_notify (settings, key, applet);
+    else if (!g_strcmp0(key, KA_SETTING_KEY_PW_PROMPT_MINS))
+        ka_preferences_prompt_mins_notify (settings, key, applet);
 }
 
-
 void
-ka_preferences_window_create (KaApplet *applet G_GNUC_UNUSED,
+ka_preferences_window_create (KaApplet *applet,
                               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);
+    ka_preferences_setup_principal_entry (applet);
+    ka_preferences_setup_pkuserid_entry (applet);
+    ka_preferences_setup_pkuserid_button (applet);
+    ka_preferences_setup_smartcard_toggle (applet);
+    ka_preferences_setup_pkanchors_entry (applet);
+    ka_preferences_setup_pkanchors_button (applet);
+
+    ka_preferences_setup_forwardable_toggle (applet);
+    ka_preferences_setup_proxiable_toggle (applet);
+    ka_preferences_setup_renewable_toggle (applet);
+    ka_preferences_setup_prompt_mins_entry (applet);
+
+    g_signal_connect (ka_applet_get_settings(applet),
+                      "changed",
+                      G_CALLBACK (ka_preferences_settings_changed),
+                      applet);
+
+    g_assert (prefs.n_bindings == N_BINDINGS);
 
     prefs.notebook = WID (xml, "ka_notebook");
     prefs.dialog = WID (xml, "krb5_preferences_dialog");
-
 }
 
 void
-ka_preferences_window_show (GtkWindow *main_window)
+ka_preferences_window_show (KaApplet *applet)
 {
-    if (main_window)
-        gtk_window_set_transient_for (GTK_WINDOW(prefs.dialog), main_window);
+    GtkWindow *parent = ka_applet_last_focused_window (applet);
+
+    if (parent)
+        gtk_window_set_transient_for (GTK_WINDOW(prefs.dialog),
+                                      GTK_WINDOW(parent));
     gtk_window_present (GTK_WINDOW(prefs.dialog));
     gtk_dialog_run (GTK_DIALOG (prefs.dialog));
     gtk_widget_hide (prefs.dialog);
 }
 
+void
+ka_preferences_window_destroy ()
+{
+    int i;
+
+    for (i = 0; i < prefs.n_bindings; i++)
+        g_object_unref (prefs.bindings[i]);
+}
+
 /*
  * vim:ts:sts=4:sw=4:et:
  */
diff --git a/src/ka-preferences.h b/src/ka-preferences.h
index 7f8e9a2..6f767c5 100644
--- a/src/ka-preferences.h
+++ b/src/ka-preferences.h
@@ -10,7 +10,9 @@
 G_BEGIN_DECLS
 
 void ka_preferences_window_create (KaApplet *applet, GtkBuilder *xml);
-void ka_preferences_window_show (GtkWindow *main_window);
+void ka_preferences_window_destroy (void);
+void ka_preferences_window_show (KaApplet *applet);
+
 
 G_END_DECLS
 
diff --git a/src/ka-pwdialog.c b/src/ka-pwdialog.c
index 483873a..5e56d8b 100644
--- a/src/ka-pwdialog.c
+++ b/src/ka-pwdialog.c
@@ -1,6 +1,6 @@
 /* Krb5 Auth Applet -- Acquire and release kerberos tickets
  *
- * (C) 2009 Guido Guenther <agx@sigxcpu.org>
+ * (C) 2009,2013 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
@@ -88,17 +88,57 @@ ka_pwdialog_new (void)
     return g_object_new (KA_TYPE_PWDIALOG, NULL);
 }
 
+static GdkGrabStatus
+for_each_keyboard (GdkWindow *window, GdkEvent *event,
+                   GdkGrabStatus (*func)(GdkDevice*,
+                                         GdkWindow*,
+                                         GdkEvent*))
+{
+    GdkDisplay *display;
+    GdkDeviceManager *device_manager;
+    GdkDevice *device;
+    GList *devices, *dev;
+    GdkGrabStatus ret = GDK_GRAB_SUCCESS;
+
+    display = gdk_window_get_display (window);
+    device_manager = gdk_display_get_device_manager (display);
+    devices = gdk_device_manager_list_devices (device_manager,
+                                               GDK_DEVICE_TYPE_MASTER);
+
+    for (dev = devices; dev; dev = dev->next) {
+        device = dev->data;
+        if (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD)
+            continue;
+        ret = (*func)(device, window, event);
+    }
+
+    g_list_free (devices);
+    return ret;
+}
+
+static GdkGrabStatus
+grab_keyboard_func (GdkDevice *device, GdkWindow *window, GdkEvent *event)
+{
+    return gdk_device_grab (device,
+                            window,
+                            GDK_OWNERSHIP_WINDOW,
+                            FALSE,
+                            GDK_ALL_EVENTS_MASK,
+                            NULL,
+                            gdk_event_get_time (event));
+}
 
 static gboolean
 grab_keyboard (GtkWidget *win, GdkEvent * event, gpointer data)
 {
     KaPwDialog *pwdialog = KA_PWDIALOG (data);
-
     GdkGrabStatus status;
 
     if (!pwdialog->priv->grabbed) {
-        status = gdk_keyboard_grab (gtk_widget_get_window (win),
-                                    FALSE, gdk_event_get_time (event));
+        status = for_each_keyboard(gtk_widget_get_window (win),
+                                   event,
+                                   &grab_keyboard_func);
+
         if (status == GDK_GRAB_SUCCESS)
             pwdialog->priv->grabbed = TRUE;
         else
@@ -107,6 +147,15 @@ grab_keyboard (GtkWidget *win, GdkEvent * event, gpointer data)
     return FALSE;
 }
 
+static GdkGrabStatus
+ungrab_keyboard_func (GdkDevice *device,
+                      GdkWindow *window G_GNUC_UNUSED,
+                      GdkEvent *event)
+{
+    gdk_device_ungrab (device,
+                       gdk_event_get_time (event));
+    return 0;
+}
 
 static gboolean
 ungrab_keyboard (GtkWidget *win G_GNUC_UNUSED,
@@ -114,9 +163,12 @@ ungrab_keyboard (GtkWidget *win G_GNUC_UNUSED,
 {
     KaPwDialog *pwdialog = KA_PWDIALOG (data);
 
-    if (pwdialog->priv->grabbed)
-        gdk_keyboard_ungrab (gdk_event_get_time (event));
-    pwdialog->priv->grabbed = FALSE;
+    if (pwdialog->priv->grabbed) {
+        for_each_keyboard(gtk_widget_get_window (win),
+                          event,
+                          &ungrab_keyboard_func);
+        pwdialog->priv->grabbed = FALSE;
+    }
     return FALSE;
 }
 
diff --git a/src/ka-settings.c b/src/ka-settings.c
new file mode 100644
index 0000000..a2baab4
--- /dev/null
+++ b/src/ka-settings.c
@@ -0,0 +1,59 @@
+/* Krb5 Auth Applet -- Acquire and release kerberos tickets
+ *
+ * (C) 2008,2009,2013 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 of the License, 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 <string.h>
+
+#include "ka-applet-priv.h"
+#include "ka-settings.h"
+
+#define do_binding(NAME) \
+    g_settings_bind(settings, \
+        KA_SETTING_KEY_##NAME,\
+        applet,               \
+        KA_PROP_NAME_##NAME,  \
+        G_SETTINGS_BIND_DEFAULT)
+
+static void
+ka_setup_bindings(KaApplet* applet,
+                  GSettings* settings)
+{
+    do_binding(PRINCIPAL);
+    do_binding(PK_USERID);
+    do_binding(PK_ANCHORS);
+    do_binding(PW_PROMPT_MINS);
+    do_binding(TGT_FORWARDABLE);
+    do_binding(TGT_PROXIABLE);
+    do_binding(TGT_RENEWABLE);
+    do_binding(CONF_TICKETS);
+}
+
+#undef do_binding
+
+GSettings*
+ka_settings_init (KaApplet* applet)
+{
+    GSettings *settings;
+
+    settings = g_settings_new (KA_SETTING_SCHEMA);
+
+    ka_setup_bindings(applet, settings);
+    return settings;
+}
diff --git a/src/ka-gconf.h b/src/ka-settings.h
index a6b3872..029c429 100644
--- a/src/ka-gconf.h
+++ b/src/ka-settings.h
@@ -21,9 +21,24 @@
 #ifndef KA_GCONF_H
 #define KA_GCONF_H
 
-#include <gconf/gconf-client.h>
 #include "ka-applet-priv.h"
 
-GConfClient* ka_gconf_init (KaApplet* applet);
+#define KA_SETTING_SCHEMA               "org.gnome.KrbAuthDialog"
+#define KA_SETTING_KEY_PRINCIPAL        "principal"
+#define KA_SETTING_KEY_PK_USERID        "pk-userid"
+#define KA_SETTING_KEY_PK_ANCHORS       "pk-anchors"
+#define KA_SETTING_KEY_PW_PROMPT_MINS   "prompt-minutes"
+#define KA_SETTING_KEY_TGT_FORWARDABLE  "forwardable"
+#define KA_SETTING_KEY_TGT_RENEWABLE    "renewable"
+#define KA_SETTING_KEY_TGT_PROXIABLE    "proxiable"
+#define KA_SETTING_KEY_CONF_TICKETS     "conf-tickets"
+#define KA_SETTING_CHILD_NOTIFY         "notify"
+#define KA_SETTING_KEY_NOTIFY_VALID     "valid"
+#define KA_SETTING_KEY_NOTIFY_EXPIRED   "expired"
+#define KA_SETTING_KEY_NOTIFY_EXPIRING  "expiring"
+#define KA_SETTING_CHILD_PLUGINS        "plugins"
+#define KA_SETTING_KEY_PLUGINS_ENABLED  "enabled"
+
+GSettings* ka_settings_init (KaApplet* applet);
 
 #endif
diff --git a/src/ka-tools.c b/src/ka-tools.c
index 227324a..18f9ba8 100644
--- a/src/ka-tools.c
+++ b/src/ka-tools.c
@@ -58,8 +58,10 @@ ka_show_help (GdkScreen* screen, const char* chapter, GtkWindow* window)
 
 
 void 
-ka_show_about ()
+ka_show_about (KaApplet *applet)
 {
+    GtkWindow *parent = ka_applet_last_focused_window (applet);
+
     const gchar *authors[] = {
         "Christopher Aillon <caillon@redhat.com>",
         "Jonathan Blandford <jrb@redhat.com>",
@@ -68,7 +70,7 @@ ka_show_about ()
         NULL
     };
 
-    gtk_show_about_dialog (NULL,
+    gtk_show_about_dialog (parent,
                            "authors", authors,
                            "version", VERSION,
                            "logo-icon-name", "krb-valid-ticket",
diff --git a/src/ka-tools.h b/src/ka-tools.h
index 4fef541..18ddf45 100644
--- a/src/ka-tools.h
+++ b/src/ka-tools.h
@@ -22,11 +22,12 @@
 #define KA_TOOLS
 
 #include <gtk/gtk.h>
+#include <ka-applet-priv.h>
 
 G_BEGIN_DECLS
 
 void ka_show_help (GdkScreen* screen, const char* section, GtkWindow* window);
-void ka_show_about (void);
+void ka_show_about (KaApplet *applet);
 
 G_END_DECLS
 
diff --git a/src/krb5-auth-dialog.desktop.in b/src/krb5-auth-dialog.desktop.in
index 7c2223a..33ac10d 100644
--- a/src/krb5-auth-dialog.desktop.in
+++ b/src/krb5-auth-dialog.desktop.in
@@ -9,3 +9,4 @@ Categories=GNOME;GTK;Utility;Network;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=krb5-auth-dialog
 X-GNOME-Bugzilla-Component=general
+X-GNOME-UsesNotifications=true
diff --git a/src/krb5-auth-dialog.schemas.in b/src/krb5-auth-dialog.schemas.in
deleted file mode 100644
index 4a88f2b..0000000
--- a/src/krb5-auth-dialog.schemas.in
+++ /dev/null
@@ -1,146 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/principal</key>
-      <applyto>/apps/krb5-auth-dialog/principal</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>string</type>
-      <default></default>
-
-      <locale name="C">
-        <short>Kerberos principal</short>
-        <long>The kerberos principal to acquire the ticket for</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/pk_userid</key>
-      <applyto>/apps/krb5-auth-dialog/pk_userid</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>string</type>
-      <default></default>
-
-      <locale name="C">
-        <short>PKINIT identifier</short>
-        <long>The principal's public/private/certificate identifier when using PKINIT</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/pk_anchors</key>
-      <applyto>/apps/krb5-auth-dialog/pk_anchors</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>string</type>
-      <default></default>
-
-      <locale name="C">
-        <short>PKINIT trust anchors</short>
-        <long>PKINIT CA certificates</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/prompt_minutes</key>
-      <applyto>/apps/krb5-auth-dialog/prompt_minutes</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>int</type>
-      <default>30</default>
-
-      <locale name="C">
-        <short>Prompt minutes before expiry</short>
-        <long>Start prompting/displaying notifications that many minutes before expiry</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/forwardable</key>
-      <applyto>/apps/krb5-auth-dialog/forwardable</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>bool</type>
-      <default>0</default>
-
-      <locale name="C">
-        <short>Forwardable ticket</short>
-        <long>Requested tickets should be forwardable</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/renewable</key>
-      <applyto>/apps/krb5-auth-dialog/renewable</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>bool</type>
-      <default>0</default>
-
-      <locale name="C">
-        <short>Renewable ticket</short>
-        <long>Requested tickets should be renewable</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/proxiable</key>
-      <applyto>/apps/krb5-auth-dialog/proxiable</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>bool</type>
-      <default>0</default>
-
-      <locale name="C">
-        <short>Proxiable ticket</short>
-        <long>Requested tickets should be proxiable</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/notify/valid</key>
-      <applyto>/apps/krb5-auth-dialog/notify/valid</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>bool</type>
-      <default>1</default>
-
-      <locale name="C">
-        <short>valid ticket notification</short>
-        <long>Notify user when ticket becomes valid</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/notify/expiring</key>
-      <applyto>/apps/krb5-auth-dialog/notify/expiring</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>bool</type>
-      <default>1</default>
-
-      <locale name="C">
-        <short>ticket expiring notification</short>
-        <long>Notify user when ticket is about to expire</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/notify/expired</key>
-      <applyto>/apps/krb5-auth-dialog/notify/expired</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>bool</type>
-      <default>1</default>
-
-      <locale name="C">
-        <short>ticket expired notification</short>
-        <long>Notify user when ticket has expired</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/plugins/enabled</key>
-      <applyto>/apps/krb5-auth-dialog/plugins/enabled</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-
-      <locale name="C">
-        <short>Enabled plugins</short>
-	<long>List of plugins that should be loaded and activated on startup.</long>
-      </locale>
-    </schema>
-  </schemalist>
-</gconfschemafile>
diff --git a/src/krb5-auth-dialog.ui b/src/krb5-auth-dialog.ui
index 1da04d7..3bbcdbf 100644
--- a/src/krb5-auth-dialog.ui
+++ b/src/krb5-auth-dialog.ui
@@ -1,6 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 3.0 -->
+  <menu id="app-menu">
+    <section>
+      <item>
+        <attribute name="action">app.preferences</attribute>
+        <attribute name="label" translatable="yes">Prefere_nces</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="action">app.about</attribute>
+        <attribute name="label" translatable="yes">_About</attribute>
+      </item>
+      <item>
+        <attribute name="action">app.help</attribute>
+        <attribute name="label" translatable="yes">_Help</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="action">app.quit</attribute>
+        <attribute name="label" translatable="yes">_Quit</attribute>
+      </item>
+    </section>
+  </menu>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
@@ -29,7 +53,6 @@
                 <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>
@@ -46,7 +69,6 @@
                 <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>
@@ -181,7 +203,7 @@
       <action-widget response="-5">krb5_renew_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkWindow" id="krb5_main_window">
+  <object class="GtkApplicationWindow" 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"/>
@@ -190,102 +212,6 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
-          <object class="GtkMenuBar" id="menubar1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkMenuItem" id="menuitem1">
-                <property name="visible">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>
-            </child>
-            <child>
-              <object class="GtkMenuItem" id="menuitem2">
-                <property name="visible">True</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>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</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>
@@ -324,7 +250,6 @@
                 <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>
@@ -541,7 +466,6 @@
                                     <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>
@@ -583,7 +507,6 @@
                                     <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>
@@ -625,7 +548,6 @@
                                     <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>
@@ -744,7 +666,6 @@
                                         <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>
@@ -799,7 +720,6 @@
                                         <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>
@@ -892,7 +812,6 @@
                             <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>
@@ -1019,9 +938,9 @@
                                 <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="adjustment">adjustment1</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>
diff --git a/src/org.gnome.KrbAuthDialog.convert b/src/org.gnome.KrbAuthDialog.convert
new file mode 100644
index 0000000..f71168e
--- /dev/null
+++ b/src/org.gnome.KrbAuthDialog.convert
@@ -0,0 +1,13 @@
+[org.gnome.KrbAuthDialog]
+principal = /apps/krb5-auth-dialog/principal
+pk-userid = /apps/krb5-auth-dialog/pk_userid
+pk-anchors = /apps/krb5-auth-dialog/pk_anchors
+prompt-minutes = /apps/krb5-auth-dialog/prompt_minutes
+
+[org.gnome.KrbAuthDialog.notify]
+valid = /apps/krb5-auth-dialog/notify/valid
+expiring = /apps/krb5-auth-dialog/notify/expiring
+expired = /apps/krb5-auth-dialog/notify/expired
+
+[org.gnome.KrbAuthDialog.plugins]
+enabled = /apps/krb5-auth-dialog/plugins/enabled
diff --git a/src/org.gnome.KrbAuthDialog.gschema.xml b/src/org.gnome.KrbAuthDialog.gschema.xml
new file mode 100644
index 0000000..4764744
--- /dev/null
+++ b/src/org.gnome.KrbAuthDialog.gschema.xml
@@ -0,0 +1,70 @@
+<schemalist>
+  <schema id="org.gnome.KrbAuthDialog" path="/apps/krb5-auth-dialog/">
+    <key name="principal" type="s">
+      <default>''</default>
+      <summary>Kerberos principal</summary>
+      <description>The Kerberos principal to acquire the ticket for</description>
+    </key>
+    <key name="pk-userid" type="s">
+      <default>''</default>
+      <summary>PKINIT identifier</summary>
+      <description>The principal's public/private/certificate identifier when using PKINIT</description>
+    </key>
+    <key name="pk-anchors" type="s">
+      <default>''</default>
+      <summary>PKINIT trust anchors</summary>
+      <description>PKINIT CA certificates</description>
+    </key>
+    <key name="prompt-minutes" type="i">
+      <default>30</default>
+      <summary>Prompt minutes before expiry</summary>
+      <description>Start prompting/displaying notifications that many minutes before expiry</description>
+    </key>
+    <key name="forwardable" type="b">
+      <default>false</default>
+      <summary>Forwardable ticket</summary>
+      <description>Requested tickets should be forwardable</description>
+    </key>
+    <key name="renewable" type="b">
+      <default>false</default>
+      <summary>Renewable ticket</summary>
+      <description>Requested tickets should be renewable</description>
+    </key>
+    <key name="proxiable" type="b">
+      <default>false</default>
+      <summary>Proxiable ticket</summary>
+      <description>Requested tickets should be proxiable</description>
+    </key>
+    <key name="conf-tickets" type="b">
+      <default>false</default>
+      <summary>Configuration tickets</summary>
+      <description>Show configuration tickets</description>
+    </key>
+    <child name="notify" schema="org.gnome.KrbAuthDialog.notify"/>
+    <child name="plugins" schema="org.gnome.KrbAuthDialog.plugins"/>
+  </schema>
+  <schema id="org.gnome.KrbAuthDialog.notify" path="/apps/krb5-auth-dialog/notify/">
+    <key name="valid" type="b">
+      <default>true</default>
+      <summary>valid ticket notification</summary>
+      <description>Notify user when ticket becomes valid</description>
+    </key>
+    <key name="expiring" type="b">
+      <default>true</default>
+      <summary>ticket expiring notification</summary>
+      <description>Notify user when ticket is about to expire</description>
+    </key>
+    <key name="expired" type="b">
+      <default>true</default>
+      <summary>ticket expired notification</summary>
+      <description>Notify user when ticket has expired</description>
+    </key>
+  </schema>
+  <schema id="org.gnome.KrbAuthDialog.plugins" path="/apps/krb5-auth-dialog/plugins/">
+    <key name="enabled" type="as">
+      <default>[]</default>
+      <summary>Enabled plugins</summary>
+      <description>List of plugins that should be loaded and activated on startup.</description>
+    </key>
+  </schema>
+</schemalist>