summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2004-09-15 19:23:55 +0000
committerTor Lillqvist <tml@src.gnome.org>2004-09-15 19:23:55 +0000
commit401b96c0df68cd854ee883951bda2f8cb1969760 (patch)
treeae2ec6fc0771964f1d4e81c36485dda1ce7c976b
parent48f02d290109108d85b5b79788ecac4e82d8d5df (diff)
downloadpango-401b96c0df68cd854ee883951bda2f8cb1969760.tar.gz
Escape also backslashes. (#152607, Kazuki Iwamoto)
2004-09-15 Tor Lillqvist <tml@iki.fi> * pango/querymodules.c (string_needs_escape, escape_string): Escape also backslashes. (#152607, Kazuki Iwamoto)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-65
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--pango/querymodules.c5
5 files changed, 24 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a359c5a..7f1f41cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-15 Tor Lillqvist <tml@iki.fi>
+
+ * pango/querymodules.c (string_needs_escape, escape_string):
+ Escape also backslashes. (#152607, Kazuki Iwamoto)
+
2004-08-22 Tor Lillqvist <tml@iki.fi>
* pango/pangowin32-fontmap.c (pango_win32_inner_enum_proc): Ignore
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 2a359c5a..7f1f41cb 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2004-09-15 Tor Lillqvist <tml@iki.fi>
+
+ * pango/querymodules.c (string_needs_escape, escape_string):
+ Escape also backslashes. (#152607, Kazuki Iwamoto)
+
2004-08-22 Tor Lillqvist <tml@iki.fi>
* pango/pangowin32-fontmap.c (pango_win32_inner_enum_proc): Ignore
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 2a359c5a..7f1f41cb 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+2004-09-15 Tor Lillqvist <tml@iki.fi>
+
+ * pango/querymodules.c (string_needs_escape, escape_string):
+ Escape also backslashes. (#152607, Kazuki Iwamoto)
+
2004-08-22 Tor Lillqvist <tml@iki.fi>
* pango/pangowin32-fontmap.c (pango_win32_inner_enum_proc): Ignore
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 2a359c5a..7f1f41cb 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+2004-09-15 Tor Lillqvist <tml@iki.fi>
+
+ * pango/querymodules.c (string_needs_escape, escape_string):
+ Escape also backslashes. (#152607, Kazuki Iwamoto)
+
2004-08-22 Tor Lillqvist <tml@iki.fi>
* pango/pangowin32-fontmap.c (pango_win32_inner_enum_proc): Ignore
diff --git a/pango/querymodules.c b/pango/querymodules.c
index 8ea48b7a..557ae7ac 100644
--- a/pango/querymodules.c
+++ b/pango/querymodules.c
@@ -52,7 +52,7 @@ string_needs_escape (const char *str)
if (!c)
return FALSE;
- else if (c == '\"' || g_ascii_isspace (c))
+ else if (c == '\"' || c == '\\' || g_ascii_isspace (c))
return TRUE;
}
}
@@ -76,6 +76,9 @@ escape_string (const char *str)
case '\"':
g_string_append (result, "\\\"");
break;
+ case '\\':
+ g_string_append (result, "\\\\");
+ break;
default:
g_string_append_c (result, c);
}