[seahorse-plugins/no-gpg-agent] [agent] Remove agent now that there's a gpg-agent in gnome-keyring.



commit 1f6e9c0a5f4b68a1df9432d38a7ec71271247511
Author: Stef Walter <stef memberwebs com>
Date:   Sun Jun 13 02:08:08 2010 +0000

    [agent] Remove agent now that there's a gpg-agent in gnome-keyring.

 HACKING                                     |   18 -
 Makefile.am                                 |    9 +-
 agent/.gitignore                            |    6 -
 agent/Makefile.am                           |   36 --
 agent/seahorse-agent-actions.c              |  245 --------
 agent/seahorse-agent-cache.c                |  657 ---------------------
 agent/seahorse-agent-cache.xml              |  156 -----
 agent/seahorse-agent-io.c                   |  828 ---------------------------
 agent/seahorse-agent-main.c                 |  289 ----------
 agent/seahorse-agent-prompt.c               |  302 ----------
 agent/seahorse-agent-status.c               |  349 -----------
 agent/seahorse-agent.1                      |  111 ----
 agent/seahorse-agent.c                      |  168 ------
 agent/seahorse-agent.h                      |  135 -----
 configure.in                                |   29 -
 help/C/seahorse-plugins.xml                 |   55 --
 libseahorse/Makefile.am                     |    9 +-
 libseahorse/seahorse-passphrase.c           |  165 ------
 libseahorse/seahorse-passphrase.h           |    9 -
 libseahorse/seahorse-prefs-cache.c          |  278 ---------
 libseahorse/seahorse-prefs.c                |   11 -
 libseahorse/seahorse-prefs.xml              |  191 ------
 libseahorse/seahorse-secure-memory.h        |    2 +-
 plugins/nautilus/seahorse-pgp-preferences.c |   17 +-
 po/POTFILES.in                              |    8 -
 25 files changed, 4 insertions(+), 4079 deletions(-)
---
diff --git a/HACKING b/HACKING
index cf62003..5d71bae 100644
--- a/HACKING
+++ b/HACKING
@@ -6,12 +6,6 @@ with possible enhancements and any current bugs.
 
 Here is a description of the modules:
 
- o agent: GPG Password caching agent. This is compiled into seahorse-daemon. 
-   (See 'daemon' below)
-
- o daemon: Various background servers and processes run in this daemon including
-   the gpg agent, dbus server, etc...
- 
  o data: Data files that need to be processed. Current this is just schemas. They 
    are here because there will be multiple schemas files to separate the app and 
    pgp settings.
@@ -48,18 +42,6 @@ implemented that feature yet, or refusal to implement a given feature. In
 these cases direct use of GPG is permitted. Such cases must be documented 
 below, and must be discussed before hand on the seahorse-devel mailing list.
 
