2008-12-15 [colin] 3.6.1cvs78

[claws.git] / src / plugins / pgpcore / pgp_viewer.c

diff --git a/src/plugins/pgpcore/pgp_viewer.c b/src/plugins/pgpcore/pgp_viewer.c
index d5e2a38f618fceca3e222a83e4a4a85f87ddeebd..9563022df4498e742f37362cfe1049d3a1a2b174 100644 (file)
--- a/src/plugins/pgpcore/pgp_viewer.c
+++ b/src/plugins/pgpcore/pgp_viewer.c
@@ -1,11 +1,11 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2007 the Claws Mail team
  * This file Copyright (C) 2006 Colin Leroy <colin@colino.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -14,8 +14,8 @@
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -26,13 +26,15 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <sys/types.h>
-#include <sys/wait.h>
-#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__))
+#ifndef G_OS_WIN32
+#  include <sys/wait.h>
+#endif
+#if (defined(__DragonFly__) || defined(SOLARIS) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__))
 #  include <sys/signal.h>
 #endif
 
 #include "version.h"
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "mainwindow.h"
 #include "mimeview.h"
 #include "textview.h"
@@ -114,10 +116,10 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
        if (!key) {
                gchar *cmd = g_strdup_printf("gpg --no-tty --recv-keys %s", sig->fpr);
                AlertValue val = G_ALERTDEFAULT;
-               if (!prefs_common.work_offline) {
+               if (!prefs_common_get_prefs()->work_offline) {
                        val = alertpanel(_("Key import"),
                                _("This key is not in your keyring. Do you want "
-                                 "Sylpheed-Claws to try and import it from a "
+                                 "Claws Mail to try and import it from a "
                                  "keyserver?"),
                                  GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL);
                        GTK_EVENTS_FLUSH();
@@ -128,7 +130,7 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
                        TEXTVIEW_INSERT(":\n\n");
                        TEXTVIEW_INSERT(_("   This key is not in your keyring.\n"));
                        TEXTVIEW_INSERT(_("   It should be possible to import it "));
-                       if (prefs_common.work_offline)
+                       if (prefs_common_get_prefs()->work_offline)
                                TEXTVIEW_INSERT(_("when working online,\n   or "));
                        TEXTVIEW_INSERT(_("with the following command: \n\n     "));
                        TEXTVIEW_INSERT(cmd);
@@ -142,6 +144,7 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
                        TEXTVIEW_INSERT(":\n\n");
 
                        main_window_cursor_wait(mainwindow_get_mainwindow());
+                       textview_cursor_wait(textview);
                        GTK_EVENTS_FLUSH();
 
                        pid = fork();
@@ -149,9 +152,10 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
                                res = -1;
                        } else if (pid == 0) {
                                /* son */
-                               res = system(cmd);
-                               res = WEXITSTATUS(res);
-                               _exit(res);
+                               gchar **argv;
+                               argv = strsplit_with_quote(cmd, " ", 0);
+                               res = execvp(argv[0], argv);
+                               exit(255);
                        } else {
                                int status = 0;
                                time_t start_wait = time(NULL);
@@ -163,22 +167,25 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
                                                res = WEXITSTATUS(status);
                                                break;
                                        }
-                                       if (time(NULL) - start_wait > 5) {
-                                               debug_print("SIGTERM'ing gpg\n");
+                                       if (time(NULL) - start_wait > 9) {
+                                               debug_print("SIGTERM'ing gpg %d\n", pid);
                                                kill(pid, SIGTERM);
                                        }
-                                       if (time(NULL) - start_wait > 6) {
-                                               debug_print("SIGKILL'ing gpg\n");
+                                       if (time(NULL) - start_wait > 10) {
+                                               debug_print("SIGKILL'ing gpg %d\n", pid);
                                                kill(pid, SIGKILL);
                                                break;
                                        }
                                } while(1);
                        }
                        main_window_cursor_normal(mainwindow_get_mainwindow());
+                       textview_cursor_normal(textview);
+                       debug_print("res %d\n", res);
                        if (res == 0) {
                                TEXTVIEW_INSERT(_("   This key has been imported to your keyring.\n"));
                        } else {
                                TEXTVIEW_INSERT(_("   This key couldn't be imported to your keyring.\n"));
+                               TEXTVIEW_INSERT(_("   Key servers are sometimes slow.\n"));
                                TEXTVIEW_INSERT(_("   You can try to import it manually with the command:\n\n     "));
                                TEXTVIEW_INSERT(cmd);
                        }