diff options
author | Guido Günther <agx@sigxcpu.org> | 2011-09-26 22:20:52 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2011-09-26 22:20:52 +0200 |
commit | 85df09c7a65dab7c54e1e35b0685f8677355710c (patch) | |
tree | 49c3d1ae8ceea68ad29185c40403c0add4b68f28 | |
parent | New upstream version 3.0.1 (diff) | |
download | krb5-auth-dialog-85df09c7a65dab7c54e1e35b0685f8677355710c.tar.gz krb5-auth-dialog-85df09c7a65dab7c54e1e35b0685f8677355710c.tar.bz2 krb5-auth-dialog-85df09c7a65dab7c54e1e35b0685f8677355710c.zip |
New upstream version 3.2.0
51 files changed, 3742 insertions, 4010 deletions
@@ -1,5 +1,344 @@ # Generated by Makefile. Do not edit. +commit 1c89fe8b203c85dcb4ff06fb8da34e411eb56730 +Author: Guido Günther <agx@sigxcpu.org> +Date: Mon Sep 26 22:13:36 2011 +0200 + + Bump version to 3.2.0 + + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + 2 files changed, 14 insertions(+), 1 deletions(-) + +commit 72886265ec4f518e32ef178cea806b336844ecec +Author: Guido Günther <agx@sigxcpu.org> +Date: Mon Sep 26 22:06:12 2011 +0200 + + Avoid crash by not settings string columns to 0 + + src/ka-kerberos.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +commit 42eaa5d3e594b69a555423e2a7c2c04fcb25465d +Author: Mario Blättermann <mariobl@gnome.org> +Date: Mon Sep 19 21:52:10 2011 +0200 + + [l10n] Updated German translation + + po/de.po | 358 ++++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 183 insertions(+), 175 deletions(-) + +commit 8efd67bb6f69ee690ea51f48a37d21cdc766e2c2 +Author: Guido Günther <agx@sigxcpu.org> +Date: Thu Sep 15 12:25:21 2011 +0200 + + autogen.sh: look for ka-kerberos.c + + autogen.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit bbe15a3a7c0d5154332e64a3bb7fbe2367056400 +Author: Guido Günther <agx@sigxcpu.org> +Date: Mon Sep 12 16:34:37 2011 +0200 + + Add translator hints + + src/ka-main-window.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit 9266c74980f52605d039cc0b6530c0a17917f6e2 +Author: Guido Günther <agx@sigxcpu.org> +Date: Mon Sep 12 12:23:13 2011 +0200 + + Require GTK+3.0 + + since GtkApplication is 3.0 only + + configure.ac | 30 +++++------------------------- + 1 files changed, 5 insertions(+), 25 deletions(-) + +commit d8efe4a8fe5152f8c53c005fb0830ef80fce8a9d +Author: Guido Günther <agx@sigxcpu.org> +Date: Mon Sep 12 12:16:50 2011 +0200 + + Don't try to free invalid context + + src/ka-kerberos.c | 10 ++++++++-- + 1 files changed, 8 insertions(+), 2 deletions(-) + +commit 25d0d29c28cc7b6038a441f8f1ca97deefcd14db +Author: Guido Günther <agx@sigxcpu.org> +Date: Mon Sep 12 10:51:06 2011 +0200 + + Rename ka-dialog to ka-kerberos + + We finally moved the startup code out there. + + configure.ac | 2 +- + po/POTFILES.in | 2 +- + src/Makefile.am | 4 +- + src/ka-applet.c | 2 +- + src/ka-dbus.c | 2 +- + src/ka-dialog.c | 1110 -------------------------------------------------- + src/ka-dialog.h | 35 -- + src/ka-kerberos.c | 1110 ++++++++++++++++++++++++++++++++++++++++++++++++++ + src/ka-kerberos.h | 35 ++ + src/ka-main-window.c | 2 +- + src/ka-pwdialog.c | 2 +- + 11 files changed, 1153 insertions(+), 1153 deletions(-) + +commit 9b3059c3b60f586d344d06cc3227ee9b7bee1bb6 +Author: Guido Günther <agx@sigxcpu.org> +Date: Mon Sep 12 10:43:57 2011 +0200 + + Move main() into ka-applet + + src/ka-applet.c | 26 +++++++++++++++++++++++--- + src/ka-dialog.c | 23 +---------------------- + 2 files changed, 24 insertions(+), 25 deletions(-) + +commit 5de82603dd831a13754a139c6eb80d9d87d4b27d +Author: Guido Günther <agx@sigxcpu.org> +Date: Sat Sep 10 14:57:34 2011 +0200 + + Remove NoDisplay=true from desktop file + + since we now use it to edit the prefs. + + src/krb5-auth-dialog.desktop.in | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +commit adc616b490faccbec37aed550002b3e3f8b0169c +Author: Guido Günther <agx@sigxcpu.org> +Date: Sun Sep 11 14:49:24 2011 +0200 + + Show main window when krb5-auth-dialog is invoked again + + src/ka-applet.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++------ + src/ka-dialog.c | 61 ++++++++++++------------------- + 2 files changed, 118 insertions(+), 50 deletions(-) + +commit 819f5ea45868fad8ed9ae47d2c99862520846eda +Author: Guido Günther <agx@sigxcpu.org> +Date: Sun Sep 11 13:35:30 2011 +0200 + + Invoke Kerberos related initialization from applet + + instead from within main. + + src/ka-applet.c | 23 +++++++++++++++++++++++ + src/ka-dialog.c | 43 +++++++++++++++++++++++++------------------ + src/ka-dialog.h | 3 +++ + 3 files changed, 51 insertions(+), 18 deletions(-) + +commit 072bf062baf562bcf35436c5ebb62919cdf069e4 +Author: Guido Günther <agx@sigxcpu.org> +Date: Sun Sep 11 10:59:14 2011 +0200 + + Use GtkApplication + + to work towards better singleton operation. Since GApplication acquires + the DBus name already don't try to own the name in ka-dbus again. + + src/ka-applet.c | 16 ++++++++++------ + src/ka-dbus.c | 41 +++++++++-------------------------------- + src/ka-dialog.c | 2 +- + 3 files changed, 20 insertions(+), 39 deletions(-) + +commit 19bb938a2bb502640f53a25f452e400dd0f68d5a +Author: Zdeněk Hataš <zdenek.hatas@gmail.com> +Date: Fri Sep 9 12:01:57 2011 +0200 + + Updated Czech translation + + po/cs.po | 202 +++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 103 insertions(+), 99 deletions(-) + +commit 8b53aed4c6ae13782b68b51fbdafba83f2da61f8 +Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com> +Date: Wed Sep 7 21:28:35 2011 +0200 + + Updated Slovenian translation + + po/sl.po | 329 ++++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 169 insertions(+), 160 deletions(-) + +commit 9687ba4ba4c547436a122f21129bc6251a8b4a49 +Author: Vincent Untz <vuntz@gnome.org> +Date: Tue Sep 6 16:36:32 2011 +0200 + + build: Really drop libgnome-control-center dependency + + https://bugzilla.gnome.org/show_bug.cgi?id=658364 + + configure.ac | 8 -------- + 1 files changed, 0 insertions(+), 8 deletions(-) + +commit 1fec2e02597926de3921da4b462610779a1333bf +Author: Guido Günther <agx@sigxcpu.org> +Date: Tue Sep 6 12:37:28 2011 +0200 + + Bump version to 3.1.91 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletions(-) + +commit becb3cadc883efcd444b9ffbccdd5ac535062feb +Author: Guido Günther <agx@sigxcpu.org> +Date: Tue Sep 6 10:53:37 2011 +0200 + + Remove items moved to ticket dialog + + src/ka-applet.c | 50 +------------------------------------------------- + 1 files changed, 1 insertions(+), 49 deletions(-) + +commit 3fe50f6c8450f1eb38dbb249c89b92ff51032ed3 +Author: Guido Günther <agx@sigxcpu.org> +Date: Sun Sep 4 21:52:47 2011 +0200 + + Add preferences dialog instead of using the cc-panel + + BZ: #657292 + + Makefile.am | 2 +- + cc-panel/Makefile.am | 55 --- + cc-panel/cc-ka-panel.c | 784 ----------------------------------- + cc-panel/cc-ka-panel.h | 45 -- + cc-panel/gnome-ka-panel.desktop.in | 17 - + cc-panel/ka-module.c | 20 - + cc-panel/ka-panel.ui | 732 --------------------------------- + configure.ac | 1 - + po/POTFILES.in | 4 +- + src/Makefile.am | 2 + + src/ka-applet.c | 3 + + src/ka-main-window.c | 3 +- + src/ka-preferences.c | 689 +++++++++++++++++++++++++++++++ + src/ka-preferences.h | 21 + + src/krb5-auth-dialog.ui | 794 ++++++++++++++++++++++++++++++++++++ + 15 files changed, 1513 insertions(+), 1659 deletions(-) + +commit 58680535a6fb6e860276d05703341f5fc505149c +Author: dmustieles <daniel.mustieles@gmail.com> +Date: Mon Sep 5 13:54:59 2011 +0200 + + Updated Spanish translation + + po/es.po | 81 ++++++++++++++++++++++++++++++++++--------------------------- + 1 files changed, 45 insertions(+), 36 deletions(-) + +commit 030d15751d0ab74b0624680f696248747fd1d562 +Author: Guido Günther <agx@sigxcpu.org> +Date: Sun Sep 4 20:08:28 2011 +0200 + + Wire up about dialog + + src/ka-applet.c | 23 +---------------------- + src/ka-main-window.c | 2 +- + src/ka-tools.c | 28 ++++++++++++++++++++++++++++ + src/ka-tools.h | 1 + + 4 files changed, 31 insertions(+), 23 deletions(-) + +commit 604cd3bbf5ed06f45d06d89c62a13b05c85e6510 +Author: Guido Günther <agx@sigxcpu.org> +Date: Sun Sep 4 19:05:08 2011 +0200 + + Add menu bar to main window + + src/ka-main-window.c | 64 +++++++++++++- + src/ka-main-window.h | 2 +- + src/krb5-auth-dialog.ui | 211 +++++++++++++++++++++++++++++++++++++---------- + 3 files changed, 226 insertions(+), 51 deletions(-) + +commit 88d1f28b5aa86aba5cf4d46f719fe2ca5c9f1040 +Author: Guido Günther <agx@sigxcpu.org> +Date: Sun Sep 4 19:20:12 2011 +0200 + + Name callbacks consistently + + src/ka-applet.c | 24 ++++++++++++------------ + 1 files changed, 12 insertions(+), 12 deletions(-) + +commit 53dfb8407380dd82d32f80c5deed39da1f982cfa +Author: Guido Günther <agx@sigxcpu.org> +Date: Sun Sep 4 18:47:32 2011 +0200 + + Update the main window's ticket list when the ccache changes + + Introduce a krb-ccache-changed signal for that. + + src/ka-applet-priv.h | 4 +++- + src/ka-applet.c | 12 +++++++++--- + src/ka-dbus.c | 2 +- + src/ka-dialog.c | 7 ++++--- + src/ka-main-window.c | 14 +++++++++++++- + src/ka-main-window.h | 4 +++- + 6 files changed, 33 insertions(+), 10 deletions(-) + +commit 47bdf47feaa0a4b5fd9fd05e96f4b1f4a4eca49c +Author: Guido Günther <agx@sigxcpu.org> +Date: Sun Sep 4 15:31:44 2011 +0200 + + Make the tickets dialog the main window + + instead of a dialog + + po/POTFILES.in | 2 +- + src/Makefile.am | 4 +- + src/ka-applet.c | 10 ++-- + src/ka-dialog.c | 2 +- + src/ka-main-window.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++ + src/ka-main-window.h | 40 +++++++++++++++ + src/ka-tickets.c | 116 -------------------------------------------- + src/ka-tickets.h | 39 --------------- + src/krb5-auth-dialog.ui | 61 +++++------------------- + 9 files changed, 184 insertions(+), 213 deletions(-) + +commit 371720a2b70b968dfcaaf5b7de0d0826c985a050 +Author: Guido Günther <agx@sigxcpu.org> +Date: Sun Sep 4 16:05:54 2011 +0200 + + Connect GtkBuilder signals + + src/ka-applet.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit 8c1a20fbfee1c1ed6ad3002e169c939ad9e87477 +Author: Fran Dieguez <fran@openhost.es> +Date: Tue Aug 16 23:00:21 2011 +0200 + + Updated Galician translations + + po/gl.po | 293 +++++++++++++++++++++++++++++++++++--------------------------- + 1 files changed, 166 insertions(+), 127 deletions(-) + +commit 7a7a51829f6fa07470f311b8d090569a9845c791 +Author: Aron Xu <aronxu@gnome.org> +Date: Tue Aug 16 15:22:10 2011 +0000 + + Update Simplified Chinese translation. + + po/zh_CN.po | 413 +++++++++++++++++++++++++++++++--------------------------- + 1 files changed, 221 insertions(+), 192 deletions(-) + +commit f12286399ca209b31ca17d4162fbf99ed6968b36 +Author: Petr Kovar <pkovar@redhat.com> +Date: Fri Jun 10 15:57:05 2011 +0200 + + Fix Czech translation + + po/cs.po | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 905cb444e01794557d038c4547d483a18f2a46cf +Author: Petr Kovar <pkovar@redhat.com> +Date: Fri Jun 10 15:52:51 2011 +0200 + + Update Czech translation by Zdenek Hatas + + po/cs.po | 347 +++++++++++++++++++++++++++++++++----------------------------- + 1 files changed, 187 insertions(+), 160 deletions(-) + commit 2b27db7f8d18d7d6d473a1efd093a1fe0e646981 Author: Guido Günther <agx@sigxcpu.org> Date: Sun Apr 24 15:56:52 2011 +0200 diff --git a/Makefile.am b/Makefile.am index 2ca6c50..ac205d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ NULL = -SUBDIRS = secmem src po etpo icons help examples plugins cc-panel +SUBDIRS = secmem src po etpo icons help examples plugins EXTRA_DIST = \ krb5-auth-dialog.spec \ diff --git a/Makefile.in b/Makefile.in index b15c109..87d8e02 100644 --- a/Makefile.in +++ b/Makefile.in @@ -126,8 +126,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ COMPILER_FLAGS = @COMPILER_FLAGS@ -CONTROL_CENTER_CFLAGS = @CONTROL_CENTER_CFLAGS@ -CONTROL_CENTER_LIBS = @CONTROL_CENTER_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -215,7 +213,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAM_LIBS = @PAM_LIBS@ -PANELS_DIR = @PANELS_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ @@ -293,7 +290,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ NULL = -SUBDIRS = secmem src po etpo icons help examples plugins cc-panel +SUBDIRS = secmem src po etpo icons help examples plugins EXTRA_DIST = \ krb5-auth-dialog.spec \ MAINTAINERS \ @@ -1,3 +1,28 @@ +============== +Version 3.2.0 +============== +* Use GtkApplication +* Turn ticket dialog into the main window that gets shown when + krb5-auth-dialog is invoked multiple times. This makes the + prefs easily accessible. +* Fix crash when displaying empty ticket dialog +* UI translations: + Andrej Žnidaršič (sl) + Mario Blättermann (de) + Zdeněk Hataš (cs) + +============== +Version 3.1.91 +============== +* Move preferences from cc into the app (BZ#657292) +* Update ticket list on ccache changes +* Add menu bar to ticket dialog making help accessible again +* UI translations: + Aron Xu (zh_CN) + dmustieles (es) + Fran Dieguez (gl) + Petr Kovar (cs) + ============= Version 3.0.1 ============= @@ -9199,7 +9199,8 @@ AC_DEFUN([AM_NLS], # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -9245,7 +9246,8 @@ m4_define([_PKG_CONFIG], pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -9293,9 +9295,9 @@ if test $pkg_failed = yes; then AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD diff --git a/cc-panel/Makefile.am b/cc-panel/Makefile.am deleted file mode 100644 index d4d412c..0000000 --- a/cc-panel/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -NULL = - -ccpanelsdir = $(PANELS_DIR) -ccpanels_LTLIBRARIES = libka.la - -libka_la_SOURCES = \ - ka-module.c \ - cc-ka-panel.c \ - $(top_srcdir)/src/ka-gconf-tools.c \ - $(top_srcdir)/src/ka-gconf-tools.h \ - $(top_srcdir)/src/ka-tools.c \ - $(top_srcdir)/src/ka-tools.h \ - cc-ka-panel.h - -INCLUDES = \ - -I$(top_srcdir)/src \ - $(GTK_CFLAGS) \ - $(GCONF_CFLAGS) \ - $(CONTROL_CENTER_CFLAGS) \ - $(WARN_CFLAGS) \ - $(AM_CFLAGS) \ - -DKA_DATA_DIR=\""$(pkgdatadir)"\" \ - -DDATA_DIR=\""$(datadir)"\" \ - -DLOCALE_DIR=\""$(localedir)/"\" \ - $(NULL) - -libka_la_LIBADD = \ - $(GCONF_LIBS) \ - $(GTK_LIBS) \ - $(CONTROL_CENTER_LIBS) \ - $(NULL) - -AM_CPPFLAGS = \ - $(DISABLE_DEPRECATED) \ - $(NULL) - -libka_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)' - -desktopdir = $(datadir)/applications -desktop_in_files = gnome-ka-panel.desktop.in -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) - -@INTLTOOL_DESKTOP_RULE@ - -pkgdatadir = $(datadir)/krb5-auth-dialog -pkgdata_DATA = \ - ka-panel.ui \ - $(NULL) - -CLEANFILES = $(desktop_DATA) - -EXTRA_DIST = \ - $(desktop_in_files) \ - $(pkgdata_DATA) \ - $(NULL) diff --git a/cc-panel/Makefile.in b/cc-panel/Makefile.in deleted file mode 100644 index a18c33d..0000000 --- a/cc-panel/Makefile.in +++ /dev/null @@ -1,723 +0,0 @@ -# Makefile.in generated by automake 1.11.1 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. -# 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = cc-panel -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -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 -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(ccpanelsdir)" "$(DESTDIR)$(desktopdir)" \ - "$(DESTDIR)$(pkgdatadir)" -LTLIBRARIES = $(ccpanels_LTLIBRARIES) -am__DEPENDENCIES_1 = -libka_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_libka_la_OBJECTS = ka-module.lo cc-ka-panel.lo ka-gconf-tools.lo \ - ka-tools.lo -libka_la_OBJECTS = $(am_libka_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) -am__v_lt_0 = --silent -libka_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libka_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -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_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -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_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(libka_la_SOURCES) -DIST_SOURCES = $(libka_la_SOURCES) -DATA = $(desktop_DATA) $(pkgdata_DATA) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkgdatadir = $(datadir)/krb5-auth-dialog -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -COMPILER_FLAGS = @COMPILER_FLAGS@ -CONTROL_CENTER_CFLAGS = @CONTROL_CENTER_CFLAGS@ -CONTROL_CENTER_LIBS = @CONTROL_CENTER_LIBS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -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@ -GMODULE_CFLAGS = @GMODULE_CFLAGS@ -GMODULE_LIBS = @GMODULE_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -HELP_DIR = @HELP_DIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ -KRB5_CFLAGS = @KRB5_CFLAGS@ -KRB5_CONFIG = @KRB5_CONFIG@ -KRB5_LIBS = @KRB5_LIBS@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBCAP = @LIBCAP@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ -NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PAM_LIBS = @PAM_LIBS@ -PANELS_DIR = @PANELS_DIR@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -RANLIB = @RANLIB@ -SC_PKCS11 = @SC_PKCS11@ -SED = @SED@ -SETCAP = @SETCAP@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -WARN_PYTHON_CFLAGS = @WARN_PYTHON_CFLAGS@ -XGETTEXT = @XGETTEXT@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -check_interval = @check_interval@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -minimum_lifetime = @minimum_lifetime@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -NULL = -ccpanelsdir = $(PANELS_DIR) -ccpanels_LTLIBRARIES = libka.la -libka_la_SOURCES = \ - ka-module.c \ - cc-ka-panel.c \ - $(top_srcdir)/src/ka-gconf-tools.c \ - $(top_srcdir)/src/ka-gconf-tools.h \ - $(top_srcdir)/src/ka-tools.c \ - $(top_srcdir)/src/ka-tools.h \ - cc-ka-panel.h - -INCLUDES = \ - -I$(top_srcdir)/src \ - $(GTK_CFLAGS) \ - $(GCONF_CFLAGS) \ - $(CONTROL_CENTER_CFLAGS) \ - $(WARN_CFLAGS) \ - $(AM_CFLAGS) \ - -DKA_DATA_DIR=\""$(pkgdatadir)"\" \ - -DDATA_DIR=\""$(datadir)"\" \ - -DLOCALE_DIR=\""$(localedir)/"\" \ - $(NULL) - -libka_la_LIBADD = \ - $(GCONF_LIBS) \ - $(GTK_LIBS) \ - $(CONTROL_CENTER_LIBS) \ - $(NULL) - -AM_CPPFLAGS = \ - $(DISABLE_DEPRECATED) \ - $(NULL) - -libka_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)' -desktopdir = $(datadir)/applications -desktop_in_files = gnome-ka-panel.desktop.in -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -pkgdata_DATA = \ - ka-panel.ui \ - $(NULL) - -CLEANFILES = $(desktop_DATA) -EXTRA_DIST = \ - $(desktop_in_files) \ - $(pkgdata_DATA) \ - $(NULL) - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cc-panel/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu cc-panel/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-ccpanelsLTLIBRARIES: $(ccpanels_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(ccpanelsdir)" || $(MKDIR_P) "$(DESTDIR)$(ccpanelsdir)" - @list='$(ccpanels_LTLIBRARIES)'; test -n "$(ccpanelsdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(ccpanelsdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(ccpanelsdir)"; \ - } - -uninstall-ccpanelsLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(ccpanels_LTLIBRARIES)'; test -n "$(ccpanelsdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(ccpanelsdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(ccpanelsdir)/$$f"; \ - done - -clean-ccpanelsLTLIBRARIES: - -test -z "$(ccpanels_LTLIBRARIES)" || rm -f $(ccpanels_LTLIBRARIES) - @list='$(ccpanels_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libka.la: $(libka_la_OBJECTS) $(libka_la_DEPENDENCIES) - $(AM_V_CCLD)$(libka_la_LINK) -rpath $(ccpanelsdir) $(libka_la_OBJECTS) $(libka_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-ka-panel.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ka-gconf-tools.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ka-module.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ka-tools.Plo@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@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(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@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(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@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -ka-gconf-tools.lo: $(top_srcdir)/src/ka-gconf-tools.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ka-gconf-tools.lo -MD -MP -MF $(DEPDIR)/ka-gconf-tools.Tpo -c -o ka-gconf-tools.lo `test -f '$(top_srcdir)/src/ka-gconf-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/ka-gconf-tools.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ka-gconf-tools.Tpo $(DEPDIR)/ka-gconf-tools.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/ka-gconf-tools.c' object='ka-gconf-tools.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ka-gconf-tools.lo `test -f '$(top_srcdir)/src/ka-gconf-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/ka-gconf-tools.c - -ka-tools.lo: $(top_srcdir)/src/ka-tools.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ka-tools.lo -MD -MP -MF $(DEPDIR)/ka-tools.Tpo -c -o ka-tools.lo `test -f '$(top_srcdir)/src/ka-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/ka-tools.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ka-tools.Tpo $(DEPDIR)/ka-tools.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/ka-tools.c' object='ka-tools.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ka-tools.lo `test -f '$(top_srcdir)/src/ka-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/ka-tools.c - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-desktopDATA: $(desktop_DATA) - @$(NORMAL_INSTALL) - test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" - @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ - 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)$(desktopdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \ - done - -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) - @$(NORMAL_INSTALL) - test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" - @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ - 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 $$?; \ - done - -uninstall-pkgdataDATA: - @$(NORMAL_UNINSTALL) - @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)$(pkgdatadir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files - -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) - 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; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$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; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) $(DATA) -installdirs: - for dir in "$(DESTDIR)$(ccpanelsdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(pkgdatadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-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 -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-ccpanelsLTLIBRARIES clean-generic clean-libtool \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-ccpanelsLTLIBRARIES install-desktopDATA \ - install-pkgdataDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-ccpanelsLTLIBRARIES uninstall-desktopDATA \ - uninstall-pkgdataDATA - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean \ - clean-ccpanelsLTLIBRARIES 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 \ - install-ccpanelsLTLIBRARIES install-data install-data-am \ - install-desktopDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-pkgdataDATA install-ps install-ps-am 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-ccpanelsLTLIBRARIES \ - uninstall-desktopDATA uninstall-pkgdataDATA - - -@INTLTOOL_DESKTOP_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/cc-panel/cc-ka-panel.c b/cc-panel/cc-ka-panel.c deleted file mode 100644 index c63e4e3..0000000 --- a/cc-panel/cc-ka-panel.c +++ /dev/null @@ -1,784 +0,0 @@ -/* - * Copyright (C) 2011 Guido Guenther <agx@sigxcpu.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#include "config.h" -#include "cc-ka-panel.h" - -#include "ka-gconf-tools.h" -#include "ka-tools.h" - -#include <glib/gi18n.h> - -G_DEFINE_DYNAMIC_TYPE (CcKaPanel, cc_ka_panel, CC_TYPE_PANEL) - -#define GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_KA_PANEL, CcKaPanelPrivate)) - -#define WID(b, w) (GtkWidget *) gtk_builder_get_object (b, w) - -#define PKINIT_SMARTCARD "PKCS11:" SC_PKCS11 -#define PKINIT_FILE "FILE:" - -#define N_LISTENERS 7 - -typedef struct _CcKaPanelPrivate CcKaPanelPrivate; - -struct _CcKaPanelPrivate { - GtkBuilder *builder; - - GConfClient *client; - - GtkWidget *notebook; - GtkWidget *principal_entry; - GtkWidget *pkuserid_entry; - GtkWidget *pkuserid_button; - GtkWidget *smartcard_toggle; - GtkWidget *pkanchors_entry; - GtkWidget *pkanchors_button; - GtkWidget *forwardable_toggle; - GtkWidget *proxiable_toggle; - GtkWidget *renewable_toggle; - GtkWidget *prompt_mins_entry; - - guint listeners [N_LISTENERS]; - int n_listeners; -}; - -static void -cc_ka_panel_principal_notify (GConfClient *client G_GNUC_UNUSED, - guint cnx_id G_GNUC_UNUSED, - GConfEntry *entry, - CcKaPanelPrivate *priv) -{ - const char *principal; - - if (!entry->value || entry->value->type != GCONF_VALUE_STRING) - return; - - principal = gconf_value_get_string (entry->value); - - if (!principal || !strlen(principal)) - gtk_entry_set_text (GTK_ENTRY (priv->principal_entry), ""); - else { - const char *old_principal; - - old_principal = gtk_entry_get_text (GTK_ENTRY (priv->principal_entry)); - if (!old_principal || (old_principal && strcmp (old_principal, principal))) - gtk_entry_set_text (GTK_ENTRY (priv->principal_entry), principal); - } -} - -static void -cc_ka_panel_principal_changed (GtkEntry *entry, - CcKaPanelPrivate *priv) -{ - const char *principal; - - principal = gtk_entry_get_text (entry); - - if (!principal || !strlen(principal)) - gconf_client_unset (priv->client, KA_GCONF_KEY_PRINCIPAL, NULL); - else - gconf_client_set_string (priv->client, KA_GCONF_KEY_PRINCIPAL, principal, NULL); -} - - -static void -cc_ka_panel_setup_principal_entry (CcKaPanelPrivate *priv) -{ - char *principal = NULL; - - priv->principal_entry = WID (priv->builder, "principal_entry"); - g_assert (priv->principal_entry != NULL); - - if (!ka_gconf_get_string (priv->client, KA_GCONF_KEY_PRINCIPAL, &principal)) - g_warning ("Getting principal failed"); - - if (principal && strlen(principal)) - gtk_entry_set_text (GTK_ENTRY (priv->principal_entry), principal); - if (principal) - g_free (principal); - - g_signal_connect (priv->principal_entry, "changed", - G_CALLBACK (cc_ka_panel_principal_changed), priv); - - if (!gconf_client_key_is_writable (priv->client, KA_GCONF_KEY_PRINCIPAL, NULL)) { - gtk_widget_set_sensitive (priv->principal_entry, FALSE); - } - - priv->listeners [priv->n_listeners] = - gconf_client_notify_add (priv->client, - KA_GCONF_KEY_PRINCIPAL, - (GConfClientNotifyFunc) cc_ka_panel_principal_notify, - priv, NULL, NULL); - priv->n_listeners++; -} - - -static void -cc_ka_panel_pkuserid_notify (GConfClient *client G_GNUC_UNUSED, - guint cnx_id G_GNUC_UNUSED, - GConfEntry *entry, - CcKaPanelPrivate *priv) -{ - const char *pkuserid; - - if (!entry->value || entry->value->type != GCONF_VALUE_STRING) - return; - - pkuserid = gconf_value_get_string (entry->value); - - if (!pkuserid || !strlen(pkuserid)) - gtk_entry_set_text (GTK_ENTRY (priv->pkuserid_entry), ""); - else { - const char *old_pkuserid; - - old_pkuserid = gtk_entry_get_text (GTK_ENTRY (priv->pkuserid_entry)); - if (!old_pkuserid || (old_pkuserid && strcmp (old_pkuserid, pkuserid))) - gtk_entry_set_text (GTK_ENTRY (priv->pkuserid_entry), pkuserid); - } -} - - -static void -cc_ka_panel_pkuserid_changed (GtkEntry *entry, - CcKaPanelPrivate *priv) -{ - const char *pkuserid; - - pkuserid = gtk_entry_get_text (entry); - - if (!pkuserid || !strlen(pkuserid)) - gconf_client_unset (priv->client, KA_GCONF_KEY_PK_USERID, NULL); - else - gconf_client_set_string (priv->client, KA_GCONF_KEY_PK_USERID, pkuserid, NULL); -} - - -static void -cc_ka_panel_setup_pkuserid_entry (CcKaPanelPrivate *priv) -{ - char *pkuserid = NULL; - - priv->pkuserid_entry = WID(priv->builder, "pkuserid_entry"); - g_assert (priv->pkuserid_entry != NULL); - - if (!ka_gconf_get_string (priv->client, KA_GCONF_KEY_PK_USERID, &pkuserid)) - g_warning ("Getting pkuserid failed"); - - if (pkuserid && strlen(pkuserid)) - gtk_entry_set_text (GTK_ENTRY (priv->pkuserid_entry), pkuserid); - if (pkuserid) - g_free (pkuserid); - - g_signal_connect (priv->pkuserid_entry, "changed", - G_CALLBACK (cc_ka_panel_pkuserid_changed), priv); - if (!gconf_client_key_is_writable (priv->client, KA_GCONF_KEY_PK_USERID, NULL)) { - gtk_widget_set_sensitive (priv->pkuserid_entry, FALSE); - } - - priv->listeners [priv->n_listeners] = - gconf_client_notify_add (priv->client, - KA_GCONF_KEY_PK_USERID, - (GConfClientNotifyFunc) cc_ka_panel_pkuserid_notify, - priv, NULL, NULL); - priv->n_listeners++; -} - - -static void -ka_preferences_pkanchors_notify (GConfClient *client G_GNUC_UNUSED, - guint cnx_id G_GNUC_UNUSED, - GConfEntry *entry, - CcKaPanelPrivate *priv) -{ - const char *pkanchors; - - if (!entry->value || entry->value->type != GCONF_VALUE_STRING) - return; - - pkanchors = gconf_value_get_string (entry->value); - - if (!pkanchors || !strlen(pkanchors)) - gtk_entry_set_text (GTK_ENTRY (priv->pkanchors_entry), ""); - else { - const char *old_pkanchors; - - old_pkanchors = gtk_entry_get_text (GTK_ENTRY (priv->pkanchors_entry)); - if (!old_pkanchors || (old_pkanchors && strcmp (old_pkanchors, pkanchors))) - gtk_entry_set_text (GTK_ENTRY (priv->pkanchors_entry), pkanchors); - } -} - - -static void -cc_ka_panel_pkanchors_changed (GtkEntry *entry, - CcKaPanelPrivate *priv) -{ - const char *pkanchors; - - pkanchors = gtk_entry_get_text (entry); - - if (!pkanchors || !strlen(pkanchors)) - gconf_client_unset (priv->client, KA_GCONF_KEY_PK_ANCHORS, NULL); - else - gconf_client_set_string (priv->client, KA_GCONF_KEY_PK_ANCHORS, - pkanchors, NULL); -} - - -static void -cc_ka_panel_setup_pkanchors_entry (CcKaPanelPrivate *priv) -{ - char *pkanchors = NULL; - - priv->pkanchors_entry = WID(priv->builder, "pkanchors_entry"); - g_assert (priv->pkanchors_entry != NULL); - - if (!ka_gconf_get_string (priv->client, KA_GCONF_KEY_PK_ANCHORS, &pkanchors)) - g_warning ("Getting pkanchors failed"); - - if (pkanchors && strlen(pkanchors)) - gtk_entry_set_text (GTK_ENTRY (priv->pkanchors_entry), pkanchors); - if (pkanchors) - g_free (pkanchors); - - g_signal_connect (priv->pkanchors_entry, "changed", - G_CALLBACK (cc_ka_panel_pkanchors_changed), priv); - if (!gconf_client_key_is_writable (priv->client, KA_GCONF_KEY_PK_ANCHORS, NULL)) { - gtk_widget_set_sensitive (priv->pkanchors_entry, FALSE); - } - - priv->listeners [priv->n_listeners] = - gconf_client_notify_add (priv->client, - KA_GCONF_KEY_PK_ANCHORS, - (GConfClientNotifyFunc) ka_preferences_pkanchors_notify, - priv, NULL, NULL); - priv->n_listeners++; -} - - -static void -ka_preferences_toggle_pkuserid_entry (gboolean state, CcKaPanelPrivate *priv) -{ - gtk_widget_set_sensitive (priv->pkuserid_entry, state); - gtk_widget_set_sensitive (priv->pkuserid_button, state); -} - - -static void -cc_ka_panel_smartcard_toggled (GtkToggleButton *toggle, - CcKaPanelPrivate *priv) -{ - gboolean smartcard = gtk_toggle_button_get_active (toggle); - static gchar *old_path = NULL; - - if (smartcard) { - const char *path; - - path = gtk_entry_get_text (GTK_ENTRY(priv->pkuserid_entry)); - if (g_strcmp0 (path, PKINIT_SMARTCARD)) { - g_free (old_path); - old_path = g_strdup (path); - } - ka_preferences_toggle_pkuserid_entry (FALSE, priv); - gconf_client_set_string (priv->client, KA_GCONF_KEY_PK_USERID, PKINIT_SMARTCARD, NULL); - } else { - ka_preferences_toggle_pkuserid_entry (TRUE, priv); - if (old_path) - gconf_client_set_string (priv->client, KA_GCONF_KEY_PK_USERID, old_path, NULL); - else - gconf_client_unset (priv->client, KA_GCONF_KEY_PK_USERID, NULL); - } -} - - -static void -cc_ka_panel_setup_smartcard_toggle(CcKaPanelPrivate *priv) -{ - char *pkuserid = NULL; - - priv->smartcard_toggle = WID (priv->builder, "smartcard_toggle"); - g_assert (priv->smartcard_toggle != NULL); - - if (!ka_gconf_get_string (priv->client, KA_GCONF_KEY_PK_USERID, &pkuserid)) - g_warning ("Getting pkanchors failed"); - - g_signal_connect (priv->smartcard_toggle, "toggled", - G_CALLBACK (cc_ka_panel_smartcard_toggled), priv); - - if (!g_strcmp0 (pkuserid, PKINIT_SMARTCARD)) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->smartcard_toggle), TRUE); - else - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->smartcard_toggle), FALSE); - - if (pkuserid) - g_free (pkuserid); -} - - -static void -cc_ka_panel_browse_certs (CcKaPanelPrivate *priv, GtkEntry *entry) -{ - GtkWidget *filechooser; - GtkFileFilter *cert_filter, *all_filter; - gchar *filename = NULL; - const gchar *current; - gint ret; - - filechooser = gtk_file_chooser_dialog_new(_("Choose Certificate"), - GTK_WINDOW (gtk_widget_get_toplevel (priv->notebook)), - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - NULL); - - current = gtk_entry_get_text (entry); - if (current && g_str_has_prefix (current, PKINIT_FILE) && - strlen(current) > strlen (PKINIT_FILE)) { - gtk_file_chooser_select_filename (GTK_FILE_CHOOSER(filechooser), - (const gchar*)¤t[strlen(PKINIT_FILE)]); - } - - cert_filter = g_object_ref_sink (gtk_file_filter_new ()); - gtk_file_filter_add_mime_type (cert_filter, "application/x-x509-ca-cert"); - gtk_file_filter_set_name (cert_filter, _("X509 Certificates")); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filechooser), cert_filter); - all_filter = g_object_ref_sink (gtk_file_filter_new ()); - gtk_file_filter_add_pattern (all_filter, "*"); - gtk_file_filter_set_name (all_filter, _("all files")); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filechooser), all_filter); - - ret = gtk_dialog_run (GTK_DIALOG(filechooser)); - if (ret == GTK_RESPONSE_ACCEPT) - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(filechooser)); - gtk_widget_destroy (GTK_WIDGET(filechooser)); - - if (filename) { - gchar *cert = g_strconcat( PKINIT_FILE, filename, NULL); - gtk_entry_set_text (entry, cert); - g_free (filename); - g_free (cert); - } - g_object_unref (cert_filter); - g_object_unref (all_filter); -} - -static void -cc_ka_panel_browse_pkuserids (GtkButton *button G_GNUC_UNUSED, - CcKaPanelPrivate *priv) -{ - cc_ka_panel_browse_certs (priv, - GTK_ENTRY(priv->pkuserid_entry)); -} - -static void -cc_ka_panel_browse_pkanchors(GtkButton *button G_GNUC_UNUSED, - CcKaPanelPrivate *priv) -{ - cc_ka_panel_browse_certs (priv, - GTK_ENTRY(priv->pkanchors_entry)); -} - -static void -cc_ka_panel_setup_pkuserid_button (CcKaPanelPrivate *priv) -{ - priv->pkuserid_button = WID (priv->builder, "pkuserid_button"); - g_assert (priv->pkuserid_button != NULL); - - g_signal_connect (priv->pkuserid_button, "clicked", - G_CALLBACK (cc_ka_panel_browse_pkuserids), priv); - -} - -static void -cc_ka_panel_setup_pkanchors_button (CcKaPanelPrivate *priv) -{ - priv->pkanchors_button = WID (priv->builder, "pkanchors_button"); - g_assert (priv->pkanchors_button != NULL); - - g_signal_connect (priv->pkanchors_button, "clicked", - G_CALLBACK (cc_ka_panel_browse_pkanchors), priv); - -} - - -static void -cc_ka_panel_forwardable_toggled (GtkToggleButton *toggle, - CcKaPanelPrivate *priv) -{ - gboolean forwardable; - - forwardable = gtk_toggle_button_get_active (toggle); - - gconf_client_set_bool (priv->client, KA_GCONF_KEY_FORWARDABLE, forwardable, NULL); -} - - -static void -cc_ka_panel_forwardable_notify (GConfClient *client G_GNUC_UNUSED, - guint cnx_id G_GNUC_UNUSED, - GConfEntry *entry, - CcKaPanelPrivate *priv) -{ - 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 (priv->forwardable_toggle))) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->forwardable_toggle), forwardable); -} - - -static gboolean -cc_ka_panel_setup_forwardable_toggle (CcKaPanelPrivate *priv) -{ - gboolean forwardable; - - priv->forwardable_toggle = WID (priv->builder, "forwardable_toggle"); - g_assert (priv->forwardable_toggle != NULL); - - forwardable = gconf_client_get_bool (priv->client, KA_GCONF_KEY_FORWARDABLE, NULL); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->forwardable_toggle), forwardable); - - g_signal_connect (priv->forwardable_toggle, "toggled", - G_CALLBACK (cc_ka_panel_forwardable_toggled), priv); - - if (!gconf_client_key_is_writable (priv->client, KA_GCONF_KEY_FORWARDABLE, NULL)) { - gtk_widget_set_sensitive (priv->forwardable_toggle, FALSE); - } - - priv->listeners [priv->n_listeners] = - gconf_client_notify_add (priv->client, - KA_GCONF_KEY_FORWARDABLE, - (GConfClientNotifyFunc) cc_ka_panel_forwardable_notify, - priv, NULL, NULL); - priv->n_listeners++; - return forwardable; -} - - -static void -cc_ka_panel_proxiable_toggled (GtkToggleButton *toggle, - CcKaPanelPrivate *priv) -{ - gboolean proxiable; - - proxiable = gtk_toggle_button_get_active (toggle); - - gconf_client_set_bool (priv->client, KA_GCONF_KEY_PROXIABLE, proxiable, NULL); -} - - -static void -cc_ka_panel_proxiable_notify (GConfClient *client G_GNUC_UNUSED, - guint cnx_id G_GNUC_UNUSED, - GConfEntry *entry, - CcKaPanelPrivate *priv) -{ - 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 (priv->proxiable_toggle))) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->proxiable_toggle), proxiable); -} - - -static gboolean -cc_ka_panel_setup_proxiable_toggle (CcKaPanelPrivate *priv) -{ - gboolean proxiable; - - priv->proxiable_toggle = WID (priv->builder, "proxiable_toggle"); - g_assert (priv->proxiable_toggle != NULL); - - proxiable = gconf_client_get_bool (priv->client, KA_GCONF_KEY_PROXIABLE, NULL); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->proxiable_toggle), proxiable); - - g_signal_connect (priv->proxiable_toggle, "toggled", - G_CALLBACK (cc_ka_panel_proxiable_toggled), priv); - - if (!gconf_client_key_is_writable (priv->client, KA_GCONF_KEY_PROXIABLE, NULL)) { - gtk_widget_set_sensitive (priv->proxiable_toggle, FALSE); - } - - priv->listeners [priv->n_listeners] = - gconf_client_notify_add (priv->client, - KA_GCONF_KEY_PROXIABLE, - (GConfClientNotifyFunc) cc_ka_panel_proxiable_notify, - priv, NULL, NULL); - priv->n_listeners++; - return proxiable; -} - - -static void -cc_ka_panel_renewable_toggled (GtkToggleButton *toggle, - CcKaPanelPrivate *priv) -{ - gboolean renewable; - - renewable = gtk_toggle_button_get_active (toggle); - - gconf_client_set_bool (priv->client, KA_GCONF_KEY_RENEWABLE, renewable, NULL); -} - - -static void -cc_ka_panel_renewable_notify (GConfClient *client G_GNUC_UNUSED, - guint cnx_id G_GNUC_UNUSED, - GConfEntry *entry, - CcKaPanelPrivate *priv) -{ - 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 (priv->renewable_toggle))) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->renewable_toggle), renewable); -} - - -static gboolean -cc_ka_panel_setup_renewable_toggle (CcKaPanelPrivate *priv) -{ - gboolean renewable; - - priv->renewable_toggle = WID (priv->builder, "renewable_toggle"); - g_assert (priv->renewable_toggle != NULL); - - renewable = gconf_client_get_bool (priv->client, KA_GCONF_KEY_RENEWABLE, NULL); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->renewable_toggle), renewable); - - g_signal_connect (priv->renewable_toggle, "toggled", - G_CALLBACK (cc_ka_panel_renewable_toggled), priv); - - if (!gconf_client_key_is_writable (priv->client, KA_GCONF_KEY_RENEWABLE, NULL)) { - gtk_widget_set_sensitive (priv->renewable_toggle, FALSE); - } - - priv->listeners [priv->n_listeners] = - gconf_client_notify_add (priv->client, - KA_GCONF_KEY_RENEWABLE, - (GConfClientNotifyFunc) cc_ka_panel_renewable_notify, - priv, NULL, NULL); - priv->n_listeners++; - return renewable; -} - - -static void -cc_ka_panel_prompt_mins_changed (GtkSpinButton *button, - CcKaPanelPrivate *priv) -{ - gint prompt_mins; - - prompt_mins = gtk_spin_button_get_value_as_int (button); - gconf_client_set_int (priv->client, KA_GCONF_KEY_PROMPT_MINS, prompt_mins, NULL); -} - - -static void -cc_ka_panel_prompt_mins_notify (GConfClient *client G_GNUC_UNUSED, - guint cnx_id G_GNUC_UNUSED, - GConfEntry *entry, - CcKaPanelPrivate *priv) -{ - 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 (priv->prompt_mins_entry))) - gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->prompt_mins_entry), prompt_mins); -} - - -static gint -cc_ka_panel_setup_prompt_mins_entry (CcKaPanelPrivate *priv) -{ - gint prompt_mins; - - priv->prompt_mins_entry = WID (priv->builder, "prompt_mins_entry"); - g_assert (priv->prompt_mins_entry != NULL); - - prompt_mins = gconf_client_get_int (priv->client, KA_GCONF_KEY_PROMPT_MINS, NULL); - - gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->prompt_mins_entry), prompt_mins); - - g_signal_connect (priv->prompt_mins_entry, "value-changed", - G_CALLBACK (cc_ka_panel_prompt_mins_changed), priv); - - if (!gconf_client_key_is_writable (priv->client, KA_GCONF_KEY_PROMPT_MINS, NULL)) { - gtk_widget_set_sensitive (priv->prompt_mins_entry, FALSE); - } - - priv->listeners [priv->n_listeners] = - gconf_client_notify_add (priv->client, - KA_GCONF_KEY_PROMPT_MINS, - (GConfClientNotifyFunc) cc_ka_panel_prompt_mins_notify, - priv, NULL, NULL); - priv->n_listeners++; - return prompt_mins; -} - -static void -cc_ka_panel_get_property (GObject *self, - guint property_id, - GValue *value G_GNUC_UNUSED, - GParamSpec *pspec) -{ - switch (property_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (self, property_id, pspec); - } -} - -static void -cc_ka_panel_set_property (GObject *self, - guint property_id, - const GValue *value G_GNUC_UNUSED, - GParamSpec *pspec) -{ - switch (property_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (self, property_id, pspec); - } -} - -static void -cc_ka_panel_dispose (GObject *self) -{ - CcKaPanelPrivate *priv = GET_PRIVATE (self); - - if (priv->builder != NULL) { - g_object_unref (priv->builder); - priv->builder = NULL; - } - G_OBJECT_CLASS (cc_ka_panel_parent_class)->dispose (self); -} - -static void -cc_ka_panel_finalize (GObject *self) -{ - CcKaPanelPrivate *priv = GET_PRIVATE (self); - - if (priv->client) { - int i; - - for (i = 0; i < priv->n_listeners; i++) { - if (priv->listeners [i]) - gconf_client_notify_remove (priv->client, priv->listeners [i]); - priv->listeners [i] = 0; - } - priv->n_listeners = 0; - - gconf_client_remove_dir (priv->client, KA_GCONF_PATH, NULL); - - g_object_unref (priv->client); - priv->client = NULL; - } - - G_OBJECT_CLASS (cc_ka_panel_parent_class)->finalize (self); -} - -static void -cc_ka_panel_class_init (CcKaPanelClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (CcKaPanelPrivate)); - - object_class->get_property = cc_ka_panel_get_property; - object_class->set_property = cc_ka_panel_set_property; - object_class->dispose = cc_ka_panel_dispose; - object_class->finalize = cc_ka_panel_finalize; -} - -static void -cc_ka_panel_class_finalize (CcKaPanelClass *klass G_GNUC_UNUSED) -{ -} - -static void -cc_ka_panel_init (CcKaPanel *self) -{ - GError *error = NULL; - - CcKaPanelPrivate *priv = GET_PRIVATE (self); - - priv->builder = gtk_builder_new (); - gtk_builder_add_from_file(priv->builder, KA_DATA_DIR G_DIR_SEPARATOR_S - "ka-panel.ui", &error); - if (error != NULL) { - g_warning ("Could not load interface file: %s", error->message); - g_error_free (error); - return; - - } - priv->client = gconf_client_get_default (); - gconf_client_add_dir (priv->client, KA_GCONF_PATH, - GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); - - cc_ka_panel_setup_principal_entry (priv); - cc_ka_panel_setup_pkuserid_entry (priv); - cc_ka_panel_setup_pkuserid_button (priv); - cc_ka_panel_setup_smartcard_toggle (priv); - cc_ka_panel_setup_pkanchors_entry(priv); - cc_ka_panel_setup_pkanchors_button (priv); - cc_ka_panel_setup_forwardable_toggle (priv); - cc_ka_panel_setup_proxiable_toggle (priv); - cc_ka_panel_setup_renewable_toggle (priv); - cc_ka_panel_setup_prompt_mins_entry (priv); - - g_assert (priv->n_listeners == N_LISTENERS); - - priv->notebook = WID (priv->builder, "ka_notebook"); - gtk_widget_reparent (priv->notebook, (GtkWidget *) self); - - gtk_widget_show (priv->notebook); -} - -void -cc_ka_panel_register (GIOModule *module) -{ - cc_ka_panel_register_type (G_TYPE_MODULE (module)); - g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT, - CC_TYPE_KA_PANEL, - "ka-panel", 0); -} - -/* - * vim:ts:sts=4:sw=4:et: - */ diff --git a/cc-panel/cc-ka-panel.h b/cc-panel/cc-ka-panel.h deleted file mode 100644 index d8fdda0..0000000 --- a/cc-panel/cc-ka-panel.h +++ /dev/null @@ -1,45 +0,0 @@ -/* cc-ka-panel.h */ - -#ifndef _CC_KA_PANEL -#define _CC_KA_PANEL - -#include <libgnome-control-center/cc-panel.h> - -G_BEGIN_DECLS - -#define CC_TYPE_KA_PANEL cc_ka_panel_get_type() - -#define CC_KA_PANEL(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj),CC_TYPE_KA_PANEL, CcKaPanel)) - -#define CC_KA_PANEL_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), CC_TYPE_KA_PANEL, CcKaPanelClass)) - -#define CC_IS_KA_PANEL(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CC_TYPE_KA_PANEL)) - -#define CC_IS_KA_PANEL_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), CC_TYPE_KA_PANEL)) - -#define CC_KA_PANEL_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), CC_TYPE_KA_PANEL, CcKaPanelClass)) - -typedef struct { - CcPanel parent; -} CcKaPanel; - -typedef struct { - CcPanelClass parent_class; -} CcKaPanelClass; - -GType cc_ka_panel_get_type (void) G_GNUC_CONST; - -void cc_ka_panel_register (GIOModule *module); - -G_END_DECLS - -#endif /* _CC_KA_PANEL */ - -/* - * vim:ts:sts=4:sw=4:et: - */ diff --git a/cc-panel/gnome-ka-panel.desktop.in b/cc-panel/gnome-ka-panel.desktop.in deleted file mode 100644 index 753ed59..0000000 --- a/cc-panel/gnome-ka-panel.desktop.in +++ /dev/null @@ -1,17 +0,0 @@ -[Desktop Entry] -_Name=Kerberos Authentication -_Comment=Set your Kerberos network authentication preferences -Exec=gnome-ka-properties -Icon=krb-valid-ticket -Terminal=false -Type=Application -StartupNotify=true -# The X-GNOME-Settings-Panel is necessary to show in the main shell UI -Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel; -OnlyShowIn=GNOME; -X-GNOME-Settings-Panel=ka-panel -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=krb5-auth-dialog -X-GNOME-Bugzilla-Component=general -# Translators: those are keywords for the Kerberos authentication control-center panel -_X-GNOME-Keywords=Kerberos;Authentication diff --git a/cc-panel/ka-module.c b/cc-panel/ka-module.c deleted file mode 100644 index 17ab5bd..0000000 --- a/cc-panel/ka-module.c +++ /dev/null @@ -1,20 +0,0 @@ -#include <config.h> - -#include "cc-ka-panel.h" - -#include <glib/gi18n.h> - -void -g_io_module_load (GIOModule *module) -{ - bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - - /* register the panel */ - cc_ka_panel_register (module); -} - -void -g_io_module_unload (GIOModule *module G_GNUC_UNUSED) -{ -} diff --git a/cc-panel/ka-panel.ui b/cc-panel/ka-panel.ui deleted file mode 100644 index 54f24ac..0000000 --- a/cc-panel/ka-panel.ui +++ /dev/null @@ -1,732 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<interface> - <!-- interface-requires gtk+ 3.0 --> - <object class="GtkAdjustment" id="adjustment1"> - <property name="upper">1000</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkWindow" id="window1"> - <property name="can_focus">False</property> - <child> - <object class="GtkNotebook" id="ka_notebook"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkVBox" id="vbox_kerberos"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="spacing">18</property> - <child> - <object class="GtkVBox" id="vbox_kerberos_user"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label_kerberos_user"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Kerberos User</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkImage" id="access"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="yalign">0</property> - <property name="icon_name">krb-valid-ticket</property> - <property name="icon-size">6</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkFrame" id="frame_princ"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">5</property> - <property name="left_padding">12</property> - <child> - <object class="GtkEntry" id="principal_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">The name of your Kerberos account. Leave blank to use your current username.</property> - <property name="invisible_char">●</property> - <property name="activates_default">True</property> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Kerberos principal:</property> - <property name="use_markup">True</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox_ticket_options"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Kerberos Ticket Options</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="yalign">0</property> - <property name="stock">gtk-properties</property> - <property name="icon-size">6</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Requested Kerberos tickets should be:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkLabel" id="label11"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label"> </property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="forwardable_toggle"> - <property name="label" translatable="yes">forwardable</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, request forwardable tickets</property> - <property name="use_action_appearance">False</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkLabel" id="label12"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label"> </property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="renewable_toggle"> - <property name="label" translatable="yes">renewable</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, request renewable tickets</property> - <property name="use_action_appearance">False</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox11"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkLabel" id="label19"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label"> </property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="proxiable_toggle"> - <property name="label" translatable="yes">proxiable</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, request proxiable tickets</property> - <property name="use_action_appearance">False</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Kerberos</property> - </object> - <packing> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox_pkinit"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="border_width">12</property> - <property name="spacing">18</property> - <child> - <object class="GtkVBox" id="vbox_pkinit_userid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label_pkinit_userid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Userid</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkImage" id="access1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="yalign">0</property> - <property name="icon_name">krb-valid-ticket</property> - <property name="icon-size">6</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox12"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkVBox" id="vbox11"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkHBox" id="hbox7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkCheckButton" id="smartcard_toggle"> - <property name="label" translatable="yes">Use Smartcard</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="has_tooltip">True</property> - <property name="tooltip_markup" translatable="yes">If checked, use a security token (Smartcard) to authenticate.</property> - <property name="tooltip_text" translatable="yes">If checked, use a security token (Smartcard) to authenticate.</property> - <property name="use_action_appearance">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox13"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkEntry" id="pkuserid_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_tooltip">True</property> - <property name="tooltip_markup" translatable="yes">Certificate and private key used for authentication</property> - <property name="tooltip_text" translatable="yes">Certificate and private key used for authentication</property> - <property name="invisible_char">●</property> - <property name="activates_default">True</property> - <property name="invisible_char_set">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="pkuserid_button"> - <property name="label" translatable="yes">_Browse...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox_anchors"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label_anchors"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">X509 trust anchors</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkEntry" id="pkanchors_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Certificate used to verify digital signatures.</property> - <property name="invisible_char">●</property> - <property name="activates_default">True</property> - <property name="invisible_char_set">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="pkanchors_button"> - <property name="label" translatable="yes">_Browse...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="label_pkinit"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Configure the use of certificates and smartcards for your Kerberos network authentication.</property> - <property name="label" translatable="yes">PKINIT</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox_notifications"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="spacing">18</property> - <child> - <object class="GtkVBox" id="vbox8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label17"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Notifications</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkImage" id="image_notifications"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="yalign">0</property> - <property name="icon_name">krb-expiring-ticket</property> - <property name="icon-size">6</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label14"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label"> </property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label15"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" comments="Used in combination: 'Warn x minutes before expiry'">Warn</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="prompt_mins_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Send notification about ticket expiry that many minutes before it finally expires</property> - <property name="invisible_char">●</property> - <property name="adjustment">adjustment1</property> - <property name="snap_to_ticks">True</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label16"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" comments="Used in combination: 'Warn x minutes before expiry'">minutes before ticket expiry</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Notifications</property> - </object> - <packing> - <property name="position">2</property> - <property name="tab_fill">False</property> - </packing> - </child> - </object> - </child> - </object> -</interface> diff --git a/config.guess b/config.guess index c2246a4..40eaed4 100755 --- a/config.guess +++ b/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2009-12-30' +timestamp='2011-05-11' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -57,7 +57,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -181,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -224,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -296,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -395,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -481,8 +484,8 @@ EOF echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -495,7 +498,7 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -552,7 +555,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -595,52 +598,52 @@ EOF 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include <stdlib.h> - #include <unistd.h> + #define _HPUX_SOURCE + #include <stdlib.h> + #include <unistd.h> - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -731,22 +734,22 @@ EOF exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -770,14 +773,14 @@ EOF exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -805,14 +808,14 @@ EOF echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -867,7 +870,7 @@ EOF EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -879,7 +882,13 @@ EOF then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) @@ -892,7 +901,7 @@ EOF echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo frv-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -960,7 +969,7 @@ EOF echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -968,6 +977,9 @@ EOF sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-tilera-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; @@ -975,7 +987,7 @@ EOF echo x86_64-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -984,11 +996,11 @@ EOF echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1020,7 +1032,7 @@ EOF fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1048,13 +1060,13 @@ EOF exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1089,8 +1101,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1133,10 +1145,10 @@ EOF echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says <Richard.M.Bartel@ccMail.Census.GOV> - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says <Richard.M.Bartel@ccMail.Census.GOV> + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes <hewes@openmarket.com>. # How about differentiating between stratus architectures? -djm @@ -1162,11 +1174,11 @@ EOF exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1231,6 +1243,9 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1276,13 +1291,13 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1322,11 +1337,11 @@ main () #include <sys/param.h> printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2010-01-22' +timestamp='2011-03-23' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -76,7 +76,7 @@ version="\ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -124,8 +124,9 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -157,8 +158,8 @@ case $os in os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -174,10 +175,10 @@ case $os in os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -282,11 +283,13 @@ case $basic_machine in | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ | rx \ | score \ @@ -294,15 +297,24 @@ case $basic_machine in | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12 | picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -314,6 +326,18 @@ case $basic_machine in basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -334,7 +358,7 @@ case $basic_machine in | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ @@ -368,26 +392,28 @@ case $basic_machine in | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile-* | tilegx-* \ | tron-* \ | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -412,7 +438,7 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -482,11 +508,20 @@ case $basic_machine in basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -518,7 +553,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -734,7 +769,7 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -841,6 +876,12 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -923,9 +964,10 @@ case $basic_machine in ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1019,6 +1061,9 @@ case $basic_machine in basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1075,20 +1120,8 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - # This must be matched before tile*. - tilegx*) + # This must be matched before tile*. + tilegx*) basic_machine=tilegx-unknown os=-linux-gnu ;; @@ -1163,6 +1196,9 @@ case $basic_machine in xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1260,11 +1296,11 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1301,7 +1337,8 @@ case $os in | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1348,7 +1385,7 @@ case $os in -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1397,7 +1434,7 @@ case $os in -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1442,8 +1479,8 @@ case $os in -dicos*) os=-dicos ;; - -nacl*) - ;; + -nacl*) + ;; -none) ;; *) @@ -1466,10 +1503,10 @@ else # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1481,8 +1518,17 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1509,7 +1555,7 @@ case $basic_machine in m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1536,7 +1582,7 @@ case $basic_machine in *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for krb5-auth-dialog 3.0.1. +# Generated by GNU Autoconf 2.68 for krb5-auth-dialog 3.2.0. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,12 +567,12 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='krb5-auth-dialog' PACKAGE_TARNAME='krb5-auth-dialog' -PACKAGE_VERSION='3.0.1' -PACKAGE_STRING='krb5-auth-dialog 3.0.1' +PACKAGE_VERSION='3.2.0' +PACKAGE_STRING='krb5-auth-dialog 3.2.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' -ac_unique_file="src/ka-dialog.c" +ac_unique_file="src/ka-kerberos.c" # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -621,9 +621,6 @@ minimum_lifetime check_interval LIBCAP SETCAP -PANELS_DIR -CONTROL_CENTER_LIBS -CONTROL_CENTER_CFLAGS ENABLE_NETWORK_MANAGER_FALSE ENABLE_NETWORK_MANAGER_TRUE NETWORK_MANAGER_LIBS @@ -842,7 +839,6 @@ with_help_dir with_omf_dir with_help_formats enable_scrollkeeper -with_gtk with_gconf_source with_gconf_schema_file_dir enable_schemas_install @@ -878,9 +874,7 @@ GMODULE_LIBS LIBNOTIFY_CFLAGS LIBNOTIFY_LIBS NETWORK_MANAGER_CFLAGS -NETWORK_MANAGER_LIBS -CONTROL_CENTER_CFLAGS -CONTROL_CENTER_LIBS' +NETWORK_MANAGER_LIBS' # Initialize some variables set by options. @@ -1423,7 +1417,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures krb5-auth-dialog 3.0.1 to adapt to many kinds of systems. +\`configure' configures krb5-auth-dialog 3.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1494,7 +1488,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of krb5-auth-dialog 3.0.1:";; + short | recursive ) echo "Configuration of krb5-auth-dialog 3.2.0:";; esac cat <<\_ACEOF @@ -1538,7 +1532,6 @@ Optional Packages: --with-omf-dir=DIR path to OMF files --with-help-formats=FORMATS list of formats - --with-gtk=2.0|3.0 which gtk+ version to compile against (default: 3.0) --with-gconf-source=sourceaddress Config database for installing schema files. --with-gconf-schema-file-dir=dir @@ -1587,10 +1580,6 @@ Some influential environment variables: C compiler flags for NETWORK_MANAGER, overriding pkg-config NETWORK_MANAGER_LIBS linker flags for NETWORK_MANAGER, overriding pkg-config - CONTROL_CENTER_CFLAGS - C compiler flags for CONTROL_CENTER, overriding pkg-config - CONTROL_CENTER_LIBS - linker flags for CONTROL_CENTER, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1658,7 +1647,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -krb5-auth-dialog configure 3.0.1 +krb5-auth-dialog configure 3.2.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2080,7 +2069,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by krb5-auth-dialog $as_me 3.0.1, which was +It was created by krb5-auth-dialog $as_me 3.2.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2896,7 +2885,7 @@ fi # Define the identity of the package. PACKAGE='krb5-auth-dialog' - VERSION='3.0.1' + VERSION='3.2.0' cat >>confdefs.h <<_ACEOF @@ -14088,6 +14077,7 @@ $as_echo "yes" >&6; } + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -14285,36 +14275,10 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which gtk+ version to compile against" >&5 -$as_echo_n "checking which gtk+ version to compile against... " >&6; } - -# Check whether --with-gtk was given. -if test "${with_gtk+set}" = set; then : - withval=$with_gtk; case "$with_gtk" in - 2.0|3.0) ;; - *) as_fn_error $? "invalid gtk version specified" "$LINENO" 5 ;; - esac -else - with_gtk=3.0 -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gtk" >&5 -$as_echo "$with_gtk" >&6; } - -case "$with_gtk" in - 2.0) GTK_API_VERSION=2.0 - GTK_REQUIRED=2.18.0 - GLIB_REQUIRED=2.26.0 - GCONF_REQUIRED=2.8 - LIBNOTIFY_REQUIRED=0.4 - ;; - 3.0) GTK_API_VERSION=3.0 - GTK_REQUIRED=2.90.4 - GLIB_REQUIRED=2.26.0 - GCONF_REQUIRED=2.31 - LIBNOTIFY_REQUIRED=0.5.1 - ;; -esac +GTK_REQUIRED=3.0 +GLIB_REQUIRED=2.28 +GCONF_REQUIRED=2.31 +LIBNOTIFY_REQUIRED=0.7.0 pkg_failed=no @@ -14325,12 +14289,13 @@ if test -n "$GTK_CFLAGS"; then pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED, glib-2.0 >= \$GLIB_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED, glib-2.0 >= \$GLIB_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null` + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14341,12 +14306,13 @@ if test -n "$GTK_LIBS"; then pkg_cv_GTK_LIBS="$GTK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED, glib-2.0 >= \$GLIB_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED, glib-2.0 >= \$GLIB_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null` + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14366,14 +14332,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED" 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED) were not met: + as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED) were not met: $GTK_PKG_ERRORS @@ -14420,6 +14386,7 @@ if test -n "$GCONF_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14436,6 +14403,7 @@ if test -n "$GCONF_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14455,9 +14423,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0 >= $GCONF_REQUIRED" 2>&1` + GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gconf-2.0 >= $GCONF_REQUIRED" 2>&1` else - GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0 >= $GCONF_REQUIRED" 2>&1` + GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gconf-2.0 >= $GCONF_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GCONF_PKG_ERRORS" >&5 @@ -14509,6 +14477,7 @@ if test -n "$GIO_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0, gio-unix-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14525,6 +14494,7 @@ if test -n "$GIO_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0, gio-unix-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14544,9 +14514,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0, gio-unix-2.0" 2>&1` + GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0, gio-unix-2.0" 2>&1` else - GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0, gio-unix-2.0" 2>&1` + GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0, gio-unix-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GIO_PKG_ERRORS" >&5 @@ -14598,6 +14568,7 @@ if test -n "$GMODULE_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14614,6 +14585,7 @@ if test -n "$GMODULE_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14633,9 +14605,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmodule-2.0" 2>&1` + GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0" 2>&1` else - GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmodule-2.0" 2>&1` + GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GMODULE_PKG_ERRORS" >&5 @@ -14687,6 +14659,7 @@ if test -n "$LIBNOTIFY_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14703,6 +14676,7 @@ if test -n "$LIBNOTIFY_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14722,9 +14696,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1` + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1` else - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1` + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBNOTIFY_PKG_ERRORS" >&5 @@ -15168,6 +15142,7 @@ if test -n "$NETWORK_MANAGER_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags "libnm-glib >= 0.7.999" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15184,6 +15159,7 @@ if test -n "$NETWORK_MANAGER_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs "libnm-glib >= 0.7.999" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15203,9 +15179,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnm-glib >= 0.7.999" 2>&1` + NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnm-glib >= 0.7.999" 2>&1` else - NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnm-glib >= 0.7.999" 2>&1` + NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnm-glib >= 0.7.999" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$NETWORK_MANAGER_PKG_ERRORS" >&5 @@ -15262,107 +15238,6 @@ CFLAGS="$savedCFLAGS" LIBS="$savedLIBS" - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CONTROL_CENTER" >&5 -$as_echo_n "checking for CONTROL_CENTER... " >&6; } - -if test -n "$CONTROL_CENTER_CFLAGS"; then - pkg_cv_CONTROL_CENTER_CFLAGS="$CONTROL_CENTER_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - libgnome-control-center >= 2.31.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors " - libgnome-control-center >= 2.31.4") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_CONTROL_CENTER_CFLAGS=`$PKG_CONFIG --cflags " - libgnome-control-center >= 2.31.4" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$CONTROL_CENTER_LIBS"; then - pkg_cv_CONTROL_CENTER_LIBS="$CONTROL_CENTER_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - libgnome-control-center >= 2.31.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors " - libgnome-control-center >= 2.31.4") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_CONTROL_CENTER_LIBS=`$PKG_CONFIG --libs " - libgnome-control-center >= 2.31.4" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - CONTROL_CENTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " - libgnome-control-center >= 2.31.4" 2>&1` - else - CONTROL_CENTER_PKG_ERRORS=`$PKG_CONFIG --print-errors " - libgnome-control-center >= 2.31.4" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$CONTROL_CENTER_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements ( - libgnome-control-center >= 2.31.4) were not met: - -$CONTROL_CENTER_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables CONTROL_CENTER_CFLAGS -and CONTROL_CENTER_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables CONTROL_CENTER_CFLAGS -and CONTROL_CENTER_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details" "$LINENO" 5; } -else - CONTROL_CENTER_CFLAGS=$pkg_cv_CONTROL_CENTER_CFLAGS - CONTROL_CENTER_LIBS=$pkg_cv_CONTROL_CENTER_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi -PANELS_DIR="${libdir}/control-center-1/panels" - - for ac_func in seteuid stpcpy mmap do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -15889,7 +15764,7 @@ else fi -ac_config_files="$ac_config_files Makefile krb5-auth-dialog.spec src/Makefile src/krb5-auth-dialog.1 secmem/Makefile icons/Makefile icons/22x22/Makefile icons/48x48/Makefile icons/scalable/Makefile etpo/Makefile po/Makefile.in help/Makefile examples/Makefile plugins/Makefile cc-panel/Makefile" +ac_config_files="$ac_config_files Makefile krb5-auth-dialog.spec src/Makefile src/krb5-auth-dialog.1 secmem/Makefile icons/Makefile icons/22x22/Makefile icons/48x48/Makefile icons/scalable/Makefile etpo/Makefile po/Makefile.in help/Makefile examples/Makefile plugins/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16461,7 +16336,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by krb5-auth-dialog $as_me 3.0.1, which was +This file was extended by krb5-auth-dialog $as_me 3.2.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16527,7 +16402,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -krb5-auth-dialog config.status 3.0.1 +krb5-auth-dialog config.status 3.2.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -16952,7 +16827,6 @@ do "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;; "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;; - "cc-panel/Makefile") CONFIG_FILES="$CONFIG_FILES cc-panel/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -18371,8 +18245,6 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: Network Manager: no" >&5 $as_echo "$as_me: Network Manager: no" >&6;} fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: gnome-cc: $CONTROL_CENTER_CFLAGS $CONTROL_CENTER_LIBS" >&5 -$as_echo "$as_me: gnome-cc: $CONTROL_CENTER_CFLAGS $CONTROL_CENTER_LIBS" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 $as_echo "$as_me: " >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: Miscellaneous" >&5 diff --git a/configure.ac b/configure.ac index 379bfd4..083ea3f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -AC_INIT([krb5-auth-dialog],[3.0.1]) -AC_CONFIG_SRCDIR(src/ka-dialog.c) +AC_INIT([krb5-auth-dialog],[3.2.0]) +AC_CONFIG_SRCDIR(src/ka-kerberos.c) dnl Make automake keep quiet about wildcards & other GNUmake-isms AM_INIT_AUTOMAKE([1.11.1 dist-bzip2 -Wno-portability]) AC_CONFIG_HEADERS([config.h]) @@ -27,32 +27,12 @@ AM_PROG_CC_C_O KA_COMPILE_WARNINGS([maximum]) GNOME_DOC_INIT -AC_MSG_CHECKING([which gtk+ version to compile against]) -AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 3.0)])], - [case "$with_gtk" in - 2.0|3.0) ;; - *) AC_MSG_ERROR([invalid gtk version specified]) ;; - esac], - [with_gtk=3.0]) -AC_MSG_RESULT([$with_gtk]) - -case "$with_gtk" in - 2.0) GTK_API_VERSION=2.0 - GTK_REQUIRED=2.18.0 - GLIB_REQUIRED=2.26.0 - GCONF_REQUIRED=2.8 - LIBNOTIFY_REQUIRED=0.4 - ;; - 3.0) GTK_API_VERSION=3.0 - GTK_REQUIRED=2.90.4 - GLIB_REQUIRED=2.26.0 - GCONF_REQUIRED=2.31 - LIBNOTIFY_REQUIRED=0.5.1 - ;; -esac - -PKG_CHECK_MODULES(GTK, [gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED]) +GTK_REQUIRED=3.0 +GLIB_REQUIRED=2.28 +GCONF_REQUIRED=2.31 +LIBNOTIFY_REQUIRED=0.7.0 + +PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED]) PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED) PKG_CHECK_MODULES(GIO, [gio-2.0, gio-unix-2.0]) PKG_CHECK_MODULES(GMODULE, gmodule-2.0) @@ -193,13 +173,6 @@ CFLAGS="$savedCFLAGS" LIBS="$savedLIBS" -dnl libgnome-control-center -dnl for the new panel -PKG_CHECK_MODULES(CONTROL_CENTER, [ - libgnome-control-center >= 2.31.4]) -PANELS_DIR="${libdir}/control-center-1/panels" -AC_SUBST(PANELS_DIR) - dnl secmem dnl Checks for library functions. AC_CHECK_FUNCS(seteuid stpcpy mmap) @@ -277,7 +250,6 @@ po/Makefile.in help/Makefile examples/Makefile plugins/Makefile -cc-panel/Makefile ]) AC_OUTPUT @@ -301,7 +273,6 @@ AC_MSG_NOTICE([ Network Manager: $NETWORK_MANAGER_CFLAGS $NETWORK_MANAGER_LIBS] else AC_MSG_NOTICE([ Network Manager: no]) fi -AC_MSG_NOTICE([ gnome-cc: $CONTROL_CENTER_CFLAGS $CONTROL_CENTER_LIBS]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) diff --git a/etpo/Makefile.in b/etpo/Makefile.in index 8fa438c..b41bc9b 100644 --- a/etpo/Makefile.in +++ b/etpo/Makefile.in @@ -116,8 +116,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ COMPILER_FLAGS = @COMPILER_FLAGS@ -CONTROL_CENTER_CFLAGS = @CONTROL_CENTER_CFLAGS@ -CONTROL_CENTER_LIBS = @CONTROL_CENTER_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -205,7 +203,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAM_LIBS = @PAM_LIBS@ -PANELS_DIR = @PANELS_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ diff --git a/examples/Makefile.in b/examples/Makefile.in index f2f8333..671f871 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -69,8 +69,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ COMPILER_FLAGS = @COMPILER_FLAGS@ -CONTROL_CENTER_CFLAGS = @CONTROL_CENTER_CFLAGS@ -CONTROL_CENTER_LIBS = @CONTROL_CENTER_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -158,7 +156,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAM_LIBS = @PAM_LIBS@ -PANELS_DIR = @PANELS_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make index 97fd549..0da2cf9 100644 --- a/gnome-doc-utils.make +++ b/gnome-doc-utils.make @@ -138,7 +138,7 @@ _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` _malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl -_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl +_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl if ENABLE_SK _ENABLE_SK = true @@ -361,7 +361,7 @@ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) ## @ _DOC_POT ## A pot file -_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot) +_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot)) .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) diff --git a/help/Makefile.in b/help/Makefile.in index 9327ded..1d3034d 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -94,8 +94,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ COMPILER_FLAGS = @COMPILER_FLAGS@ -CONTROL_CENTER_CFLAGS = @CONTROL_CENTER_CFLAGS@ -CONTROL_CENTER_LIBS = @CONTROL_CENTER_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -183,7 +181,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAM_LIBS = @PAM_LIBS@ -PANELS_DIR = @PANELS_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ @@ -359,7 +356,7 @@ _DOC_SRC_FIGURES = \ $(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \ $(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) )) -_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot) +_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot)) ################################################################################ _DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \ @@ -659,7 +656,7 @@ _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` _malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl -_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl +_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml diff --git a/icons/22x22/Makefile.in b/icons/22x22/Makefile.in index 7cd5fec..d46bf64 100644 --- a/icons/22x22/Makefile.in +++ b/icons/22x22/Makefile.in @@ -93,8 +93,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ COMPILER_FLAGS = @COMPILER_FLAGS@ -CONTROL_CENTER_CFLAGS = @CONTROL_CENTER_CFLAGS@ -CONTROL_CENTER_LIBS = @CONTROL_CENTER_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -182,7 +180,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAM_LIBS = @PAM_LIBS@ -PANELS_DIR = @PANELS_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ diff --git a/icons/48x48/Makefile.in b/icons/48x48/Makefile.in index 9ef19d6..5233358 100644 --- a/icons/48x48/Makefile.in +++ b/icons/48x48/Makefile.in @@ -93,8 +93,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ COMPILER_FLAGS = @COMPILER_FLAGS@ -CONTROL_CENTER_CFLAGS = @CONTROL_CENTER_CFLAGS@ -CONTROL_CENTER_LIBS = @CONTROL_CENTER_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -182,7 +180,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAM_LIBS = @PAM_LIBS@ -PANELS_DIR = @PANELS_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ diff --git a/icons/Makefile.in b/icons/Makefile.in index e7d165d..76fd4de 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -109,8 +109,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ COMPILER_FLAGS = @COMPILER_FLAGS@ -CONTROL_CENTER_CFLAGS = @CONTROL_CENTER_CFLAGS@ -CONTROL_CENTER_LIBS = @CONTROL_CENTER_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -198,7 +196,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAM_LIBS = @PAM_LIBS@ -PANELS_DIR = @PANELS_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ diff --git a/icons/scalable/Makefile.in b/icons/scalable/Makefile.in index d70b28d..53612fa 100644 --- a/icons/scalable/Makefile.in +++ b/icons/scalable/Makefile.in @@ -93,8 +93,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ COMPILER_FLAGS = @COMPILER_FLAGS@ -CONTROL_CENTER_CFLAGS = @CONTROL_CENTER_CFLAGS@ -CONTROL_CENTER_LIBS = @CONTROL_CENTER_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -182,7 +180,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAM_LIBS = @PAM_LIBS@ -PANELS_DIR = @PANELS_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ diff --git a/krb5-auth-dialog.spec b/krb5-auth-dialog.spec index d569a88..65e442e 100644 --- a/krb5-auth-dialog.spec +++ b/krb5-auth-dialog.spec @@ -1,6 +1,6 @@ Summary: Kerberos 5 authentication dialog Name: krb5-auth-dialog -Version: 3.0.1 +Version: 3.2.0 Release: 1 License: GPL Group: User Interface/X @@ -69,7 +69,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 Debian-2.4-2 +# $progname: (GNU libtool) 2.4 Debian-2.4-3 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,7 +79,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4 Debian-2.4-2" +VERSION="2.4 Debian-2.4-3" TIMESTAMP="" package_revision=1.3293 diff --git a/plugins/Makefile.in b/plugins/Makefile.in index 4d8aa6c..39b1cce 100644 --- a/plugins/Makefile.in +++ b/plugins/Makefile.in @@ -151,8 +151,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ COMPILER_FLAGS = @COMPILER_FLAGS@ -CONTROL_CENTER_CFLAGS = @CONTROL_CENTER_CFLAGS@ -CONTROL_CENTER_LIBS = @CONTROL_CENTER_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -240,7 +238,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAM_LIBS = @PAM_LIBS@ -PANELS_DIR = @PANELS_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ diff --git a/po/POTFILES.in b/po/POTFILES.in index 279ce6d..7485558 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,13 +1,11 @@ [type: gettext/glade]src/krb5-auth-dialog.ui -src/ka-dialog.c +src/ka-kerberos.c src/ka-pwdialog.c src/dummy-strings.c src/ka-applet.c src/ka-tools.c -src/ka-tickets.c +src/ka-main-window.c +src/ka-preferences.c src/krb5-auth-dialog.desktop.in src/krb5-auth-dialog.schemas.in secmem/util.c -cc-panel/gnome-ka-panel.desktop.in -[type: gettext/glade]cc-panel/ka-panel.ui -cc-panel/cc-ka-panel.c @@ -1,48 +1,68 @@ # Czech translation for krb5-auth-dialog. -# Copyright (C) 2010 krb5-auth-dialog's COPYRIGHT HOLDER +# Copyright (C) 2010, 2011 krb5-auth-dialog's COPYRIGHT HOLDER # This file is distributed under the same license as the krb5-auth-dialog package. -# Zdeněk Hataš <zdenek.hatas@gmail.com>, 2010. +# +# Zdeněk Hataš <zdenek.hatas@gmail.com>, 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-21 19:37+0100\n" -"PO-Revision-Date: 2010-02-25 22:29+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-auth-dialog&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-09-04 18:15+0000\n" +"PO-Revision-Date: 2011-09-05 08:42+0100\n" "Last-Translator: Zdeněk Hataš <zdenek.hatas@gmail.com>\n" "Language-Team: Czech <gnome-cs-list@gnome.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../src/krb5-auth-dialog.xml.h:1 ../src/krb5-auth-dialog.desktop.in.h:2 -#: ../preferences/krb5-auth-dialog-preferences.desktop.in.h:1 -msgid "Network Authentication" -msgstr "Síťová autentizace" +#: ../src/krb5-auth-dialog.ui.h:1 +#: ../src/krb5-auth-dialog.desktop.in.h:1 +#: ../cc-panel/gnome-ka-panel.desktop.in.h:1 +msgid "Kerberos Authentication" +msgstr "Autentizace Kerberos" -#: ../src/krb5-auth-dialog.xml.h:2 +#: ../src/krb5-auth-dialog.ui.h:2 msgid "Service Tickets" msgstr "Lístky služeb" -#: ../src/krb5-auth-dialog.xml.h:3 +#: ../src/krb5-auth-dialog.ui.h:3 +msgid "_Edit" +msgstr "Ú_pravy" + +#: ../src/krb5-auth-dialog.ui.h:4 +msgid "_File" +msgstr "_Soubor" + +#: ../src/krb5-auth-dialog.ui.h:5 +msgid "_Help" +msgstr "Nápo_věda" + +#: ../src/krb5-auth-dialog.ui.h:6 msgid "_Renew Ticket" msgstr "_Obnovit lístek" -#: ../src/krb5-auth-dialog.c:172 +#: ../src/ka-dialog.c:177 msgid "unknown error" msgstr "neznámá chyba" -#: ../src/krb5-auth-dialog.c:329 +#: ../src/ka-dialog.c:317 +msgid "Your ticket cache is currently empty" +msgstr "Mezipaměť vašich přihlašovacích údajů je prázdná" + +#: ../src/ka-dialog.c:343 msgid "Expired" msgstr "Platnost vypršela" -#: ../src/krb5-auth-pwdialog.c:170 +#: ../src/ka-pwdialog.c:178 #, c-format msgid "Couldn't acquire kerberos ticket: '%s'" msgstr "Nelze získat lístek: '%s'" -#: ../src/krb5-auth-pwdialog.c:207 ../src/krb5-auth-applet.c:359 +#: ../src/ka-pwdialog.c:217 +#: ../src/ka-applet.c:367 #, c-format msgid "Your credentials expire in %d minute" msgid_plural "Your credentials expire in %d minutes" @@ -50,85 +70,86 @@ msgstr[0] "Vaše přihlašovací údaje vyprší za %d minutu" msgstr[1] "Vaše přihlašovací údaje vyprší za %d minuty" msgstr[2] "Vaše přihlašovací údaje vyprší za %d minut" -#: ../src/krb5-auth-pwdialog.c:212 ../src/krb5-auth-applet.c:364 +#: ../src/ka-pwdialog.c:222 +#: ../src/ka-applet.c:372 msgid "Your credentials have expired" msgstr "Vaše přihlašovací údaje vypršely" -#: ../src/krb5-auth-pwdialog.c:233 +#: ../src/ka-pwdialog.c:245 msgid "Please enter your Kerberos password:" msgstr "Vložte prosím své Kerberos heslo:" -#: ../src/krb5-auth-pwdialog.c:244 +#: ../src/ka-pwdialog.c:258 #, c-format msgid "Please enter the password for '%s':" msgstr "Vložte prosím své heslo pro '%s':" -#: ../src/krb5-auth-pwdialog.c:264 +#: ../src/ka-pwdialog.c:276 msgid "The password you entered is invalid" msgstr "Vložené heslo není platné" -#: ../src/krb5-auth-pwdialog.c:280 +#: ../src/ka-pwdialog.c:292 #, c-format msgid "%s Error" msgstr "Chyba %s" #. Translators: files from dummy-strings.c are *all* possible errors #. returned from Kerberos (since Kerberos itself doesn't handle i18n). If in -#. doubt please translate strings from files starting with krb5-auth +#. doubt please translate strings from files starting with ka- and krb5-auth- #. first since these are the ones the user will see in any case. #: ../src/dummy-strings.c:10 msgid "ASN.1 failed call to system time library" -msgstr "" +msgstr "ASN.1 - selhalo volání do systémové časové knihovny" #. asn1_err.et:asn1:ASN1_BAD_TIMEFORMAT #: ../src/dummy-strings.c:11 msgid "ASN.1 structure is missing a required field" -msgstr "" +msgstr "ASN.1 - chybí požadované pole struktury" #. asn1_err.et:asn1:ASN1_MISSING_FIELD #: ../src/dummy-strings.c:12 msgid "ASN.1 unexpected field number" -msgstr "" +msgstr "ASN.1 - neočekávané číslo pole" #. asn1_err.et:asn1:ASN1_MISPLACED_FIELD #: ../src/dummy-strings.c:13 msgid "ASN.1 type numbers are inconsistent" -msgstr "" +msgstr "ASN.1 - čísla typů jsou nekonzistentní" #. asn1_err.et:asn1:ASN1_TYPE_MISMATCH #: ../src/dummy-strings.c:14 msgid "ASN.1 value too large" -msgstr "" +msgstr "ASN.1 - hodnota je příliš velká" #. asn1_err.et:asn1:ASN1_OVERFLOW #: ../src/dummy-strings.c:15 msgid "ASN.1 encoding ended unexpectedly" -msgstr "" +msgstr "ASN.1 - neočekávaný konec kódování" #. asn1_err.et:asn1:ASN1_OVERRUN #: ../src/dummy-strings.c:16 msgid "ASN.1 identifier doesn't match expected value" -msgstr "" +msgstr "ASN.1 - identifikátor neodpovídá očekávané hodnotě" #. asn1_err.et:asn1:ASN1_BAD_ID #: ../src/dummy-strings.c:17 msgid "ASN.1 length doesn't match expected value" -msgstr "" +msgstr "ASN.1 - délka neodpovídá očekávané hodnotě" #. asn1_err.et:asn1:ASN1_BAD_LENGTH #: ../src/dummy-strings.c:18 msgid "ASN.1 badly-formatted encoding" -msgstr "" +msgstr "ASN.1 - nesprávně formátované kódování" #. asn1_err.et:asn1:ASN1_BAD_FORMAT #: ../src/dummy-strings.c:19 msgid "ASN.1 parse error" -msgstr "" +msgstr "ASN.1 - chyba analýzy" #. asn1_err.et:asn1:ASN1_PARSE_ERROR #: ../src/dummy-strings.c:20 msgid "ASN.1 bad return from gmtime" -msgstr "" +msgstr "ASN.1 - nesprávná návratová hodnota funkce gmtime" #. asn1_err.et:asn1:ASN1_BAD_GMTIME #: ../src/dummy-strings.c:21 @@ -138,7 +159,7 @@ msgstr "" #. asn1_err.et:asn1:ASN1_MISMATCH_INDEF #: ../src/dummy-strings.c:22 msgid "ASN.1 missing expected EOC" -msgstr "" +msgstr "ASN.1 - chybí očekávaný EOC" #. asn1_err.et:asn1:ASN1_MISSING_EOC #: ../src/dummy-strings.c:23 @@ -158,7 +179,7 @@ msgstr "Záznam serveru v databázi vypršel" #. krb5_err.et:krb5:KRB5KDC_ERR_SERVICE_EXP #: ../src/dummy-strings.c:26 msgid "Requested protocol version not supported" -msgstr "" +msgstr "Požadovaná verze protokolu není podporována" #. krb5_err.et:krb5:KRB5KDC_ERR_BAD_PVNO #: ../src/dummy-strings.c:27 @@ -173,17 +194,17 @@ msgstr "" #. krb5_err.et:krb5:KRB5KDC_ERR_S_OLD_MAST_KVNO #: ../src/dummy-strings.c:29 msgid "Client not found in Kerberos database" -msgstr "" +msgstr "Klient nebyl nalezen v databázi Kerberos" #. krb5_err.et:krb5:KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN #: ../src/dummy-strings.c:30 msgid "Server not found in Kerberos database" -msgstr "" +msgstr "Server nebyl nalezen v databázi Kerberos" #. krb5_err.et:krb5:KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN #: ../src/dummy-strings.c:31 msgid "Principal has multiple entries in Kerberos database" -msgstr "" +msgstr "Principal má v databázi Kerberos více záznamů" #. krb5_err.et:krb5:KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE #: ../src/dummy-strings.c:32 @@ -198,27 +219,27 @@ msgstr "" #. krb5_err.et:krb5:KRB5KDC_ERR_CANNOT_POSTDATE #: ../src/dummy-strings.c:34 msgid "Requested effective lifetime is negative or too short" -msgstr "" +msgstr "Požadovaná doba platnosti je záporná nebo příliš krátká" #. krb5_err.et:krb5:KRB5KDC_ERR_NEVER_VALID #: ../src/dummy-strings.c:35 msgid "KDC policy rejects request" -msgstr "" +msgstr "Požadavek byl odmítnut politikou KDC" #. krb5_err.et:krb5:KRB5KDC_ERR_POLICY #: ../src/dummy-strings.c:36 msgid "KDC can't fulfill requested option" -msgstr "" +msgstr "KDC nemůže vyplnit požadovanou volbu" #. krb5_err.et:krb5:KRB5KDC_ERR_BADOPTION #: ../src/dummy-strings.c:37 msgid "KDC has no support for encryption type" -msgstr "" +msgstr "KDC nepodporuje typ šifrování" #. krb5_err.et:krb5:KRB5KDC_ERR_ETYPE_NOSUPP #: ../src/dummy-strings.c:38 msgid "KDC has no support for checksum type" -msgstr "" +msgstr "KDC nepodporuje tento typ kontrolního součtu" #. krb5_err.et:krb5:KRB5KDC_ERR_SUMTYPE_NOSUPP #: ../src/dummy-strings.c:39 @@ -248,12 +269,12 @@ msgstr "TGT byl znepatněn" #. krb5_err.et:krb5:KRB5KDC_ERR_TGT_REVOKED #: ../src/dummy-strings.c:44 msgid "Client not yet valid - try again later" -msgstr "" +msgstr "Klient ještě není platný - opakujte později" #. krb5_err.et:krb5:KRB5KDC_ERR_CLIENT_NOTYET #: ../src/dummy-strings.c:45 msgid "Server not yet valid - try again later" -msgstr "" +msgstr "Server ještě není platný - opakujte později" #. krb5_err.et:krb5:KRB5KDC_ERR_SERVICE_NOTYET #: ../src/dummy-strings.c:46 @@ -263,17 +284,17 @@ msgstr "Platnost hesla vypršela" #. krb5_err.et:krb5:KRB5KDC_ERR_KEY_EXP #: ../src/dummy-strings.c:47 msgid "Preauthentication failed" -msgstr "" +msgstr "Preautentizace selhala" #. krb5_err.et:krb5:KRB5KDC_ERR_PREAUTH_FAILED #: ../src/dummy-strings.c:48 msgid "Additional pre-authentication required" -msgstr "" +msgstr "Další předautentizace je požadována" #. krb5_err.et:krb5:KRB5KDC_ERR_PREAUTH_REQUIRED #: ../src/dummy-strings.c:49 msgid "Requested server and ticket don't match" -msgstr "" +msgstr "Požadovaný server a lístek se neshodují" #. krb5_err.et:krb5:KRB5KDC_ERR_SERVER_NOMATCH #: ../src/dummy-strings.c:50 @@ -283,7 +304,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5KDC_ERR_SVC_UNAVAILABLE #: ../src/dummy-strings.c:51 msgid "Decrypt integrity check failed" -msgstr "" +msgstr "Selhala kontrola integrity při dešifrování" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BAD_INTEGRITY #: ../src/dummy-strings.c:52 @@ -298,7 +319,7 @@ msgstr "Lístek ještě nezačal platit" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_TKT_NYV #: ../src/dummy-strings.c:54 msgid "Request is a replay" -msgstr "" +msgstr "Požadavek je odpovědí" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_REPEAT #: ../src/dummy-strings.c:55 @@ -308,7 +329,7 @@ msgstr "Lístek je pro někoho jiného" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_NOT_US #: ../src/dummy-strings.c:56 msgid "Ticket/authenticator don't match" -msgstr "" +msgstr "Lístek/autentikátor neodpovídá" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADMATCH #: ../src/dummy-strings.c:57 @@ -357,7 +378,8 @@ msgstr "Klíč služby není k dispozici" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_NOKEY #. krb5_err.et:krb5:KRB5_NO_LOCALNAME -#: ../src/dummy-strings.c:66 ../src/dummy-strings.c:122 +#: ../src/dummy-strings.c:66 +#: ../src/dummy-strings.c:122 msgid "Mutual authentication failed" msgstr "Vzájemná autentizace selhala" @@ -369,17 +391,17 @@ msgstr "" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADDIRECTION #: ../src/dummy-strings.c:68 msgid "Alternative authentication method required" -msgstr "" +msgstr "Je požadována alternativní metoda autentizace" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_METHOD #: ../src/dummy-strings.c:69 msgid "Incorrect sequence number in message" -msgstr "" +msgstr "Chybné číslo sekvence ve zprávě" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADSEQ #: ../src/dummy-strings.c:70 msgid "Inappropriate type of checksum in message" -msgstr "" +msgstr "Nevhodný typ kontrolního součtu ve zprávě" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_INAPP_CKSUM #: ../src/dummy-strings.c:71 @@ -389,7 +411,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5KRB_AP_PATH_NOT_ACCEPTED #: ../src/dummy-strings.c:72 msgid "Response too big for UDP, retry with TCP" -msgstr "" +msgstr "Odpověď je pro UDP příliš velká, další pokus s TCP" #. krb5_err.et:krb5:KRB5KRB_ERR_RESPONSE_TOO_BIG #: ../src/dummy-strings.c:73 @@ -399,7 +421,7 @@ msgstr "Obecná chyba (viz popis chyby)" #. krb5_err.et:krb5:KRB5KRB_ERR_GENERIC #: ../src/dummy-strings.c:74 msgid "Field is too long for this implementation" -msgstr "" +msgstr "Pole je pro tuto implementaci příliš dlouhé" #. krb5_err.et:krb5:KRB5KRB_ERR_FIELD_TOOLONG #: ../src/dummy-strings.c:75 @@ -474,7 +496,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5KDC_ERR_DIGEST_IN_CERT_NOT_ACCEPTED #: ../src/dummy-strings.c:89 msgid "Checksum must be included" -msgstr "" +msgstr "Musí být vložen kontrolní součet" #. krb5_err.et:krb5:KRB5KDC_ERR_PA_CHECKSUM_MUST_BE_INCLUDED #: ../src/dummy-strings.c:90 @@ -569,7 +591,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5_NO_TKT_SUPPLIED #: ../src/dummy-strings.c:108 msgid "Wrong principal in request" -msgstr "" +msgstr "Špatný principal v požadavku" #. krb5_err.et:krb5:KRB5KRB_AP_WRONG_PRINC #: ../src/dummy-strings.c:109 @@ -579,7 +601,7 @@ msgstr "Lístek nese nesprávné nastavení příznaků" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_TKT_INVALID #: ../src/dummy-strings.c:110 msgid "Requested principal and ticket don't match" -msgstr "" +msgstr "Požadovaný principal a lístek si neodpovídají" #. krb5_err.et:krb5:KRB5_PRINC_NOMATCH #: ../src/dummy-strings.c:111 @@ -629,7 +651,7 @@ msgstr "Neznámá služba Kerberos" #. krb5_err.et:krb5:KRB5_SERVICE_UNKNOWN #: ../src/dummy-strings.c:120 msgid "Cannot contact any KDC for requested realm" -msgstr "" +msgstr "Pro požadovaný realm nelze kontaktovat žádný KDC" #. krb5_err.et:krb5:KRB5_KDC_UNREACH #: ../src/dummy-strings.c:121 @@ -654,7 +676,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5_RC_TYPE_NOTFOUND #: ../src/dummy-strings.c:126 msgid "Generic unknown RC error" -msgstr "" +msgstr "Obecná neznámá RC chyba" #. krb5_err.et:krb5:KRB5_RC_UNKNOWN #: ../src/dummy-strings.c:127 @@ -739,27 +761,27 @@ msgstr "Vnitřní chyba systému šifrování" #. krb5_err.et:krb5:KRB5_CRYPTO_INTERNAL #: ../src/dummy-strings.c:143 msgid "Key table name malformed" -msgstr "" +msgstr "Název tabulky s klíči je poškozen" #. krb5_err.et:krb5:KRB5_KT_BADNAME #: ../src/dummy-strings.c:144 msgid "Unknown Key table type" -msgstr "" +msgstr "Neznámý typ tabulky s klíči" #. krb5_err.et:krb5:KRB5_KT_UNKNOWN_TYPE #: ../src/dummy-strings.c:145 msgid "Key table entry not found" -msgstr "" +msgstr "Záznam v tabulce s klíči nebyl nalezen" #. krb5_err.et:krb5:KRB5_KT_NOTFOUND #: ../src/dummy-strings.c:146 msgid "End of key table reached" -msgstr "" +msgstr "Dosažen konec tabulky s klíči" #. krb5_err.et:krb5:KRB5_KT_END #: ../src/dummy-strings.c:147 msgid "Cannot write to specified key table" -msgstr "" +msgstr "Nelze zapisovat do zadané tabulky s klíči" #. krb5_err.et:krb5:KRB5_KT_NOWRITE #: ../src/dummy-strings.c:148 @@ -804,7 +826,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5_CC_TYPE_EXISTS #: ../src/dummy-strings.c:156 msgid "Key table type is already registered." -msgstr "" +msgstr "Typ tabulky s klíči je již zaregistrován" #. krb5_err.et:krb5:KRB5_KT_TYPE_EXISTS #: ../src/dummy-strings.c:157 @@ -914,7 +936,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5_KEYTAB_BADVNO #: ../src/dummy-strings.c:178 msgid "Program lacks support for address type" -msgstr "" +msgstr "Pro tento typ adresy v programu chybí podpora" #. krb5_err.et:krb5:KRB5_PROG_ATYPE_NOSUPP #: ../src/dummy-strings.c:179 @@ -924,12 +946,12 @@ msgstr "" #. krb5_err.et:krb5:KRB5_RC_REQUIRED #: ../src/dummy-strings.c:180 msgid "Hostname cannot be canonicalized" -msgstr "" +msgstr "Název počítače nelze převést do kanonického tvaru" #. krb5_err.et:krb5:KRB5_ERR_BAD_HOSTNAME #: ../src/dummy-strings.c:181 msgid "Cannot determine realm for host" -msgstr "" +msgstr "Nelze zjistit realm pro hosta" #. krb5_err.et:krb5:KRB5_ERR_HOST_REALM_UNKNOWN #: ../src/dummy-strings.c:182 @@ -1039,7 +1061,7 @@ msgstr "Program zavolal zastaralou nebo odstraněnou funkci" #. krb5_err.et:krb5:KRB5_OBSOLETE_FN #: ../src/dummy-strings.c:203 msgid "unknown getaddrinfo failure" -msgstr "" +msgstr "selhání funkce getaddrinfo z neznámých příčin" #. krb5_err.et:krb5:KRB5_EAI_FAIL #: ../src/dummy-strings.c:204 @@ -1049,7 +1071,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5_EAI_NODATA #: ../src/dummy-strings.c:205 msgid "host/domain name not found" -msgstr "" +msgstr "název počítače/domény nebyl nalezen" #. krb5_err.et:krb5:KRB5_EAI_NONAME #: ../src/dummy-strings.c:206 @@ -1343,7 +1365,8 @@ msgstr "" #. kv5m_err.et:kv5m:KV5M_SAM_KEY #. kv5m_err.et:kv5m:KV5M_ENC_SAM_RESPONSE_ENC -#: ../src/dummy-strings.c:264 ../src/dummy-strings.c:265 +#: ../src/dummy-strings.c:264 +#: ../src/dummy-strings.c:265 msgid "Bad magic number for krb5_enc_sam_response_enc" msgstr "" @@ -1377,169 +1400,182 @@ msgstr "" msgid "Bad magic number for GSSAPI QUEUE" msgstr "" -#. Translators: First number is hours, second number is minutes -#: ../src/krb5-auth-applet.c:355 +#: ../src/ka-applet.c:361 #, c-format msgid "Your credentials expire in %.2d:%.2dh" msgstr "Vaše přihlašovací údaje vyprší za %.2d:%.2dh" -#: ../src/krb5-auth-applet.c:460 +#: ../src/ka-applet.c:543 +msgid "List Tickets" +msgstr "Lístky služeb" + +#: ../src/ka-applet.c:553 +msgid "Get Ticket" +msgstr "Získat lístek" + +#: ../src/ka-applet.c:562 msgid "Don't show me this again" msgstr "Znovu nezobrazovat" -#: ../src/krb5-auth-applet.c:497 -msgid "Network credentials valid" -msgstr "" +#: ../src/ka-applet.c:569 +msgid "Remove Credentials Cache" +msgstr "Odstranit mezipaměť přihlašovacích údajů" -#: ../src/krb5-auth-applet.c:498 +#: ../src/ka-applet.c:618 +msgid "You have valid Kerberos credentials." +msgstr "Vaše přihlašovací údaje jsou platné." + +#: ../src/ka-applet.c:620 msgid "You've refreshed your Kerberos credentials." msgstr "Aktualizovali jste své přihlašovací údaje." -#: ../src/krb5-auth-applet.c:511 +#: ../src/ka-applet.c:623 +msgid "Network credentials valid" +msgstr "Síťové přihlašovací údaje jsou platné" + +#: ../src/ka-applet.c:642 msgid "Network credentials expiring" -msgstr "" +msgstr "Blíží se konec platnosti síťových přihlašovacích údajů" -#: ../src/krb5-auth-applet.c:526 +#: ../src/ka-applet.c:660 msgid "Network credentials expired" -msgstr "" +msgstr "Platnost síťových přihlašovacích údajů vypršela" -#: ../src/krb5-auth-applet.c:527 +#: ../src/ka-applet.c:661 msgid "Your Kerberos credentails have expired." -msgstr "" +msgstr "Platnost vašich přihlašovacích údajů Kerberos vypršela." -#: ../src/krb5-auth-applet.c:570 +#: ../src/ka-applet.c:705 #, c-format msgid "There was an error launching the preferences dialog: %s" -msgstr "" - -#: ../src/krb5-auth-applet.c:611 -#, c-format -msgid "" -"There was an error displaying %s:\n" -"%s" -msgstr "" - -#. Translators: add the translators of your language here -#: ../src/krb5-auth-applet.c:647 -msgid "translator-credits" -msgstr "" +msgstr "Při spouštění dialogového okna předvoleb došlo k chybě: %s " -#. kdestroy -#: ../src/krb5-auth-applet.c:689 +#: ../src/ka-applet.c:775 msgid "Remove Credentials _Cache" msgstr "Odstranit mezipaměť přihlašova_cích údajů" -#: ../src/krb5-auth-tools.c:45 +#. Ticket dialog +#: ../src/ka-applet.c:785 +msgid "_List Tickets" +msgstr "_Lístky služeb" + +#: ../src/ka-tools.c:45 #, c-format msgid "" "There was an error displaying help:\n" "%s" msgstr "" +"Při pokusu o zobrazení nápovědy došlo k chybě:\n" +"%s" + +#. Translators: add the translators of your language here +#: ../src/ka-tools.c:83 +msgid "translator-credits" +msgstr "Zdeněk Hataš <zdenek.hatas@gmail.com>" -#: ../src/krb5-auth-tickets.c:54 +#: ../src/ka-main-window.c:118 msgid "Principal" msgstr "Principal" -#: ../src/krb5-auth-tickets.c:60 +#: ../src/ka-main-window.c:124 msgid "Start Time" msgstr "Začátek platnosti" -#: ../src/krb5-auth-tickets.c:66 +#: ../src/ka-main-window.c:130 msgid "End Time" msgstr "Konec platnosti" -#: ../src/krb5-auth-tickets.c:72 +#: ../src/ka-main-window.c:136 msgid "Fwd" -msgstr "" +msgstr "Předat" -#: ../src/krb5-auth-tickets.c:78 +#: ../src/ka-main-window.c:142 msgid "Proxy" -msgstr "" +msgstr "Proxy" -#: ../src/krb5-auth-tickets.c:84 +#: ../src/ka-main-window.c:148 msgid "Renew" -msgstr "" +msgstr "Obnovit" -#: ../src/krb5-auth-tickets.c:107 +#: ../src/ka-main-window.c:175 msgid "Error displaying service ticket information" -msgstr "" +msgstr "Chyba zobrazení informací o lístku služby" -#: ../src/krb5-auth-dialog.desktop.in.h:1 +#: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" -msgstr "" +msgstr "Dialog síťové autentizace Kerberos" #: ../src/krb5-auth-dialog.schemas.in.h:1 +msgid "Enabled plugins" +msgstr "Povolené zásuvné moduly" + +#: ../src/krb5-auth-dialog.schemas.in.h:2 msgid "Forwardable ticket" msgstr "" -#: ../src/krb5-auth-dialog.schemas.in.h:2 +#: ../src/krb5-auth-dialog.schemas.in.h:3 msgid "Kerberos principal" msgstr "Kerberos principal" -#: ../src/krb5-auth-dialog.schemas.in.h:3 -msgid "Notify user when ticket becomes valid" -msgstr "" - #: ../src/krb5-auth-dialog.schemas.in.h:4 -msgid "Notify user when ticket has expired" -msgstr "" +msgid "List of plugins that should be loaded and activated on startup." +msgstr "Seznam zásuvných modulů, které budou nahrány a aktivovány při startu." #: ../src/krb5-auth-dialog.schemas.in.h:5 -msgid "Notify user when ticket is about to expire" -msgstr "" +msgid "Notify user when ticket becomes valid" +msgstr "Upozornit uživatele, když lístek začne platit" #: ../src/krb5-auth-dialog.schemas.in.h:6 -msgid "PKINIT CA certificates" -msgstr "Certifikát CA pro PKINIT" +msgid "Notify user when ticket has expired" +msgstr "Upozornit uživatele, když lístek přestane platit" #: ../src/krb5-auth-dialog.schemas.in.h:7 -msgid "PKINIT identifier" -msgstr "Identifikátor PKINIT" +msgid "Notify user when ticket is about to expire" +msgstr "Upozornit uživatele na blížící se vypršení platnosti lístku" #: ../src/krb5-auth-dialog.schemas.in.h:8 -msgid "PKINIT trust anchors" -msgstr "" +msgid "PKINIT CA certificates" +msgstr "Certifikát CA pro PKINIT" #: ../src/krb5-auth-dialog.schemas.in.h:9 -msgid "Prompt minutes before expiry" -msgstr "" +msgid "PKINIT identifier" +msgstr "Identifikátor PKINIT" #: ../src/krb5-auth-dialog.schemas.in.h:10 -msgid "Proxiable ticket" +msgid "PKINIT trust anchors" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:11 -msgid "Renewable ticket" -msgstr "" +msgid "Prompt minutes before expiry" +msgstr "Počet minut připomenutí před koncem platnosti" #: ../src/krb5-auth-dialog.schemas.in.h:12 -msgid "Requested tickets should be forwardable" +msgid "Proxiable ticket" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:13 -msgid "Requested tickets should be proxiable" -msgstr "" +msgid "Renewable ticket" +msgstr "Obnovitelný lístek" #: ../src/krb5-auth-dialog.schemas.in.h:14 -msgid "Requested tickets should be renewable" +msgid "Requested tickets should be forwardable" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:15 -msgid "Show a trayicon in the status area of the panel" +msgid "Requested tickets should be proxiable" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:16 -msgid "Show trayicon" -msgstr "" +msgid "Requested tickets should be renewable" +msgstr "Požadované lístky by měly být obnovitelné" #: ../src/krb5-auth-dialog.schemas.in.h:17 -msgid "" -"Start prompting/displaying notifications that many minutes before expiry" +msgid "Start prompting/displaying notifications that many minutes before expiry" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:18 msgid "The kerberos principal to acquire the ticket for" -msgstr "" +msgstr "Kerberos principal, pro který bude získán lístek" #: ../src/krb5-auth-dialog.schemas.in.h:19 msgid "The principal's public/private/certificate identifier when using PKINIT" @@ -1560,132 +1596,127 @@ msgstr "" #: ../secmem/util.c:106 #, c-format msgid "Warning: running q-agent setuid on this system is dangerous\n" -msgstr "" - -#: ../preferences/krb5-auth-dialog-preferences.c:345 -msgid "Choose Certificate" -msgstr "Vyberte certifikát" - -#: ../preferences/krb5-auth-dialog-preferences.c:361 -msgid "X509 Certificates" -msgstr "Certifikáty X.509" +msgstr "Pozor: provozovat q-agent setuid na tomto systému je nebezpečné\n" -#: ../preferences/krb5-auth-dialog-preferences.c:365 -msgid "all files" -msgstr "všechny soubory" +#. Translators: those are keywords for the Kerberos authentication control-center panel +#: ../cc-panel/gnome-ka-panel.desktop.in.h:3 +msgid "Kerberos;Authentication" +msgstr "Kerberos;Autentizace" -#: ../preferences/krb5-auth-dialog-preferences.desktop.in.h:2 +#: ../cc-panel/gnome-ka-panel.desktop.in.h:4 msgid "Set your Kerberos network authentication preferences" -msgstr "" +msgstr "Nastavte své předvolby síťové autentizace Kerberos" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:1 -msgid "Appearance" -msgstr "" - -#: ../preferences/krb5-auth-dialog-preferences.xml.h:2 -msgid "Applet" -msgstr "Applet" - -#: ../preferences/krb5-auth-dialog-preferences.xml.h:3 +#: ../cc-panel/ka-panel.ui.h:1 msgid "Certificate and private key used for authentication" msgstr "Certifikát a soukromý klíč použitý k autentizaci" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:4 -msgid "If checked, display the tray icon in the status bar" -msgstr "" +#: ../cc-panel/ka-panel.ui.h:2 +msgid "Certificate used to verify digital signatures." +msgstr "Certifikát použitý pro ověření digitálních podpisů." + +#: ../cc-panel/ka-panel.ui.h:3 +msgid "Configure the use of certificates and smartcards for your Kerberos network authentication." +msgstr "Nastavit použití certifikátů a čipových karet při síťové autentizaci Kerberos." -#: ../preferences/krb5-auth-dialog-preferences.xml.h:5 +#: ../cc-panel/ka-panel.ui.h:4 msgid "If checked, request forwardable tickets" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:6 +#: ../cc-panel/ka-panel.ui.h:5 msgid "If checked, request proxiable tickets" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:7 +#: ../cc-panel/ka-panel.ui.h:6 msgid "If checked, request renewable tickets" -msgstr "" +msgstr "Pokud je zaškrtnuto, požadovat obnovitelné lístky" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:8 +#: ../cc-panel/ka-panel.ui.h:7 msgid "If checked, use a security token (Smartcard) to authenticate." msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:9 +#: ../cc-panel/ka-panel.ui.h:8 msgid "Kerberos" msgstr "Kerberos" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:10 -msgid "Kerberos Authentication Configuration" -msgstr "Nastavení autentizace Kerberos" +#: ../cc-panel/ka-panel.ui.h:9 +msgid "Kerberos Ticket Options" +msgstr "Vlastnosti lístku Kerberos" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:11 +#: ../cc-panel/ka-panel.ui.h:10 msgid "Kerberos User" msgstr "Uživatel" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:12 +#: ../cc-panel/ka-panel.ui.h:11 msgid "Kerberos principal:" msgstr "Principal:" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:13 +#: ../cc-panel/ka-panel.ui.h:12 msgid "Notifications" msgstr "Upozornění" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:14 -msgid "PKINIT:" -msgstr "PKINIT:" +#: ../cc-panel/ka-panel.ui.h:13 +msgid "PKINIT" +msgstr "PKINIT" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:15 +#: ../cc-panel/ka-panel.ui.h:14 msgid "Requested Kerberos tickets should be:" msgstr "Požadované lístky Kerberos mohou být:" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:16 -msgid "" -"Send notification about ticket expiry that many minutes before it finally " -"expires" +#: ../cc-panel/ka-panel.ui.h:15 +msgid "Send notification about ticket expiry that many minutes before it finally expires" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:17 -msgid "Show tray icon" -msgstr "" +#: ../cc-panel/ka-panel.ui.h:16 +msgid "The name of your Kerberos account. Leave blank to use your current username." +msgstr "Název vašeho účtu Kerberos. Ponechte prázdné, pokud chcete použít aktuální uživatelské jméno." -#: ../preferences/krb5-auth-dialog-preferences.xml.h:18 -msgid "Ticket Options" -msgstr "Vlastnosti lístku" - -#: ../preferences/krb5-auth-dialog-preferences.xml.h:19 +#: ../cc-panel/ka-panel.ui.h:17 msgid "Use Smartcard" msgstr "Použít čipovou kartu" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:20 -msgid "Userid:" -msgstr "Id uživatele:" +#: ../cc-panel/ka-panel.ui.h:18 +msgid "Userid" +msgstr "Id uživatele" #. Used in combination: 'Warn x minutes before expiry' -#: ../preferences/krb5-auth-dialog-preferences.xml.h:22 +#: ../cc-panel/ka-panel.ui.h:20 msgid "Warn" -msgstr "" +msgstr "Upozornit" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:23 -msgid "X509 trust anchors:" +#: ../cc-panel/ka-panel.ui.h:21 +msgid "X509 trust anchors" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:24 +#: ../cc-panel/ka-panel.ui.h:22 msgid "_Browse..." -msgstr "" +msgstr "_Procházet..." -#: ../preferences/krb5-auth-dialog-preferences.xml.h:25 +#: ../cc-panel/ka-panel.ui.h:23 msgid "forwardable" msgstr "" #. Used in combination: 'Warn x minutes before expiry' -#: ../preferences/krb5-auth-dialog-preferences.xml.h:27 -msgid "minutes before expiry" -msgstr "minut do vypršení" +#: ../cc-panel/ka-panel.ui.h:25 +msgid "minutes before ticket expiry" +msgstr "minut do vypršení lístku" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:28 +#: ../cc-panel/ka-panel.ui.h:26 msgid "proxiable" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:29 +#: ../cc-panel/ka-panel.ui.h:27 msgid "renewable" msgstr "" + +#: ../cc-panel/cc-ka-panel.c:345 +msgid "Choose Certificate" +msgstr "Vyberte certifikát" + +#: ../cc-panel/cc-ka-panel.c:361 +msgid "X509 Certificates" +msgstr "Certifikáty X.509" + +#: ../cc-panel/cc-ka-panel.c:365 +msgid "all files" +msgstr "všechny soubory" @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: krb5-auth-dialog master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-" "auth-dialog&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-03-30 13:43+0000\n" -"PO-Revision-Date: 2011-03-31 22:34+0100\n" +"POT-Creation-Date: 2011-09-06 10:36+0000\n" +"PO-Revision-Date: 2011-09-19 21:49+0100\n" "Last-Translator: Mario Blättermann <mariobl@freenet.de>\n" "Language-Team: Deutsch <gnome-de@gnome.org>\n" "MIME-Version: 1.0\n" @@ -30,19 +30,148 @@ msgstr "" "X-Poedit-Language: German\n" "X-Poedit-Country: GERMANY\n" -#: ../src/krb5-auth-dialog.ui.h:1 ../src/krb5-auth-dialog.desktop.in.h:1 -#: ../cc-panel/gnome-ka-panel.desktop.in.h:1 +#: ../src/krb5-auth-dialog.ui.h:1 +msgid "Certificate and private key used for authentication" +msgstr "Zertifikat und geheimer Schlüssel zur Identifizierung" + +#: ../src/krb5-auth-dialog.ui.h:2 +msgid "Certificate used to verify digital signatures." +msgstr "Zur Überprüfung der digitalen Signaturen verwendetes Zertifikat." + +#: ../src/krb5-auth-dialog.ui.h:3 +msgid "" +"Configure the use of certificates and smartcards for your Kerberos network " +"authentication." +msgstr "" +"Konfigurieren Sie die Nutzung von Zertifikaten und Smartcards für Ihre " +"Kerberos-Netzwerklegitimierung." + +#: ../src/krb5-auth-dialog.ui.h:4 +msgid "If checked, request forwardable tickets" +msgstr "Legt fest, ob weiterleitbare Tickets angefordert werden sollen" + +#: ../src/krb5-auth-dialog.ui.h:5 +msgid "If checked, request proxiable tickets" +msgstr "Legt fest, ob Proxy-fähige Tickets angefordert werden sollen" + +#: ../src/krb5-auth-dialog.ui.h:6 +msgid "If checked, request renewable tickets" +msgstr "Legt fest, ob erneuerbare Tickets angefordert werden sollen" + +#: ../src/krb5-auth-dialog.ui.h:7 +msgid "If checked, use a security token (Smartcard) to authenticate." +msgstr "" +"Legt fest, ob ein Sicherheits-Token (Smartcard) zur Identifizierung verwendet " +"wird" + +#: ../src/krb5-auth-dialog.ui.h:8 +msgid "Kerberos" +msgstr "Kerberos" + +#. +#. * vim:ts:sts=4:sw=4:et: +#. +#: ../src/krb5-auth-dialog.ui.h:9 ../src/krb5-auth-dialog.desktop.in.h:1 msgid "Kerberos Authentication" msgstr "Kerberos-Legitimierung" -#: ../src/krb5-auth-dialog.ui.h:2 +#: ../src/krb5-auth-dialog.ui.h:10 +msgid "Kerberos Ticket Options" +msgstr "Optionen zum Kerberos-Ticket " + +#: ../src/krb5-auth-dialog.ui.h:11 +msgid "Kerberos User" +msgstr "Kerberos-Benutzer" + +#: ../src/krb5-auth-dialog.ui.h:12 +msgid "Kerberos principal:" +msgstr "Kerberos-Principal:" + +#: ../src/krb5-auth-dialog.ui.h:13 +msgid "Notifications" +msgstr "Benachrichtigungen" + +#: ../src/krb5-auth-dialog.ui.h:14 +msgid "PKINIT" +msgstr "PKINIT" + +#: ../src/krb5-auth-dialog.ui.h:15 +msgid "Requested Kerberos tickets should be:" +msgstr "Angeforderte Kerberos-Tickets sollen sein:" + +#: ../src/krb5-auth-dialog.ui.h:16 +msgid "" +"Send notification about ticket expiry that many minutes before it finally " +"expires" +msgstr "" +"So viele Minuten vor endgültigem Ablauf des Tickets eine Benachrichtigung " +"senden" + +#: ../src/krb5-auth-dialog.ui.h:17 msgid "Service Tickets" msgstr "Service-Tickets" -#: ../src/krb5-auth-dialog.ui.h:3 +#: ../src/krb5-auth-dialog.ui.h:18 +msgid "" +"The name of your Kerberos account. Leave blank to use your current username." +msgstr "" +"Der Name Ihres Kerberos-Kontos. Leer lassen, um Ihren aktuellen Benutzernamen " +"zu verwenden." + +#: ../src/krb5-auth-dialog.ui.h:19 +msgid "Use Smartcard" +msgstr "Smartcard verwenden" + +#: ../src/krb5-auth-dialog.ui.h:20 +msgid "Userid" +msgstr "Benutzerkennung" + +#. Used in combination: 'Warn x minutes before expiry' +#: ../src/krb5-auth-dialog.ui.h:22 +msgid "Warn" +msgstr "Warnen" + +#: ../src/krb5-auth-dialog.ui.h:23 +msgid "X509 trust anchors" +msgstr "X509 Vertrauensinstitutionen" + +#: ../src/krb5-auth-dialog.ui.h:24 +msgid "_Browse..." +msgstr "_Auswählen …" + +#: ../src/krb5-auth-dialog.ui.h:25 +msgid "_Edit" +msgstr "_Bearbeiten" + +#: ../src/krb5-auth-dialog.ui.h:26 +msgid "_File" +msgstr "_Datei" + +#: ../src/krb5-auth-dialog.ui.h:27 +msgid "_Help" +msgstr "_Hilfe" + +#: ../src/krb5-auth-dialog.ui.h:28 msgid "_Renew Ticket" msgstr "Ticket _erneuern" +#: ../src/krb5-auth-dialog.ui.h:29 +msgid "forwardable" +msgstr "weiterleitbar" + +#. Used in combination: 'Warn x minutes before expiry' +#: ../src/krb5-auth-dialog.ui.h:31 +msgid "minutes before ticket expiry" +msgstr "Minuten vor Ablauf des Tickets" + +#: ../src/krb5-auth-dialog.ui.h:32 +msgid "proxiable" +msgstr "als Proxy nutzbar" + +#: ../src/krb5-auth-dialog.ui.h:33 +msgid "renewable" +msgstr "erneuerbar" + #: ../src/ka-dialog.c:177 msgid "unknown error" msgstr "Unbekannter Fehler" @@ -60,14 +189,14 @@ msgstr "Abgelaufen" msgid "Couldn't acquire kerberos ticket: '%s'" msgstr "Kerberos-Ticket konnte nicht erlangt werden: »%s«" -#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:361 +#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:368 #, c-format msgid "Your credentials expire in %d minute" msgid_plural "Your credentials expire in %d minutes" msgstr[0] "Ihre Anmeldeinformationen laufen in %d Minute ab" msgstr[1] "Ihre Anmeldeinformationen laufen in %d Minuten ab" -#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:366 +#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:373 msgid "Your credentials have expired" msgstr "Anmeldeinformationen abgelaufen" @@ -1434,70 +1563,57 @@ msgstr "Falsche magische Zahl für GSSAPI OID" msgid "Bad magic number for GSSAPI QUEUE" msgstr "Falsche magische Zahl für GSSAPI QUEUE" -#: ../src/ka-applet.c:355 +#: ../src/ka-applet.c:362 #, c-format msgid "Your credentials expire in %.2d:%.2dh" msgstr "Anmeldeinformationen laufen in %.2d:%.2dh ab." -#: ../src/ka-applet.c:537 +#: ../src/ka-applet.c:544 msgid "List Tickets" msgstr "Tickets auflisten" -#: ../src/ka-applet.c:547 +#: ../src/ka-applet.c:554 msgid "Get Ticket" msgstr "Ticket holen" -#: ../src/ka-applet.c:556 +#: ../src/ka-applet.c:563 msgid "Don't show me this again" msgstr "Dies nicht mehr anzeigen" -#: ../src/ka-applet.c:563 +#: ../src/ka-applet.c:570 msgid "Remove Credentials Cache" msgstr "Zwischenspeicher für Anmeldeinformationen löschen" -#: ../src/ka-applet.c:612 +#: ../src/ka-applet.c:619 msgid "You have valid Kerberos credentials." msgstr "Sie verfügen über gültige Kerberos-Anmeldeinformationen." -#: ../src/ka-applet.c:614 +#: ../src/ka-applet.c:621 msgid "You've refreshed your Kerberos credentials." msgstr "Sie haben Ihre Kerberos-Anmeldeinformationen erneuert." -#: ../src/ka-applet.c:617 +#: ../src/ka-applet.c:624 msgid "Network credentials valid" msgstr "Anmeldeinformationen sind gültig" -#: ../src/ka-applet.c:636 +#: ../src/ka-applet.c:643 msgid "Network credentials expiring" msgstr "Anmeldeinformationen laufen ab" -#: ../src/ka-applet.c:654 +#: ../src/ka-applet.c:661 msgid "Network credentials expired" msgstr "Anmeldeinformationen abgelaufen" -#: ../src/ka-applet.c:655 +#: ../src/ka-applet.c:662 msgid "Your Kerberos credentails have expired." msgstr "Ihre Kerberos-Anmeldeinformationen sind abgelaufen." -#: ../src/ka-applet.c:699 -#, c-format -msgid "There was an error launching the preferences dialog: %s" -msgstr "Fehler beim Öffnen des Einstellungsdialogs: %s" - -#. Translators: add the translators of your language here -#: ../src/ka-applet.c:745 -msgid "translator-credits" -msgstr "" -"Guido Günther <agx@sigxcpu.org>\n" -"Mario Blättermann <mariobl@freenet.de>\n" -"Christian Kirbach <Christian.Kirbach@googlemail.com>" - -#: ../src/ka-applet.c:790 +#: ../src/ka-applet.c:741 msgid "Remove Credentials _Cache" msgstr "_Anmeldeinformationen löschen" #. Ticket dialog -#: ../src/ka-applet.c:800 +#: ../src/ka-applet.c:751 msgid "_List Tickets" msgstr "Tickets auf_listen" @@ -1510,34 +1626,54 @@ msgstr "" "Fehler beim Anzeigen der Hilfe:\n" "%s" -#: ../src/ka-tickets.c:56 +#. Translators: add the translators of your language here +#: ../src/ka-tools.c:83 +msgid "translator-credits" +msgstr "" +"Guido Günther <agx@sigxcpu.org>\n" +"Mario Blättermann <mariobl@freenet.de>\n" +"Christian Kirbach <Christian.Kirbach@googlemail.com>" + +#: ../src/ka-main-window.c:119 msgid "Principal" msgstr "Principal" -#: ../src/ka-tickets.c:62 +#: ../src/ka-main-window.c:125 msgid "Start Time" msgstr "Startzeit" -#: ../src/ka-tickets.c:68 +#: ../src/ka-main-window.c:131 msgid "End Time" msgstr "Endzeit" -#: ../src/ka-tickets.c:74 +#: ../src/ka-main-window.c:137 msgid "Fwd" msgstr "Weiterleiten" -#: ../src/ka-tickets.c:80 +#: ../src/ka-main-window.c:143 msgid "Proxy" msgstr "Proxy" -#: ../src/ka-tickets.c:86 +#: ../src/ka-main-window.c:149 msgid "Renew" msgstr "Erneuern" -#: ../src/ka-tickets.c:109 +#: ../src/ka-main-window.c:176 msgid "Error displaying service ticket information" msgstr "Fehler beim Anzeigen der Informationen des Tickets des Dienstes" +#: ../src/ka-preferences.c:340 +msgid "Choose Certificate" +msgstr "Zertifikat wählen" + +#: ../src/ka-preferences.c:356 +msgid "X509 Certificates" +msgstr "X509-Zertifikate" + +#: ../src/ka-preferences.c:360 +msgid "all files" +msgstr "Alle Dateien" + #: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" msgstr "Kerberos Netzwerkanmeldungsdialog" @@ -1640,139 +1776,11 @@ msgstr "" "Warnung: q-agent mit Admistratorrechten auszuführen ist auf diesem System " "gefährlich\n" -#. Translators: those are keywords for the Kerberos authentication control-center panel -#: ../cc-panel/gnome-ka-panel.desktop.in.h:3 -msgid "Kerberos;Authentication" -msgstr "Kerberos;Legitimierung" - -#: ../cc-panel/gnome-ka-panel.desktop.in.h:4 -msgid "Set your Kerberos network authentication preferences" -msgstr "Einstellungen für Kerberos-Netzwerkanmeldung" - -#: ../cc-panel/ka-panel.ui.h:1 -msgid "Certificate and private key used for authentication" -msgstr "Zertifikat und geheimer Schlüssel zur Identifizierung" - -#: ../cc-panel/ka-panel.ui.h:2 -msgid "Certificate used to verify digital signatures." -msgstr "Zur Überprüfung der digitalen Signaturen verwendetes Zertifikat." - -#: ../cc-panel/ka-panel.ui.h:3 -msgid "" -"Configure the use of certificates and smartcards for your Kerberos network " -"authentication." -msgstr "" -"Konfigurieren Sie die Nutzung von Zertifikaten und Smartcards für Ihre " -"Kerberos-Netzwerklegitimierung." - -#: ../cc-panel/ka-panel.ui.h:4 -msgid "If checked, request forwardable tickets" -msgstr "Legt fest, ob weiterleitbare Tickets angefordert werden sollen" - -#: ../cc-panel/ka-panel.ui.h:5 -msgid "If checked, request proxiable tickets" -msgstr "Legt fest, ob Proxy-fähige Tickets angefordert werden sollen" - -#: ../cc-panel/ka-panel.ui.h:6 -msgid "If checked, request renewable tickets" -msgstr "Legt fest, ob erneuerbare Tickets angefordert werden sollen" - -#: ../cc-panel/ka-panel.ui.h:7 -msgid "If checked, use a security token (Smartcard) to authenticate." -msgstr "" -"Legt fest, ob ein Sicherheits-Token (Smartcard) zur Identifizierung verwendet " -"wird" - -#: ../cc-panel/ka-panel.ui.h:8 -msgid "Kerberos" -msgstr "Kerberos" - -#: ../cc-panel/ka-panel.ui.h:9 -msgid "Kerberos Ticket Options" -msgstr "Optionen zum Kerberos-Ticket " - -#: ../cc-panel/ka-panel.ui.h:10 -msgid "Kerberos User" -msgstr "Kerberos-Benutzer" - -#: ../cc-panel/ka-panel.ui.h:11 -msgid "Kerberos principal:" -msgstr "Kerberos-Principal:" +#~ msgid "There was an error launching the preferences dialog: %s" +#~ msgstr "Fehler beim Öffnen des Einstellungsdialogs: %s" -#: ../cc-panel/ka-panel.ui.h:12 -msgid "Notifications" -msgstr "Benachrichtigungen" - -#: ../cc-panel/ka-panel.ui.h:13 -msgid "PKINIT" -msgstr "PKINIT" - -#: ../cc-panel/ka-panel.ui.h:14 -msgid "Requested Kerberos tickets should be:" -msgstr "Angeforderte Kerberos-Tickets sollen sein:" - -#: ../cc-panel/ka-panel.ui.h:15 -msgid "" -"Send notification about ticket expiry that many minutes before it finally " -"expires" -msgstr "" -"So viele Minuten vor endgültigem Ablauf des Tickets eine Benachrichtigung " -"senden" - -#: ../cc-panel/ka-panel.ui.h:16 -msgid "" -"The name of your Kerberos account. Leave blank to use your current username." -msgstr "" -"Der Name Ihres Kerberos-Kontos. Leer lassen, um Ihren aktuellen Benutzernamen " -"zu verwenden." - -#: ../cc-panel/ka-panel.ui.h:17 -msgid "Use Smartcard" -msgstr "Smartcard verwenden" - -#: ../cc-panel/ka-panel.ui.h:18 -msgid "Userid" -msgstr "Benutzerkennung" - -#. Used in combination: 'Warn x minutes before expiry' -#: ../cc-panel/ka-panel.ui.h:20 -msgid "Warn" -msgstr "Warnen" - -#: ../cc-panel/ka-panel.ui.h:21 -msgid "X509 trust anchors" -msgstr "X509 Vertrauensinstitutionen" - -#: ../cc-panel/ka-panel.ui.h:22 -msgid "_Browse..." -msgstr "_Auswählen …" - -#: ../cc-panel/ka-panel.ui.h:23 -msgid "forwardable" -msgstr "weiterleitbar" - -#. Used in combination: 'Warn x minutes before expiry' -#: ../cc-panel/ka-panel.ui.h:25 -msgid "minutes before ticket expiry" -msgstr "Minuten vor Ablauf des Tickets" - -#: ../cc-panel/ka-panel.ui.h:26 -msgid "proxiable" -msgstr "als Proxy nutzbar" - -#: ../cc-panel/ka-panel.ui.h:27 -msgid "renewable" -msgstr "erneuerbar" - -#: ../cc-panel/cc-ka-panel.c:345 -msgid "Choose Certificate" -msgstr "Zertifikat wählen" - -#: ../cc-panel/cc-ka-panel.c:361 -msgid "X509 Certificates" -msgstr "X509-Zertifikate" - -#: ../cc-panel/cc-ka-panel.c:365 -msgid "all files" -msgstr "Alle Dateien" +#~ msgid "Kerberos;Authentication" +#~ msgstr "Kerberos;Legitimierung" +#~ msgid "Set your Kerberos network authentication preferences" +#~ msgstr "Einstellungen für Kerberos-Netzwerkanmeldung" @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: krb5-auth-dialog.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-" "auth-dialog&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-03-30 13:43+0000\n" -"PO-Revision-Date: 2011-04-04 13:28+0200\n" +"POT-Creation-Date: 2011-09-04 18:15+0000\n" +"PO-Revision-Date: 2011-09-05 13:53+0200\n" "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n" "Language-Team: Español <gnome-es-list@gnome.org>\n" "MIME-Version: 1.0\n" @@ -30,6 +30,19 @@ msgid "Service Tickets" msgstr "Tiques de servicio" #: ../src/krb5-auth-dialog.ui.h:3 +#| msgid "_Quit" +msgid "_Edit" +msgstr "_Editar" + +#: ../src/krb5-auth-dialog.ui.h:4 +msgid "_File" +msgstr "_Archivo" + +#: ../src/krb5-auth-dialog.ui.h:5 +msgid "_Help" +msgstr "_Ayuda" + +#: ../src/krb5-auth-dialog.ui.h:6 msgid "_Renew Ticket" msgstr "_Renovar tique" @@ -50,14 +63,14 @@ msgstr "Caducado" msgid "Couldn't acquire kerberos ticket: '%s'" msgstr "No se pudo obtener el tique de Kerberos: «%s»" -#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:361 +#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:367 #, c-format msgid "Your credentials expire in %d minute" msgid_plural "Your credentials expire in %d minutes" msgstr[0] "Sus credenciales caducan en %d minuto" msgstr[1] "Sus credenciales caducan en %d minutos" -#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:366 +#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:372 msgid "Your credentials have expired" msgstr "Sus credenciales han caducado" @@ -1406,70 +1419,62 @@ msgstr "Número mágico erróneo para GSSAPI OID" msgid "Bad magic number for GSSAPI QUEUE" msgstr "Número mágico erróneo para GSSAPI QUEUE" -#: ../src/ka-applet.c:355 +#: ../src/ka-applet.c:361 #, c-format msgid "Your credentials expire in %.2d:%.2dh" msgstr "Sus credenciales caducan en %.2d:%.2dh" -#: ../src/ka-applet.c:537 +#: ../src/ka-applet.c:543 msgid "List Tickets" msgstr "Listar tiques" -#: ../src/ka-applet.c:547 +#: ../src/ka-applet.c:553 msgid "Get Ticket" msgstr "Obtener tique" -#: ../src/ka-applet.c:556 +#: ../src/ka-applet.c:562 msgid "Don't show me this again" msgstr "No mostrar este mensaje de nuevo" -#: ../src/ka-applet.c:563 +#: ../src/ka-applet.c:569 msgid "Remove Credentials Cache" msgstr "Quitar la caché de credenciales" -#: ../src/ka-applet.c:612 -#| msgid "You've refreshed your Kerberos credentials." +#: ../src/ka-applet.c:618 msgid "You have valid Kerberos credentials." msgstr "Sus credenciales de Kerberos son válidas." -#: ../src/ka-applet.c:614 +#: ../src/ka-applet.c:620 msgid "You've refreshed your Kerberos credentials." msgstr "Ha actualizado sus credenciales de Kerberos." -#: ../src/ka-applet.c:617 +#: ../src/ka-applet.c:623 msgid "Network credentials valid" msgstr "Credenciales de red válidas" -#: ../src/ka-applet.c:636 +#: ../src/ka-applet.c:642 msgid "Network credentials expiring" msgstr "Las credenciales de red van a caducar" -#: ../src/ka-applet.c:654 +#: ../src/ka-applet.c:660 msgid "Network credentials expired" msgstr "Las credenciales de red han caducado" -#: ../src/ka-applet.c:655 +#: ../src/ka-applet.c:661 msgid "Your Kerberos credentails have expired." msgstr "Sus credenciales Kerberos han caducado" -#: ../src/ka-applet.c:699 +#: ../src/ka-applet.c:705 #, c-format msgid "There was an error launching the preferences dialog: %s" msgstr "Hubo un error al lanzar el diálogo de preferencias: %s" -#. Translators: add the translators of your language here -#: ../src/ka-applet.c:745 -msgid "translator-credits" -msgstr "" -"Jorge González <jorgegonz@svn.gnome.org>, 2009-2010\n" -"Daniel Mustieles <daniel.mustieles@gmail.com>, 2009" - -#: ../src/ka-applet.c:790 +#: ../src/ka-applet.c:775 msgid "Remove Credentials _Cache" msgstr "Quitar la _caché de credenciales" #. Ticket dialog -#: ../src/ka-applet.c:800 +#: ../src/ka-applet.c:785 msgid "_List Tickets" msgstr "_Listar tiques" @@ -1482,31 +1487,38 @@ msgstr "" "Hubo un error al mostrar la ayuda:\n" "%s" -#: ../src/ka-tickets.c:56 +#. Translators: add the translators of your language here +#: ../src/ka-tools.c:83 +msgid "translator-credits" +msgstr "" +"Jorge González <jorgegonz@svn.gnome.org>, 2009-2010\n" +"Daniel Mustieles <daniel.mustieles@gmail.com>, 2009" + +#: ../src/ka-main-window.c:118 msgid "Principal" msgstr "Principal" -#: ../src/ka-tickets.c:62 +#: ../src/ka-main-window.c:124 msgid "Start Time" msgstr "Tiempo de inicio" -#: ../src/ka-tickets.c:68 +#: ../src/ka-main-window.c:130 msgid "End Time" msgstr "Tiempo de finalización" -#: ../src/ka-tickets.c:74 +#: ../src/ka-main-window.c:136 msgid "Fwd" msgstr "Rnv" -#: ../src/ka-tickets.c:80 +#: ../src/ka-main-window.c:142 msgid "Proxy" msgstr "Proxy" -#: ../src/ka-tickets.c:86 +#: ../src/ka-main-window.c:148 msgid "Renew" msgstr "Renovar" -#: ../src/ka-tickets.c:109 +#: ../src/ka-main-window.c:175 msgid "Error displaying service ticket information" msgstr "Error al mostrar la información del tique de servicio" @@ -1872,9 +1884,6 @@ msgstr "todos los archivos" #~ msgid "_About" #~ msgstr "Acerca _de" -#~ msgid "_Quit" -#~ msgstr "_Salir" - #~ msgid " " #~ msgstr " " @@ -4,80 +4,85 @@ # Galician translation of krb5-auth-dialog. # Copyright (C) 2009 krb5-auth-dialog's COPYRIGHT HOLDER # This file is distributed under the same license as the krb5-auth-dialog package. -# Fran Diéguez <frandieguez@ubuntu.com>, 2010. +# Fran Diéguez <frandieguez@gnome.org>, 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog.po.master.gl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-23 02:39+0200\n" -"PO-Revision-Date: 2010-05-23 02:38+0200\n" -"Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n" -"Language-Team: Galician <gnome@g11.net>\n" +"POT-Creation-Date: 2011-08-16 22:57+0200\n" +"PO-Revision-Date: 2011-08-16 23:00+0200\n" +"Last-Translator: Fran Diéguez <frandieguez@gnome.org>\n" +"Language-Team: Galician <gnome-l10n-gl@gnome.org>\n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\\\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#: ../src/krb5-auth-dialog.xml.h:1 ../src/krb5-auth-dialog.desktop.in.h:2 -#: ../preferences/krb5-auth-dialog-preferences.desktop.in.h:1 -msgid "Network Authentication" -msgstr "Autenticación de rede" +#: ../src/krb5-auth-dialog.ui.h:1 ../src/krb5-auth-dialog.desktop.in.h:1 +#: ../cc-panel/gnome-ka-panel.desktop.in.h:1 +msgid "Kerberos Authentication" +msgstr "Configuración de autenticación de Kerberos" -#: ../src/krb5-auth-dialog.xml.h:2 +#: ../src/krb5-auth-dialog.ui.h:2 msgid "Service Tickets" msgstr "Tiquets de servicio" -#: ../src/krb5-auth-dialog.xml.h:3 +#: ../src/krb5-auth-dialog.ui.h:3 msgid "_Renew Ticket" msgstr "_Anovar tícket" -#: ../src/ka-dialog.c:172 +#: ../src/ka-dialog.c:177 msgid "unknown error" msgstr "erro descoñecido" -#: ../src/ka-dialog.c:332 +#: ../src/ka-dialog.c:317 +msgid "Your ticket cache is currently empty" +msgstr "A súa caché de tiques está baleira actualmente" + +#: ../src/ka-dialog.c:343 msgid "Expired" msgstr "Caducado" -#: ../src/ka-pwdialog.c:174 +#: ../src/ka-pwdialog.c:178 #, c-format msgid "Couldn't acquire kerberos ticket: '%s'" msgstr "No se puido obter o tícket de Kerberos: '%s'" -#: ../src/ka-pwdialog.c:211 ../src/ka-applet.c:390 +#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:361 #, c-format msgid "Your credentials expire in %d minute" msgid_plural "Your credentials expire in %d minutes" msgstr[0] "As súas credenciais caducan dentro de %d minuto" msgstr[1] "As súas credenciais caducan dentro de %d minutos" -#: ../src/ka-pwdialog.c:216 ../src/ka-applet.c:395 +#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:366 msgid "Your credentials have expired" msgstr "As súas credenciais caducaron" -#: ../src/ka-pwdialog.c:237 +#: ../src/ka-pwdialog.c:245 msgid "Please enter your Kerberos password:" msgstr "Introduza o seu contrasinal de Kerberos:" -#: ../src/ka-pwdialog.c:248 +#: ../src/ka-pwdialog.c:258 #, c-format msgid "Please enter the password for '%s':" msgstr "Introduza o contrasinal para '%s':" -#: ../src/ka-pwdialog.c:268 +#: ../src/ka-pwdialog.c:276 msgid "The password you entered is invalid" msgstr "O contrasinal que introduciu non é válido" -#: ../src/ka-pwdialog.c:284 +#: ../src/ka-pwdialog.c:292 #, c-format msgid "%s Error" msgstr "Erro %s" #. Translators: files from dummy-strings.c are *all* possible errors #. returned from Kerberos (since Kerberos itself doesn't handle i18n). If in -#. doubt please translate strings from files starting with krb5-auth +#. doubt please translate strings from files starting with ka- and krb5-auth- #. first since these are the ones the user will see in any case. #: ../src/dummy-strings.c:10 msgid "ASN.1 failed call to system time library" @@ -1390,62 +1395,72 @@ msgstr "Número máxico incorrecto para a estrutura GSSAPI OID" msgid "Bad magic number for GSSAPI QUEUE" msgstr "Número máxico incorrecto para GSSAPI QUEUE" -#. Translators: First number is hours, second number is minutes -#: ../src/ka-applet.c:386 +#: ../src/ka-applet.c:355 #, c-format msgid "Your credentials expire in %.2d:%.2dh" msgstr "As súas credenciais caducan en %.2d:%.2dh" -#: ../src/ka-applet.c:491 +#: ../src/ka-applet.c:537 +msgid "List Tickets" +msgstr "Listar tiques" + +#: ../src/ka-applet.c:547 +msgid "Get Ticket" +msgstr "Obter tique" + +#: ../src/ka-applet.c:556 msgid "Don't show me this again" msgstr "Non mostrar esta mensaxe de novo" -#: ../src/ka-applet.c:533 -msgid "Network credentials valid" -msgstr "As credenciais de rede son válidas" +#: ../src/ka-applet.c:563 +msgid "Remove Credentials Cache" +msgstr "Quitar a caché de credenciais" + +#: ../src/ka-applet.c:612 +msgid "You have valid Kerberos credentials." +msgstr "As súas credenciais de Kerberos son válidas." -#: ../src/ka-applet.c:534 +#: ../src/ka-applet.c:614 msgid "You've refreshed your Kerberos credentials." msgstr "Actualizou as súas credenciais Kerberos." -#: ../src/ka-applet.c:550 +#: ../src/ka-applet.c:617 +msgid "Network credentials valid" +msgstr "As credenciais de rede son válidas" + +#: ../src/ka-applet.c:636 msgid "Network credentials expiring" msgstr "As credenciais de rede van caducar" -#: ../src/ka-applet.c:569 +#: ../src/ka-applet.c:654 msgid "Network credentials expired" msgstr "As credenciais de rede caducaron" -#: ../src/ka-applet.c:570 +#: ../src/ka-applet.c:655 msgid "Your Kerberos credentails have expired." msgstr "As súas credenciais Kerberos caducaron." -#: ../src/ka-applet.c:615 +#: ../src/ka-applet.c:699 #, c-format msgid "There was an error launching the preferences dialog: %s" msgstr "Produciuse un erro ao iniciar o diálogo de preferencias: %s" -#: ../src/ka-applet.c:656 -#, c-format -msgid "" -"There was an error displaying %s:\n" -"%s" -msgstr "" -"Houbo un erro ao mostrar %s:\n" -"%s" - #. Translators: add the translators of your language here -#: ../src/ka-applet.c:692 +#: ../src/ka-applet.c:745 msgid "translator-credits" msgstr "" "Antón Méixome <meixome@mancomun.org> para Mancomún. Centro de Referencia de " "Software Libre " -#. kdestroy -#: ../src/ka-applet.c:734 +#: ../src/ka-applet.c:790 msgid "Remove Credentials _Cache" msgstr "Quitar a _caché de credenciais" +#. Ticket dialog +#: ../src/ka-applet.c:800 +msgid "_List Tickets" +msgstr "_Listar tiques" + #: ../src/ka-tools.c:45 #, c-format msgid "" @@ -1455,35 +1470,35 @@ msgstr "" "Ocorreu un erro ao mostrar a axuda:\n" "%s" -#: ../src/ka-tickets.c:54 +#: ../src/ka-tickets.c:56 msgid "Principal" msgstr "Principal" -#: ../src/ka-tickets.c:60 +#: ../src/ka-tickets.c:62 msgid "Start Time" msgstr "Tempo de inicio" -#: ../src/ka-tickets.c:66 +#: ../src/ka-tickets.c:68 msgid "End Time" msgstr "Tempo de finalización" -#: ../src/ka-tickets.c:72 +#: ../src/ka-tickets.c:74 msgid "Fwd" msgstr "Rnv" -#: ../src/ka-tickets.c:78 +#: ../src/ka-tickets.c:80 msgid "Proxy" msgstr "Proxy" -#: ../src/ka-tickets.c:84 +#: ../src/ka-tickets.c:86 msgid "Renew" msgstr "Renovar" -#: ../src/ka-tickets.c:107 +#: ../src/ka-tickets.c:109 msgid "Error displaying service ticket information" msgstr "Produciuse un erro ao mostrar a información do tiquet de servizo" -#: ../src/krb5-auth-dialog.desktop.in.h:1 +#: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" msgstr "Diálogo de autenticación de rede de Kerberos" @@ -1552,36 +1567,28 @@ msgid "Requested tickets should be renewable" msgstr "Os tíckets solicitados deberían ser anovábeis" #: ../src/krb5-auth-dialog.schemas.in.h:17 -msgid "Show a trayicon in the status area of the panel" -msgstr "Mostrar unha icona na bandexa do sistema na área do panel" - -#: ../src/krb5-auth-dialog.schemas.in.h:18 -msgid "Show trayicon" -msgstr "Mostrar a icona na bandexa" - -#: ../src/krb5-auth-dialog.schemas.in.h:19 msgid "" "Start prompting/displaying notifications that many minutes before expiry" msgstr "Deixar de mostrar notificacións eses minutos antes de que caduque" -#: ../src/krb5-auth-dialog.schemas.in.h:20 +#: ../src/krb5-auth-dialog.schemas.in.h:18 msgid "The kerberos principal to acquire the ticket for" msgstr "O principal de Kerberos para o que adquirir o tícket" -#: ../src/krb5-auth-dialog.schemas.in.h:21 +#: ../src/krb5-auth-dialog.schemas.in.h:19 msgid "The principal's public/private/certificate identifier when using PKINIT" msgstr "" "O identificador público/privado/certificado do principal ao usar PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:22 +#: ../src/krb5-auth-dialog.schemas.in.h:20 msgid "ticket expired notification" msgstr "notificación de tícket caducado" -#: ../src/krb5-auth-dialog.schemas.in.h:23 +#: ../src/krb5-auth-dialog.schemas.in.h:21 msgid "ticket expiring notification" msgstr "notificación de caducidade de tícket" -#: ../src/krb5-auth-dialog.schemas.in.h:24 +#: ../src/krb5-auth-dialog.schemas.in.h:22 msgid "valid ticket notification" msgstr "tícket de notificación válido" @@ -1590,84 +1597,77 @@ msgstr "tícket de notificación válido" msgid "Warning: running q-agent setuid on this system is dangerous\n" msgstr "Advertencia: executar q-agent setuid neste sistema é perigoso\n" -#: ../preferences/ka-preferences.c:345 -msgid "Choose Certificate" -msgstr "Seleccione o certificado" +#. Translators: those are keywords for the Kerberos authentication control-center panel +#: ../cc-panel/gnome-ka-panel.desktop.in.h:3 +msgid "Kerberos;Authentication" +msgstr "Kerberos;Autenticación" -#: ../preferences/ka-preferences.c:361 -msgid "X509 Certificates" -msgstr "Certificados X509" - -#: ../preferences/ka-preferences.c:365 -msgid "all files" -msgstr "todos os ficheiros" - -#: ../preferences/krb5-auth-dialog-preferences.desktop.in.h:2 +#: ../cc-panel/gnome-ka-panel.desktop.in.h:4 msgid "Set your Kerberos network authentication preferences" msgstr "Estabeleza as súas preferencias de autenticación de rede en Kerberos" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:1 -msgid "Appearance" -msgstr "Aparencia" - -#: ../preferences/krb5-auth-dialog-preferences.xml.h:2 -msgid "Applet" -msgstr "Miniaplicativo" - -#: ../preferences/krb5-auth-dialog-preferences.xml.h:3 +#: ../cc-panel/ka-panel.ui.h:1 msgid "Certificate and private key used for authentication" msgstr "Certificado e chave privada empregada para a autenticación" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:4 -msgid "If checked, display the tray icon in the status bar" -msgstr "Se está seleccionado mostra a icona da bandexa na barra de estado" +#: ../cc-panel/ka-panel.ui.h:2 +msgid "Certificate used to verify digital signatures." +msgstr "Certificado usado para comprobar firmas dixitais." + +#: ../cc-panel/ka-panel.ui.h:3 +msgid "" +"Configure the use of certificates and smartcards for your Kerberos network " +"authentication." +msgstr "" +"Configurar o uso do certificados e tarxeta intelixentes para a súa " +"autenticación de rede de Kerberos." -#: ../preferences/krb5-auth-dialog-preferences.xml.h:5 +#: ../cc-panel/ka-panel.ui.h:4 msgid "If checked, request forwardable tickets" msgstr "Se está seleccionado, pide tíckets reenviábeis" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:6 +#: ../cc-panel/ka-panel.ui.h:5 msgid "If checked, request proxiable tickets" msgstr "Se está seleccionado, solicita tíckets utilizábeis vía proxy" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:7 +#: ../cc-panel/ka-panel.ui.h:6 msgid "If checked, request renewable tickets" msgstr "Se está seleccionado pide tíckets anovábeis" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:8 +#: ../cc-panel/ka-panel.ui.h:7 msgid "If checked, use a security token (Smartcard) to authenticate." msgstr "" "Se está activado emprega un token de seguranza (Smartcard) para autenticar." -#: ../preferences/krb5-auth-dialog-preferences.xml.h:9 +#: ../cc-panel/ka-panel.ui.h:8 msgid "Kerberos" msgstr "Kerberos" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:10 -msgid "Kerberos Authentication Configuration" -msgstr "Configuración de autenticación de Kerberos" +#: ../cc-panel/ka-panel.ui.h:9 +msgid "Kerberos Ticket Options" +msgstr "Opcións do tique de Kerberos" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:11 +#: ../cc-panel/ka-panel.ui.h:10 msgid "Kerberos User" msgstr "Usuario de Kerberos" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:12 +#: ../cc-panel/ka-panel.ui.h:11 msgid "Kerberos principal:" msgstr "Principal de Kerberos:" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:13 +#: ../cc-panel/ka-panel.ui.h:12 msgid "Notifications" msgstr "Notificacións" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:14 -msgid "PKINIT:" -msgstr "PKINIT:" +#: ../cc-panel/ka-panel.ui.h:13 +msgid "PKINIT" +msgstr "PKINIT" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:15 +#: ../cc-panel/ka-panel.ui.h:14 msgid "Requested Kerberos tickets should be:" msgstr "Os tíckets solicitados a Kerberos deberían ser:" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:16 +#: ../cc-panel/ka-panel.ui.h:15 msgid "" "Send notification about ticket expiry that many minutes before it finally " "expires" @@ -1675,52 +1675,91 @@ msgstr "" "Enviar notificación sobre a caducidade do tícket neses minutos antes de que " "caduque" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:17 -msgid "Show tray icon" -msgstr "Mostrar a icona da bandexa" - -#: ../preferences/krb5-auth-dialog-preferences.xml.h:18 -msgid "Ticket Options" -msgstr "Opcións do tícket" +#: ../cc-panel/ka-panel.ui.h:16 +msgid "" +"The name of your Kerberos account. Leave blank to use your current username." +msgstr "" +"O nome da súa conta de Kerberos. Déixeo en branco para usar o seu nome de " +"usuario actual." -#: ../preferences/krb5-auth-dialog-preferences.xml.h:19 +#: ../cc-panel/ka-panel.ui.h:17 msgid "Use Smartcard" msgstr "Empregar Smartcard" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:20 -msgid "Userid:" -msgstr "Id de usuario:" +#: ../cc-panel/ka-panel.ui.h:18 +msgid "Userid" +msgstr "Id de usuario" #. Used in combination: 'Warn x minutes before expiry' -#: ../preferences/krb5-auth-dialog-preferences.xml.h:22 +#: ../cc-panel/ka-panel.ui.h:20 msgid "Warn" msgstr "Advertir" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:23 -msgid "X509 trust anchors:" +#: ../cc-panel/ka-panel.ui.h:21 +msgid "X509 trust anchors" msgstr "Áncoras de confianza de X509" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:24 +#: ../cc-panel/ka-panel.ui.h:22 msgid "_Browse..." msgstr "_Explorar..." -#: ../preferences/krb5-auth-dialog-preferences.xml.h:25 +#: ../cc-panel/ka-panel.ui.h:23 msgid "forwardable" msgstr "reenviábel" #. Used in combination: 'Warn x minutes before expiry' -#: ../preferences/krb5-auth-dialog-preferences.xml.h:27 -msgid "minutes before expiry" -msgstr "minutos antes de que caduque" +#: ../cc-panel/ka-panel.ui.h:25 +msgid "minutes before ticket expiry" +msgstr "minutos antes de que caduque o tique" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:28 +#: ../cc-panel/ka-panel.ui.h:26 msgid "proxiable" msgstr "vía proxy" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:29 +#: ../cc-panel/ka-panel.ui.h:27 msgid "renewable" msgstr "renovábel" +#: ../cc-panel/cc-ka-panel.c:345 +msgid "Choose Certificate" +msgstr "Seleccione o certificado" + +#: ../cc-panel/cc-ka-panel.c:361 +msgid "X509 Certificates" +msgstr "Certificados X509" + +#: ../cc-panel/cc-ka-panel.c:365 +msgid "all files" +msgstr "todos os ficheiros" + +#~ msgid "Network Authentication" +#~ msgstr "Autenticación de rede" + +#~ msgid "" +#~ "There was an error displaying %s:\n" +#~ "%s" +#~ msgstr "" +#~ "Houbo un erro ao mostrar %s:\n" +#~ "%s" + +#~ msgid "Show a trayicon in the status area of the panel" +#~ msgstr "Mostrar unha icona na bandexa do sistema na área do panel" + +#~ msgid "Show trayicon" +#~ msgstr "Mostrar a icona na bandexa" + +#~ msgid "Appearance" +#~ msgstr "Aparencia" + +#~ msgid "Applet" +#~ msgstr "Miniaplicativo" + +#~ msgid "If checked, display the tray icon in the status bar" +#~ msgstr "Se está seleccionado mostra a icona da bandexa na barra de estado" + +#~ msgid "Show tray icon" +#~ msgstr "Mostrar a icona da bandexa" + #~ msgid "Cursor Position" #~ msgstr "Posición do cursor" @@ -8,33 +8,149 @@ msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-auth-dialog&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-04-04 17:53+0000\n" -"PO-Revision-Date: 2011-04-06 10:08+0100\n" +"POT-Creation-Date: 2011-09-06 17:21+0000\n" +"PO-Revision-Date: 2011-09-07 21:28+0100\n" "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n" "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" "X-Poedit-Country: SLOVENIA\n" "X-Poedit-Language: Slovenian\n" "X-Poedit-SourceCharset: utf-8\n" #: ../src/krb5-auth-dialog.ui.h:1 +msgid "Certificate and private key used for authentication" +msgstr "Potrdilo in osebni ključ uporabljena za overitev" + +#: ../src/krb5-auth-dialog.ui.h:2 +msgid "Certificate used to verify digital signatures." +msgstr "Potrdilo, ki se uporablja za potrjevanje digitalnih podpisov." + +#: ../src/krb5-auth-dialog.ui.h:3 +msgid "Configure the use of certificates and smartcards for your Kerberos network authentication." +msgstr "Nastavite uporabo potrdil in pametnih kartic za vašo overitev omrežja Kerberos." + +#: ../src/krb5-auth-dialog.ui.h:4 +msgid "If checked, request forwardable tickets" +msgstr "Izbrana možnost določi zahtevo za uporabo prenosljivih vstopnic" + +#: ../src/krb5-auth-dialog.ui.h:5 +msgid "If checked, request proxiable tickets" +msgstr "Izbrana možnost omogoči zahtevo za posredovalno vstopnico" + +#: ../src/krb5-auth-dialog.ui.h:6 +msgid "If checked, request renewable tickets" +msgstr "Izbrana možnost določi zahtevo za uporabo obnovljivih vstopnic" + +#: ../src/krb5-auth-dialog.ui.h:7 +msgid "If checked, use a security token (Smartcard) to authenticate." +msgstr "Izbrana možnost omogoči zahtevo za uporabo Varnostne SmartCard za overjanje" + +#: ../src/krb5-auth-dialog.ui.h:8 +msgid "Kerberos" +msgstr "Kerberos" + +#. +#. * vim:ts:sts=4:sw=4:et: +#. +#: ../src/krb5-auth-dialog.ui.h:9 #: ../src/krb5-auth-dialog.desktop.in.h:1 -#: ../cc-panel/gnome-ka-panel.desktop.in.h:1 msgid "Kerberos Authentication" msgstr "Overitev Kerberos" -#: ../src/krb5-auth-dialog.ui.h:2 +#: ../src/krb5-auth-dialog.ui.h:10 +msgid "Kerberos Ticket Options" +msgstr "Možnosti vstopnice Kerberos" + +#: ../src/krb5-auth-dialog.ui.h:11 +msgid "Kerberos User" +msgstr "Uporabnik Kerberos" + +#: ../src/krb5-auth-dialog.ui.h:12 +msgid "Kerberos principal:" +msgstr "Kerberos ravnatelj:" + +#: ../src/krb5-auth-dialog.ui.h:13 +msgid "Notifications" +msgstr "Obvestila" + +#: ../src/krb5-auth-dialog.ui.h:14 +msgid "PKINIT" +msgstr "PKINIT" + +#: ../src/krb5-auth-dialog.ui.h:15 +msgid "Requested Kerberos tickets should be:" +msgstr "Zahtevane vstopnice Kerberos bi morale biti:" + +#: ../src/krb5-auth-dialog.ui.h:16 +msgid "Send notification about ticket expiry that many minutes before it finally expires" +msgstr "Pošiljanje obvestila o preteku vstopnice toliko minut pred končnim pretekom." + +#: ../src/krb5-auth-dialog.ui.h:17 msgid "Service Tickets" msgstr "Storitvene vstopnice" -#: ../src/krb5-auth-dialog.ui.h:3 +#: ../src/krb5-auth-dialog.ui.h:18 +msgid "The name of your Kerberos account. Leave blank to use your current username." +msgstr "Ime vašega računa Kerberos. Pustite prazno za uporabo vašega trenutnega uporabniškega imena." + +#: ../src/krb5-auth-dialog.ui.h:19 +msgid "Use Smartcard" +msgstr "Uporabi SmartCard" + +#: ../src/krb5-auth-dialog.ui.h:20 +msgid "Userid" +msgstr "Uporabniški id" + +#. Used in combination: 'Warn x minutes before expiry' +#: ../src/krb5-auth-dialog.ui.h:22 +msgid "Warn" +msgstr "Opozori" + +#: ../src/krb5-auth-dialog.ui.h:23 +msgid "X509 trust anchors" +msgstr "X509 zaupna sidra" + +#: ../src/krb5-auth-dialog.ui.h:24 +msgid "_Browse..." +msgstr "_Prebrskaj ..." + +#: ../src/krb5-auth-dialog.ui.h:25 +msgid "_Edit" +msgstr "_Uredi" + +#: ../src/krb5-auth-dialog.ui.h:26 +msgid "_File" +msgstr "_Datoteka" + +#: ../src/krb5-auth-dialog.ui.h:27 +msgid "_Help" +msgstr "Pomo_č" + +#: ../src/krb5-auth-dialog.ui.h:28 msgid "_Renew Ticket" msgstr "_Obnovi vstopnico" +#: ../src/krb5-auth-dialog.ui.h:29 +msgid "forwardable" +msgstr "prenosljiva" + +#. Used in combination: 'Warn x minutes before expiry' +#: ../src/krb5-auth-dialog.ui.h:31 +msgid "minutes before ticket expiry" +msgstr "Opozorilo pred potekom v minutah" + +#: ../src/krb5-auth-dialog.ui.h:32 +msgid "proxiable" +msgstr "posredovana" + +#: ../src/krb5-auth-dialog.ui.h:33 +msgid "renewable" +msgstr "obnovljiva" + #: ../src/ka-dialog.c:177 msgid "unknown error" msgstr "neznana napaka" @@ -53,7 +169,7 @@ msgid "Couldn't acquire kerberos ticket: '%s'" msgstr "Ni mogoče pridobiti vstopnice kerberos: '%s'" #: ../src/ka-pwdialog.c:217 -#: ../src/ka-applet.c:361 +#: ../src/ka-applet.c:368 #, c-format msgid "Your credentials expire in %d minute" msgid_plural "Your credentials expire in %d minutes" @@ -63,7 +179,7 @@ msgstr[2] "Vaša poverila potečejo v %d minutah" msgstr[3] "Vaša poverila potečejo v %d minutah" #: ../src/ka-pwdialog.c:222 -#: ../src/ka-applet.c:366 +#: ../src/ka-applet.c:373 msgid "Your credentials have expired" msgstr "Vaša poverila so potekla" @@ -1392,69 +1508,57 @@ msgstr "Slabo čarobno število za GSSAPI OID" msgid "Bad magic number for GSSAPI QUEUE" msgstr "Slabo čarobno število od GSSAPI VRSTE" -#: ../src/ka-applet.c:355 +#: ../src/ka-applet.c:362 #, c-format msgid "Your credentials expire in %.2d:%.2dh" msgstr "Vaša poverila potečejo v %.2d%.2dh" -#: ../src/ka-applet.c:537 +#: ../src/ka-applet.c:544 msgid "List Tickets" msgstr "Izpiši vstopnice" -#: ../src/ka-applet.c:547 +#: ../src/ka-applet.c:554 msgid "Get Ticket" msgstr "Dobi vstopnico" -#: ../src/ka-applet.c:556 +#: ../src/ka-applet.c:563 msgid "Don't show me this again" msgstr "Tega ne prikaži več" -#: ../src/ka-applet.c:563 +#: ../src/ka-applet.c:570 msgid "Remove Credentials Cache" msgstr "Odstrani predpomnilnik varoval" -#: ../src/ka-applet.c:612 +#: ../src/ka-applet.c:619 msgid "You have valid Kerberos credentials." msgstr "Naložena so veljavna poverila Kerberos" -#: ../src/ka-applet.c:614 +#: ../src/ka-applet.c:621 msgid "You've refreshed your Kerberos credentials." msgstr "Osvežili ste svoja poverila Kerberos" -#: ../src/ka-applet.c:617 +#: ../src/ka-applet.c:624 msgid "Network credentials valid" msgstr "Omrežna varovala so veljavna" -#: ../src/ka-applet.c:636 +#: ../src/ka-applet.c:643 msgid "Network credentials expiring" msgstr "Omrežna varovala bodo potekla" -#: ../src/ka-applet.c:654 +#: ../src/ka-applet.c:661 msgid "Network credentials expired" msgstr "Omrežna varovala so potekla" -#: ../src/ka-applet.c:655 +#: ../src/ka-applet.c:662 msgid "Your Kerberos credentails have expired." msgstr "Vaša varovala Kerberos so potekla." -#: ../src/ka-applet.c:699 -#, c-format -msgid "There was an error launching the preferences dialog: %s" -msgstr "Prišlo je do napake med zagonom pogovornega okna možnosti: %s" - -#. Translators: add the translators of your language here -#: ../src/ka-applet.c:745 -msgid "translator-credits" -msgstr "" -"Andrej Žnidaršič\n" -"Matej Urbančič" - -#: ../src/ka-applet.c:790 +#: ../src/ka-applet.c:741 msgid "Remove Credentials _Cache" msgstr "Odstrani _predpomnilnik varoval" #. Ticket dialog -#: ../src/ka-applet.c:800 +#: ../src/ka-applet.c:751 msgid "_List Tickets" msgstr "_Naštej vstopnice" @@ -1467,34 +1571,53 @@ msgstr "" "Prišlo je do napake med prikazovanjem pomoči:\n" "%s" -#: ../src/ka-tickets.c:56 +#. Translators: add the translators of your language here +#: ../src/ka-tools.c:83 +msgid "translator-credits" +msgstr "" +"Andrej Žnidaršič\n" +"Matej Urbančič" + +#: ../src/ka-main-window.c:119 msgid "Principal" msgstr "Ravnatelj" -#: ../src/ka-tickets.c:62 +#: ../src/ka-main-window.c:125 msgid "Start Time" msgstr "Začetni čas" -#: ../src/ka-tickets.c:68 +#: ../src/ka-main-window.c:131 msgid "End Time" msgstr "Končni čas" -#: ../src/ka-tickets.c:74 +#: ../src/ka-main-window.c:137 msgid "Fwd" msgstr "Posreduj" -#: ../src/ka-tickets.c:80 +#: ../src/ka-main-window.c:143 msgid "Proxy" msgstr "Posredovalni strežnik" -#: ../src/ka-tickets.c:86 +#: ../src/ka-main-window.c:149 msgid "Renew" msgstr "Obnovi" -#: ../src/ka-tickets.c:109 +#: ../src/ka-main-window.c:176 msgid "Error displaying service ticket information" msgstr "Napaka med prikazovanjem podrobnosti storitvene vstopnice" +#: ../src/ka-preferences.c:340 +msgid "Choose Certificate" +msgstr "Izbor potrdila" + +#: ../src/ka-preferences.c:356 +msgid "X509 Certificates" +msgstr "X509 potrdila" + +#: ../src/ka-preferences.c:360 +msgid "all files" +msgstr "vse datoteke" + #: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" msgstr "Pogovorno okno Kerberos omrežne overitve" @@ -1592,128 +1715,14 @@ msgstr "obvestilo veljavne vstopnice" msgid "Warning: running q-agent setuid on this system is dangerous\n" msgstr "Opozorilo: poganjanje q-agent setuid na tem sistemu je nevarno\n" -#. Translators: those are keywords for the Kerberos authentication control-center panel -#: ../cc-panel/gnome-ka-panel.desktop.in.h:3 -msgid "Kerberos;Authentication" -msgstr "Kerberos;Overitev" - -#: ../cc-panel/gnome-ka-panel.desktop.in.h:4 -msgid "Set your Kerberos network authentication preferences" -msgstr "Nastavitev možnosti Kerberos overitve omrežja" - -#: ../cc-panel/ka-panel.ui.h:1 -msgid "Certificate and private key used for authentication" -msgstr "Potrdilo in osebni ključ uporabljena za overitev" - -#: ../cc-panel/ka-panel.ui.h:2 -msgid "Certificate used to verify digital signatures." -msgstr "Potrdilo, ki se uporablja za potrjevanje digitalnih podpisov." - -#: ../cc-panel/ka-panel.ui.h:3 -msgid "Configure the use of certificates and smartcards for your Kerberos network authentication." -msgstr "Nastavite uporabo potrdil in pametnih kartic za vašo overitev omrežja Kerberos." - -#: ../cc-panel/ka-panel.ui.h:4 -msgid "If checked, request forwardable tickets" -msgstr "Izbrana možnost določi zahtevo za uporabo prenosljivih vstopnic" - -#: ../cc-panel/ka-panel.ui.h:5 -msgid "If checked, request proxiable tickets" -msgstr "Izbrana možnost omogoči zahtevo za posredovalno vstopnico" - -#: ../cc-panel/ka-panel.ui.h:6 -msgid "If checked, request renewable tickets" -msgstr "Izbrana možnost določi zahtevo za uporabo obnovljivih vstopnic" - -#: ../cc-panel/ka-panel.ui.h:7 -msgid "If checked, use a security token (Smartcard) to authenticate." -msgstr "Izbrana možnost omogoči zahtevo za uporabo Varnostne SmartCard za overjanje" - -#: ../cc-panel/ka-panel.ui.h:8 -msgid "Kerberos" -msgstr "Kerberos" - -#: ../cc-panel/ka-panel.ui.h:9 -msgid "Kerberos Ticket Options" -msgstr "Možnosti vstopnice Kerberos" - -#: ../cc-panel/ka-panel.ui.h:10 -msgid "Kerberos User" -msgstr "Uporabnik Kerberos" - -#: ../cc-panel/ka-panel.ui.h:11 -msgid "Kerberos principal:" -msgstr "Kerberos ravnatelj:" - -#: ../cc-panel/ka-panel.ui.h:12 -msgid "Notifications" -msgstr "Obvestila" - -#: ../cc-panel/ka-panel.ui.h:13 -msgid "PKINIT" -msgstr "PKINIT" - -#: ../cc-panel/ka-panel.ui.h:14 -msgid "Requested Kerberos tickets should be:" -msgstr "Zahtevane vstopnice Kerberos bi morale biti:" - -#: ../cc-panel/ka-panel.ui.h:15 -msgid "Send notification about ticket expiry that many minutes before it finally expires" -msgstr "Pošiljanje obvestila o preteku vstopnice toliko minut pred končnim pretekom." - -#: ../cc-panel/ka-panel.ui.h:16 -msgid "The name of your Kerberos account. Leave blank to use your current username." -msgstr "Ime vašega računa Kerberos. Pustite prazno za uporabo vašega trenutnega uporabniškega imena." +#~ msgid "There was an error launching the preferences dialog: %s" +#~ msgstr "Prišlo je do napake med zagonom pogovornega okna možnosti: %s" -#: ../cc-panel/ka-panel.ui.h:17 -msgid "Use Smartcard" -msgstr "Uporabi SmartCard" - -#: ../cc-panel/ka-panel.ui.h:18 -msgid "Userid" -msgstr "Uporabniški id" - -#. Used in combination: 'Warn x minutes before expiry' -#: ../cc-panel/ka-panel.ui.h:20 -msgid "Warn" -msgstr "Opozori" - -#: ../cc-panel/ka-panel.ui.h:21 -msgid "X509 trust anchors" -msgstr "X509 zaupna sidra" +#~ msgid "Kerberos;Authentication" +#~ msgstr "Kerberos;Overitev" -#: ../cc-panel/ka-panel.ui.h:22 -msgid "_Browse..." -msgstr "_Prebrskaj ..." - -#: ../cc-panel/ka-panel.ui.h:23 -msgid "forwardable" -msgstr "prenosljiva" - -#. Used in combination: 'Warn x minutes before expiry' -#: ../cc-panel/ka-panel.ui.h:25 -msgid "minutes before ticket expiry" -msgstr "Opozorilo pred potekom v minutah" - -#: ../cc-panel/ka-panel.ui.h:26 -msgid "proxiable" -msgstr "posredovana" - -#: ../cc-panel/ka-panel.ui.h:27 -msgid "renewable" -msgstr "obnovljiva" - -#: ../cc-panel/cc-ka-panel.c:345 -msgid "Choose Certificate" -msgstr "Izbor potrdila" - -#: ../cc-panel/cc-ka-panel.c:361 -msgid "X509 Certificates" -msgstr "X509 potrdila" - -#: ../cc-panel/cc-ka-panel.c:365 -msgid "all files" -msgstr "vse datoteke" +#~ msgid "Set your Kerberos network authentication preferences" +#~ msgstr "Nastavitev možnosti Kerberos overitve omrežja" #~ msgid "Applet" #~ msgstr "Aplet" diff --git a/po/zh_CN.po b/po/zh_CN.po index 3f6848d..8dfcd8f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,72 +1,77 @@ # Chinese (China) translation for krb5-auth-dialog. -# Copyright (C) 2010 Free Software Foundation, Inc. +# Copyright (C) 2010, 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the krb5-auth-dialog package. # Yinghua_Wang <wantinghard@gmail.com>, 2010. +# Aron Xu <aronxu@gnome.org>, 2011. # msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-" -"auth-dialog&component=general\n" -"POT-Creation-Date: 2010-07-29 10:31+0000\n" -"PO-Revision-Date: 2010-08-11 19:30+0800\n" -"Last-Translator: Yinghua Wang <wantinghard@gmail.com>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-08-16 15:16+0000\n" +"PO-Revision-Date: 2011-08-16 15:21+0000\n" +"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n" +"Language: zh\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../src/krb5-auth-dialog.xml.h:1 ../src/krb5-auth-dialog.desktop.in.h:2 -#: ../preferences/krb5-auth-dialog-preferences.desktop.in.h:1 -msgid "Network Authentication" -msgstr "网络认证" +#: ../src/krb5-auth-dialog.ui.h:1 ../src/krb5-auth-dialog.desktop.in.h:1 +#: ../cc-panel/gnome-ka-panel.desktop.in.h:1 +msgid "Kerberos Authentication" +msgstr "Kerberos 认证" -#: ../src/krb5-auth-dialog.xml.h:2 +#: ../src/krb5-auth-dialog.ui.h:2 msgid "Service Tickets" msgstr "服务票据" -#: ../src/krb5-auth-dialog.xml.h:3 +#: ../src/krb5-auth-dialog.ui.h:3 msgid "_Renew Ticket" msgstr "更新票据(_R)" -#: ../src/ka-dialog.c:172 +#: ../src/ka-dialog.c:177 msgid "unknown error" msgstr "未知错误" -#: ../src/ka-dialog.c:333 +#: ../src/ka-dialog.c:317 +msgid "Your ticket cache is currently empty" +msgstr "" + +#: ../src/ka-dialog.c:343 msgid "Expired" msgstr "已过期" -#: ../src/ka-pwdialog.c:174 +#: ../src/ka-pwdialog.c:178 #, c-format msgid "Couldn't acquire kerberos ticket: '%s'" msgstr "无法获取 Kerberos 票据:'%s'" -#: ../src/ka-pwdialog.c:211 ../src/ka-applet.c:390 +#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:361 #, c-format msgid "Your credentials expire in %d minute" msgid_plural "Your credentials expire in %d minutes" msgstr[0] "您的证书于 %d 分钟后过期" -#: ../src/ka-pwdialog.c:216 ../src/ka-applet.c:395 +#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:366 msgid "Your credentials have expired" msgstr "您的证书已过期" -#: ../src/ka-pwdialog.c:237 +#: ../src/ka-pwdialog.c:245 msgid "Please enter your Kerberos password:" msgstr "请输入您的 Kerberos 密码:" -#: ../src/ka-pwdialog.c:248 +#: ../src/ka-pwdialog.c:258 #, c-format msgid "Please enter the password for '%s':" msgstr "请输入 '%s' 的密码:" -#: ../src/ka-pwdialog.c:268 +#: ../src/ka-pwdialog.c:276 msgid "The password you entered is invalid" msgstr "您输入的密码不正确" -#: ../src/ka-pwdialog.c:284 +#: ../src/ka-pwdialog.c:292 #, c-format msgid "%s Error" msgstr "%s 错误" @@ -226,7 +231,6 @@ msgstr "KDC 不支持 padata 类型" #. krb5_err.et:krb5:KRB5KDC_ERR_PADATA_TYPE_NOSUPP #: ../src/dummy-strings.c:40 -#, fuzzy msgid "KDC has no support for transited type" msgstr "KDC 不支持过渡类型" @@ -383,13 +387,11 @@ msgstr "信息中的校验和类型不合适" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_INAPP_CKSUM #: ../src/dummy-strings.c:71 -#, fuzzy msgid "Policy rejects transited path" msgstr "策略拒绝中转路径" #. krb5_err.et:krb5:KRB5KRB_AP_PATH_NOT_ACCEPTED #: ../src/dummy-strings.c:72 -#, fuzzy msgid "Response too big for UDP, retry with TCP" msgstr "UDP 响应数据包过大,用 TCP 重试" @@ -400,7 +402,6 @@ msgstr "普通错误(见 e-text)" #. krb5_err.et:krb5:KRB5KRB_ERR_GENERIC #: ../src/dummy-strings.c:74 -#, fuzzy msgid "Field is too long for this implementation" msgstr "此实现的字段过长" @@ -471,9 +472,8 @@ msgstr "密钥用途不一致" #. krb5_err.et:krb5:KRB5KDC_ERR_INCONSISTENT_KEY_PURPOSE #: ../src/dummy-strings.c:88 -#, fuzzy msgid "Digest in certificate not accepted" -msgstr "详查证书不被接受" +msgstr "" #. krb5_err.et:krb5:KRB5KDC_ERR_DIGEST_IN_CERT_NOT_ACCEPTED #: ../src/dummy-strings.c:89 @@ -482,9 +482,8 @@ msgstr "必须包含校验和" #. krb5_err.et:krb5:KRB5KDC_ERR_PA_CHECKSUM_MUST_BE_INCLUDED #: ../src/dummy-strings.c:90 -#, fuzzy msgid "Digest in signed-data not accepted" -msgstr "详查签名的数据不被接受" +msgstr "" #. krb5_err.et:krb5:KRB5KDC_ERR_DIGEST_IN_SIGNED_DATA_NOT_ACCEPTED #: ../src/dummy-strings.c:91 @@ -1107,341 +1106,348 @@ msgstr "插件不支持该操作" #. krb5_err.et:krb5:KRB5_PLUGIN_OP_NOTSUPP #: ../src/dummy-strings.c:215 msgid "Kerberos V5 magic number table" -msgstr "Kerberos V5 幻数表" +msgstr "Kerberos V5 魔数表" #. kv5m_err.et:kv5m:KV5M_NONE #: ../src/dummy-strings.c:216 msgid "Bad magic number for krb5_principal structure" -msgstr "krb5_principal 结构的幻数有误" +msgstr "krb5_principal 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_PRINCIPAL #: ../src/dummy-strings.c:217 msgid "Bad magic number for krb5_data structure" -msgstr "krb5_data 结构的幻数有误" +msgstr "krb5_data 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_DATA #: ../src/dummy-strings.c:218 msgid "Bad magic number for krb5_keyblock structure" -msgstr "krb5_keyblock 结构的幻数有误" +msgstr "krb5_keyblock 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_KEYBLOCK #: ../src/dummy-strings.c:219 msgid "Bad magic number for krb5_checksum structure" -msgstr "krb5_checksum 结构的幻数有误" +msgstr "krb5_checksum 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_CHECKSUM #: ../src/dummy-strings.c:220 msgid "Bad magic number for krb5_encrypt_block structure" -msgstr "krb5_encrypt_block 结构的幻数有误" +msgstr "krb5_encrypt_block 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_ENCRYPT_BLOCK #: ../src/dummy-strings.c:221 msgid "Bad magic number for krb5_enc_data structure" -msgstr "krb5_enc_data 结构的幻数有误" +msgstr "krb5_enc_data 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_ENC_DATA #: ../src/dummy-strings.c:222 msgid "Bad magic number for krb5_cryptosystem_entry structure" -msgstr "krb5_cryptosystem_entry 结构的幻数有误" +msgstr "krb5_cryptosystem_entry 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_CRYPTOSYSTEM_ENTRY #: ../src/dummy-strings.c:223 msgid "Bad magic number for krb5_cs_table_entry structure" -msgstr "krb5_cs_table_entry 结构的幻数有误" +msgstr "krb5_cs_table_entry 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_CS_TABLE_ENTRY #: ../src/dummy-strings.c:224 msgid "Bad magic number for krb5_checksum_entry structure" -msgstr "krb5_checksum_entry 结构的幻数有误" +msgstr "krb5_checksum_entry 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_CHECKSUM_ENTRY #: ../src/dummy-strings.c:225 msgid "Bad magic number for krb5_authdata structure" -msgstr "krb5_authdata 结构的幻数有误" +msgstr "krb5_authdata 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_AUTHDATA #: ../src/dummy-strings.c:226 msgid "Bad magic number for krb5_transited structure" -msgstr "krb5_transited 结构的幻数有误" +msgstr "krb5_transited 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_TRANSITED #: ../src/dummy-strings.c:227 msgid "Bad magic number for krb5_enc_tkt_part structure" -msgstr "krb5_enc_tkt_part 结构的幻数有误" +msgstr "krb5_enc_tkt_part 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_ENC_TKT_PART #: ../src/dummy-strings.c:228 msgid "Bad magic number for krb5_ticket structure" -msgstr "krb5_ticket 结构的幻数有误" +msgstr "krb5_ticket 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_TICKET #: ../src/dummy-strings.c:229 msgid "Bad magic number for krb5_authenticator structure" -msgstr "krb5_authenticator 结构的幻数有误" +msgstr "krb5_authenticator 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_AUTHENTICATOR #: ../src/dummy-strings.c:230 msgid "Bad magic number for krb5_tkt_authent structure" -msgstr "krb5_tkt_authent 结构的幻数有误" +msgstr "krb5_tkt_authent 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_TKT_AUTHENT #: ../src/dummy-strings.c:231 msgid "Bad magic number for krb5_creds structure" -msgstr "krb5_creds 结构的幻数有误" +msgstr "krb5_creds 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_CREDS #: ../src/dummy-strings.c:232 msgid "Bad magic number for krb5_last_req_entry structure" -msgstr "krb5_last_req_entry 结构的幻数有误" +msgstr "krb5_last_req_entry 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_LAST_REQ_ENTRY #: ../src/dummy-strings.c:233 msgid "Bad magic number for krb5_pa_data structure" -msgstr "krb5_pa_data 结构的幻数有误" +msgstr "krb5_pa_data 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_PA_DATA #: ../src/dummy-strings.c:234 msgid "Bad magic number for krb5_kdc_req structure" -msgstr "krb5_kdc_req 结构的幻数有误" +msgstr "krb5_kdc_req 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_KDC_REQ #: ../src/dummy-strings.c:235 msgid "Bad magic number for krb5_enc_kdc_rep_part structure" -msgstr "krb5_enc_kdc_rep_part 结构的幻数有误" +msgstr "krb5_enc_kdc_rep_part 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_ENC_KDC_REP_PART #: ../src/dummy-strings.c:236 msgid "Bad magic number for krb5_kdc_rep structure" -msgstr "krb5_kdc_rep 结构的幻数有误" +msgstr "krb5_kdc_rep 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_KDC_REP #: ../src/dummy-strings.c:237 msgid "Bad magic number for krb5_error structure" -msgstr "krb5_error 结构的幻数有误" +msgstr "krb5_error 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_ERROR #: ../src/dummy-strings.c:238 msgid "Bad magic number for krb5_ap_req structure" -msgstr "krb5_ap_req 结构的幻数有误" +msgstr "krb5_ap_req 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_AP_REQ #: ../src/dummy-strings.c:239 msgid "Bad magic number for krb5_ap_rep structure" -msgstr "krb5_ap_rep 结构的幻数有误" +msgstr "krb5_ap_rep 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_AP_REP #: ../src/dummy-strings.c:240 msgid "Bad magic number for krb5_ap_rep_enc_part structure" -msgstr "krb5_ap_rep_enc_part 结构的幻数有误" +msgstr "krb5_ap_rep_enc_part 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_AP_REP_ENC_PART #: ../src/dummy-strings.c:241 msgid "Bad magic number for krb5_response structure" -msgstr "krb5_response 结构的幻数有误" +msgstr "krb5_response 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_RESPONSE #: ../src/dummy-strings.c:242 msgid "Bad magic number for krb5_safe structure" -msgstr "krb5_safe 结构的幻数有误" +msgstr "krb5_safe 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_SAFE #: ../src/dummy-strings.c:243 msgid "Bad magic number for krb5_priv structure" -msgstr "krb5_priv 结构的幻数有误" +msgstr "krb5_priv 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_PRIV #: ../src/dummy-strings.c:244 msgid "Bad magic number for krb5_priv_enc_part structure" -msgstr "krb5_priv_enc_part 结构的幻数有误" +msgstr "krb5_priv_enc_part 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_PRIV_ENC_PART #: ../src/dummy-strings.c:245 msgid "Bad magic number for krb5_cred structure" -msgstr "krb5_cred 结构的幻数有误" +msgstr "krb5_cred 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_CRED #: ../src/dummy-strings.c:246 msgid "Bad magic number for krb5_cred_info structure" -msgstr "krb5_cred_info 结构的幻数有误" +msgstr "krb5_cred_info 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_CRED_INFO #: ../src/dummy-strings.c:247 msgid "Bad magic number for krb5_cred_enc_part structure" -msgstr "krb5_cred_enc_part 结构的幻数有误" +msgstr "krb5_cred_enc_part 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_CRED_ENC_PART #: ../src/dummy-strings.c:248 msgid "Bad magic number for krb5_pwd_data structure" -msgstr "krb5_pwd_data 结构的幻数有误" +msgstr "krb5_pwd_data 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_PWD_DATA #: ../src/dummy-strings.c:249 msgid "Bad magic number for krb5_address structure" -msgstr "krb5_address 结构的幻数有误" +msgstr "krb5_address 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_ADDRESS #: ../src/dummy-strings.c:250 msgid "Bad magic number for krb5_keytab_entry structure" -msgstr "krb5_keytab_entry 结构的幻数有误" +msgstr "krb5_keytab_entry 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_KEYTAB_ENTRY #: ../src/dummy-strings.c:251 msgid "Bad magic number for krb5_context structure" -msgstr "krb5_context 结构的幻数有误" +msgstr "krb5_context 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_CONTEXT #: ../src/dummy-strings.c:252 msgid "Bad magic number for krb5_os_context structure" -msgstr "krb5_os_context 结构的幻数有误" +msgstr "krb5_os_context 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_OS_CONTEXT #: ../src/dummy-strings.c:253 msgid "Bad magic number for krb5_alt_method structure" -msgstr "krb5_alt_method 结构的幻数有误" +msgstr "krb5_alt_method 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_ALT_METHOD #: ../src/dummy-strings.c:254 msgid "Bad magic number for krb5_etype_info_entry structure" -msgstr "krb5_etype_info_entry 结构的幻数有误" +msgstr "krb5_etype_info_entry 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_ETYPE_INFO_ENTRY #: ../src/dummy-strings.c:255 msgid "Bad magic number for krb5_db_context structure" -msgstr "krb5_db_context 结构的幻数有误" +msgstr "krb5_db_context 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_DB_CONTEXT #: ../src/dummy-strings.c:256 msgid "Bad magic number for krb5_auth_context structure" -msgstr "krb5_auth_context 结构的幻数有误" +msgstr "krb5_auth_context 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_AUTH_CONTEXT #: ../src/dummy-strings.c:257 msgid "Bad magic number for krb5_keytab structure" -msgstr "krb5_keytab 结构的幻数有误" +msgstr "krb5_keytab 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_KEYTAB #: ../src/dummy-strings.c:258 msgid "Bad magic number for krb5_rcache structure" -msgstr "krb5_rcache 结构的幻数有误" +msgstr "krb5_rcache 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_RCACHE #: ../src/dummy-strings.c:259 msgid "Bad magic number for krb5_ccache structure" -msgstr "krb5_ccache 结构的幻数有误" +msgstr "krb5_ccache 结构的魔数有误" #. kv5m_err.et:kv5m:KV5M_CCACHE #: ../src/dummy-strings.c:260 msgid "Bad magic number for krb5_preauth_ops" -msgstr "krb5_preauth_ops 的幻数有误" +msgstr "krb5_preauth_ops 的魔数有误" #. kv5m_err.et:kv5m:KV5M_PREAUTH_OPS #: ../src/dummy-strings.c:261 msgid "Bad magic number for krb5_sam_challenge" -msgstr "krb5_sam_challenge 的幻数有误" +msgstr "krb5_sam_challenge 的魔数有误" #. kv5m_err.et:kv5m:KV5M_SAM_CHALLENGE #: ../src/dummy-strings.c:262 msgid "Bad magic number for krb5_sam_challenge_2" -msgstr "krb5_sam_challenge_2 的幻数有误" +msgstr "krb5_sam_challenge_2 的魔数有误" #. kv5m_err.et:kv5m:KV5M_SAM_CHALLENGE_2 #: ../src/dummy-strings.c:263 msgid "Bad magic number for krb5_sam_key" -msgstr "krb5_sam_key 的幻数有误" +msgstr "krb5_sam_key 的魔数有误" #. kv5m_err.et:kv5m:KV5M_SAM_KEY #. kv5m_err.et:kv5m:KV5M_ENC_SAM_RESPONSE_ENC #: ../src/dummy-strings.c:264 ../src/dummy-strings.c:265 msgid "Bad magic number for krb5_enc_sam_response_enc" -msgstr "krb5_enc_sam_response_enc 的幻数有误" +msgstr "krb5_enc_sam_response_enc 的魔数有误" #. kv5m_err.et:kv5m:KV5M_ENC_SAM_RESPONSE_ENC_2 #: ../src/dummy-strings.c:266 msgid "Bad magic number for krb5_sam_response" -msgstr "krb5_sam_response 的幻数有误" +msgstr "krb5_sam_response 的魔数有误" #. kv5m_err.et:kv5m:KV5M_SAM_RESPONSE #: ../src/dummy-strings.c:267 msgid "Bad magic number for krb5_sam_response 2" -msgstr "krb5_sam_response 2 的幻数有误" +msgstr "krb5_sam_response 2 的魔数有误" #. kv5m_err.et:kv5m:KV5M_SAM_RESPONSE_2 #: ../src/dummy-strings.c:268 msgid "Bad magic number for krb5_predicted_sam_response" -msgstr "krb5_predicted_sam_response 的幻数有误" +msgstr "krb5_predicted_sam_response 的魔数有误" #. kv5m_err.et:kv5m:KV5M_PREDICTED_SAM_RESPONSE #: ../src/dummy-strings.c:269 msgid "Bad magic number for passwd_phrase_element" -msgstr "passwd_phrase_element 的幻数有误" +msgstr "passwd_phrase_element 的魔数有误" #. kv5m_err.et:kv5m:KV5M_PASSWD_PHRASE_ELEMENT #: ../src/dummy-strings.c:270 msgid "Bad magic number for GSSAPI OID" -msgstr "GSSAPI OID 的幻数有误" +msgstr "GSSAPI OID 的魔数有误" #. kv5m_err.et:kv5m:KV5M_GSS_OID #: ../src/dummy-strings.c:271 msgid "Bad magic number for GSSAPI QUEUE" -msgstr "GSSAPI QUEUE 的幻数有误" +msgstr "GSSAPI QUEUE 的魔数有误" -#. Translators: First number is hours, second number is minutes -#: ../src/ka-applet.c:386 +#: ../src/ka-applet.c:355 #, c-format msgid "Your credentials expire in %.2d:%.2dh" msgstr "您的证书将于 %.2d:%.2dh 后过期" -#: ../src/ka-applet.c:500 +#: ../src/ka-applet.c:537 #, fuzzy +msgid "List Tickets" +msgstr "列出票据(_L)" + +#: ../src/ka-applet.c:547 +#, fuzzy +msgid "Get Ticket" +msgstr "列出票据(_L)" + +#: ../src/ka-applet.c:556 msgid "Don't show me this again" -msgstr "不要再告诉我这个了" +msgstr "不再显示此信息" -#: ../src/ka-applet.c:542 -msgid "Network credentials valid" -msgstr "网络证书有效" +#: ../src/ka-applet.c:563 +#, fuzzy +msgid "Remove Credentials Cache" +msgstr "移除证书缓存(_C)" + +#: ../src/ka-applet.c:612 +msgid "You have valid Kerberos credentials." +msgstr "您的 Kerberos 证书有效。" -#: ../src/ka-applet.c:543 +#: ../src/ka-applet.c:614 msgid "You've refreshed your Kerberos credentials." msgstr "您已更新自己的 Kerberos 证书。" -#: ../src/ka-applet.c:559 +#: ../src/ka-applet.c:617 +msgid "Network credentials valid" +msgstr "网络证书有效" + +#: ../src/ka-applet.c:636 msgid "Network credentials expiring" msgstr "网络证书即将过期" -#: ../src/ka-applet.c:578 +#: ../src/ka-applet.c:654 msgid "Network credentials expired" msgstr "网络证书已过期" -#: ../src/ka-applet.c:579 +#: ../src/ka-applet.c:655 msgid "Your Kerberos credentails have expired." msgstr "您的 Kerberos 证书已过期。" -#: ../src/ka-applet.c:624 +#: ../src/ka-applet.c:699 #, c-format msgid "There was an error launching the preferences dialog: %s" msgstr "启动首选项对话框时出错:%s" -#: ../src/ka-applet.c:665 -#, c-format -msgid "" -"There was an error displaying %s:\n" -"%s" -msgstr "" -"显示 %s 出错:\n" -"%s" - #. Translators: add the translators of your language here -#: ../src/ka-applet.c:701 +#: ../src/ka-applet.c:745 msgid "translator-credits" msgstr "Yinghua_Wang <wantinghard@gmail.com>" -#. kdestroy -#: ../src/ka-applet.c:743 +#: ../src/ka-applet.c:790 msgid "Remove Credentials _Cache" msgstr "移除证书缓存(_C)" #. Ticket dialog -#: ../src/ka-applet.c:753 +#: ../src/ka-applet.c:800 msgid "_List Tickets" msgstr "列出票据(_L)" @@ -1454,35 +1460,35 @@ msgstr "" "显示帮助时出现了一个错误:\n" "%s" -#: ../src/ka-tickets.c:54 +#: ../src/ka-tickets.c:56 msgid "Principal" msgstr "委托方" -#: ../src/ka-tickets.c:60 +#: ../src/ka-tickets.c:62 msgid "Start Time" msgstr "开始时间" -#: ../src/ka-tickets.c:66 +#: ../src/ka-tickets.c:68 msgid "End Time" msgstr "结束时间" -#: ../src/ka-tickets.c:72 +#: ../src/ka-tickets.c:74 msgid "Fwd" msgstr "转发" -#: ../src/ka-tickets.c:78 +#: ../src/ka-tickets.c:80 msgid "Proxy" msgstr "代理" -#: ../src/ka-tickets.c:84 +#: ../src/ka-tickets.c:86 msgid "Renew" msgstr "更新" -#: ../src/ka-tickets.c:107 +#: ../src/ka-tickets.c:109 msgid "Error displaying service ticket information" msgstr "显示服务票据信息出错" -#: ../src/krb5-auth-dialog.desktop.in.h:1 +#: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" msgstr "Kerberos 网络认证对话框" @@ -1551,36 +1557,28 @@ msgid "Requested tickets should be renewable" msgstr "请求的票据要是可更新的" #: ../src/krb5-auth-dialog.schemas.in.h:17 -msgid "Show a trayicon in the status area of the panel" -msgstr "在面板的状态区显示托盘图标" - -#: ../src/krb5-auth-dialog.schemas.in.h:18 -msgid "Show trayicon" -msgstr "显示托盘图标" - -#: ../src/krb5-auth-dialog.schemas.in.h:19 #, fuzzy msgid "" "Start prompting/displaying notifications that many minutes before expiry" msgstr "在过期前这么多分钟前开始提示/显示通知" -#: ../src/krb5-auth-dialog.schemas.in.h:20 +#: ../src/krb5-auth-dialog.schemas.in.h:18 msgid "The kerberos principal to acquire the ticket for" msgstr "获取票据的 Kerberos 委托方" -#: ../src/krb5-auth-dialog.schemas.in.h:21 +#: ../src/krb5-auth-dialog.schemas.in.h:19 msgid "The principal's public/private/certificate identifier when using PKINIT" msgstr "使用 PKINIT 时委托方的公/私/证书标识符" -#: ../src/krb5-auth-dialog.schemas.in.h:22 +#: ../src/krb5-auth-dialog.schemas.in.h:20 msgid "ticket expired notification" msgstr "票据过期通知" -#: ../src/krb5-auth-dialog.schemas.in.h:23 +#: ../src/krb5-auth-dialog.schemas.in.h:21 msgid "ticket expiring notification" msgstr "票据将过期通知" -#: ../src/krb5-auth-dialog.schemas.in.h:24 +#: ../src/krb5-auth-dialog.schemas.in.h:22 msgid "valid ticket notification" msgstr "有效票据通知" @@ -1589,131 +1587,162 @@ msgstr "有效票据通知" msgid "Warning: running q-agent setuid on this system is dangerous\n" msgstr "警告:在此系统上执行 q-agent setuid 是危险的\n" -#: ../preferences/ka-preferences.c:345 -msgid "Choose Certificate" -msgstr "选择证书" - -#: ../preferences/ka-preferences.c:361 -msgid "X509 Certificates" -msgstr "X509 证书" - -#: ../preferences/ka-preferences.c:365 -msgid "all files" -msgstr "所有文件" +#. Translators: those are keywords for the Kerberos authentication control-center panel +#: ../cc-panel/gnome-ka-panel.desktop.in.h:3 +msgid "Kerberos;Authentication" +msgstr "Kerberos;Authentication;认证" -#: ../preferences/krb5-auth-dialog-preferences.desktop.in.h:2 +#: ../cc-panel/gnome-ka-panel.desktop.in.h:4 msgid "Set your Kerberos network authentication preferences" msgstr "设置您的 Kerberos 网络认证首选参数" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:1 -msgid "Appearance" -msgstr "外观" - -#: ../preferences/krb5-auth-dialog-preferences.xml.h:2 -msgid "Applet" -msgstr "小程序" - -#: ../preferences/krb5-auth-dialog-preferences.xml.h:3 +#: ../cc-panel/ka-panel.ui.h:1 msgid "Certificate and private key used for authentication" msgstr "用于认证的证书和私钥" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:4 -msgid "If checked, display the tray icon in the status bar" -msgstr "如果选择,在状态栏显示托盘图标" +#: ../cc-panel/ka-panel.ui.h:2 +msgid "Certificate used to verify digital signatures." +msgstr "用于校验数字签名的证书。" + +#: ../cc-panel/ka-panel.ui.h:3 +msgid "" +"Configure the use of certificates and smartcards for your Kerberos network " +"authentication." +msgstr "" +"为您的 Kerberos 网络认证配置证书和智能卡。" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:5 +#: ../cc-panel/ka-panel.ui.h:4 msgid "If checked, request forwardable tickets" msgstr "如果选择,请求可转发的票据" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:6 +#: ../cc-panel/ka-panel.ui.h:5 msgid "If checked, request proxiable tickets" msgstr "如果选择,请求可代理的票据" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:7 +#: ../cc-panel/ka-panel.ui.h:6 msgid "If checked, request renewable tickets" msgstr "如果选择,请求可更新的票据" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:8 +#: ../cc-panel/ka-panel.ui.h:7 msgid "If checked, use a security token (Smartcard) to authenticate." msgstr "如果选择,使用加密令牌(智能卡)认证。" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:9 +#: ../cc-panel/ka-panel.ui.h:8 msgid "Kerberos" msgstr "Kerberos" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:10 -msgid "Kerberos Authentication Configuration" -msgstr "Kerberos 认证配置" +#: ../cc-panel/ka-panel.ui.h:9 +#, fuzzy +msgid "Kerberos Ticket Options" +msgstr "票据选项" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:11 +#: ../cc-panel/ka-panel.ui.h:10 msgid "Kerberos User" msgstr "Kerberos 用户" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:12 +#: ../cc-panel/ka-panel.ui.h:11 msgid "Kerberos principal:" msgstr "Kerberos 委托方:" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:13 +#: ../cc-panel/ka-panel.ui.h:12 msgid "Notifications" msgstr "通知" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:14 -msgid "PKINIT:" -msgstr "PKINIT:" +#: ../cc-panel/ka-panel.ui.h:13 +msgid "PKINIT" +msgstr "PKINIT" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:15 +#: ../cc-panel/ka-panel.ui.h:14 msgid "Requested Kerberos tickets should be:" msgstr "请求的 Kerberos 票据应该:" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:16 +#: ../cc-panel/ka-panel.ui.h:15 msgid "" "Send notification about ticket expiry that many minutes before it finally " "expires" msgstr "在票据最终过期前若干分钟发送票据过期通知" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:17 -msgid "Show tray icon" -msgstr "显示托盘图标" - -#: ../preferences/krb5-auth-dialog-preferences.xml.h:18 -msgid "Ticket Options" -msgstr "票据选项" +#: ../cc-panel/ka-panel.ui.h:16 +msgid "" +"The name of your Kerberos account. Leave blank to use your current username." +msgstr "" +"您的 Kerberos 帐号名。留空使用当前用户名。" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:19 +#: ../cc-panel/ka-panel.ui.h:17 msgid "Use Smartcard" msgstr "使用智能卡" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:20 -msgid "Userid:" -msgstr "用户标识:" +#: ../cc-panel/ka-panel.ui.h:18 +msgid "Userid" +msgstr "用户标识" #. Used in combination: 'Warn x minutes before expiry' -#: ../preferences/krb5-auth-dialog-preferences.xml.h:22 +#: ../cc-panel/ka-panel.ui.h:20 msgid "Warn" msgstr "警告" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:23 -msgid "X509 trust anchors:" -msgstr "X509 信任标记:" +#: ../cc-panel/ka-panel.ui.h:21 +msgid "X509 trust anchors" +msgstr "X509 信任标记" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:24 +#: ../cc-panel/ka-panel.ui.h:22 msgid "_Browse..." msgstr "浏览(_B)..." -#: ../preferences/krb5-auth-dialog-preferences.xml.h:25 +#: ../cc-panel/ka-panel.ui.h:23 msgid "forwardable" msgstr "可转发的" #. Used in combination: 'Warn x minutes before expiry' -#: ../preferences/krb5-auth-dialog-preferences.xml.h:27 +#: ../cc-panel/ka-panel.ui.h:25 #, fuzzy -msgid "minutes before expiry" +msgid "minutes before ticket expiry" msgstr "过期前的分钟数" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:28 +#: ../cc-panel/ka-panel.ui.h:26 msgid "proxiable" msgstr "可代理的" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:29 +#: ../cc-panel/ka-panel.ui.h:27 msgid "renewable" msgstr "可更新的" + +#: ../cc-panel/cc-ka-panel.c:345 +msgid "Choose Certificate" +msgstr "选择证书" + +#: ../cc-panel/cc-ka-panel.c:361 +msgid "X509 Certificates" +msgstr "X509 证书" + +#: ../cc-panel/cc-ka-panel.c:365 +msgid "all files" +msgstr "所有文件" + +#~ msgid "Network Authentication" +#~ msgstr "网络认证" + +#~ msgid "" +#~ "There was an error displaying %s:\n" +#~ "%s" +#~ msgstr "" +#~ "显示 %s 出错:\n" +#~ "%s" + +#~ msgid "Show a trayicon in the status area of the panel" +#~ msgstr "在面板的状态区显示托盘图标" + +#~ msgid "Show trayicon" +#~ msgstr "显示托盘图标" + +#~ msgid "Appearance" +#~ msgstr "外观" + +#~ msgid "Applet" +#~ msgstr "小程序" + +#~ msgid "If checked, display the tray icon in the status bar" +#~ msgstr "如果选择,在状态栏显示托盘图标" + +#~ msgid "Show tray icon" +#~ msgstr "显示托盘图标" diff --git a/secmem/Makefile.in b/secmem/Makefile.in index fbf6338..135ea6e 100644 --- a/secmem/Makefile.in +++ b/secmem/Makefile.in @@ -123,8 +123,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ COMPILER_FLAGS = @COMPILER_FLAGS@ -CONTROL_CENTER_CFLAGS = @CONTROL_CENTER_CFLAGS@ -CONTROL_CENTER_LIBS = @CONTROL_CENTER_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,7 +210,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAM_LIBS = @PAM_LIBS@ -PANELS_DIR = @PANELS_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ diff --git a/src/Makefile.am b/src/Makefile.am index 65d2a92..9c22dcf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,8 +25,8 @@ $(service_DATA): $(service_in_files) Makefile sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@ krb5_auth_dialog_SOURCES = \ - ka-dialog.c \ - ka-dialog.h \ + ka-kerberos.c \ + ka-kerberos.h \ ka-applet.c \ ka-applet-priv.h \ ka-applet.h \ @@ -40,12 +40,14 @@ krb5_auth_dialog_SOURCES = \ ka-dbus.h \ ka-tools.c \ ka-tools.h \ - ka-tickets.c \ - ka-tickets.h \ + ka-main-window.c \ + ka-main-window.h \ ka-plugin.c \ ka-plugin.h \ ka-plugin-loader.c \ ka-plugin-loader.h \ + ka-preferences.c \ + ka-preferences.h \ ka-closures.h \ ka-closures.c \ ka-entry-buffer.h \ diff --git a/src/Makefile.in b/src/Makefile.in index b67314b..f4a24be 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -54,16 +54,17 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ "$(DESTDIR)$(servicedir)" PROGRAMS = $(bin_PROGRAMS) am__objects_1 = -am_krb5_auth_dialog_OBJECTS = krb5_auth_dialog-ka-dialog.$(OBJEXT) \ +am_krb5_auth_dialog_OBJECTS = krb5_auth_dialog-ka-kerberos.$(OBJEXT) \ krb5_auth_dialog-ka-applet.$(OBJEXT) \ krb5_auth_dialog-ka-pwdialog.$(OBJEXT) \ krb5_auth_dialog-ka-gconf.$(OBJEXT) \ krb5_auth_dialog-ka-gconf-tools.$(OBJEXT) \ krb5_auth_dialog-ka-dbus.$(OBJEXT) \ krb5_auth_dialog-ka-tools.$(OBJEXT) \ - krb5_auth_dialog-ka-tickets.$(OBJEXT) \ + krb5_auth_dialog-ka-main-window.$(OBJEXT) \ krb5_auth_dialog-ka-plugin.$(OBJEXT) \ krb5_auth_dialog-ka-plugin-loader.$(OBJEXT) \ + krb5_auth_dialog-ka-preferences.$(OBJEXT) \ krb5_auth_dialog-ka-closures.$(OBJEXT) \ krb5_auth_dialog-ka-entry-buffer.$(OBJEXT) \ krb5_auth_dialog-dummy-strings.$(OBJEXT) $(am__objects_1) @@ -155,8 +156,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ COMPILER_FLAGS = @COMPILER_FLAGS@ -CONTROL_CENTER_CFLAGS = @CONTROL_CENTER_CFLAGS@ -CONTROL_CENTER_LIBS = @CONTROL_CENTER_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -244,7 +243,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAM_LIBS = @PAM_LIBS@ -PANELS_DIR = @PANELS_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ @@ -336,8 +334,8 @@ servicedir = $(datadir)/dbus-1/services service_in_files = org.gnome.KrbAuthDialog.service.in service_DATA = $(service_in_files:.service.in=.service) krb5_auth_dialog_SOURCES = \ - ka-dialog.c \ - ka-dialog.h \ + ka-kerberos.c \ + ka-kerberos.h \ ka-applet.c \ ka-applet-priv.h \ ka-applet.h \ @@ -351,12 +349,14 @@ krb5_auth_dialog_SOURCES = \ ka-dbus.h \ ka-tools.c \ ka-tools.h \ - ka-tickets.c \ - ka-tickets.h \ + ka-main-window.c \ + ka-main-window.h \ ka-plugin.c \ ka-plugin.h \ ka-plugin-loader.c \ ka-plugin-loader.h \ + ka-preferences.c \ + ka-preferences.h \ ka-closures.h \ ka-closures.c \ ka-entry-buffer.h \ @@ -512,14 +512,15 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-applet.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-closures.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-dbus.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-dialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-entry-buffer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-gconf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-kerberos.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-main-window.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-plugin.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-preferences.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-tickets.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-tools.Po@am__quote@ .c.o: @@ -546,21 +547,21 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -krb5_auth_dialog-ka-dialog.o: ka-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-dialog.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-dialog.Tpo -c -o krb5_auth_dialog-ka-dialog.o `test -f 'ka-dialog.c' || echo '$(srcdir)/'`ka-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-dialog.Tpo $(DEPDIR)/krb5_auth_dialog-ka-dialog.Po +krb5_auth_dialog-ka-kerberos.o: ka-kerberos.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-kerberos.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Tpo -c -o krb5_auth_dialog-ka-kerberos.o `test -f 'ka-kerberos.c' || echo '$(srcdir)/'`ka-kerberos.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Tpo $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-dialog.c' object='krb5_auth_dialog-ka-dialog.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-kerberos.c' object='krb5_auth_dialog-ka-kerberos.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-dialog.o `test -f 'ka-dialog.c' || echo '$(srcdir)/'`ka-dialog.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-kerberos.o `test -f 'ka-kerberos.c' || echo '$(srcdir)/'`ka-kerberos.c -krb5_auth_dialog-ka-dialog.obj: ka-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-dialog.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-dialog.Tpo -c -o krb5_auth_dialog-ka-dialog.obj `if test -f 'ka-dialog.c'; then $(CYGPATH_W) 'ka-dialog.c'; else $(CYGPATH_W) '$(srcdir)/ka-dialog.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-dialog.Tpo $(DEPDIR)/krb5_auth_dialog-ka-dialog.Po +krb5_auth_dialog-ka-kerberos.obj: ka-kerberos.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-kerberos.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Tpo -c -o krb5_auth_dialog-ka-kerberos.obj `if test -f 'ka-kerberos.c'; then $(CYGPATH_W) 'ka-kerberos.c'; else $(CYGPATH_W) '$(srcdir)/ka-kerberos.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Tpo $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-dialog.c' object='krb5_auth_dialog-ka-dialog.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-kerberos.c' object='krb5_auth_dialog-ka-kerberos.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-dialog.obj `if test -f 'ka-dialog.c'; then $(CYGPATH_W) 'ka-dialog.c'; else $(CYGPATH_W) '$(srcdir)/ka-dialog.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-kerberos.obj `if test -f 'ka-kerberos.c'; then $(CYGPATH_W) 'ka-kerberos.c'; else $(CYGPATH_W) '$(srcdir)/ka-kerberos.c'; fi` krb5_auth_dialog-ka-applet.o: ka-applet.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-applet.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-applet.Tpo -c -o krb5_auth_dialog-ka-applet.o `test -f 'ka-applet.c' || echo '$(srcdir)/'`ka-applet.c @@ -658,21 +659,21 @@ krb5_auth_dialog-ka-tools.obj: ka-tools.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-tools.obj `if test -f 'ka-tools.c'; then $(CYGPATH_W) 'ka-tools.c'; else $(CYGPATH_W) '$(srcdir)/ka-tools.c'; fi` -krb5_auth_dialog-ka-tickets.o: ka-tickets.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-tickets.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-tickets.Tpo -c -o krb5_auth_dialog-ka-tickets.o `test -f 'ka-tickets.c' || echo '$(srcdir)/'`ka-tickets.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-tickets.Tpo $(DEPDIR)/krb5_auth_dialog-ka-tickets.Po +krb5_auth_dialog-ka-main-window.o: ka-main-window.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-main-window.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-main-window.Tpo -c -o krb5_auth_dialog-ka-main-window.o `test -f 'ka-main-window.c' || echo '$(srcdir)/'`ka-main-window.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-main-window.Tpo $(DEPDIR)/krb5_auth_dialog-ka-main-window.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-tickets.c' object='krb5_auth_dialog-ka-tickets.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-main-window.c' object='krb5_auth_dialog-ka-main-window.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-tickets.o `test -f 'ka-tickets.c' || echo '$(srcdir)/'`ka-tickets.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-main-window.o `test -f 'ka-main-window.c' || echo '$(srcdir)/'`ka-main-window.c -krb5_auth_dialog-ka-tickets.obj: ka-tickets.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-tickets.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-tickets.Tpo -c -o krb5_auth_dialog-ka-tickets.obj `if test -f 'ka-tickets.c'; then $(CYGPATH_W) 'ka-tickets.c'; else $(CYGPATH_W) '$(srcdir)/ka-tickets.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-tickets.Tpo $(DEPDIR)/krb5_auth_dialog-ka-tickets.Po +krb5_auth_dialog-ka-main-window.obj: ka-main-window.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-main-window.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-main-window.Tpo -c -o krb5_auth_dialog-ka-main-window.obj `if test -f 'ka-main-window.c'; then $(CYGPATH_W) 'ka-main-window.c'; else $(CYGPATH_W) '$(srcdir)/ka-main-window.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-main-window.Tpo $(DEPDIR)/krb5_auth_dialog-ka-main-window.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-tickets.c' object='krb5_auth_dialog-ka-tickets.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-main-window.c' object='krb5_auth_dialog-ka-main-window.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-tickets.obj `if test -f 'ka-tickets.c'; then $(CYGPATH_W) 'ka-tickets.c'; else $(CYGPATH_W) '$(srcdir)/ka-tickets.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-main-window.obj `if test -f 'ka-main-window.c'; then $(CYGPATH_W) 'ka-main-window.c'; else $(CYGPATH_W) '$(srcdir)/ka-main-window.c'; fi` krb5_auth_dialog-ka-plugin.o: ka-plugin.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-plugin.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-plugin.Tpo -c -o krb5_auth_dialog-ka-plugin.o `test -f 'ka-plugin.c' || echo '$(srcdir)/'`ka-plugin.c @@ -706,6 +707,22 @@ krb5_auth_dialog-ka-plugin-loader.obj: ka-plugin-loader.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin-loader.obj `if test -f 'ka-plugin-loader.c'; then $(CYGPATH_W) 'ka-plugin-loader.c'; else $(CYGPATH_W) '$(srcdir)/ka-plugin-loader.c'; fi` +krb5_auth_dialog-ka-preferences.o: ka-preferences.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-preferences.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-preferences.Tpo -c -o krb5_auth_dialog-ka-preferences.o `test -f 'ka-preferences.c' || echo '$(srcdir)/'`ka-preferences.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-preferences.Tpo $(DEPDIR)/krb5_auth_dialog-ka-preferences.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-preferences.c' object='krb5_auth_dialog-ka-preferences.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-preferences.o `test -f 'ka-preferences.c' || echo '$(srcdir)/'`ka-preferences.c + +krb5_auth_dialog-ka-preferences.obj: ka-preferences.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-preferences.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-preferences.Tpo -c -o krb5_auth_dialog-ka-preferences.obj `if test -f 'ka-preferences.c'; then $(CYGPATH_W) 'ka-preferences.c'; else $(CYGPATH_W) '$(srcdir)/ka-preferences.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-preferences.Tpo $(DEPDIR)/krb5_auth_dialog-ka-preferences.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-preferences.c' object='krb5_auth_dialog-ka-preferences.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-preferences.obj `if test -f 'ka-preferences.c'; then $(CYGPATH_W) 'ka-preferences.c'; else $(CYGPATH_W) '$(srcdir)/ka-preferences.c'; fi` + krb5_auth_dialog-ka-closures.o: ka-closures.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-closures.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-closures.Tpo -c -o krb5_auth_dialog-ka-closures.o `test -f 'ka-closures.c' || echo '$(srcdir)/'`ka-closures.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-closures.Tpo $(DEPDIR)/krb5_auth_dialog-ka-closures.Po diff --git a/src/ka-applet-priv.h b/src/ka-applet-priv.h index bd55996..d571230 100644 --- a/src/ka-applet-priv.h +++ b/src/ka-applet-priv.h @@ -34,11 +34,13 @@ G_BEGIN_DECLS #define KA_NAME _("Kerberos Authentication") + /* signals emitted by KaApplet */ - typedef enum { +typedef enum { KA_SIGNAL_ACQUIRED_TGT, /* New TGT acquired */ KA_SIGNAL_RENEWED_TGT, /* TGT got renewed */ KA_SIGNAL_EXPIRED_TGT, /* TGT expired or ticket cache got destroyed */ + KA_CCACHE_CHANGED, /* The credential cache changed */ KA_SIGNAL_COUNT } KaAppletSignalNumber; diff --git a/src/ka-applet.c b/src/ka-applet.c index 441ed94..f1fffbf 100644 --- a/src/ka-applet.c +++ b/src/ka-applet.c @@ -23,12 +23,14 @@ #include <glib/gi18n.h> #include "ka-applet-priv.h" -#include "ka-dialog.h" +#include "ka-dbus.h" +#include "ka-kerberos.h" #include "ka-gconf-tools.h" #include "ka-gconf.h" #include "ka-tools.h" -#include "ka-tickets.h" +#include "ka-main-window.h" #include "ka-plugin-loader.h" +#include "ka-preferences.h" #include "ka-closures.h" #include <libnotify/notify.h> @@ -56,22 +58,23 @@ const gchar *ka_signal_names[KA_SIGNAL_COUNT] = { "krb-tgt-acquired", "krb-tgt-renewed", "krb-tgt-expired", + "krb-ccache-changed", }; struct _KaApplet { - GObject parent; + GtkApplication parent; KaAppletPrivate *priv; }; struct _KaAppletClass { - GObjectClass parent; + GtkApplicationClass parent; guint signals[KA_SIGNAL_COUNT]; }; -G_DEFINE_TYPE (KaApplet, ka_applet, G_TYPE_OBJECT); +G_DEFINE_TYPE (KaApplet, ka_applet, GTK_TYPE_APPLICATION); struct _KaAppletPrivate { GtkBuilder *uixml; @@ -84,6 +87,11 @@ struct _KaAppletPrivate { int pw_prompt_secs; /* when to start sending notifications */ KaPluginLoader *loader; /* Plugin loader */ + /* command line handling */ + gboolean startup_ccache; /* ccache found on startup */ + gboolean auto_run; /* only start with valid ccache */ + + /* GConf optins */ NotifyNotification *notification; /* notification messages */ char *krb_msg; /* Additional banner delivered by Kerberos */ const char *notify_gconf_key; /* disable notification gconf key */ @@ -98,7 +106,96 @@ struct _KaAppletPrivate { GConfClient *gconf; /* gconf client */ }; + static void ka_close_notification (KaApplet *self); +static gboolean is_initialized; + +static void +ka_applet_activate (GApplication *application G_GNUC_UNUSED) +{ + if (is_initialized) { + KA_DEBUG ("Main window activated"); + ka_main_window_show (); + } else + is_initialized = TRUE; +} + + +static int +ka_applet_command_line (GApplication *application, + GApplicationCommandLine *cmdline G_GNUC_UNUSED) +{ + KaApplet *self = KA_APPLET(application); + KA_DEBUG ("Evaluating command line"); + + if (!self->priv->startup_ccache && + self->priv->auto_run) + ka_applet_destroy (self); + else + ka_applet_activate (application); + return 0; +} + + + +static gint +ka_applet_local_command_line (GApplication *application, + gchar ***argv, + gint *exit_status) +{ + KaApplet *self = KA_APPLET(application); + GOptionContext *context; + GError *error = NULL; + + gint argc = g_strv_length (*argv); + gboolean auto_run = FALSE; + + const char *help_msg = + "Run '" PACKAGE + " --help' to see a full list of available command line options"; + const GOptionEntry options[] = { + {"auto", 'a', 0, G_OPTION_ARG_NONE, &auto_run, + "Only run if an initialized ccache is found", NULL}, + {NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL} + }; + + KA_DEBUG ("Parsing local command line"); + + context = g_option_context_new ("- Kerberos 5 credential checking"); + g_option_context_add_main_entries (context, options, NULL); + g_option_context_add_group (context, gtk_get_option_group (TRUE)); + g_option_context_parse (context, &argc, argv, &error); + + if (error) { + g_print ("%s\n%s\n", error->message, help_msg); + g_clear_error (&error); + *exit_status = 1; + } else { + self->priv->auto_run = auto_run; + *exit_status = 0; + } + + g_option_context_free (context); + return FALSE; +} + +static void +ka_applet_startup (GApplication *application) +{ + KaApplet *self = KA_APPLET (application); + GtkWindow *main_window; + + KA_DEBUG ("Primary application"); + + self->priv->startup_ccache = ka_kerberos_init (self); + if (!ka_dbus_connect (self)) { + ka_applet_destroy (self); + } + + main_window = ka_main_window_create (self, self->priv->uixml); + gtk_application_add_window (GTK_APPLICATION(self), main_window); + ka_preferences_window_create (self, self->priv->uixml); +} static void ka_applet_set_property (GObject *object, @@ -266,6 +363,11 @@ ka_applet_class_init (KaAppletClass *klass) object_class->finalize = ka_applet_finalize; g_type_class_add_private (klass, sizeof (KaAppletPrivate)); + G_APPLICATION_CLASS (klass)->local_command_line = \ + ka_applet_local_command_line; + G_APPLICATION_CLASS (klass)->command_line = ka_applet_command_line; + G_APPLICATION_CLASS (klass)->startup = ka_applet_startup; + object_class->set_property = ka_applet_set_property; object_class->get_property = ka_applet_get_property; @@ -318,8 +420,7 @@ ka_applet_class_init (KaAppletClass *klass) G_PARAM_CONSTRUCT | G_PARAM_READWRITE); g_object_class_install_property (object_class, KA_PROP_TGT_RENEWABLE, pspec); - - for (i = 0; i < KA_SIGNAL_COUNT; i++) { + for (i=0; i < KA_SIGNAL_COUNT-1; i++) { guint signalId; signalId = g_signal_new (ka_signal_names[i], G_OBJECT_CLASS_TYPE (klass), @@ -329,13 +430,21 @@ ka_applet_class_init (KaAppletClass *klass) G_TYPE_STRING, G_TYPE_UINT); klass->signals[i] = signalId; } + klass->signals[KA_CCACHE_CHANGED] = g_signal_new ( + ka_signal_names[KA_CCACHE_CHANGED], + G_OBJECT_CLASS_TYPE (klass), + G_SIGNAL_RUN_LAST, 0, NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); } static KaApplet * ka_applet_new (void) { - return g_object_new (KA_TYPE_APPLET, NULL); + return g_object_new (KA_TYPE_APPLET, + "application-id", "org.gnome.KrbAuthDialog", + NULL); } @@ -456,8 +565,8 @@ ka_notify_ticket_action_cb (NotifyNotification *notification G_GNUC_UNUSED, KA_DEBUG ("Removing ccache"); ka_destroy_ccache (self); } else if (strcmp (action, "ka-list-tickets") == 0) { - KA_DEBUG ("Listing tickets"); - ka_tickets_dialog_run (); + KA_DEBUG ("Showing main window"); + ka_main_window_show (); } else { g_warning ("unkonwn action for callback"); } @@ -680,37 +789,10 @@ ka_applet_menu_add_separator_item (GtkWidget *menu) gtk_widget_show (menu_item); } -static void -ka_applet_cb_preferences (GtkWidget *menuitem G_GNUC_UNUSED, - gpointer user_data G_GNUC_UNUSED) -{ - GError *error = NULL; - - g_spawn_command_line_async (BIN_DIR - G_DIR_SEPARATOR_S - "gnome-control-center ka-panel", &error); - if (error) { - GtkWidget *message_dialog; - - message_dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - _("There was an error launching the preferences dialog: %s"), - error->message); - gtk_window_set_resizable (GTK_WINDOW (message_dialog), FALSE); - - g_signal_connect (message_dialog, "response", - G_CALLBACK (gtk_widget_destroy), NULL); - gtk_widget_show (message_dialog); - g_clear_error (&error); - } -} - /* Free all resources and quit */ static void -ka_applet_cb_quit (GtkMenuItem *menuitem G_GNUC_UNUSED, gpointer user_data) +ka_applet_quit_cb (GtkMenuItem *menuitem G_GNUC_UNUSED, gpointer user_data) { KaApplet *applet = KA_APPLET (user_data); @@ -719,36 +801,7 @@ ka_applet_cb_quit (GtkMenuItem *menuitem G_GNUC_UNUSED, gpointer user_data) static void -ka_applet_cb_about_dialog (GtkMenuItem *menuitem G_GNUC_UNUSED, - gpointer user_data G_GNUC_UNUSED) -{ - const gchar *authors[] = { - "Christopher Aillon <caillon@redhat.com>", - "Jonathan Blandford <jrb@redhat.com>", - "Colin Walters <walters@verbum.org>", - "Guido Günther <agx@sigxcpu.org>", - NULL - }; - - gtk_show_about_dialog (NULL, - "authors", authors, - "version", VERSION, - "logo-icon-name", "krb-valid-ticket", - "copyright", - "Copyright (C) 2004,2005,2006 Red Hat, Inc.,\n" - "2008-2011 Guido Günther", - "website-label", PACKAGE " website", - "website", - "https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/", - "license", "GNU General Public License Version 2", - /* Translators: add the translators of your language here */ - "translator-credits", _("translator-credits"), - NULL); -} - - -static void -ka_applet_cb_show_help (GtkMenuItem *menuitem G_GNUC_UNUSED, +ka_applet_show_help_cb (GtkMenuItem *menuitem G_GNUC_UNUSED, gpointer user_data) { KaApplet *applet = KA_APPLET (user_data); @@ -759,7 +812,7 @@ ka_applet_cb_show_help (GtkMenuItem *menuitem G_GNUC_UNUSED, static void -ka_applet_cb_destroy_ccache (GtkMenuItem *menuitem G_GNUC_UNUSED, +ka_applet_destroy_ccache_cb (GtkMenuItem *menuitem G_GNUC_UNUSED, gpointer user_data) { KaApplet *applet = KA_APPLET (user_data); @@ -768,10 +821,10 @@ ka_applet_cb_destroy_ccache (GtkMenuItem *menuitem G_GNUC_UNUSED, } static void -ka_applet_cb_show_tickets (GtkMenuItem *menuitem G_GNUC_UNUSED, +ka_applet_show_tickets_cb (GtkMenuItem *menuitem G_GNUC_UNUSED, gpointer user_data G_GNUC_UNUSED) { - ka_tickets_dialog_run (); + ka_main_window_show (); } @@ -789,7 +842,7 @@ ka_applet_create_context_menu (KaApplet *applet) menu_item = gtk_image_menu_item_new_with_mnemonic (_("Remove Credentials _Cache")); g_signal_connect (G_OBJECT (menu_item), "activate", - G_CALLBACK (ka_applet_cb_destroy_ccache), applet); + G_CALLBACK (ka_applet_destroy_ccache_cb), applet); image = gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); @@ -799,26 +852,13 @@ ka_applet_create_context_menu (KaApplet *applet) /* Ticket dialog */ menu_item = gtk_image_menu_item_new_with_mnemonic (_("_List Tickets")); g_signal_connect (G_OBJECT (menu_item), "activate", - G_CALLBACK (ka_applet_cb_show_tickets), applet); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); - - /* Preferences */ - menu_item = - gtk_image_menu_item_new_from_stock (GTK_STOCK_PREFERENCES, NULL); - g_signal_connect (G_OBJECT (menu_item), "activate", - G_CALLBACK (ka_applet_cb_preferences), applet); + G_CALLBACK (ka_applet_show_tickets_cb), applet); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); - /* About item */ + /* Help item */ menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_HELP, NULL); g_signal_connect (G_OBJECT (menu_item), "activate", - G_CALLBACK (ka_applet_cb_show_help), applet); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); - - /* About item */ - menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ABOUT, NULL); - g_signal_connect (G_OBJECT (menu_item), "activate", - G_CALLBACK (ka_applet_cb_about_dialog), applet); + G_CALLBACK (ka_applet_show_help_cb), applet); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); ka_applet_menu_add_separator_item (menu); @@ -826,7 +866,7 @@ ka_applet_create_context_menu (KaApplet *applet) /* Quit */ menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_QUIT, NULL); g_signal_connect (G_OBJECT (menu_item), "activate", - G_CALLBACK (ka_applet_cb_quit), applet); + G_CALLBACK (ka_applet_quit_cb), applet); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); gtk_widget_show_all (menu); @@ -984,12 +1024,21 @@ ka_ns_check_persistence (KaApplet *self) } -/* destroy the applet and quit */ +/* undo what was done on startup() */ void -ka_applet_destroy (KaApplet* applet) +ka_applet_destroy (KaApplet* self) { - g_object_unref (applet); - gtk_main_quit (); + GList *windows, *first; + + ka_dbus_disconnect (); + windows = gtk_application_get_windows (GTK_APPLICATION(self)); + if (windows) { + first = g_list_first (windows); + gtk_application_remove_window(GTK_APPLICATION (self), + GTK_WINDOW (first->data)); + } + + ka_kerberos_destroy (); } @@ -1020,19 +1069,42 @@ ka_applet_create () g_assert (error->message); g_error ("Failed to load UI XML: %s", error->message); } + gtk_builder_connect_signals (applet->priv->uixml, NULL); + applet->priv->pwdialog = ka_pwdialog_create (applet->priv->uixml); g_return_val_if_fail (applet->priv->pwdialog != NULL, NULL); applet->priv->gconf = ka_gconf_init (applet); g_return_val_if_fail (applet->priv->gconf != NULL, NULL); - ka_tickets_dialog_create (applet->priv->uixml); applet->priv->loader = ka_plugin_loader_create (applet); g_return_val_if_fail (applet->priv->loader != NULL, NULL); return applet; } +int +main (int argc, char *argv[]) +{ + KaApplet *applet; + int ret = 0; + + textdomain (PACKAGE); + bind_textdomain_codeset (PACKAGE, "UTF-8"); + bindtextdomain (PACKAGE, LOCALE_DIR); + + g_set_application_name (KA_NAME); + + gtk_init (&argc, &argv); + applet = ka_applet_create (); + if (!applet) + return 1; + + ret = g_application_run (G_APPLICATION(applet), argc, argv); + g_object_unref (applet); + return ret; +} + /* * vim:ts:sts=4:sw=4:et: */ diff --git a/src/ka-dbus.c b/src/ka-dbus.c index a79f85f..2b84adc 100644 --- a/src/ka-dbus.c +++ b/src/ka-dbus.c @@ -21,10 +21,9 @@ #include "config.h" #include "ka-applet-priv.h" -#include "ka-dialog.h" +#include "ka-kerberos.h" #include "ka-dbus.h" -static guint dbus_owner_id; static GDBusConnection *dbus_connection; static const char *dbus_object_path = "/org/gnome/KrbAuthDialog"; static const char *dbus_interface_name = "org.gnome.KrbAuthDialog"; @@ -156,7 +155,7 @@ ka_dbus_connect_signals(KaApplet *applet) { int i; - for (i = 0; i < KA_SIGNAL_COUNT; i++) { + for (i = 0; i < KA_SIGNAL_COUNT-1; i++) { g_signal_connect (applet, ka_signal_names[i], G_CALLBACK (ka_dbus_signal_cb), (gpointer)ka_signal_names[i]); @@ -171,18 +170,19 @@ static const GDBusInterfaceVTable interface_vtable = static void -ka_dbus_on_bus_acquired (GDBusConnection *connection, - const gchar *name G_GNUC_UNUSED, - gpointer user_data) +ka_dbus_on_get_bus_cb (GObject *source_object G_GNUC_UNUSED, + GAsyncResult *res, + gpointer user_data) { KaApplet *applet = user_data; guint id; + dbus_connection = g_bus_get_finish (res, NULL); introspection_data = g_dbus_node_info_new_for_xml ( ka_dbus_introspection_xml, NULL); - id = g_dbus_connection_register_object (connection, + id = g_dbus_connection_register_object (dbus_connection, "/org/gnome/KrbAuthDialog", introspection_data->interfaces[0], &interface_vtable, @@ -190,22 +190,8 @@ ka_dbus_on_bus_acquired (GDBusConnection *connection, NULL, /* user_data_free_func */ NULL); /* GError** */ if (!id) - g_error ("Failed to regiester DBus object"); + g_error ("Failed to register DBus object"); ka_dbus_connect_signals (applet); - - dbus_connection = connection; -} - - -static void -ka_dbus_on_name_lost (GDBusConnection *connection G_GNUC_UNUSED, - const gchar *name G_GNUC_UNUSED, - gpointer user_data) -{ - KaApplet *applet = user_data; - - g_warning ("Cannot acquire DBUS name"); - ka_applet_destroy (applet); } @@ -217,10 +203,6 @@ ka_dbus_disconnect () introspection_data = NULL; } - if (dbus_owner_id) { - g_bus_unown_name (dbus_owner_id); - dbus_owner_id = 0; - } dbus_connection = NULL; } @@ -230,17 +212,12 @@ ka_dbus_connect (KaApplet *applet) { g_return_val_if_fail (applet != 0, FALSE); - dbus_owner_id = g_bus_own_name (G_BUS_TYPE_SESSION, - "org.gnome.KrbAuthDialog", - G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT, - ka_dbus_on_bus_acquired, - NULL, - ka_dbus_on_name_lost, - applet, - NULL); + g_bus_get (G_BUS_TYPE_SESSION, NULL, ka_dbus_on_get_bus_cb, + applet); return TRUE; } /* * vim:ts=4:sts=4:sw=4:et: */ + diff --git a/src/ka-dialog.c b/src/ka-kerberos.c index fffd2fd..e131286 100644 --- a/src/ka-dialog.c +++ b/src/ka-kerberos.c @@ -2,7 +2,7 @@ * Copyright (C) 2004,2005,2006 Red Hat, Inc. * Authored by Christopher Aillon <caillon@redhat.com> * - * Copyright (C) 2008,2009,2010 Guido Guenther <agx@sigxcpu.org> + * Copyright (C) 2008,2009,2010,2011 Guido Guenther <agx@sigxcpu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -35,12 +35,11 @@ #include "secmem-util.h" #include "memory.h" -#include "ka-dialog.h" +#include "ka-kerberos.h" #include "ka-applet-priv.h" #include "ka-pwdialog.h" -#include "ka-dbus.h" #include "ka-tools.h" -#include "ka-tickets.h" +#include "ka-main-window.h" #ifdef ENABLE_NETWORK_MANAGER #include <nm-client.h> @@ -60,8 +59,9 @@ static krb5_timestamp creds_expiry; static krb5_timestamp canceled_creds_expiry; static gboolean canceled; static gboolean invalid_auth; -static gboolean always_run; static gboolean is_online = TRUE; +static gboolean kcontext_valid; +GFileMonitor *ccache_monitor; static int grab_credentials (KaApplet *applet); static int ka_renew_credentials (KaApplet *applet); @@ -315,8 +315,6 @@ ka_get_service_tickets (GtkListStore * tickets) gtk_list_store_append (tickets, &iter); gtk_list_store_set (tickets, &iter, PRINCIPAL_COLUMN, _("Your ticket cache is currently empty"), - START_TIME_COLUMN, 0, - END_TIME_COLUMN, 0, FORWARDABLE_COLUMN, FALSE, RENEWABLE_COLUMN, FALSE, PROXIABLE_COLUMN, FALSE, -1); @@ -677,9 +675,9 @@ ka_unparse_name () static void -ccache_changed_cb (GFileMonitor * monitor G_GNUC_UNUSED, - GFile * file, - GFile * other_file G_GNUC_UNUSED, +ccache_changed_cb (GFileMonitor *monitor G_GNUC_UNUSED, + GFile *file, + GFile *other_file G_GNUC_UNUSED, GFileMonitorEvent event_type, gpointer data) { KaApplet *applet = KA_APPLET (data); @@ -691,6 +689,7 @@ ccache_changed_cb (GFileMonitor * monitor G_GNUC_UNUSED, case G_FILE_MONITOR_EVENT_CHANGED: KA_DEBUG ("%s changed", ccache_name); credentials_expiring ((gpointer) applet); + g_signal_emit_by_name(applet, "krb-ccache-changed"); break; default: KA_DEBUG ("%s unhandled event: %d", ccache_name, event_type); @@ -898,7 +897,7 @@ ka_get_tgt_from_ccache (krb5_context context, krb5_creds *creds) } static gboolean -using_krb5 (void) +ka_krb5_context_init () { krb5_error_code err; gboolean have_tgt = FALSE; @@ -907,6 +906,8 @@ using_krb5 (void) err = krb5_init_context (&kcontext); if (err) return FALSE; + else + kcontext_valid = TRUE; have_tgt = ka_get_tgt_from_ccache (kcontext, &creds); if (have_tgt) { @@ -917,6 +918,17 @@ using_krb5 (void) } +static gboolean +ka_krb5_context_free () +{ + if (kcontext_valid) { + krb5_free_context (kcontext); + kcontext_valid = FALSE; + } + return TRUE; +} + + gboolean ka_destroy_ccache (KaApplet *applet) { @@ -1069,68 +1081,32 @@ ka_nm_init (void) } -int -main (int argc, char *argv[]) +gboolean +ka_kerberos_init (KaApplet *applet) { - KaApplet *applet; - GOptionContext *context; - GError *error = NULL; - - gboolean run_auto = FALSE; - - const char *help_msg = - "Run '" PACKAGE - " --help' to see a full list of available command line options"; - const GOptionEntry options[] = { - {"auto", 'a', 0, G_OPTION_ARG_NONE, &run_auto, - "Only run if an initialized ccache is found", NULL}, - {NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL} - }; - GFileMonitor *monitor = NULL; - - context = g_option_context_new ("- Kerberos 5 credential checking"); - g_option_context_add_main_entries (context, options, NULL); - g_option_context_add_group (context, gtk_get_option_group (TRUE)); - g_option_context_parse (context, &argc, &argv, &error); + gboolean ret; - if (error) { - g_print ("%s\n%s\n", error->message, help_msg); - g_clear_error (&error); - return 1; - } - g_option_context_free (context); - - textdomain (PACKAGE); - bind_textdomain_codeset (PACKAGE, "UTF-8"); - bindtextdomain (PACKAGE, LOCALE_DIR); ka_secmem_init (); + ret = ka_krb5_context_init (applet); + ka_nm_init (); + g_timeout_add_seconds (CREDENTIAL_CHECK_INTERVAL, + (GSourceFunc) credentials_expiring, applet); + g_idle_add ((GSourceFunc) credentials_expiring_once, applet); + ccache_monitor = monitor_ccache (applet); + return ret; +} - always_run = !run_auto; - if (using_krb5 () || always_run) { - g_set_application_name (KA_NAME); - - applet = ka_applet_create (); - if (!applet) - return 1; - if (!ka_dbus_connect (applet)) { - ka_applet_destroy (applet); - return 1; - } - ka_nm_init (); +gboolean +ka_kerberos_destroy () +{ + ka_nm_shutdown (); - g_timeout_add_seconds (CREDENTIAL_CHECK_INTERVAL, - (GSourceFunc) credentials_expiring, applet); - g_idle_add ((GSourceFunc) credentials_expiring_once, applet); - monitor = monitor_ccache (applet); + if (ccache_monitor) + g_object_unref (ccache_monitor); - gtk_main (); - } - ka_dbus_disconnect (); - ka_nm_shutdown (); - if (monitor) - g_object_unref (monitor); - return 0; + ka_krb5_context_free (); + return TRUE; } /* diff --git a/src/ka-dialog.h b/src/ka-kerberos.h index c62acb3..504cc14 100644 --- a/src/ka-dialog.h +++ b/src/ka-kerberos.h @@ -23,6 +23,9 @@ #include "ka-applet-priv.h" +gboolean ka_kerberos_init (KaApplet *applet); +gboolean ka_kerberos_destroy (void); + gboolean ka_destroy_ccache (KaApplet* applet); gboolean ka_grab_credentials(KaApplet* applet); gboolean ka_check_credentials (KaApplet *applet, const char* principal); diff --git a/src/ka-tickets.c b/src/ka-main-window.c index ce01fce..b841b3e 100644 --- a/src/ka-tickets.c +++ b/src/ka-main-window.c @@ -1,6 +1,8 @@ -/* Krb5 Auth Applet -- Acquire and release kerberos tickets +/* -*- c-file-style: "linux"; c-basic-offset: 4; indent-tabs-mode: nil; -*- * * - * (C) 2009 Guido Guenther <agx@sigxcpu.org> + * Krb5 Auth Applet -- Acquire and release kerberos tickets + * + * (C) 2009,2011 Guido Guenther <agx@sigxcpu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,14 +25,75 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> -#include "ka-tickets.h" -#include "ka-dialog.h" +#include "ka-main-window.h" +#include "ka-kerberos.h" +#include "ka-tools.h" +#include "ka-preferences.h" static GtkListStore *tickets; -static GtkWidget *tickets_dialog; +static GtkWindow *main_window; + +static void +ccache_changed_cb (KaApplet* applet G_GNUC_UNUSED, + gpointer user_data G_GNUC_UNUSED) +{ + KA_DEBUG("Refreshing ticket list"); + ka_get_service_tickets (tickets); +} + +static void +menuitem_close_cb (GtkMenuItem *menuitem G_GNUC_UNUSED, + gpointer user_data G_GNUC_UNUSED) +{ + ka_main_window_hide(); +} + +static void +menuitem_preferences_cb (GtkMenuItem *menuitem G_GNUC_UNUSED, + gpointer user_data G_GNUC_UNUSED) +{ + ka_preferences_window_show (main_window); +} + +static void +menuitem_about_cb (GtkMenuItem *menuitem G_GNUC_UNUSED, + gpointer user_data G_GNUC_UNUSED) +{ + ka_show_about (); +} + +static void +menuitem_help_contents_cb (GtkMenuItem *menuitem G_GNUC_UNUSED, + gpointer user_data G_GNUC_UNUSED) +{ + ka_show_help (gtk_window_get_screen (main_window), NULL, NULL); +} -GtkWidget * -ka_tickets_dialog_create (GtkBuilder *xml) + +static void +ka_main_window_create_menu (KaApplet *applet, GtkBuilder *xml) +{ + GtkMenuItem *item; + +#define CONNECT_MENU(name) \ + item = GTK_MENU_ITEM (gtk_builder_get_object (xml, \ + "menuitem_" #name)); \ + g_signal_connect (item, \ + "activate", \ + G_CALLBACK(menuitem_ ##name## _cb), \ + applet) + + CONNECT_MENU(close); + CONNECT_MENU(preferences); + CONNECT_MENU(about); + CONNECT_MENU(help_contents); + +#undef CONNECT_MENU +} + + +GtkWindow * +ka_main_window_create (KaApplet *applet, GtkBuilder *xml) { GtkCellRenderer *text_renderer, *toggle_renderer; GtkTreeView *tickets_view; @@ -42,8 +105,8 @@ ka_tickets_dialog_create (GtkBuilder *xml) G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); - tickets_dialog = - GTK_WIDGET (gtk_builder_get_object (xml, "krb5_tickets_dialog")); + main_window = + GTK_WINDOW (gtk_builder_get_object (xml, "krb5_main_window")); tickets_view = GTK_TREE_VIEW (gtk_builder_get_object (xml, "krb5_tickets_treeview")); gtk_tree_view_set_model (GTK_TREE_VIEW (tickets_view), @@ -71,36 +134,43 @@ ka_tickets_dialog_create (GtkBuilder *xml) END_TIME_COLUMN, NULL); gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1, + /* Translators: this is an abbreviation for forwardable */ _("Fwd"), toggle_renderer, "active", FORWARDABLE_COLUMN, NULL); gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1, + /* Translators: this is an abbreviation for proxiable */ _("Proxy"), toggle_renderer, "active", PROXIABLE_COLUMN, NULL); gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1, + /* Translators: this is an abbreviation for renewable */ _("Renew"), toggle_renderer, "active", RENEWABLE_COLUMN, NULL); - return tickets_dialog; + + g_signal_connect (applet, "krb-ccache-changed", + G_CALLBACK(ccache_changed_cb), + NULL); + + ka_main_window_create_menu(applet, xml); + return main_window; } void -ka_tickets_dialog_run () +ka_main_window_show () { if (ka_get_service_tickets (tickets)) { - gtk_window_present (GTK_WINDOW (tickets_dialog)); - gtk_dialog_run (GTK_DIALOG (tickets_dialog)); - gtk_widget_hide (tickets_dialog); + gtk_window_present (main_window); } else { GtkWidget *message_dialog; - + message_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, @@ -108,9 +178,16 @@ ka_tickets_dialog_run () _ ("Error displaying service ticket information")); gtk_window_set_resizable (GTK_WINDOW (message_dialog), FALSE); - + g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL); gtk_widget_show (message_dialog); } } + +void +ka_main_window_hide () +{ + KA_DEBUG("Hiding main window"); + gtk_widget_hide (GTK_WIDGET(main_window)); +} diff --git a/src/ka-tickets.h b/src/ka-main-window.h index 2a8aa3f..bc5b191 100644 --- a/src/ka-tickets.h +++ b/src/ka-main-window.h @@ -21,6 +21,8 @@ #ifndef KA_TICKETS_H #define KA_TICKETS_H +#include "ka-applet.h" + enum ticket_columns { PRINCIPAL_COLUMN, START_TIME_COLUMN, @@ -32,8 +34,9 @@ enum ticket_columns { }; -GtkWidget *ka_tickets_dialog_create (GtkBuilder *xml); -void ka_tickets_dialog_run (void); +GtkWindow *ka_main_window_create (KaApplet *applet, GtkBuilder *xml); +void ka_main_window_show (void); +void ka_main_window_hide (void); #endif diff --git a/src/ka-preferences.c b/src/ka-preferences.c new file mode 100644 index 0000000..a80f6d9 --- /dev/null +++ b/src/ka-preferences.c @@ -0,0 +1,689 @@ +/* + * Copyright (C) 2011 Guido Guenther <agx@sigxcpu.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +#include "config.h" +#include "ka-preferences.h" + +#include "ka-gconf-tools.h" +#include "ka-tools.h" + +#include <glib/gi18n.h> + +#define WID(b, w) (GtkWidget *) gtk_builder_get_object (b, w) + +#define PKINIT_SMARTCARD "PKCS11:" SC_PKCS11 +#define PKINIT_FILE "FILE:" + +#define N_LISTENERS 7 + +struct _KaPreferencesPrivate { + GtkBuilder *builder; + + GConfClient *client; + + GtkWidget *dialog; + GtkWidget *notebook; + GtkWidget *principal_entry; + GtkWidget *pkuserid_entry; + GtkWidget *pkuserid_button; + GtkWidget *smartcard_toggle; + GtkWidget *pkanchors_entry; + GtkWidget *pkanchors_button; + GtkWidget *forwardable_toggle; + GtkWidget *proxiable_toggle; + GtkWidget *renewable_toggle; + GtkWidget *prompt_mins_entry; + + guint listeners [N_LISTENERS]; + int n_listeners; +} prefs; + + +static void +ka_preferences_principal_notify (GConfClient *client G_GNUC_UNUSED, + guint cnx_id G_GNUC_UNUSED, + GConfEntry *entry, + gpointer userdata G_GNUC_UNUSED) +{ + const char *principal; + + if (!entry->value || entry->value->type != GCONF_VALUE_STRING) + return; + + principal = gconf_value_get_string (entry->value); + + if (!principal || !strlen(principal)) + gtk_entry_set_text (GTK_ENTRY (prefs.principal_entry), ""); + else { + const char *old_principal; + + old_principal = gtk_entry_get_text (GTK_ENTRY (prefs.principal_entry)); + if (!old_principal || (old_principal && strcmp (old_principal, principal))) + gtk_entry_set_text (GTK_ENTRY (prefs.principal_entry), principal); + } +} + +static void +ka_preferences_principal_changed (GtkEntry *entry, + gpointer userdata G_GNUC_UNUSED) +{ + const char *principal; + + principal = gtk_entry_get_text (entry); + + if (!principal || !strlen(principal)) + gconf_client_unset (prefs.client, KA_GCONF_KEY_PRINCIPAL, NULL); + else + gconf_client_set_string (prefs.client, KA_GCONF_KEY_PRINCIPAL, principal, NULL); +} + + +static void +ka_preferences_setup_principal_entry () +{ + char *principal = NULL; + + prefs.principal_entry = WID (prefs.builder, "principal_entry"); + g_assert (prefs.principal_entry != NULL); + + if (!ka_gconf_get_string (prefs.client, KA_GCONF_KEY_PRINCIPAL, &principal)) + g_warning ("Getting principal failed"); + + if (principal && strlen(principal)) + gtk_entry_set_text (GTK_ENTRY (prefs.principal_entry), principal); + if (principal) + g_free (principal); + + g_signal_connect (prefs.principal_entry, "changed", + G_CALLBACK (ka_preferences_principal_changed), NULL); + + if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_PRINCIPAL, NULL)) { + gtk_widget_set_sensitive (prefs.principal_entry, FALSE); + } + + prefs.listeners [prefs.n_listeners] = + gconf_client_notify_add (prefs.client, + KA_GCONF_KEY_PRINCIPAL, + (GConfClientNotifyFunc) ka_preferences_principal_notify, + NULL, NULL, NULL); + prefs.n_listeners++; +} + + +static void +ka_preferences_pkuserid_notify (GConfClient *client G_GNUC_UNUSED, + guint cnx_id G_GNUC_UNUSED, + GConfEntry *entry, + gpointer *userdata G_GNUC_UNUSED) +{ + const char *pkuserid; + + if (!entry->value || entry->value->type != GCONF_VALUE_STRING) + return; + + pkuserid = gconf_value_get_string (entry->value); + + if (!pkuserid || !strlen(pkuserid)) + gtk_entry_set_text (GTK_ENTRY (prefs.pkuserid_entry), ""); + else { + const char *old_pkuserid; + + old_pkuserid = gtk_entry_get_text (GTK_ENTRY (prefs.pkuserid_entry)); + if (!old_pkuserid || (old_pkuserid && strcmp (old_pkuserid, pkuserid))) + gtk_entry_set_text (GTK_ENTRY (prefs.pkuserid_entry), pkuserid); + } +} + + +static void +ka_preferences_pkuserid_changed (GtkEntry *entry, + gpointer *user_data G_GNUC_UNUSED) +{ + const char *pkuserid; + + pkuserid = gtk_entry_get_text (entry); + + if (!pkuserid || !strlen(pkuserid)) + gconf_client_unset (prefs.client, KA_GCONF_KEY_PK_USERID, NULL); + else + gconf_client_set_string (prefs.client, KA_GCONF_KEY_PK_USERID, pkuserid, NULL); +} + + +static void +ka_preferences_setup_pkuserid_entry () +{ + char *pkuserid = NULL; + + prefs.pkuserid_entry = WID(prefs.builder, "pkuserid_entry"); + g_assert (prefs.pkuserid_entry != NULL); + + if (!ka_gconf_get_string (prefs.client, KA_GCONF_KEY_PK_USERID, &pkuserid)) + g_warning ("Getting pkuserid failed"); + + if (pkuserid && strlen(pkuserid)) + gtk_entry_set_text (GTK_ENTRY (prefs.pkuserid_entry), pkuserid); + if (pkuserid) + g_free (pkuserid); + + g_signal_connect (prefs.pkuserid_entry, "changed", + G_CALLBACK (ka_preferences_pkuserid_changed), NULL); + if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_PK_USERID, NULL)) { + gtk_widget_set_sensitive (prefs.pkuserid_entry, FALSE); + } + + prefs.listeners [prefs.n_listeners] = + gconf_client_notify_add (prefs.client, + KA_GCONF_KEY_PK_USERID, + (GConfClientNotifyFunc) ka_preferences_pkuserid_notify, + NULL, NULL, NULL); + prefs.n_listeners++; +} + + +static void +ka_preferences_pkanchors_notify (GConfClient *client G_GNUC_UNUSED, + guint cnx_id G_GNUC_UNUSED, + GConfEntry *entry, + gpointer userdata G_GNUC_UNUSED) +{ + const char *pkanchors; + + if (!entry->value || entry->value->type != GCONF_VALUE_STRING) + return; + + pkanchors = gconf_value_get_string (entry->value); + + if (!pkanchors || !strlen(pkanchors)) + gtk_entry_set_text (GTK_ENTRY (prefs.pkanchors_entry), ""); + else { + const char *old_pkanchors; + + old_pkanchors = gtk_entry_get_text (GTK_ENTRY (prefs.pkanchors_entry)); + if (!old_pkanchors || (old_pkanchors && strcmp (old_pkanchors, pkanchors))) + gtk_entry_set_text (GTK_ENTRY (prefs.pkanchors_entry), pkanchors); + } +} + + +static void +ka_preferences_pkanchors_changed (GtkEntry *entry, + gpointer userdata G_GNUC_UNUSED) +{ + const char *pkanchors; + + pkanchors = gtk_entry_get_text (entry); + + if (!pkanchors || !strlen(pkanchors)) + gconf_client_unset (prefs.client, KA_GCONF_KEY_PK_ANCHORS, NULL); + else + gconf_client_set_string (prefs.client, KA_GCONF_KEY_PK_ANCHORS, + pkanchors, NULL); +} + + +static void +ka_preferences_setup_pkanchors_entry () +{ + char *pkanchors = NULL; + + prefs.pkanchors_entry = WID(prefs.builder, "pkanchors_entry"); + g_assert (prefs.pkanchors_entry != NULL); + + if (!ka_gconf_get_string (prefs.client, KA_GCONF_KEY_PK_ANCHORS, &pkanchors)) + g_warning ("Getting pkanchors failed"); + + if (pkanchors && strlen(pkanchors)) + gtk_entry_set_text (GTK_ENTRY (prefs.pkanchors_entry), pkanchors); + if (pkanchors) + g_free (pkanchors); + + g_signal_connect (prefs.pkanchors_entry, "changed", + G_CALLBACK (ka_preferences_pkanchors_changed), NULL); + if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_PK_ANCHORS, NULL)) { + gtk_widget_set_sensitive (prefs.pkanchors_entry, FALSE); + } + + prefs.listeners [prefs.n_listeners] = + gconf_client_notify_add (prefs.client, + KA_GCONF_KEY_PK_ANCHORS, + (GConfClientNotifyFunc) ka_preferences_pkanchors_notify, + NULL, NULL, NULL); + prefs.n_listeners++; +} + + +static void +ka_preferences_toggle_pkuserid_entry (gboolean state, gpointer userdata G_GNUC_UNUSED) +{ + gtk_widget_set_sensitive (prefs.pkuserid_entry, state); + gtk_widget_set_sensitive (prefs.pkuserid_button, state); +} + + +static void +ka_preferences_smartcard_toggled (GtkToggleButton *toggle, + gpointer userdata G_GNUC_UNUSED) +{ + gboolean smartcard = gtk_toggle_button_get_active (toggle); + static gchar *old_path = NULL; + + if (smartcard) { + const char *path; + + path = gtk_entry_get_text (GTK_ENTRY(prefs.pkuserid_entry)); + if (g_strcmp0 (path, PKINIT_SMARTCARD)) { + g_free (old_path); + old_path = g_strdup (path); + } + ka_preferences_toggle_pkuserid_entry (FALSE, NULL); + gconf_client_set_string (prefs.client, KA_GCONF_KEY_PK_USERID, PKINIT_SMARTCARD, NULL); + } else { + ka_preferences_toggle_pkuserid_entry (TRUE, NULL); + if (old_path) + gconf_client_set_string (prefs.client, KA_GCONF_KEY_PK_USERID, old_path, NULL); + else + gconf_client_unset (prefs.client, KA_GCONF_KEY_PK_USERID, NULL); + } +} + + +static void +ka_preferences_setup_smartcard_toggle () +{ + char *pkuserid = NULL; + + prefs.smartcard_toggle = WID (prefs.builder, "smartcard_toggle"); + g_assert (prefs.smartcard_toggle != NULL); + + if (!ka_gconf_get_string (prefs.client, KA_GCONF_KEY_PK_USERID, &pkuserid)) + g_warning ("Getting pkanchors failed"); + + g_signal_connect (prefs.smartcard_toggle, "toggled", + G_CALLBACK (ka_preferences_smartcard_toggled), NULL); + + if (!g_strcmp0 (pkuserid, PKINIT_SMARTCARD)) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.smartcard_toggle), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.smartcard_toggle), FALSE); + + if (pkuserid) + g_free (pkuserid); +} + + +static void +ka_preferences_browse_certs (GtkEntry *entry) +{ + GtkWidget *filechooser; + GtkFileFilter *cert_filter, *all_filter; + gchar *filename = NULL; + const gchar *current; + gint ret; + + filechooser = gtk_file_chooser_dialog_new(_("Choose Certificate"), + GTK_WINDOW (prefs.dialog), + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL); + + current = gtk_entry_get_text (entry); + if (current && g_str_has_prefix (current, PKINIT_FILE) && + strlen(current) > strlen (PKINIT_FILE)) { + gtk_file_chooser_select_filename (GTK_FILE_CHOOSER(filechooser), + (const gchar*)¤t[strlen(PKINIT_FILE)]); + } + + cert_filter = g_object_ref_sink (gtk_file_filter_new ()); + gtk_file_filter_add_mime_type (cert_filter, "application/x-x509-ca-cert"); + gtk_file_filter_set_name (cert_filter, _("X509 Certificates")); + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filechooser), cert_filter); + all_filter = g_object_ref_sink (gtk_file_filter_new ()); + gtk_file_filter_add_pattern (all_filter, "*"); + gtk_file_filter_set_name (all_filter, _("all files")); + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filechooser), all_filter); + + ret = gtk_dialog_run (GTK_DIALOG(filechooser)); + if (ret == GTK_RESPONSE_ACCEPT) + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(filechooser)); + gtk_widget_destroy (GTK_WIDGET(filechooser)); + + if (filename) { + gchar *cert = g_strconcat( PKINIT_FILE, filename, NULL); + gtk_entry_set_text (entry, cert); + g_free (filename); + g_free (cert); + } + g_object_unref (cert_filter); + g_object_unref (all_filter); +} + +static void +ka_preferences_browse_pkuserids (GtkButton *button G_GNUC_UNUSED, + gpointer userdata G_GNUC_UNUSED) +{ + ka_preferences_browse_certs (GTK_ENTRY(prefs.pkuserid_entry)); +} + +static void +ka_preferences_browse_pkanchors(GtkButton *button G_GNUC_UNUSED, + gpointer userdata G_GNUC_UNUSED) +{ + ka_preferences_browse_certs (GTK_ENTRY(prefs.pkanchors_entry)); +} + +static void +ka_preferences_setup_pkuserid_button () +{ + prefs.pkuserid_button = WID (prefs.builder, "pkuserid_button"); + g_assert (prefs.pkuserid_button != NULL); + + g_signal_connect (prefs.pkuserid_button, "clicked", + G_CALLBACK (ka_preferences_browse_pkuserids), NULL); + +} + +static void +ka_preferences_setup_pkanchors_button () +{ + prefs.pkanchors_button = WID (prefs.builder, "pkanchors_button"); + g_assert (prefs.pkanchors_button != NULL); + + g_signal_connect (prefs.pkanchors_button, "clicked", + G_CALLBACK (ka_preferences_browse_pkanchors), NULL); + +} + + +static void +ka_preferences_forwardable_toggled (GtkToggleButton *toggle, + gpointer userdata G_GNUC_UNUSED) +{ + gboolean forwardable; + + forwardable = gtk_toggle_button_get_active (toggle); + + gconf_client_set_bool (prefs.client, KA_GCONF_KEY_FORWARDABLE, forwardable, NULL); +} + + +static void +ka_preferences_forwardable_notify (GConfClient *client G_GNUC_UNUSED, + guint cnx_id G_GNUC_UNUSED, + GConfEntry *entry, + gpointer userdata G_GNUC_UNUSED) +{ + gboolean forwardable; + + if (!entry->value || entry->value->type != GCONF_VALUE_BOOL) + return; + + forwardable = gconf_value_get_bool (entry->value) != FALSE; + + if (forwardable != gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs.forwardable_toggle))) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.forwardable_toggle), forwardable); +} + + +static gboolean +ka_preferences_setup_forwardable_toggle () +{ + gboolean forwardable; + + prefs.forwardable_toggle = WID (prefs.builder, "forwardable_toggle"); + g_assert (prefs.forwardable_toggle != NULL); + + forwardable = gconf_client_get_bool (prefs.client, KA_GCONF_KEY_FORWARDABLE, NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.forwardable_toggle), forwardable); + + g_signal_connect (prefs.forwardable_toggle, "toggled", + G_CALLBACK (ka_preferences_forwardable_toggled), NULL); + + if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_FORWARDABLE, NULL)) { + gtk_widget_set_sensitive (prefs.forwardable_toggle, FALSE); + } + + prefs.listeners [prefs.n_listeners] = + gconf_client_notify_add (prefs.client, + KA_GCONF_KEY_FORWARDABLE, + (GConfClientNotifyFunc) ka_preferences_forwardable_notify, + NULL, NULL, NULL); + prefs.n_listeners++; + return forwardable; +} + + +static void +ka_preferences_proxiable_toggled (GtkToggleButton *toggle, + gpointer userdata G_GNUC_UNUSED) +{ + gboolean proxiable; + + proxiable = gtk_toggle_button_get_active (toggle); + + gconf_client_set_bool (prefs.client, KA_GCONF_KEY_PROXIABLE, proxiable, NULL); +} + + +static void +ka_preferences_proxiable_notify (GConfClient *client G_GNUC_UNUSED, + guint cnx_id G_GNUC_UNUSED, + GConfEntry *entry, + gpointer userdata G_GNUC_UNUSED) +{ + gboolean proxiable; + + if (!entry->value || entry->value->type != GCONF_VALUE_BOOL) + return; + + proxiable = gconf_value_get_bool (entry->value) != FALSE; + + if (proxiable != gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs.proxiable_toggle))) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.proxiable_toggle), proxiable); +} + + +static gboolean +ka_preferences_setup_proxiable_toggle () +{ + gboolean proxiable; + + prefs.proxiable_toggle = WID (prefs.builder, "proxiable_toggle"); + g_assert (prefs.proxiable_toggle != NULL); + + proxiable = gconf_client_get_bool (prefs.client, KA_GCONF_KEY_PROXIABLE, NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.proxiable_toggle), proxiable); + + g_signal_connect (prefs.proxiable_toggle, "toggled", + G_CALLBACK (ka_preferences_proxiable_toggled), NULL); + + if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_PROXIABLE, NULL)) { + gtk_widget_set_sensitive (prefs.proxiable_toggle, FALSE); + } + + prefs.listeners [prefs.n_listeners] = + gconf_client_notify_add (prefs.client, + KA_GCONF_KEY_PROXIABLE, + (GConfClientNotifyFunc) ka_preferences_proxiable_notify, + NULL, NULL, NULL); + prefs.n_listeners++; + return proxiable; +} + + +static void +ka_preferences_renewable_toggled (GtkToggleButton *toggle, + gpointer userdata G_GNUC_UNUSED) +{ + gboolean renewable; + + renewable = gtk_toggle_button_get_active (toggle); + + gconf_client_set_bool (prefs.client, KA_GCONF_KEY_RENEWABLE, renewable, NULL); +} + + +static void +ka_preferences_renewable_notify (GConfClient *client G_GNUC_UNUSED, + guint cnx_id G_GNUC_UNUSED, + GConfEntry *entry, + gpointer userdata G_GNUC_UNUSED) +{ + gboolean renewable; + + if (!entry->value || entry->value->type != GCONF_VALUE_BOOL) + return; + + renewable = gconf_value_get_bool (entry->value) != FALSE; + + if (renewable != gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs.renewable_toggle))) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.renewable_toggle), renewable); +} + + +static gboolean +ka_preferences_setup_renewable_toggle () +{ + gboolean renewable; + + prefs.renewable_toggle = WID (prefs.builder, "renewable_toggle"); + g_assert (prefs.renewable_toggle != NULL); + + renewable = gconf_client_get_bool (prefs.client, KA_GCONF_KEY_RENEWABLE, NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.renewable_toggle), renewable); + + g_signal_connect (prefs.renewable_toggle, "toggled", + G_CALLBACK (ka_preferences_renewable_toggled), NULL); + + if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_RENEWABLE, NULL)) { + gtk_widget_set_sensitive (prefs.renewable_toggle, FALSE); + } + + prefs.listeners [prefs.n_listeners] = + gconf_client_notify_add (prefs.client, + KA_GCONF_KEY_RENEWABLE, + (GConfClientNotifyFunc) ka_preferences_renewable_notify, + NULL, NULL, NULL); + prefs.n_listeners++; + return renewable; +} + + +static void +ka_preferences_prompt_mins_changed (GtkSpinButton *button, + gpointer userdata G_GNUC_UNUSED) +{ + gint prompt_mins; + + prompt_mins = gtk_spin_button_get_value_as_int (button); + gconf_client_set_int (prefs.client, KA_GCONF_KEY_PROMPT_MINS, prompt_mins, NULL); +} + + +static void +ka_preferences_prompt_mins_notify (GConfClient *client G_GNUC_UNUSED, + guint cnx_id G_GNUC_UNUSED, + GConfEntry *entry, + gpointer userdata G_GNUC_UNUSED) +{ + gint prompt_mins; + + if (!entry->value || entry->value->type != GCONF_VALUE_INT) + return; + + prompt_mins = gconf_value_get_int (entry->value); + + if (prompt_mins != gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (prefs.prompt_mins_entry))) + gtk_spin_button_set_value (GTK_SPIN_BUTTON (prefs.prompt_mins_entry), prompt_mins); +} + + +static gint +ka_preferences_setup_prompt_mins_entry () +{ + gint prompt_mins; + + prefs.prompt_mins_entry = WID (prefs.builder, "prompt_mins_entry"); + g_assert (prefs.prompt_mins_entry != NULL); + + prompt_mins = gconf_client_get_int (prefs.client, KA_GCONF_KEY_PROMPT_MINS, NULL); + + gtk_spin_button_set_value (GTK_SPIN_BUTTON (prefs.prompt_mins_entry), prompt_mins); + + g_signal_connect (prefs.prompt_mins_entry, "value-changed", + G_CALLBACK (ka_preferences_prompt_mins_changed), NULL); + + if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_PROMPT_MINS, NULL)) { + gtk_widget_set_sensitive (prefs.prompt_mins_entry, FALSE); + } + + prefs.listeners [prefs.n_listeners] = + gconf_client_notify_add (prefs.client, + KA_GCONF_KEY_PROMPT_MINS, + (GConfClientNotifyFunc) ka_preferences_prompt_mins_notify, + NULL, NULL, NULL); + prefs.n_listeners++; + return prompt_mins; +} + + +void +ka_preferences_window_create (KaApplet *applet G_GNUC_UNUSED, + GtkBuilder *xml) +{ + prefs.client = gconf_client_get_default (); + gconf_client_add_dir (prefs.client, KA_GCONF_PATH, + GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); + + prefs.builder = xml; + ka_preferences_setup_principal_entry (prefs); + ka_preferences_setup_pkuserid_entry (prefs); + ka_preferences_setup_pkuserid_button (prefs); + ka_preferences_setup_smartcard_toggle (prefs); + ka_preferences_setup_pkanchors_entry(prefs); + ka_preferences_setup_pkanchors_button (prefs); + ka_preferences_setup_forwardable_toggle (prefs); + ka_preferences_setup_proxiable_toggle (prefs); + ka_preferences_setup_renewable_toggle (prefs); + ka_preferences_setup_prompt_mins_entry (prefs); + + g_assert (prefs.n_listeners == N_LISTENERS); + + prefs.notebook = WID (xml, "ka_notebook"); + prefs.dialog = WID (xml, "krb5_preferences_dialog"); + +} + +void +ka_preferences_window_show (GtkWindow *main_window) +{ + if (main_window) + gtk_window_set_transient_for (GTK_WINDOW(prefs.dialog), main_window); + gtk_window_present (GTK_WINDOW(prefs.dialog)); + gtk_dialog_run (GTK_DIALOG (prefs.dialog)); + gtk_widget_hide (prefs.dialog); +} + +/* + * vim:ts:sts=4:sw=4:et: + */ diff --git a/src/ka-preferences.h b/src/ka-preferences.h new file mode 100644 index 0000000..7f8e9a2 --- /dev/null +++ b/src/ka-preferences.h @@ -0,0 +1,21 @@ +/* ka-preferences.h */ + +#ifndef KA_PREFERENCES_H +#define KA_PREFERENCES_H + +#include <gtk/gtk.h> + +#include "ka-applet.h" + +G_BEGIN_DECLS + +void ka_preferences_window_create (KaApplet *applet, GtkBuilder *xml); +void ka_preferences_window_show (GtkWindow *main_window); + +G_END_DECLS + +#endif /* KA_PREFERENCES */ + +/* + * vim:ts:sts=4:sw=4:et: + */ diff --git a/src/ka-pwdialog.c b/src/ka-pwdialog.c index 49ed2e4..483873a 100644 --- a/src/ka-pwdialog.c +++ b/src/ka-pwdialog.c @@ -23,7 +23,7 @@ #include <glib/gi18n.h> #include "ka-applet-priv.h" -#include "ka-dialog.h" +#include "ka-kerberos.h" #include "ka-pwdialog.h" #include "ka-entry-buffer.h" diff --git a/src/ka-tools.c b/src/ka-tools.c index 260d101..227324a 100644 --- a/src/ka-tools.c +++ b/src/ka-tools.c @@ -55,3 +55,31 @@ ka_show_help (GdkScreen* screen, const char* chapter, GtkWindow* window) } g_free (url); } + + +void +ka_show_about () +{ + const gchar *authors[] = { + "Christopher Aillon <caillon@redhat.com>", + "Jonathan Blandford <jrb@redhat.com>", + "Colin Walters <walters@verbum.org>", + "Guido Günther <agx@sigxcpu.org>", + NULL + }; + + gtk_show_about_dialog (NULL, + "authors", authors, + "version", VERSION, + "logo-icon-name", "krb-valid-ticket", + "copyright", + "Copyright (C) 2004,2005,2006 Red Hat, Inc.,\n" + "2008-2011 Guido Günther", + "website-label", PACKAGE " website", + "website", + "https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/", + "license", "GNU General Public License Version 2", + /* Translators: add the translators of your language here */ + "translator-credits", _("translator-credits"), + NULL); +} diff --git a/src/ka-tools.h b/src/ka-tools.h index f97791b..4fef541 100644 --- a/src/ka-tools.h +++ b/src/ka-tools.h @@ -26,6 +26,7 @@ G_BEGIN_DECLS void ka_show_help (GdkScreen* screen, const char* section, GtkWindow* window); +void ka_show_about (void); G_END_DECLS diff --git a/src/krb5-auth-dialog.desktop.in b/src/krb5-auth-dialog.desktop.in index 5569646..6f02571 100644 --- a/src/krb5-auth-dialog.desktop.in +++ b/src/krb5-auth-dialog.desktop.in @@ -4,7 +4,6 @@ _Comment=Kerberos Network Authentication Dialog Exec=krb5-auth-dialog Terminal=false Type=Application -NoDisplay=true Icon=krb-valid-ticket X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=krb5-auth-dialog diff --git a/src/krb5-auth-dialog.ui b/src/krb5-auth-dialog.ui index f36f537..1da04d7 100644 --- a/src/krb5-auth-dialog.ui +++ b/src/krb5-auth-dialog.ui @@ -1,47 +1,106 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">100</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> <object class="GtkDialog" id="krb5_dialog"> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Kerberos Authentication</property> <property name="resizable">False</property> <property name="window_position">center-always</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox2"> + <object class="GtkBox" id="dialog-vbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancelbutton1"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="krb5_renew_button"> + <property name="label" translatable="yes">_Renew Ticket</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="spacing">12</property> <child> <object class="GtkImage" id="image1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="yalign">0</property> <property name="icon_name">krb-valid-ticket</property> <property name="icon-size">6</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkAlignment" id="alignment4"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="bottom_padding">10</property> <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkLabel" id="krb5_message_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="use_markup">True</property> </object> @@ -53,28 +112,35 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">3</property> <child> <object class="GtkHBox" id="entry_hbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">3</property> <child> <placeholder/> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="krb5_status_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">1</property> <property name="label"><span size="smaller"> </span></property> <property name="use_markup">True</property> @@ -87,6 +153,8 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -94,123 +162,933 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area2"> + </object> + </child> + <action-widgets> + <action-widget response="-6">cancelbutton1</action-widget> + <action-widget response="-5">krb5_renew_button</action-widget> + </action-widgets> + </object> + <object class="GtkWindow" id="krb5_main_window"> + <property name="can_focus">False</property> + <property name="title" translatable="yes">Service Tickets</property> + <signal name="delete-event" handler="ka_main_window_hide" swapped="no"/> + <child> + <object class="GtkVBox" id="tickets-vbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuBar" id="menubar1"> <property name="visible">True</property> - <property name="layout_style">end</property> + <property name="can_focus">False</property> <child> - <object class="GtkButton" id="cancelbutton1"> - <property name="label">gtk-cancel</property> + <object class="GtkMenuItem" id="menuitem1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="can_focus">False</property> + <property name="use_action_appearance">False</property> + <property name="label" translatable="yes">_File</property> + <property name="use_underline">True</property> + <child type="submenu"> + <object class="GtkMenu" id="menu1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkImageMenuItem" id="menuitem_close"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + </object> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> </child> <child> - <object class="GtkButton" id="krb5_renew_button"> - <property name="label" translatable="yes">_Renew Ticket</property> + <object class="GtkMenuItem" id="menuitem2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> + <property name="can_focus">False</property> + <property name="use_action_appearance">False</property> + <property name="label" translatable="yes">_Edit</property> <property name="use_underline">True</property> + <child type="submenu"> + <object class="GtkMenu" id="menu2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkImageMenuItem" id="menuitem_preferences"> + <property name="label">gtk-preferences</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + </object> + </child> + </object> + </child> + <child> + <object class="GtkMenuItem" id="menuitem4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_action_appearance">False</property> + <property name="label" translatable="yes">_Help</property> + <property name="use_underline">True</property> + <child type="submenu"> + <object class="GtkMenu" id="menu3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkImageMenuItem" id="menuitem_help_contents"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="menuitem_about"> + <property name="label">gtk-about</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + </object> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="pack_type">end</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> + <child> + <object class="GtkTreeView" id="krb5_tickets_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection"/> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> </child> - <action-widgets> - <action-widget response="-6">cancelbutton1</action-widget> - <action-widget response="-5">krb5_renew_button</action-widget> - </action-widgets> </object> - <object class="GtkDialog" id="krb5_tickets_dialog"> + <object class="GtkDialog" id="krb5_preferences_dialog"> + <property name="can_focus">False</property> <property name="border_width">5</property> - <property name="title" translatable="yes">Service Tickets</property> - <property name="resizable">False</property> - <property name="type_hint">normal</property> + <property name="type_hint">dialog</property> <child internal-child="vbox"> - <object class="GtkVBox" id="tickets-vbox2"> - <property name="visible">True</property> + <object class="GtkBox" id="dialog-vbox3"> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">2</property> - <child> - <object class="GtkVBox" id="tickets-vbox1"> - <property name="visible">True</property> - <property name="orientation">vertical</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area3"> + <property name="can_focus">False</property> + <property name="layout_style">end</property> <child> - <object class="GtkTreeView" id="krb5_tickets_treeview"> + <placeholder/> + </child> + <child> + <object class="GtkButton" id="button1"> + <property name="label">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + <property name="use_stock">True</property> </object> <packing> - <property name="position">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> - <property name="position">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> </packing> </child> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area"> + <child> + <object class="GtkNotebook" id="ka_notebook"> <property name="visible">True</property> - <property name="layout_style">end</property> + <property name="can_focus">True</property> <child> - <placeholder/> + <object class="GtkVBox" id="vbox_kerberos"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">12</property> + <property name="spacing">18</property> + <child> + <object class="GtkVBox" id="vbox_kerberos_user"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label_kerberos_user"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Kerberos User</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage" id="access"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="yalign">0</property> + <property name="icon_name">krb-valid-ticket</property> + <property name="icon-size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkFrame" id="frame_princ"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">5</property> + <property name="left_padding">12</property> + <child> + <object class="GtkEntry" id="principal_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">The name of your Kerberos account. Leave blank to use your current username.</property> + <property name="tooltip_text" translatable="yes">The name of your Kerberos account. Leave blank to use your current username.</property> + <property name="invisible_char">●</property> + <property name="activates_default">True</property> + <property name="invisible_char_set">True</property> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Kerberos principal:</property> + <property name="use_markup">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox_ticket_options"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Kerberos Ticket Options</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="yalign">0</property> + <property name="stock">gtk-properties</property> + <property name="icon-size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Requested Kerberos tickets should be:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label"> </property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="forwardable_toggle"> + <property name="label" translatable="yes">forwardable</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">If checked, request forwardable tickets</property> + <property name="tooltip_text" translatable="yes">If checked, request forwardable tickets</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkLabel" id="label12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label"> </property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="renewable_toggle"> + <property name="label" translatable="yes">renewable</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">If checked, request renewable tickets</property> + <property name="tooltip_text" translatable="yes">If checked, request renewable tickets</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkLabel" id="label19"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label"> </property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="proxiable_toggle"> + <property name="label" translatable="yes">proxiable</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">If checked, request proxiable tickets</property> + <property name="tooltip_text" translatable="yes">If checked, request proxiable tickets</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <child type="tab"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Kerberos</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> </child> <child> - <object class="GtkButton" id="krb5_tickets_ok"> - <property name="label">gtk-close</property> + <object class="GtkVBox" id="vbox_pkinit"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="border_width">12</property> + <property name="spacing">18</property> + <child> + <object class="GtkVBox" id="vbox_pkinit_userid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label_pkinit_userid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Userid</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage" id="access1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="yalign">0</property> + <property name="icon_name">krb-valid-ticket</property> + <property name="icon-size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkVBox" id="vbox11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkHBox" id="hbox7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkCheckButton" id="smartcard_toggle"> + <property name="label" translatable="yes">Use Smartcard</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">If checked, use a security token (Smartcard) to authenticate.</property> + <property name="tooltip_text" translatable="yes">If checked, use a security token (Smartcard) to authenticate.</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkEntry" id="pkuserid_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Certificate and private key used for authentication</property> + <property name="tooltip_text" translatable="yes">Certificate and private key used for authentication</property> + <property name="invisible_char">●</property> + <property name="activates_default">True</property> + <property name="invisible_char_set">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="pkuserid_button"> + <property name="label" translatable="yes">_Browse...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox_anchors"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label_anchors"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">X509 trust anchors</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkEntry" id="pkanchors_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Certificate used to verify digital signatures.</property> + <property name="tooltip_text" translatable="yes">Certificate used to verify digital signatures.</property> + <property name="invisible_char">●</property> + <property name="activates_default">True</property> + <property name="invisible_char_set">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="pkanchors_button"> + <property name="label" translatable="yes">_Browse...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label_pkinit"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Configure the use of certificates and smartcards for your Kerberos network authentication.</property> + <property name="tooltip_text" translatable="yes">Configure the use of certificates and smartcards for your Kerberos network authentication.</property> + <property name="label" translatable="yes">PKINIT</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">1</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox_notifications"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">12</property> + <property name="spacing">18</property> + <child> + <object class="GtkVBox" id="vbox8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label17"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Notifications</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage" id="image_notifications"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="yalign">0</property> + <property name="icon_name">krb-expiring-ticket</property> + <property name="icon-size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label"> </property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" comments="Used in combination: 'Warn x minutes before expiry'">Warn</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="prompt_mins_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Send notification about ticket expiry that many minutes before it finally expires</property> + <property name="tooltip_text" translatable="yes">Send notification about ticket expiry that many minutes before it finally expires</property> + <property name="invisible_char">●</property> + <property name="invisible_char_set">True</property> + <property name="snap_to_ticks">True</property> + <property name="numeric">True</property> + <property name="adjustment">adjustment1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" comments="Used in combination: 'Warn x minutes before expiry'">minutes before ticket expiry</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Notifications</property> + </object> + <packing> + <property name="position">2</property> + <property name="tab_fill">False</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> </child> <action-widgets> - <action-widget response="0">krb5_tickets_ok</action-widget> + <action-widget response="0">button1</action-widget> </action-widgets> </object> </interface> |