From 90a125dadea83d4c365bb3463762396994c1a08a Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Mon, 22 Oct 2007 16:00:52 +0000 Subject: [PATCH] 2007-10-22 [colin] 3.0.2cvs96 * src/prefs_customheader.c Catch compface warnings when generating X-Faces --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_customheader.c | 8 +++++++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1a9e57a0..8c6f45ab9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-10-22 [colin] 3.0.2cvs96 + + * src/prefs_customheader.c + Catch compface warnings when generating X-Faces + 2007-10-22 [wwp] 3.0.2cvs95 * src/quote_fmt_parse.y diff --git a/PATCHSETS b/PATCHSETS index 5c42737aa..31912106f 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3008,3 +3008,4 @@ ( cvs diff -u -r 1.4.2.22 -r 1.4.2.23 src/common/ssl_certificate.c; ) > 3.0.2cvs93.patchset ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/etpan/nntp-thread.c; ) > 3.0.2cvs94.patchset ( cvs diff -u -r 1.22.2.37 -r 1.22.2.38 src/quote_fmt_parse.y; ) > 3.0.2cvs95.patchset +( cvs diff -u -r 1.16.2.31 -r 1.16.2.32 src/prefs_customheader.c; ) > 3.0.2cvs96.patchset diff --git a/configure.ac b/configure.ac index fec722d00..a3d95c5a2 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=95 +EXTRA_VERSION=96 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c index e3b4da018..17755d32d 100644 --- a/src/prefs_customheader.c +++ b/src/prefs_customheader.c @@ -607,12 +607,18 @@ static void prefs_custom_header_val_from_file_cb(void) cmd = g_strdup_printf("compface %s", filename); tmp = get_command_output(cmd); g_free(cmd); - if (tmp == NULL || strlen(tmp) == 0){ + if (tmp == NULL || *tmp == '\0') { alertpanel_error(_("Couldn't call `compface`. Make sure it's in your $PATH.")); g_free(filename); g_free(tmp); return; } + if (strstr(tmp, "compface:")) { + alertpanel_error(_("Compface error: %s"), tmp); + g_free(filename); + g_free(tmp); + return; + } while (tmp[i]) { gchar *tmp2 = NULL; if (tmp[i] == ' ') { -- 2.25.1