diff options
| author | Radek Doulik <rodo@ximian.com> | 2004-06-22 00:59:33 +0800 |
|---|---|---|
| committer | Radek Doulik <rodo@src.gnome.org> | 2004-06-22 00:59:33 +0800 |
| commit | e2d0cba03c1a0ba5f6132865ced5107ca1d76e8e (patch) | |
| tree | 7fd010f1b56cf601ae9861aaf95d078c43e7e598 /mail | |
| parent | 8fb58feae7be02fc2c0d058ef70437d7b4846324 (diff) | |
| download | gsoc2013-evolution-e2d0cba03c1a0ba5f6132865ced5107ca1d76e8e.tar gsoc2013-evolution-e2d0cba03c1a0ba5f6132865ced5107ca1d76e8e.tar.gz gsoc2013-evolution-e2d0cba03c1a0ba5f6132865ced5107ca1d76e8e.tar.bz2 gsoc2013-evolution-e2d0cba03c1a0ba5f6132865ced5107ca1d76e8e.tar.lz gsoc2013-evolution-e2d0cba03c1a0ba5f6132865ced5107ca1d76e8e.tar.xz gsoc2013-evolution-e2d0cba03c1a0ba5f6132865ced5107ca1d76e8e.tar.zst gsoc2013-evolution-e2d0cba03c1a0ba5f6132865ced5107ca1d76e8e.zip | |
clone view before saving it to avoid problems with setting current_view_id
2004-06-21 Radek Doulik <rodo@ximian.com>
* gal-view-instance-save-as-dialog.c
(gal_view_instance_save_as_dialog_save): clone view before saving
it to avoid problems with setting current_view_id
Fixes #57354
svn path=/trunk/; revision=26441
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-junk-filter.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index f6af13ea4f..94316ca0d1 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2004-06-21 Radek Doulik <rodo@ximian.com> + + * em-junk-filter.c (em_junk_sa_test_spamd): make sure we test for + -p and --port only and not for other options as --pidfile + + Fixes #60260 + 2004-06-18 Not Zed <NotZed@Ximian.com> ** See #31027. diff --git a/mail/em-junk-filter.c b/mail/em-junk-filter.c index a6fe7c4cd2..338dd5d931 100644 --- a/mail/em-junk-filter.c +++ b/mail/em-junk-filter.c @@ -279,7 +279,7 @@ em_junk_sa_test_spamd (void) i = 0; argv [i++] = "/bin/sh"; argv [i++] = "-c"; - argv [i++] = "ps ax|grep -v grep|grep -E 'spamd.*(\\-L|\\-\\-local)'|grep -E -v '\\-p|\\-\\-port'"; + argv [i++] = "ps ax|grep -v grep|grep -E 'spamd.*(\\-L|\\-\\-local)'|grep -E -v '\\ \\-p\\ |\\ \\-\\-port\\ '"; argv[i] = NULL; if (pipe_to_sa (NULL, NULL, argv) != 0) { |