seahorse r2186 - in trunk: . agent bonobo data libseahorse m4 plugins po tests
- From: nnielsen svn gnome org
- To: svn-commits-list gnome org
- Subject: seahorse r2186 - in trunk: . agent bonobo data libseahorse m4 plugins po tests
- Date: Fri, 18 Apr 2008 00:43:18 +0100 (BST)
Author: nnielsen
Date: Thu Apr 17 23:43:18 2008
New Revision: 2186
URL: http://svn.gnome.org/viewvc/seahorse?rev=2186&view=rev
Log:
* Split out the seahorse-plugins module
Removed:
trunk/agent/
trunk/bonobo/
trunk/libseahorse/seahorse-prefs-cache.c
trunk/m4/epiphany.m4
trunk/m4/gecko.m4
trunk/plugins/
trunk/tests/calc-dsa.py
trunk/tests/calc-rsa.py
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/configure.in
trunk/data/seahorse.schemas.in
trunk/libseahorse/Makefile.am
trunk/libseahorse/seahorse-gconf.h
trunk/libseahorse/seahorse-passphrase.c
trunk/libseahorse/seahorse-passphrase.h
trunk/libseahorse/seahorse-prefs.c
trunk/libseahorse/seahorse-prefs.glade
trunk/po/POTFILES.in
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Thu Apr 17 23:43:18 2008
@@ -2,12 +2,6 @@
ACLOCAL_AMFLAGS = -I m4
-if WITH_AGENT
-AGENT_DIR = agent
-else
-AGENT_DIR =
-endif
-
SUBDIRS = libcryptui \
libseahorse \
src \
@@ -15,8 +9,6 @@
data \
help \
pixmaps \
- plugins \
- $(AGENT_DIR) \
daemon
EXTRA_DIST = \
@@ -48,8 +40,7 @@
DISTCHECK_CONFIGURE_FLAGS = \
--disable-scrollkeeper \
- --disable-update-mime-database \
- --with-nautilus-ext-dir=/tmp
+ --disable-update-mime-database
distuninstallcheck:
@:
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Thu Apr 17 23:43:18 2008
@@ -278,83 +278,6 @@
echo "disabling key server support"
fi
-dnl ***************
-dnl NAUTILUS
-dnl ***************
-
-# Allow nautilus plugin to be disabled
-AC_ARG_ENABLE(nautilus,
- AC_HELP_STRING([--disable-nautilus],
- [Don't compile nautilus plugin]))
-
-with_nautilus_ext=no
-
-# Nautilus tests
-if test "$enable_nautilus" = "no"; then
- echo "disabling nautilus plugin"
-else
- enable_nautilus=yes
- echo "enabling nautilus plugin..."
- echo "checking for supported versions of nautilus..."
-
- PKG_CHECK_MODULES(NAUTILUS, [libnautilus-extension >= 2.12.0 glib-2.0 >= 2.10.0 gnome-vfs-2.0],
- [enable_nautilus=yes],[enable_nautilus=no])
-
- # The new Nautilus extension
- if test "$enable_nautilus" = "yes"; then
- with_nautilus_ext=yes
- AC_SUBST(NAUTILUS_CFLAGS)
- AC_SUBST(NAUTILUS_LIBS)
- fi
-
- dnl We have this --with-nautils-ext-dir option primarily so it
- dnl can work with DISTCHECK_CONFIGURE_FLAGS in Makefile.am
- dnl and get around autotools limitations.
-
- AC_ARG_WITH([nautilus-ext-dir],
- [AC_HELP_STRING([--with-nautilus-ext-dir=DIR],
- [directory to nautilus extension config])],
- [], [with_nautilus_ext_dir=""])
-
- # Fetch the extension directory
- if test "$enable_nautilus" = "yes"; then
- if test -z "$with_nautilus_ext_dir"; then
- NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
- else
- NAUTILUS_EXTENSION_DIR="$with_nautilus_ext_dir"
- fi
- AC_SUBST(NAUTILUS_EXTENSION_DIR)
- fi
-fi
-
-AM_CONDITIONAL(WITH_NAUTILUS_EXT, test "$with_nautilus_ext" = "yes")
-
-
-dnl ****************************************************************************
-dnl AGENT
-dnl ****************************************************************************
-
-# Allow agent to be disabled
-AC_ARG_ENABLE(agent,
- AC_HELP_STRING([--disable-agent],
- [Don't compile agent for passphrase caching]))
-
-if test "$enable_agent" = "no"; then
- echo "disabling password caching agent"
-else
-
- enable_agent=yes
- echo "enabling password caching agent"
-
- AC_DEFINE_UNQUOTED(WITH_AGENT, 1, [Compile password caching 'agent' code])
-
- AC_SUBST([AGENT_CFLAGS])
- AC_SUBST([AGENT_LIBS])
-
-fi
-
-AM_CONDITIONAL(WITH_AGENT, test "$enable_agent" != "no")
-
dnl ****************************************************************************
dnl GNOME-KEYRING
@@ -452,270 +375,6 @@
AC_SUBST(LIBCRYPTUI_LIBS)
fi
-dnl ****************************************************************************
-dnl EPIPHANY
-dnl ****************************************************************************
-
-with_epiphany_plugin="no"
-
-EPIPHANY_API_VERSION=2.14
-EPIPHANY_REQUIRED=2.14.0
-EPIPHANY_LIBXML_REQUIRED=2.6.0
-EPIPHANY_LIBGLIB_REQUIRED=2.10.0
-EPIPHANY_LIBGTK_REQUIRED=2.8.0
-
-AC_SUBST([EPIPHANY_REQUIRED])
-AC_SUBST([EPIPHANY_LIBXML_REQUIRED])
-AC_SUBST([EPIPHANY_LIBGLIB_REQUIRED])
-AC_SUBST([EPIPHANY_LIBGTK_REQUIRED])
-
-if test "$enable_dbus" != "yes"; then
- echo "disabling epiphany plugin: no dbus support"
- AC_DEFINE([HAVE_MOZILLA_TOOLKIT],[0],[Define if mozilla is of the toolkit flavour])
- AM_CONDITIONAL([HAVE_MOZILLA_TOOLKIT],[test 0])
- AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test 0])
- AM_CONDITIONAL([HAVE_GECKO_1_7],[test 0])
- AM_CONDITIONAL([HAVE_GECKO_1_8],[test 0])
- AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test 0])
- AM_CONDITIONAL([HAVE_GECKO_1_9],[test 0])
-else
- # Allow epiphany plugin to be disabled
- AC_ARG_ENABLE(epiphany,
- AC_HELP_STRING([--disable-epiphany],
- [Don't enable the epiphany plugin]))
-
- # Epiphany tests
- if test "$enable_epiphany" = "no"; then
- echo "disabling epiphany plugin"
- AC_DEFINE([HAVE_MOZILLA_TOOLKIT],[0],[Define if mozilla is of the toolkit flavour])
- AM_CONDITIONAL([HAVE_MOZILLA_TOOLKIT],[test 0])
- AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test 0])
- AM_CONDITIONAL([HAVE_GECKO_1_7],[test 0])
- AM_CONDITIONAL([HAVE_GECKO_1_8],[test 0])
- AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test 0])
- AM_CONDITIONAL([HAVE_GECKO_1_9],[test 0])
- else
- enable_epiphany=yes
- echo "enabling epiphany plugin..."
-
- GECKO_INIT([MOZILLA],[with_epiphany_plugin=yes],[with_epiphany_plugin=no])
-
- if test "$with_epiphany_plugin" = "yes"; then
- AC_SUBST([MOZILLA])
- AC_SUBST([MOZILLA_FLAVOUR])
- AC_SUBST([MOZILLA_HOME])
- AC_SUBST([MOZILLA_PREFIX])
- AC_SUBST([MOZILLA_INCLUDE_ROOT])
-
- case "$MOZILLA" in
- xulrunner) min_version=1.8 ;;
- *firefox) min_version=1.5 ;;
- *) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;;
- esac
-
- PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.22 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.22 e_api_minor=22],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.21 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.21 e_api_minor=21],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.20 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.20 e_api_minor=20],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.19 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.19 e_api_minor=19],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.18 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.18 e_api_minor=18],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY],[\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.17 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.17 e_api_minor=17],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY],[\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.16 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.16 e_api_minor=16],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY],[\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.15 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.15 e_api_minor=15],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY],[\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.14 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.14 e_api_minor=14],[with_epiphany_plugin=no; echo "no"; echo "disabling epiphany plugin"])])])])])])])])])
- else
- echo "disabling epiphany plugin"
- fi
-
- if test "$with_epiphany_plugin" = "yes"; then
- PKG_CHECK_MODULES([MOZILLA_COMPONENT],
- [${gecko_cv_gecko}-xpcom >= $min_version $gecko_cv_extra_pkg_dependencies],
- [with_epiphany_plugin=yes],[with_epiphany_plugin=no echo "disabling epiphany plugin"])
- fi
-
- if test "$with_epiphany_plugin" = "yes"; then
- echo "enabling epiphany plugin"
-
- if test "$e_api_minor" -ge 21; then
- AC_DEFINE([EPHY_NOTAB], 1, [Defines whether EphyTab exists in the API])
- else
- AC_DEFINE([EPHY_NOTAB], 0, [Defines whether EphyTab exists in the API])
- fi
-
- EPIPHANY_EXTENSION_INIT([$E_API_VERSION], [$EPIPHANY_REQUIRED])
- AC_SUBST([E_API_VERSION])
-
- EPIPHANY_EXTENSIONS_DIR=$(pkg-config --variable=extensionsdir epiphany-$E_API_VERSION)
- AC_SUBST([EPIPHANY_EXTENSIONS_DIR])
-
- AC_SUBST([EPIPHANY_DEPENDENCY_CFLAGS])
- AC_SUBST([EPIPHANY_DEPENDENCY_LIBS])
- AC_SUBST([MOZILLA_COMPONENT_CFLAGS])
- AC_SUBST([MOZILLA_COMPONENT_LIBS])
- fi
- fi
-fi
-
-AM_CONDITIONAL(WITH_EPIPHANY, test "$with_epiphany_plugin" = "yes")
-
-dnl ****************************************************************************
-dnl GEDIT
-dnl ****************************************************************************
-
-with_gedit_plugin="no"
-with_gedit_bonobo="no"
-
-if test "$enable_dbus" != "yes"; then
- echo "disabling gedit plugin: no dbus support"
-
-else
-
- # Allow gedit plugin to be disabled
- AC_ARG_ENABLE(gedit,
- AC_HELP_STRING([--disable-gedit],
- [Don't compile gedit plugin]))
-
- # Gedit tests
- if test "$enable_gedit" = "no"; then
- echo "disabling gedit plugin"
- else
- enable_gedit=yes
- echo "enabling gedit plugin..."
- echo "checking for supported versions of gedit..."
-
- # Gedit plugins completely changed after 2.14.
- # - Bonobo plugins <= 2.12.
- # - Glib type plugins > 2.13
-
- PKG_CHECK_MODULES(GEDIT, gedit-2.20 >= 2.20.0, [with_gedit_plugin=yes],
- [PKG_CHECK_MODULES(GEDIT, gedit-2.16 >= 2.15.0, [with_gedit_plugin=yes],
- [PKG_CHECK_MODULES(GEDIT, gedit-2.14 >= 2.13.0, [with_gedit_plugin=yes],
- [PKG_CHECK_MODULES(GEDIT, gedit-2.12 >= 2.12.0, [with_gedit_bonobo=yes],
- [PKG_CHECK_MODULES(GEDIT, gedit-2.10 >= 2.9.0, [with_gedit_bonobo=yes],
- [PKG_CHECK_MODULES(GEDIT, gedit-2.8 >= 2.8.0, [with_gedit_bonobo=yes],
- [PKG_CHECK_MODULES(GEDIT, gedit-2.6 >= 2.6.0, [with_gedit_bonobo=yes],
- [enable_gedit=no])])])])])])])
-
- if test "$enable_gedit" = "yes"; then
- echo "enabling gedit plugin..."
-
- if test "$with_gedit_bonobo" = "yes"; then
- echo "using bonobo type gedit plugin..."
- AC_DEFINE_UNQUOTED(WITH_GEDIT_BONOBO, 1, [Use 'bonobo' type gedit plugin (for versions <= 2.12)])
- else
- echo "using glib type gedit plugin..."
- fi
-
- AC_SUBST(GEDIT_CFLAGS)
- AC_SUBST(GEDIT_LIBS)
- fi
- fi
-fi
-
-AM_CONDITIONAL(WITH_GEDIT, test "$enable_gedit" = "yes")
-AM_CONDITIONAL(WITH_GEDIT_BONOBO, test "$with_gedit_bonobo" = "yes")
-
-dnl ***************
-dnl APPLET
-dnl ***************
-
-PANEL_APPLET_REQUIRED=2.9.4
-
-with_panel_applet="no"
-
-if test "$enable_dbus" != "yes"; then
- echo "disabling panel applet: no dbus support"
-
-else
-
- # Allow applet to be disabled
- AC_ARG_ENABLE(applet,
- AC_HELP_STRING([--disable-applet],
- [Don't compile clipboard encryption panel applet]))
-
- # Applet tests
- if test "$enable_applet" = "no"; then
- echo "disabling panel applet"
- else
- echo "checking for supported versions of libpanelapplet..."
-
- PKG_CHECK_MODULES(GNOME_APPLETS, libpanelapplet-2.0 >= $PANEL_APPLET_REQUIRED,
- [enable_applet=yes],
- [enable_applet=no])
-
- if test "$enable_applet" = "yes"; then
- echo "enabling panel applet..."
- AC_SUBST(GNOME_APPLETS_CFLAGS)
- AC_SUBST(GNOME_APPLETS_LIBS)
- AC_DEFINE(WITH_APPLET, 1, [Build the clipboard encryption panel applet])
- with_panel_applet=yes
- fi
- fi
-fi
-
-AM_CONDITIONAL(WITH_APPLET, test "$enable_applet" = "yes")
dnl *******************
dnl LIBNOTIFY
@@ -770,20 +429,6 @@
AM_CONDITIONAL(WITH_SSH, test "$enable_ssh" == "yes")
-dnl ==============================================
-dnl libebook
-dnl ==============================================
-
-PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 1.7.90], [enable_ebook=yes],[enable_ebook=no])
-
-AC_SUBST([EBOOK_CFLAGS])
-AC_SUBST([EBOOK_LIBS])
-
-SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $EBOOK_CFLAGS"
-SEAHORSE_LIBS="$SEAHORSE_LIBS $EBOOK_LIBS"
-
-AM_CONDITIONAL(WITH_EBOOK, test "$enable_ebook" == "yes")
-
dnl ****************************************************************************
# Debug mode
@@ -865,16 +510,7 @@
src/seahorse-pgp-encrypted.desktop.in
src/seahorse-pgp-keys.desktop.in
src/seahorse-pgp-signature.desktop.in
-agent/Makefile
daemon/Makefile
-plugins/Makefile
-plugins/applet/Makefile
-plugins/applet/docs/Makefile
-plugins/epiphany/Makefile
-plugins/epiphany/mozilla/Makefile
-plugins/gedit/Makefile
-plugins/nautilus/Makefile
-plugins/nautilus-ext/Makefile
])
dnl ****************************************************************************
@@ -888,13 +524,6 @@
Keyserver Support: $with_keyserver
LDAP: $with_ldap
HKP: $enable_hkp
-Plugins:
- Epiphany: $with_epiphany_plugin
- GEdit (v <= 2.12): $with_gedit_bonobo
- GEdit (v >= 2.14): $with_gedit_plugin
Key Sharing: $enable_sharing
- Panel Applet: $with_panel_applet
- Nautilus: $with_nautilus_ext
- Seahorse Agent: $enable_agent
Notification Support: $enable_libnotify
"
Modified: trunk/data/seahorse.schemas.in
==============================================================================
--- trunk/data/seahorse.schemas.in (original)
+++ trunk/data/seahorse.schemas.in Thu Apr 17 23:43:18 2008
@@ -1,117 +1,4 @@
<gconfschemafile>
- <schemalist>
- <schema>
- <key>/schemas/apps/seahorse/agent/cache_enabled</key>
- <applyto>/apps/seahorse/agent/cache_enabled</applyto>
- <owner>seahorse</owner>
- <type>bool</type>
- <default>TRUE</default>
- <locale name="C">
- <short>Whether the GPG password cache is enabled</short>
- <long>This option enables the GPG password cache in the
- seahorse-agent program. The 'use-agent' setting in gpg.conf
- affects this setting.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/seahorse/agent/cache_method</key>
- <applyto>/apps/seahorse/agent/cache_method</applyto>
- <owner>seahorse</owner>
- <type>string</type>
- <default>internal</default>
- <locale name="C">
- <short>Where to store cached passwords.</short>
- <long>If set to 'gnome' uses gnome-keyring to cache passwords.
- When set to 'internal' uses internal cache.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/seahorse/agent/cache_expire</key>
- <applyto>/apps/seahorse/agent/cache_expire</applyto>
- <owner>seahorse</owner>
- <type>bool</type>
- <default>TRUE</default>
- <locale name="C">
- <short>Expire passwords in the cache</short>
- <long>When set, seahorse-agent expires GPG passwords in
- its cache after a period of time. </long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/seahorse/agent/cache_ttl</key>
- <applyto>/apps/seahorse/agent/cache_ttl</applyto>
- <owner>seahorse</owner>
- <type>int</type>
- <default>300</default>
- <locale name="C">
- <short>The time (in minutes) to cache GPG passwords</short>
- <long>This is the amount of time, specified in minutes,
- to cache GPG passwords in seahorse-agent. </long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/seahorse/agent/cache_authorize</key>
- <applyto>/apps/seahorse/agent/cache_authorize</applyto>
- <owner>seahorse</owner>
- <type>bool</type>
- <default>TRUE</default>
- <locale name="C">
- <short>Prompt before using GPG passwords in cache</short>
- <long>Set to 'true' to have seahorse-agent prompt before
- giving out passwords it has cached.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/seahorse/agent/cache_display</key>
- <applyto>/apps/seahorse/agent/cache_display</applyto>
- <owner>seahorse</owner>
- <type>bool</type>
- <default>FALSE</default>
- <locale name="C">
- <short>Display cache reminder in the notification area</short>
- <long>Set to 'true' to enable display of the cache reminder in the
- notification area of your panel.</long>
- </locale>
- </schema>
- </schemalist>
- <schemalist>
- <schema>
- <key>/schemas/apps/seahorse/applet/show_clipboard_state</key>
- <applyto>/apps/seahorse/applet/show_clipboard_state</applyto>
- <owner>seahorse</owner>
- <type>bool</type>
- <default>FALSE</default>
- <locale name="C">
- <short>Show clipboard state in panel</short>
- <long>Reflect the contents of the clipboard (whether encrypted,
- signed, etc...) in the panel applet icon.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/seahorse/applet/display_encrypted_clipboard</key>
- <applyto>/apps/seahorse/applet/display_encrypted_clipboard</applyto>
- <owner>seahorse</owner>
- <type>bool</type>
- <default>TRUE</default>
- <locale name="C">
- <short>Display clipboard after encrypting</short>
- <long>After performing an encrypt or signing operation from the applet,
- display the resulting text in a window.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/seahorse/applet/display_decrypted_clipboard</key>
- <applyto>/apps/seahorse/applet/display_decrypted_clipboard</applyto>
- <owner>seahorse</owner>
- <type>bool</type>
- <default>FALSE</default>
- <locale name="C">
- <short>Display clipboard after decrypting</short>
- <long>After performing an decrypt or verify operation from the applet,
- display the resulting text in a window.</long>
- </locale>
- </schema>
- </schemalist>
<schemalist>
<schema>
<key>/schemas/apps/seahorse/sharing/sharing_enabled</key>
Modified: trunk/libseahorse/Makefile.am
==============================================================================
--- trunk/libseahorse/Makefile.am (original)
+++ trunk/libseahorse/Makefile.am Thu Apr 17 23:43:18 2008
@@ -20,12 +20,6 @@
BUILT_SOURCES = \
seahorse-marshal.c seahorse-marshal.h
-if WITH_AGENT
-AGENT_SRCS = seahorse-prefs-cache.c
-else
-AGENT_SRCS =
-endif
-
if WITH_LDAP
LDAP_SRCS = seahorse-ldap-source.c seahorse-ldap-source.h
else
@@ -91,7 +85,6 @@
seahorse-algo.c seahorse-algo.h \
seahorse-unix-signal.c seahorse-unix-signal.h \
$(BUILT_SOURCES) \
- $(AGENT_SRCS) \
$(KEYSERVER_SRCS) \
$(LDAP_SRCS) \
$(HKP_SRCS) \
Modified: trunk/libseahorse/seahorse-gconf.h
==============================================================================
--- trunk/libseahorse/seahorse-gconf.h (original)
+++ trunk/libseahorse/seahorse-gconf.h Thu Apr 17 23:43:18 2008
@@ -30,7 +30,6 @@
#include <gtk/gtk.h>
#include "cryptui-defines.h"
-#define ARMOR_KEY SEAHORSE_DESKTOP_KEYS "/ascii_armor"
#define ENCRYPTSELF_KEY SEAHORSE_DESKTOP_KEYS "/encrypt_to_self"
#define MULTI_EXTENSION_KEY SEAHORSE_DESKTOP_KEYS "/package_extension"
#define MULTI_SEPERATE_KEY SEAHORSE_DESKTOP_KEYS "/multi_seperate"
Modified: trunk/libseahorse/seahorse-passphrase.c
==============================================================================
--- trunk/libseahorse/seahorse-passphrase.c (original)
+++ trunk/libseahorse/seahorse-passphrase.c Thu Apr 17 23:43:18 2008
@@ -47,7 +47,6 @@
#include "seahorse-passphrase.h"
#include "seahorse-secure-entry.h"
#include "seahorse-gpg-options.h"
-#include "agent/seahorse-agent.h"
#include "seahorse-ssh-key.h"
#include "seahorse-pgp-key.h"
@@ -357,208 +356,3 @@
gtk_widget_destroy (GTK_WIDGET (dialog));
return err;
}
-
-/* -----------------------------------------------------------------------------
- * GPG AGENT
- */
-
-/* Check if given process is running */
-static gboolean
-is_pid_running (pid_t pid)
-{
- /*
- * We try to send it a harmless signal. Note that this won't
- * work when sending to another users process. But other users
- * shouldn't be running agent for this user anyway.
- */
- return (kill (pid, SIGWINCH) != -1);
-}
-
-/* Check if the server at the other end of the socket is our agent */
-static SeahorseAgentType
-check_agent_id (int fd)
-{
- SeahorseAgentType ret = SEAHORSE_AGENT_NONE;
- GIOChannel *io;
- gchar *t;
- GError *err = NULL;
-
- io = g_io_channel_unix_new (fd);
-
- /* Server always sends a response first */
- if (g_io_channel_read_line (io, &t, NULL, NULL, NULL) == G_IO_STATUS_NORMAL && t) {
- g_strstrip (t);
- if (g_str_has_prefix (t, "OK"))
- ret = SEAHORSE_AGENT_OTHER;
- g_free (t);
-
- /* Send back request for info */
- if (ret != SEAHORSE_AGENT_NONE &&
- g_io_channel_write_chars (io, "AGENT_ID\n", -1, NULL,
- &err) == G_IO_STATUS_NORMAL
- && g_io_channel_flush (io, &err) == G_IO_STATUS_NORMAL
- && g_io_channel_read_line (io, &t, NULL, NULL,
- &err) == G_IO_STATUS_NORMAL && t) {
- g_strstrip (t);
- if (g_str_has_prefix (t, "OK seahorse-agent"))
- ret = SEAHORSE_AGENT_SEAHORSE;
- g_free (t);
- }
- }
-
- g_io_channel_shutdown (io, FALSE, NULL);
- g_io_channel_unref (io);
-
- if (err) {
- g_warning ("couldn't check GPG agent: %s", err->message);
- g_error_free (err);
- ret = SEAHORSE_AGENT_UNKNOWN;
- }
-
- return ret;
-}
-
-/* Open a connection to our agent */
-static SeahorseAgentType
-get_listening_agent_type (const gchar *sockname)
-{
- struct sockaddr_un addr;
- SeahorseAgentType ret;
- int len;
- int fd;
-
- /* Agent is always a unix socket */
- fd = socket (AF_UNIX, SOCK_STREAM, 0);
- if (fd == -1)
- return SEAHORSE_AGENT_UNKNOWN;
-
- memset (&addr, 0, sizeof (addr));
- addr.sun_family = AF_UNIX;
- g_strlcpy (addr.sun_path, sockname, sizeof (addr.sun_path));
- len = offsetof (struct sockaddr_un, sun_path) + strlen (addr.sun_path) + 1;
-
- if (connect (fd, (const struct sockaddr *) &addr, len) == 0)
- ret = check_agent_id (fd);
- else
- ret = SEAHORSE_AGENT_UNKNOWN;
-
- shutdown (fd, SHUT_RDWR);
- close (fd);
- return ret;
-}
-
-/* Given an agent info string make sure it's running and is our agent */
-static SeahorseAgentType
-check_agent_info (const gchar *agent_info)
-{
- SeahorseAgentType ret = SEAHORSE_AGENT_NONE;
- gchar **info;
- gchar **t;
- int i;
-
- gchar *socket;
- pid_t pid;
- gint version;
-
- info = g_strsplit (agent_info, ":", 3);
-
- for (i = 0, t = info; *t && i < 3; t++, i++) {
- switch (i) {
- /* The socket name first */
- case 0:
- socket = *t;
- break;
-
- /* Then the process id */
- case 1:
- pid = (pid_t) atoi (*t);
- break;
-
- /* Then the protocol version */
- case 2:
- version = (gint) atoi (*t);
- break;
-
- default:
- g_assert_not_reached ();
- };
- }
-
- if (version == 1 && pid != 0 && is_pid_running (pid))
- ret = get_listening_agent_type (socket);
-
- g_strfreev (info);
- return ret;
-}
-
-static SeahorseAgentType
-gpg_detect_agent ()
-{
- gchar *value = NULL;
-
- /* Seahorse edits gpg.conf by default */
- seahorse_gpg_options_find ("gpg-agent-info", &value, NULL);
- if (value != NULL) {
- SeahorseAgentType ret = check_agent_info (value);
- g_free (value);
- return ret;
- }
-
- /* The user probably set this up on their own */
- value = (gchar*)g_getenv ("GPG_AGENT_INFO");
- if (value != NULL)
- return check_agent_info (value);
-
- return SEAHORSE_AGENT_NONE;
-}
-
-/* -----------------------------------------------------------------------------
- * SSH AGENT
- */
-
-static SeahorseAgentType
-ssh_detect_agent ()
-{
- SeahorseAgentType ret;
- const gchar *socketpath;
- struct sockaddr_un sunaddr;
- int agentfd;
-
- socketpath = g_getenv ("SSH_AUTH_SOCK");
- if (!socketpath || !socketpath[0])
- return SEAHORSE_AGENT_NONE;
-
- /* Try to connect to the real agent */
- agentfd = socket (AF_UNIX, SOCK_STREAM, 0);
- if (agentfd == -1) {
- g_warning ("couldn't create socket: %s", g_strerror (errno));
- return SEAHORSE_AGENT_UNKNOWN;
- }
-
- memset (&sunaddr, 0, sizeof (sunaddr));
- sunaddr.sun_family = AF_UNIX;
- g_strlcpy (sunaddr.sun_path, socketpath, sizeof (sunaddr.sun_path));
- if (connect (agentfd, (struct sockaddr*) &sunaddr, sizeof (sunaddr)) < 0) {
- g_warning ("couldn't connect to SSH agent at: %s: %s", socketpath,
- g_strerror (errno));
- close (agentfd);
- return SEAHORSE_AGENT_UNKNOWN;
- }
-
- shutdown (agentfd, SHUT_RDWR);
- close (agentfd);
- return SEAHORSE_AGENT_OTHER;
-}
-
-/* -------------------------------------------------------------------------- */
-
-/* Check if the agent is running */
-SeahorseAgentType
-seahorse_passphrase_detect_agent (GQuark ktype)
-{
- if (ktype == SKEY_PGP)
- return gpg_detect_agent ();
- if (ktype == SKEY_SSH)
- return ssh_detect_agent ();
- g_return_val_if_reached (SEAHORSE_AGENT_UNKNOWN);
-}
Modified: trunk/libseahorse/seahorse-passphrase.h
==============================================================================
--- trunk/libseahorse/seahorse-passphrase.h (original)
+++ trunk/libseahorse/seahorse-passphrase.h Thu Apr 17 23:43:18 2008
@@ -42,13 +42,4 @@
const char* passphrase_info,
int prev_bad, int fd);
-typedef enum {
- SEAHORSE_AGENT_UNKNOWN,
- SEAHORSE_AGENT_NONE,
- SEAHORSE_AGENT_OTHER,
- SEAHORSE_AGENT_SEAHORSE
-} SeahorseAgentType;
-
-SeahorseAgentType seahorse_passphrase_detect_agent ();
-
#endif /* __SEAHORSE_PASSPHRASE__ */
Modified: trunk/libseahorse/seahorse-prefs.c
==============================================================================
--- trunk/libseahorse/seahorse-prefs.c (original)
+++ trunk/libseahorse/seahorse-prefs.c Thu Apr 17 23:43:18 2008
@@ -468,28 +468,6 @@
/* -------------------------------------------------------------------------- */
-static void
-default_key_changed (GtkComboBox *combo, gpointer *data)
-{
- GQuark keyid = seahorse_combo_keys_get_active_id (combo);
- seahorse_gconf_set_string (SEAHORSE_DEFAULT_KEY, keyid == 0 ? "" : g_quark_to_string (keyid));
-}
-
-static void
-gconf_notification (GConfClient *gclient, guint id, GConfEntry *entry,
- GtkComboBox *combo)
-{
- GQuark keyid = g_quark_from_string (gconf_value_get_string (gconf_entry_get_value (entry)));
- seahorse_combo_keys_set_active_id (combo, keyid);
-}
-
-static void
-remove_gconf_notification (GObject *obj, gpointer data)
-{
- guint gconf_id = GPOINTER_TO_INT (data);
- seahorse_gconf_unnotify (gconf_id);
-}
-
/**
* seahorse_prefs_new
*
@@ -500,43 +478,11 @@
SeahorseWidget *
seahorse_prefs_new (GtkWindow *parent)
{
- SeahorseKeyset *skset;
SeahorseWidget *swidget;
GtkWidget *widget;
- guint gconf_id;
swidget = seahorse_widget_new ("prefs", parent);
- widget = glade_xml_get_widget (swidget->xml, "encrypt-self");
- seahorse_check_button_gconf_attach (GTK_CHECK_BUTTON (widget), ENCRYPTSELF_KEY);
-
- widget = glade_xml_get_widget (swidget->xml, "signer-select");
- g_return_val_if_fail (widget != NULL, NULL);
-
- skset = seahorse_keyset_new (SKEY_PGP,
- SKEY_PRIVATE,
- SKEY_LOC_LOCAL,
- SKEY_FLAG_CAN_SIGN,
- SKEY_FLAG_EXPIRED | SKEY_FLAG_REVOKED | SKEY_FLAG_DISABLED);
- seahorse_combo_keys_attach (GTK_COMBO_BOX (widget), skset, _("None. Prompt for a key."));
- g_object_unref (skset);
-
- seahorse_combo_keys_set_active_id (GTK_COMBO_BOX (widget),
- g_quark_from_string (seahorse_gconf_get_string (SEAHORSE_DEFAULT_KEY)));
- g_signal_connect (widget, "changed", G_CALLBACK (default_key_changed), NULL);
-
- gconf_id = seahorse_gconf_notify (SEAHORSE_DEFAULT_KEY,
- (GConfClientNotifyFunc)gconf_notification, GTK_COMBO_BOX (widget));
- g_signal_connect (widget, "destroy", G_CALLBACK (remove_gconf_notification), GINT_TO_POINTER (gconf_id));
-
-#ifdef WITH_AGENT
- seahorse_prefs_cache (swidget);
-#else
- widget = glade_xml_get_widget (swidget->xml, "cache-tab");
- g_return_val_if_fail (GTK_IS_WIDGET (widget), swidget);
- seahorse_prefs_remove_tab (swidget, widget);
-#endif
-
#ifdef WITH_KEYSERVER
setup_keyservers (swidget);
#else
Modified: trunk/libseahorse/seahorse-prefs.glade
==============================================================================
--- trunk/libseahorse/seahorse-prefs.glade (original)
+++ trunk/libseahorse/seahorse-prefs.glade Thu Apr 17 23:43:18 2008
@@ -565,513 +565,6 @@
</child>
<child>
- <widget class="GtkVBox" id="encryption-tab">
- <property name="border_width">12</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox10">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Default Key</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">12</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox27">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
-
- <child>
- <widget class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Default key:</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">signer-select</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label20">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><i>This key is used to sign messages when no other key is chosen</i></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkComboBox" id="signer-select">
- <property name="visible">True</property>
- <property name="add_tearoffs">False</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="encrypt-self">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">When _encrypting, always include myself as a recipient</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Encryption</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="cache-tab">
- <property name="border_width">12</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">18</property>
-
- <child>
- <widget class="GtkVBox" id="vbox26">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label15">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Remember PGP Passphrases</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkAlignment" id="pgp-message">
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">12</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkLabel" id="label18">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><i>A supported PGP passphrase caching agent is not running.</i></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkAlignment" id="pgp-area">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">12</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox12">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkRadioButton" id="no-cache">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Never remember passphrases</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkRadioButton" id="session-cache">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Remember passphrases for</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">no-cache</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkSpinButton" id="ttl">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">True</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">5 1 1000 1 10 10</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">minutes</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkRadioButton" id="keyring-cache">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Always remember passphrases whenever logged in</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">no-cache</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="authorize">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">As_k me before using a cached passphrase</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="authorize_toggled"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="display_status">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Show _icon in status area when passphrases are in memory</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <placeholder/>
- </child>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="label" translatable="yes">PGP Passphrases</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkTable" id="keyserver-tab">
<property name="border_width">12</property>
<property name="visible">True</property>
Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in (original)
+++ trunk/po/POTFILES.in Thu Apr 17 23:43:18 2008
@@ -1,12 +1,5 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
-agent/seahorse-agent-actions.c
-agent/seahorse-agent.c
-agent/seahorse-agent-cache.c
-agent/seahorse-agent-cache.glade
-agent/seahorse-agent-main.c
-agent/seahorse-agent-prompt.c
-agent/seahorse-agent-status.c
daemon/seahorse-daemon.c
daemon/seahorse-service.c
daemon/seahorse-service-crypto.c
@@ -28,7 +21,6 @@
libseahorse/seahorse-pgp-key-op.c
libseahorse/seahorse-pgp-source.c
libseahorse/seahorse-prefs.c
-libseahorse/seahorse-prefs-cache.c
libseahorse/seahorse-prefs-keyrings.c
libseahorse/seahorse-prefs.glade
libseahorse/seahorse-progress.glade
@@ -45,21 +37,6 @@
libseahorse/seahorse-util.c
libseahorse/seahorse-validity.c
libseahorse/seahorse-widget.c
-plugins/applet/GNOME_SeahorseApplet.server.in.in
-plugins/applet/GNOME_SeahorseApplet.xml
-plugins/applet/seahorse-applet.c
-plugins/applet/seahorse-applet-preferences.glade
-plugins/epiphany/seahorse.ephy-extension.in.in
-plugins/epiphany/seahorse-extension.c
-plugins/gedit/seahorse-gedit.c
-plugins/gedit/seahorse-gedit-plugin.c
-plugins/gedit/seahorse-gedit.schemas.in
-plugins/gedit/seahorse-pgp.gedit-plugin.desktop.in
-plugins/nautilus-ext/seahorse-nautilus.c
-plugins/nautilus/seahorse-pgp-preferences.c
-plugins/nautilus/seahorse-pgp-preferences.desktop.in
-plugins/nautilus/seahorse-tool.c
-plugins/nautilus/seahorse-tool-files.c
src/main.c
src/seahorse-add-subkey.c
src/seahorse-add-subkey.glade
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