- o seahorse-agent implements a gpg-agent compatible assuan interface. It also
-   depends on figuring out where the GPG home directory is and modifying 
-   GPG options (see below).
-   - agent/*
-   
- o The Backup Keyrings feature accesses the ~/.gnupg/pubring.gpg and 
-   ~/.gnupg/secring.gpg files directly. 
-   - src/seahorse-key-manager.c
-   
- o There is code which modifies the ~/.gnupg/gpg.conf GPG configuration file. 
-   - libseahorse/seahorse-gpg-options.c
-   
  o Photo ID support
    - gpgme_op_edit state machine in libseahorse/seahorse-pgp-key-op.c 
    
diff --git a/Makefile.am b/Makefile.am
index b265ed2..39d4d35 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,19 +2,12 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-if WITH_AGENT
-AGENT_DIR = agent
-else
-AGENT_DIR = 
-endif
-
 SUBDIRS = libseahorse \
           po \
           data \
           help \
           pixmaps \
-          plugins \
-          $(AGENT_DIR)
+          plugins
 
 EXTRA_DIST = \
     AUTHORS \
diff --git a/configure.in b/configure.in
index 1808214..afc690a 100644
--- a/configure.in
+++ b/configure.in
@@ -200,33 +200,6 @@ 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
 dnl ****************************************************************************
@@ -613,7 +586,6 @@ pixmaps/Makefile
 pixmaps/22x22/Makefile
 pixmaps/48x48/Makefile
 pixmaps/scalable/Makefile
-agent/Makefile
 plugins/Makefile
 plugins/applet/Makefile
 plugins/applet/docs/Makefile
@@ -640,6 +612,5 @@ Plugins:
   GEdit (v >= 2.14):     $with_gedit_plugin
   Panel Applet:          $with_panel_applet
   Nautilus:              $with_nautilus_ext
-  Seahorse Agent:        $enable_agent
 Notification Support:    $enable_libnotify
 "
diff --git a/help/C/seahorse-plugins.xml b/help/C/seahorse-plugins.xml
index 48a6070..9000cf2 100644
--- a/help/C/seahorse-plugins.xml
+++ b/help/C/seahorse-plugins.xml
@@ -477,61 +477,6 @@
 	  </varlistentry>
 	</variablelist>
       </sect3>
-      
-      <sect3 id="password-cache">
-	<title>Passphrase Cache</title>
-	<para>
-	  Enabling the passphrase caching ability will allow you to 
-	  perform many operations that require entering your passphrase without 
-	  re-entering it every time. <command>seahorse-agent</command> takes the 
-	  place of <command>gpg-agent</command>. Letting the cached passphrases 
-	  expire is usually a good idea. This will then require re-entering your 
-	  passphrase, but adds security.
-	</para>
-	<variablelist>
-	  <varlistentry>
-	    <term><guilabel>Never remember passphrases</guilabel></term>
-	    <listitem>
-	      <para>
-		Sets to not remember any passphrase.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Remember passphrases for ... minutes</guilabel></term>
-	    <listitem>
-	      <para>
-		Sets the amount of time, in minutes, for storing passphrases. 
-		Use the spin box to set the desired time.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Always remember passphrases whenever logged in</guilabel></term>
-	    <listitem>
-	      <para>
-		Sets to remember any passphrases whenever you are logged in the session.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Ask me before using a cached passphrase</guilabel></term>
-	    <listitem>
-	      <para>
-		Sets to ask you before using a stored passphrase.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Automatically load Secure Shell keys</guilabel></term>
-	    <listitem>
-	      <para>
-		Sets to automatically cache any Secure Shell key.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </sect3>   
     </sect2>
   </sect1>
       
diff --git a/libseahorse/Makefile.am b/libseahorse/Makefile.am
index e0ae1b4..6007703 100644
--- a/libseahorse/Makefile.am
+++ b/libseahorse/Makefile.am
@@ -20,12 +20,6 @@ noinst_LIBRARIES = libseahorse.a
 BUILT_SOURCES = \
 	seahorse-marshal.c seahorse-marshal.h
 
-if WITH_AGENT
-AGENT_SRCS = seahorse-prefs-cache.c
-else
-AGENT_SRCS = 
-endif
-
 libseahorse_a_SOURCES = \
 	seahorse-pgp-operation.c seahorse-pgp-operation.h \
 	seahorse-widget.c seahorse-widget.h \
@@ -46,8 +40,7 @@ libseahorse_a_SOURCES = \
 	seahorse-secure-buffer.c seahorse-secure-buffer.h \
 	seahorse-algo.c seahorse-algo.h \
 	seahorse-unix-signal.c seahorse-unix-signal.h \
-	$(BUILT_SOURCES) \
-	$(AGENT_SRCS)
+	$(BUILT_SOURCES)
 
 seahorse-marshal.h: seahorse-marshal.list $(GLIB_GENMARSHAL)
 	$(GLIB_GENMARSHAL) $< --header --prefix=seahorse_marshal > $@
diff --git a/libseahorse/seahorse-passphrase.c b/libseahorse/seahorse-passphrase.c
index 658d276..1bbbaf6 100644
--- a/libseahorse/seahorse-passphrase.c
+++ b/libseahorse/seahorse-passphrase.c
@@ -48,7 +48,6 @@
 #include "seahorse-passphrase.h"
 #include "seahorse-secure-buffer.h"
 #include "seahorse-gpg-options.h"
-#include "agent/seahorse-agent.h"
 
 #define HIG_SMALL      6        /* gnome hig small space in pixels */
 #define HIG_LARGE     12        /* gnome hig large space in pixels */
