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 b1a9e57a023a1d22ec483e3aaf4cda173e6e5972..8c6f45ab93fd13f3c0604b14af084cf84db48d87 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
index 5c42737aa9f7ad92b2b4ac998f66c64624d13168..31912106f56422813fc98982d777e7fd72697c98 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.16.2.31 -r 1.16.2.32 src/prefs_customheader.c;  ) > 3.0.2cvs96.patchset
index fec722d004b507a21a43c160d79fa6a3b241c2d1..a3d95c5a2850b0a7e6209c2f777672ea349d72d1 100644 (file)
@@ -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=
 
index e3b4da01856d86f80cfa400e85bc88935dc9bc81..17755d32da6245202ac8f77839338ad06bb37d52 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);
-                               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] == ' ') {