2007-10-22 [colin] 3.0.2cvs96
authorColin Leroy <colin@colino.net>
Mon, 22 Oct 2007 16:00:52 +0000 (16:00 +0000)
committerColin Leroy <colin@colino.net>
Mon, 22 Oct 2007 16:00:52 +0000 (16:00 +0000)
* src/prefs_customheader.c
Catch compface warnings when generating X-Faces

ChangeLog
PATCHSETS
configure.ac
src/prefs_customheader.c

index b1a9e57..8c6f45a 100644 (file)
--- 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
 2007-10-22 [wwp]       3.0.2cvs95
 
        * src/quote_fmt_parse.y
index 5c42737..3191210 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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.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
index fec722d..a3d95c5 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=95
+EXTRA_VERSION=96
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index e3b4da0..17755d3 100644 (file)
@@ -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);
                                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;
                                }
                                        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] == ' ') {
                                while (tmp[i]) {
                                        gchar *tmp2 = NULL;
                                        if (tmp[i] == ' ') {