@@ -389,167 +388,3 @@ seahorse_passphrase_get (gconstpointer dummy, const gchar *passphrase_hint,
     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;
-}
-
-/* -------------------------------------------------------------------------- */
-
-/* Check if the agent is running */
-SeahorseAgentType
-seahorse_passphrase_detect_agent (void)
-{
-    return gpg_detect_agent ();
-}
-
diff --git a/libseahorse/seahorse-passphrase.h b/libseahorse/seahorse-passphrase.h
index e34e84b..57bf51b 100644
--- a/libseahorse/seahorse-passphrase.h
+++ b/libseahorse/seahorse-passphrase.h
@@ -43,13 +43,4 @@ gpgme_error_t   seahorse_passphrase_get             (gconstpointer dummy,
                                                      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 (void);
-
 #endif /* __SEAHORSE_PASSPHRASE__ */
diff --git a/libseahorse/seahorse-prefs.c b/libseahorse/seahorse-prefs.c
index 44ea4e9..e6acaab 100644
--- a/libseahorse/seahorse-prefs.c
+++ b/libseahorse/seahorse-prefs.c
@@ -35,9 +35,6 @@
 #include "seahorse-secure-buffer.h"
 #include "seahorse-widget.h"
 
-/* From seahorse-prefs-cache.c */
-void seahorse_prefs_cache (SeahorseWidget *widget);
-
 /* From sehorse-prefs-keyrings.c */
 void seahorse_prefs_keyrings (SeahorseWidget *widget);
 
@@ -111,14 +108,6 @@ seahorse_prefs_new (GtkWindow *parent)
                                       (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 = GTK_WIDGET (seahorse_widget_get_widget (swidget, "cache-tab"));
-    g_return_val_if_fail (GTK_IS_WIDGET (widget), swidget);
-    seahorse_prefs_remove_tab (swidget, widget);
-#endif
-
     seahorse_widget_show (swidget);
     return swidget;
 }
diff --git a/libseahorse/seahorse-prefs.xml b/libseahorse/seahorse-prefs.xml
index 47ef0b6..aadcb5b 100644
--- a/libseahorse/seahorse-prefs.xml
+++ b/libseahorse/seahorse-prefs.xml
@@ -135,197 +135,6 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Encryption</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" id="cache-tab">
-                <property name="visible">True</property>
-                <property name="border_width">12</property>
-                <property name="spacing">18</property>
-                <child>
-                  <object class="GtkVBox" id="vbox26">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label15">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Remember PGP Passphrases&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="pgp-message">
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkLabel" id="label18">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">&lt;i&gt;A supported PGP passphrase caching agent is not running.&lt;/i&gt;</property>
-                            <property name="use_markup">True</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="pgp-area">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkVBox" id="vbox12">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkRadioButton" id="no-cache">
-                                <property name="label" translatable="yes">_Never remember passphrases</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</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="hbox9">
-                                <property name="visible">True</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkRadioButton" id="session-cache">
-                                    <property name="label" translatable="yes">_Remember passphrases for</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
-                                    <property name="group">no-cache</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSpinButton" id="ttl">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="adjustment">adjustment1</property>
-                                    <property name="climb_rate">1</property>
-                                    <property name="numeric">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label4">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">minutes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">2</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="GtkRadioButton" id="keyring-cache">
-                                <property name="label" translatable="yes">_Always remember passphrases whenever logged in</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                                <property name="group">no-cache</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="authorize">
-                                <property name="label" translatable="yes">As_k me before using a cached passphrase</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="display_status">
-                                <property name="label" translatable="yes">Show _icon in status area when passphrases are in memory</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="position">4</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child type="tab">
               <object class="GtkLabel" id="label2">
                 <property name="label" translatable="yes">PGP Passphrases</property>
               </object>
diff --git a/libseahorse/seahorse-secure-memory.h b/libseahorse/seahorse-secure-memory.h
index 5df638d..2811155 100644
--- a/libseahorse/seahorse-secure-memory.h
+++ b/libseahorse/seahorse-secure-memory.h
@@ -1,5 +1,5 @@
 /* 
- * Quintuple Agent secure memory allocation
+ * Secure memory allocation
  * Copyright (C) 1998,1999 Free Software Foundation, Inc.
  * Copyright (C) 1999,2000 Robert Bihlmeyer <robbe orcus priv at>
  *
diff --git a/plugins/nautilus/seahorse-pgp-preferences.c b/plugins/nautilus/seahorse-pgp-preferences.c
index 9b9b076..576f565 100644
--- a/plugins/nautilus/seahorse-pgp-preferences.c
+++ b/plugins/nautilus/seahorse-pgp-preferences.c
@@ -29,16 +29,8 @@
 #include "seahorse-prefs.h"
 #include "seahorse-gtkstock.h"
 
-#ifdef WITH_AGENT
-static gboolean show_cache = FALSE;
-#endif
-
 static const GOptionEntry options[] = {
-#ifdef WITH_AGENT    
-	{ "cache", 'c', 0, G_OPTION_ARG_NONE, &show_cache,
-	    N_("For internal use"), NULL },
-#endif 
-    { NULL }
+	{ NULL }
 };
 
 G_MODULE_EXPORT static void
@@ -83,13 +75,6 @@ main (int argc, char **argv)
                       G_CALLBACK (destroyed), NULL);
     g_signal_connect (seahorse_widget_get_widget (swidget, "helpbutton1"), "clicked", G_CALLBACK (help_clicked), swidget);
 
-#ifdef WITH_AGENT	
-    if (show_cache) {
-        GtkWidget *tab = GTK_WIDGET (seahorse_widget_get_widget (swidget, "cache-tab"));
-        seahorse_prefs_select_tab (swidget, tab);
-    }
-#endif
-   
 	gtk_main();
 	return 0;
 }
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ae59934..d23f229 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -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
-[type: gettext/glade]agent/seahorse-agent-cache.xml
-agent/seahorse-agent-main.c
-agent/seahorse-agent-prompt.c
-agent/seahorse-agent-status.c
 data/seahorse-plugins.schemas.in
 libseahorse/seahorse-gpg-options.c
 [type: gettext/glade]libseahorse/seahorse-multi-encrypt.xml
@@ -14,7 +7,6 @@ libseahorse/seahorse-notification.c
 [type: gettext/glade]libseahorse/seahorse-notify.xml
 libseahorse/seahorse-passphrase.c
 libseahorse/seahorse-prefs.c
-libseahorse/seahorse-prefs-cache.c
 [type: gettext/glade]libseahorse/seahorse-prefs.xml
 [type: gettext/glade]libseahorse/seahorse-progress.xml
 libseahorse/seahorse-util.c



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]