2006-12-04 [colin] 2.6.0cvs81
authorColin Leroy <colin@colino.net>
Mon, 4 Dec 2006 07:42:35 +0000 (07:42 +0000)
committerColin Leroy <colin@colino.net>
Mon, 4 Dec 2006 07:42:35 +0000 (07:42 +0000)
* src/common/utils.c
Trim tabs from mailcap file too.

ChangeLog
PATCHSETS
configure.ac
src/common/utils.c

index f96fd1c0b5a90ff86fe6e2046e8305d0be8ce670..7731dac27c2c561284204a43b125f84f881675ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-04 [colin]     2.6.0cvs81
+
+       * src/common/utils.c
+               Trim tabs from mailcap file too.
+
 2006-12-02 [paul]      2.6.0cvs80
 
        * src/exphtmldlg.c
index 028cc2774d2d5f4216c4fd6f42d8c22266a47483..7eaec8d7f5d91747ddcbaee39238f43603b59c9e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.60.2.71 -r 1.60.2.72 src/addressbook.c;  cvs diff -u -r 1.14.2.18 -r 1.14.2.19 src/editaddress.c;  ) > 2.6.0cvs78.patchset
 ( cvs diff -u -r 1.25.2.14 -r 1.25.2.15 tools/Makefile.am;  ) > 2.6.0cvs79.patchset
 ( cvs diff -u -r 1.3.2.18 -r 1.3.2.19 src/exphtmldlg.c;  cvs diff -u -r 1.1.4.21 -r 1.1.4.22 src/expldifdlg.c;  ) > 2.6.0cvs80.patchset
+( cvs diff -u -r 1.36.2.90 -r 1.36.2.91 src/common/utils.c;  ) > 2.6.0cvs81.patchset
index 0c11f8256b8ac185806d8ac44e067501bcedeea1..d2b4bc2f003c302ebe3cb2e85d5ffdd99deeed5e 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=80
+EXTRA_VERSION=81
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index d3650104974629a6bb29a65e23d4d46f7147e57f..1dd271887af16a60c0d91fcccd76c433113755bc 100644 (file)
@@ -4549,9 +4549,9 @@ static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type,
        while (fgets(buf, sizeof (buf), fp) != NULL) {
                gchar **parts = g_strsplit(buf, ";", 3);
                gchar *trimmed = parts[0];
-               while (trimmed[0] == ' ')
+               while (trimmed[0] == ' ' || trimmed[0] == '\t')
                        trimmed++;
-               while (trimmed[strlen(trimmed)-1] == ' ')
+               while (trimmed[strlen(trimmed)-1] == ' ' || trimmed[strlen(trimmed)-1] == '\t')
                        trimmed[strlen(trimmed)-1] = '\0';
 
                if (!strcmp(trimmed, type)) {
@@ -4564,13 +4564,13 @@ static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type,
                                gchar *testcmd = orig_testcmd;
                                if (strstr(testcmd,";"))
                                        *(strstr(testcmd,";")) = '\0';
-                               while (testcmd[0] == ' ')
+                               while (testcmd[0] == ' ' || testcmd[0] == '\t')
                                        testcmd++;
                                while (testcmd[strlen(testcmd)-1] == '\n')
                                        testcmd[strlen(testcmd)-1] = '\0';
                                while (testcmd[strlen(testcmd)-1] == '\r')
                                        testcmd[strlen(testcmd)-1] = '\0';
-                               while (testcmd[strlen(testcmd)-1] == ' ')
+                               while (testcmd[strlen(testcmd)-1] == ' ' || testcmd[strlen(testcmd)-1] == '\t')
                                        testcmd[strlen(testcmd)-1] = '\0';
                                        
                                if (strstr(testcmd, "%s")) {
@@ -4595,13 +4595,13 @@ static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type,
                        }
                        
                        trimmed = parts[1];
-                       while (trimmed[0] == ' ')
+                       while (trimmed[0] == ' ' || trimmed[0] == '\t')
                                trimmed++;
                        while (trimmed[strlen(trimmed)-1] == '\n')
                                trimmed[strlen(trimmed)-1] = '\0';
                        while (trimmed[strlen(trimmed)-1] == '\r')
                                trimmed[strlen(trimmed)-1] = '\0';
-                       while (trimmed[strlen(trimmed)-1] == ' ')
+                       while (trimmed[strlen(trimmed)-1] == ' ' || trimmed[strlen(trimmed)-1] == '\t')
                                trimmed[strlen(trimmed)-1] = '\0';
                        result = g_strdup(trimmed);
                        g_strfreev(parts);