From 580cd3266f8805c01112017f233e22f54a54db11 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Fri, 20 Jun 2014 06:48:51 +0200 Subject: New upstream version 3.12.0 --- src/Makefile.am | 12 +- src/Makefile.in | 271 +++++++++++++++++++++++------------- src/ka-applet-priv.h | 3 +- src/ka-applet.c | 8 +- src/ka-applet.h | 3 +- src/ka-closures.c | 3 +- src/ka-closures.h | 3 +- src/ka-dbus.c | 3 +- src/ka-dbus.h | 3 +- src/ka-entry-buffer.c | 3 +- src/ka-entry-buffer.h | 3 +- src/ka-kerberos.c | 15 +- src/ka-kerberos.h | 3 +- src/ka-main-window.c | 3 +- src/ka-main-window.h | 3 +- src/ka-plugin-loader.c | 3 +- src/ka-plugin-loader.h | 3 +- src/ka-plugin.c | 3 +- src/ka-plugin.h | 3 +- src/ka-preferences.c | 3 +- src/ka-pwdialog.c | 3 +- src/ka-pwdialog.h | 3 +- src/ka-settings.c | 3 +- src/ka-settings.h | 3 +- src/ka-tools.c | 3 +- src/ka-tools.h | 3 +- src/krb5-auth-dialog.appdata.xml.in | 23 +++ src/krb5-auth-dialog.ui | 72 +++++----- 28 files changed, 278 insertions(+), 189 deletions(-) create mode 100644 src/krb5-auth-dialog.appdata.xml.in (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 3cf1a7d..fd055cb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,6 +25,11 @@ service_DATA = $(service_in_files:.service.in=.service) $(service_DATA): $(service_in_files) Makefile sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@ +@INTLTOOL_XML_RULE@ +appdatadir = $(datadir)/appdata +appdata_in_files = krb5-auth-dialog.appdata.xml.in +appdata_DATA = $(appdata_in_files:.xml.in=.xml) + krb5_auth_dialog_SOURCES = \ ka-kerberos.c \ ka-kerberos.h \ @@ -100,11 +105,16 @@ EXTRA_DIST = \ $(schema_in_files) \ $(autostart_in_files) \ $(service_in_files) \ + $(appdata_in_files) \ org.gnome.KrbAuthDialog.gschema.xml \ krb5-auth-dialog.1.in \ $(NULL) -CLEANFILES = $(schema_DATA) $(service_DATA) +CLEANFILES = $(schema_DATA) \ + $(service_DATA) \ + $(appdata_DATA) \ + $(NULL) + DISTCLEANFILES = \ krb5-auth-dialog.desktop \ $(NULL) diff --git a/src/Makefile.in b/src/Makefile.in index dc2bf38..e78d4ed 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ 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;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -53,22 +80,23 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = krb5-auth-dialog$(EXEEXT) subdir = src -DIST_COMMON = $(dist_convert_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/krb5-auth-dialog.1.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/krb5-auth-dialog.1.in $(top_srcdir)/depcomp \ + $(dist_convert_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/m4/compiler-flags.m4 \ $(top_srcdir)/m4/gnome-doc-utils.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = krb5-auth-dialog.1 CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ - "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(desktopdir)" \ - "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(pkgdatadir)" \ - "$(DESTDIR)$(servicedir)" + "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(autostartdir)" \ + "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(convertdir)" \ + "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(servicedir)" PROGRAMS = $(bin_PROGRAMS) am__objects_1 = am_krb5_auth_dialog_OBJECTS = krb5_auth_dialog-ka-kerberos.$(OBJEXT) \ @@ -94,10 +122,23 @@ krb5_auth_dialog_DEPENDENCIES = $(top_builddir)/secmem/libsecmem.a \ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = krb5_auth_dialog_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(krb5_auth_dialog_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -110,20 +151,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) 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_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = 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_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(krb5_auth_dialog_SOURCES) DIST_SOURCES = $(krb5_auth_dialog_SOURCES) am__can_run_installinfo = \ @@ -161,8 +198,25 @@ am__uninstall_files_from_dir = { \ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) -DATA = $(autostart_DATA) $(desktop_DATA) $(dist_convert_DATA) \ - $(pkgdata_DATA) $(service_DATA) +DATA = $(appdata_DATA) $(autostart_DATA) $(desktop_DATA) \ + $(dist_convert_DATA) $(pkgdata_DATA) $(service_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -363,6 +417,9 @@ 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) +appdatadir = $(datadir)/appdata +appdata_in_files = krb5-auth-dialog.appdata.xml.in +appdata_DATA = $(appdata_in_files:.xml.in=.xml) krb5_auth_dialog_SOURCES = \ ka-kerberos.c \ ka-kerberos.h \ @@ -437,11 +494,16 @@ EXTRA_DIST = \ $(schema_in_files) \ $(autostart_in_files) \ $(service_in_files) \ + $(appdata_in_files) \ org.gnome.KrbAuthDialog.gschema.xml \ krb5-auth-dialog.1.in \ $(NULL) -CLEANFILES = $(schema_DATA) $(service_DATA) +CLEANFILES = $(schema_DATA) \ + $(service_DATA) \ + $(appdata_DATA) \ + $(NULL) + DISTCLEANFILES = \ krb5-auth-dialog.desktop \ $(NULL) @@ -491,10 +553,12 @@ install-binPROGRAMS: $(bin_PROGRAMS) 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; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -515,7 +579,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -528,6 +593,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) $(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) @@ -557,14 +623,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @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@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .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 @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@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -803,6 +869,27 @@ uninstall-man1: } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) +install-appdataDATA: $(appdata_DATA) + @$(NORMAL_INSTALL) + @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || 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)$(appdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \ + done + +uninstall-appdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir) install-autostartDATA: $(autostart_DATA) @$(NORMAL_INSTALL) @list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \ @@ -909,26 +996,15 @@ uninstall-serviceDATA: files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -940,15 +1016,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -957,24 +1029,26 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1008,7 +1082,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)$(convertdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(servicedir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(servicedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1065,9 +1139,9 @@ info: info-am info-am: -install-data-am: install-autostartDATA install-desktopDATA \ - install-dist_convertDATA install-man install-pkgdataDATA \ - install-serviceDATA +install-data-am: install-appdataDATA install-autostartDATA \ + install-desktopDATA install-dist_convertDATA install-man \ + install-pkgdataDATA install-serviceDATA install-dvi: install-dvi-am @@ -1113,18 +1187,20 @@ ps: ps-am ps-am: -uninstall-am: uninstall-autostartDATA uninstall-binPROGRAMS \ - uninstall-desktopDATA uninstall-dist_convertDATA uninstall-man \ - uninstall-pkgdataDATA uninstall-serviceDATA +uninstall-am: uninstall-appdataDATA uninstall-autostartDATA \ + uninstall-binPROGRAMS uninstall-desktopDATA \ + uninstall-dist_convertDATA uninstall-man uninstall-pkgdataDATA \ + uninstall-serviceDATA uninstall-man: uninstall-man1 .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-appdataDATA \ install-autostartDATA install-binPROGRAMS install-data \ install-data-am install-desktopDATA install-dist_convertDATA \ install-dvi install-dvi-am install-exec install-exec-am \ @@ -1134,10 +1210,11 @@ uninstall-man: uninstall-man1 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 + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-appdataDATA uninstall-autostartDATA \ + uninstall-binPROGRAMS uninstall-desktopDATA \ + uninstall-dist_convertDATA uninstall-man uninstall-man1 \ + uninstall-pkgdataDATA uninstall-serviceDATA @INTLTOOL_DESKTOP_RULE@ @GSETTINGS_RULES@ @@ -1145,6 +1222,8 @@ uninstall-man: uninstall-man1 $(service_DATA): $(service_in_files) Makefile sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@ +@INTLTOOL_XML_RULE@ + # 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 ffcb4a4..eaf5b48 100644 --- a/src/ka-applet-priv.h +++ b/src/ka-applet-priv.h @@ -13,8 +13,7 @@ * 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. + * along with this program; if not, see . * */ diff --git a/src/ka-applet.c b/src/ka-applet.c index 2b48825..8b99695 100644 --- a/src/ka-applet.c +++ b/src/ka-applet.c @@ -13,8 +13,7 @@ * 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. + * along with this program; if not, see . * */ @@ -151,6 +150,7 @@ ka_applet_local_command_line (GApplication *application, GError *error = NULL; gint argc = g_strv_length (*argv); + gint flags; gboolean auto_run = FALSE; const char *help_msg = @@ -163,6 +163,10 @@ ka_applet_local_command_line (GApplication *application, }; KA_DEBUG ("Parsing local command line"); +#if GLIB_CHECK_VERSION(2, 40, 0) + flags = g_application_get_flags(application); + g_application_set_flags(application, flags | G_APPLICATION_HANDLES_COMMAND_LINE); +#endif context = g_option_context_new ("- Kerberos 5 credential checking"); g_option_context_add_main_entries (context, options, NULL); diff --git a/src/ka-applet.h b/src/ka-applet.h index e9af644..1e6f3e0 100644 --- a/src/ka-applet.h +++ b/src/ka-applet.h @@ -13,8 +13,7 @@ * 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. + * along with this program; if not, see . * */ diff --git a/src/ka-closures.c b/src/ka-closures.c index a3c651b..efbc491 100644 --- a/src/ka-closures.c +++ b/src/ka-closures.c @@ -12,8 +12,7 @@ * 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. + * along with this program; if not, see . * * This file was generated using glib-genmarshal */ diff --git a/src/ka-closures.h b/src/ka-closures.h index 37b0a7d..317954c 100644 --- a/src/ka-closures.h +++ b/src/ka-closures.h @@ -12,8 +12,7 @@ * 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. + * along with this program; if not, see . * * This file was generated using glib-genmarshal */ diff --git a/src/ka-dbus.c b/src/ka-dbus.c index c88561e..75949ee 100644 --- a/src/ka-dbus.c +++ b/src/ka-dbus.c @@ -13,8 +13,7 @@ * 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. + * along with this program; if not, see . * */ diff --git a/src/ka-dbus.h b/src/ka-dbus.h index 41b30d7..d64f00e 100644 --- a/src/ka-dbus.h +++ b/src/ka-dbus.h @@ -13,8 +13,7 @@ * 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. + * along with this program; if not, see . * */ diff --git a/src/ka-entry-buffer.c b/src/ka-entry-buffer.c index 45587bf..8cdd630 100644 --- a/src/ka-entry-buffer.c +++ b/src/ka-entry-buffer.c @@ -13,8 +13,7 @@ * 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. + * along with this program; if not, see . * */ diff --git a/src/ka-entry-buffer.h b/src/ka-entry-buffer.h index 5626ac4..4bb13f2 100644 --- a/src/ka-entry-buffer.h +++ b/src/ka-entry-buffer.h @@ -13,8 +13,7 @@ * 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. + * along with this program; if not, see . * */ diff --git a/src/ka-kerberos.c b/src/ka-kerberos.c index db5cddd..2b0106e 100644 --- a/src/ka-kerberos.c +++ b/src/ka-kerberos.c @@ -15,8 +15,7 @@ * 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. + * along with this program; if not, see . * */ @@ -221,8 +220,10 @@ credentials_expiring_real (KaApplet *applet) } /* copy principal from cache if any */ - if (krb5_principal_compare (kcontext, my_creds.client, kprincipal)) { - krb5_free_principal (kcontext, kprincipal); + if (kprincipal == NULL || + krb5_principal_compare (kcontext, my_creds.client, kprincipal)) { + if (kprincipal) + krb5_free_principal (kcontext, kprincipal); krb5_copy_principal (kcontext, my_creds.client, &kprincipal); } creds_expiry = my_creds.times.endtime; @@ -781,6 +782,8 @@ grab_credentials (KaApplet *applet) switch (retval) { case KRB5KDC_ERR_PREAUTH_FAILED: case KRB5KRB_AP_ERR_BAD_INTEGRITY: + case KRB5KRB_AP_ERR_MODIFIED: + case KRB5_GET_IN_TKT_LOOP: #ifdef HAVE_HX509_ERR_H case HX509_PKCS11_LOGIN: #endif /* Invalid password/pin, try again. */ @@ -1026,7 +1029,9 @@ ka_grab_credentials (KaApplet *applet) if (retval) { gchar *errmsg; - errmsg = ka_get_error_message (kcontext, retval); + errmsg = g_strdup_printf("%s%s", + ka_get_error_message (kcontext, retval), + is_online ? "" : _(" (No network connection)")); ka_pwdialog_error (pwdialog, errmsg); g_free (errmsg); break; diff --git a/src/ka-kerberos.h b/src/ka-kerberos.h index aa70c90..e94bb63 100644 --- a/src/ka-kerberos.h +++ b/src/ka-kerberos.h @@ -13,8 +13,7 @@ * 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. + * along with this program; if not, see . * */ diff --git a/src/ka-main-window.c b/src/ka-main-window.c index efcec63..84848ef 100644 --- a/src/ka-main-window.c +++ b/src/ka-main-window.c @@ -15,8 +15,7 @@ * 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. + * along with this program; if not, see . * */ diff --git a/src/ka-main-window.h b/src/ka-main-window.h index ee1ea46..ca647f0 100644 --- a/src/ka-main-window.h +++ b/src/ka-main-window.h @@ -13,8 +13,7 @@ * 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. + * along with this program; if not, see . * */ diff --git a/src/ka-plugin-loader.c b/src/ka-plugin-loader.c index e21a863..ebc3791 100644 --- a/src/ka-plugin-loader.c +++ b/src/ka-plugin-loader.c @@ -12,8 +12,7 @@ * 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. + * along with this program; if not, see . */ #include "ka-plugin-loader.h" diff --git a/src/ka-plugin-loader.h b/src/ka-plugin-loader.h index 6f0560a..15ef815 100644 --- a/src/ka-plugin-loader.h +++ b/src/ka-plugin-loader.h @@ -12,8 +12,7 @@ * 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. + * along with this program; if not, see . */ #ifndef _KA_PLUGIN_LOADER diff --git a/src/ka-plugin.c b/src/ka-plugin.c index 88fec34..1092eb1 100644 --- a/src/ka-plugin.c +++ b/src/ka-plugin.c @@ -12,8 +12,7 @@ * 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. + * along with this program; if not, see . */ #include "ka-plugin.h" diff --git a/src/ka-plugin.h b/src/ka-plugin.h index ead9b96..429a101 100644 --- a/src/ka-plugin.h +++ b/src/ka-plugin.h @@ -12,8 +12,7 @@ * 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. + * along with this program; if not, see . */ #ifndef _KA_PLUGIN diff --git a/src/ka-preferences.c b/src/ka-preferences.c index 987ef5c..d410e48 100644 --- a/src/ka-preferences.c +++ b/src/ka-preferences.c @@ -12,8 +12,7 @@ * 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. + * along with this program; if not, see . * */ diff --git a/src/ka-pwdialog.c b/src/ka-pwdialog.c index 5e56d8b..7653a4d 100644 --- a/src/ka-pwdialog.c +++ b/src/ka-pwdialog.c @@ -13,8 +13,7 @@ * 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. + * along with this program; if not, see . * */ diff --git a/src/ka-pwdialog.h b/src/ka-pwdialog.h index ff518dc..5af1117 100644 --- a/src/ka-pwdialog.h +++ b/src/ka-pwdialog.h @@ -13,8 +13,7 @@ * 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. + * along with this program; if not, see . * */ diff --git a/src/ka-settings.c b/src/ka-settings.c index a2baab4..6ccb45a 100644 --- a/src/ka-settings.c +++ b/src/ka-settings.c @@ -13,8 +13,7 @@ * 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. + * along with this program; if not, see . * */ #include "config.h" diff --git a/src/ka-settings.h b/src/ka-settings.h index 029c429..6870c81 100644 --- a/src/ka-settings.h +++ b/src/ka-settings.h @@ -13,8 +13,7 @@ * 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. + * along with this program; if not, see . * */ diff --git a/src/ka-tools.c b/src/ka-tools.c index 18f9ba8..a5a9e03 100644 --- a/src/ka-tools.c +++ b/src/ka-tools.c @@ -12,8 +12,7 @@ * 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. + * along with this program; if not, see . */ #include "config.h" diff --git a/src/ka-tools.h b/src/ka-tools.h index 18ddf45..2fb31aa 100644 --- a/src/ka-tools.h +++ b/src/ka-tools.h @@ -13,8 +13,7 @@ * 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. + * along with this program; if not, see . * */ diff --git a/src/krb5-auth-dialog.appdata.xml.in b/src/krb5-auth-dialog.appdata.xml.in new file mode 100644 index 0000000..0e4ef2d --- /dev/null +++ b/src/krb5-auth-dialog.appdata.xml.in @@ -0,0 +1,23 @@ + + + + krb5-auth-dialog.desktop + CC0 + + <_p> + Kerberos Authentication allows you to list your current Kerberos tickets, + and to request a new ticket (authenticate to the Kerberos Server). It also + notifies you when your Kerberos credentials are about to expire and renews + your ticket automatically if possible. + + <_p> + This is useful if you need to authenticate to a Kerberos Server (KDC) + after your login to the desktop (e.g. on a mobile device). + + + + http://honk.sigxcpu.org/con/images/krb5-auth-dialog-pkinit.png + + https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/ + agx_at_sigxcpu.org + diff --git a/src/krb5-auth-dialog.ui b/src/krb5-auth-dialog.ui index 3bbcdbf..44621e0 100644 --- a/src/krb5-auth-dialog.ui +++ b/src/krb5-auth-dialog.ui @@ -37,54 +37,44 @@ False center-always dialog - - + + + True False - - + + + gtk-cancel True - False - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - _Renew Ticket - True - True - True - True - False - True - - - False - False - 1 - - + True + True + False + True - False - True - end - 0 + start + + + _Renew Ticket + True + True + True + True + False + True + + + end + + + > + + + + True + False True -- cgit