From: Paul Mangan Date: Fri, 24 Jun 2005 05:36:26 +0000 (+0000) Subject: 2005-06-24 [paul] 1.9.11cvs96 X-Git-Tag: rel_1_9_12~11 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=03ba23857fee0976b454cd5b5cc8c6c4038fc0de 2005-06-24 [paul] 1.9.11cvs96 * src/editldap.c made bind password entry invisible (sync with main) * src/send_message.c send_message_local(): check exit status to detect errors (sync with main) * src/textview.c use main's less ambiguous popup menu wording --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 3f6581150..fe7e2979f 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,15 @@ +2005-06-24 [paul] 1.9.11cvs96 + + * src/editldap.c + made bind password entry invisible + (sync with main) + * src/send_message.c + send_message_local(): check exit status + to detect errors (sync with main) + * src/textview.c + use main's less ambiguous popup menu + wording + 2005-06-24 [paul] 1.9.11cvs95 * src/prefs_actions.c diff --git a/PATCHSETS b/PATCHSETS index 1b5445e3e..e84897256 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -584,3 +584,4 @@ ( cvs diff -u -r 1.395.2.85 -r 1.395.2.86 src/summaryview.c; ) > 1.9.11cvs93.patchset ( cvs diff -u -r 1.395.2.86 -r 1.395.2.87 src/summaryview.c; ) > 1.9.11cvs94.patchset ( cvs diff -u -r 1.60.2.16 -r 1.60.2.17 src/prefs_actions.c; cvs diff -u -r 1.16.2.10 -r 1.16.2.11 src/prefs_customheader.c; cvs diff -u -r 1.16.2.9 -r 1.16.2.10 src/prefs_display_header.c; cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/prefs_filtering_action.c; cvs diff -u -r 1.43.2.19 -r 1.43.2.20 src/prefs_matcher.c; cvs diff -u -r 1.12.2.11 -r 1.12.2.12 src/prefs_template.c; cvs diff -u -r 1.30.2.14 -r 1.30.2.15 src/prefs_toolbar.c; cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/gtk/description_window.c; ) > 1.9.11cvs95.patchset +( cvs diff -u -r 1.8.2.4 -r 1.8.2.5 src/editldap.c; cvs diff -u -r 1.17.2.15 -r 1.17.2.16 src/send_message.c; cvs diff -u -r 1.96.2.58 -r 1.96.2.59 src/textview.c; ) > 1.9.11cvs96.patchset diff --git a/configure.ac b/configure.ac index 6c6d8e8de..47debfae4 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=11 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=95 +EXTRA_VERSION=96 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/editldap.c b/src/editldap.c index f41b0ae9b..6a62c6056 100644 --- a/src/editldap.c +++ b/src/editldap.c @@ -691,6 +691,7 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl ) entry_bindPW = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entry_bindPW, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); + gtk_entry_set_visibility(GTK_ENTRY(entry_bindPW), FALSE); toolTip = gtk_tooltips_new(); gtk_tooltips_set_tip( toolTip, entry_bindPW, _( diff --git a/src/send_message.c b/src/send_message.c index 9f51e1793..466ddad9a 100644 --- a/src/send_message.c +++ b/src/send_message.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2003 Hiroyuki Yamamoto + * Copyright (C) 1999-2005 Hiroyuki Yamamoto * * 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 @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include "send_message.h" #include "session.h" @@ -122,6 +124,7 @@ gint send_message_local(const gchar *command, FILE *fp) gint child_stdin; gchar buf[BUFFSIZE]; gboolean err = FALSE; + gint status; g_return_val_if_fail(command != NULL, -1); g_return_val_if_fail(fp != NULL, -1); @@ -130,8 +133,10 @@ gint send_message_local(const gchar *command, FILE *fp) argv = strsplit_with_quote(command, " ", 0); - if (g_spawn_async_with_pipes(NULL, argv, NULL, 0, NULL, NULL, &pid, - &child_stdin, NULL, NULL, NULL) == FALSE) { + if (g_spawn_async_with_pipes(NULL, argv, NULL, + G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, + &pid, &child_stdin, NULL, NULL, + NULL) == FALSE) { g_snprintf(buf, sizeof(buf), _("Can't execute command: %s"), command); log_warning("%s\n", buf); @@ -157,6 +162,11 @@ gint send_message_local(const gchar *command, FILE *fp) } fd_close(child_stdin); + + waitpid(pid, &status, 0); + if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) + err = TRUE; + g_spawn_close_pid(pid); if (err) { diff --git a/src/textview.c b/src/textview.c index f70e83013..1997e4a2c 100644 --- a/src/textview.c +++ b/src/textview.c @@ -211,15 +211,15 @@ static void save_file_cb (TextView *textview, static GtkItemFactoryEntry textview_link_popup_entries[] = { - {N_("/_Open link"), NULL, open_uri_cb, 0, NULL}, - {N_("/_Copy link location"), NULL, copy_uri_cb, 0, NULL}, + {N_("/_Open with Web browser"), NULL, open_uri_cb, 0, NULL}, + {N_("/Copy this _link"), NULL, copy_uri_cb, 0, NULL}, }; static GtkItemFactoryEntry textview_mail_popup_entries[] = { - {N_("/_Add to addressbook"), NULL, add_uri_to_addrbook_cb, 0, NULL}, - {N_("/_Email"), NULL, mail_to_uri_cb, 0, NULL}, - {N_("/_Copy"), NULL, copy_mail_to_uri_cb, 0, NULL}, + {N_("/Compose _new message"), NULL, mail_to_uri_cb, 0, NULL}, + {N_("/Add to _address book"), NULL, add_uri_to_addrbook_cb, 0, NULL}, + {N_("/Copy this add_ress"), NULL, copy_mail_to_uri_cb, 0, NULL}, }; static GtkItemFactoryEntry textview_file_popup_entries[] =