Fix quoting of \' sequence (#72548, Christian Rose)

Mon Feb 25 16:31:09 2002  Owen Taylor  <otaylor@redhat.com>

        * glib/gshell.c (tokenize_command_line): Fix quoting
        of \' sequence (#72548, Christian Rose)

diff --git a/ChangeLog b/ChangeLog
index 2bd55f1..2150913 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 25 16:31:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gshell.c (tokenize_command_line): Fix quoting
+       of \' sequence (#72548, Christian Rose)
+
 2002-02-24  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Edits.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2bd55f1..2150913 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Feb 25 16:31:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gshell.c (tokenize_command_line): Fix quoting
+       of \' sequence (#72548, Christian Rose)
+
 2002-02-24  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Edits.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2bd55f1..2150913 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Feb 25 16:31:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gshell.c (tokenize_command_line): Fix quoting
+       of \' sequence (#72548, Christian Rose)
+
 2002-02-24  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Edits.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 2bd55f1..2150913 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Mon Feb 25 16:31:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gshell.c (tokenize_command_line): Fix quoting
+       of \' sequence (#72548, Christian Rose)
+
 2002-02-24  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Edits.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2bd55f1..2150913 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Feb 25 16:31:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gshell.c (tokenize_command_line): Fix quoting
+       of \' sequence (#72548, Christian Rose)
+
 2002-02-24  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Edits.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2bd55f1..2150913 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Feb 25 16:31:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gshell.c (tokenize_command_line): Fix quoting
+       of \' sequence (#72548, Christian Rose)
+
 2002-02-24  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Edits.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2bd55f1..2150913 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Feb 25 16:31:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gshell.c (tokenize_command_line): Fix quoting
+       of \' sequence (#72548, Christian Rose)
+
 2002-02-24  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Edits.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2bd55f1..2150913 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Feb 25 16:31:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gshell.c (tokenize_command_line): Fix quoting
+       of \' sequence (#72548, Christian Rose)
+
 2002-02-24  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Edits.

diff --git a/glib/gshell.c b/glib/gshell.c
index 30d7367..7a2c70a 100644 (file)
--- a/glib/gshell.c
+++ b/glib/gshell.c
@@ -525,7 +525,7 @@ tokenize_command_line (const gchar *command_line,
         g_set_error (error,
                      G_SHELL_ERROR,
                      G_SHELL_ERROR_BAD_QUOTING,
-                     _("Text ended just after a '\' character."
+                     _("Text ended just after a '\\' character."
                        " (The text was '%s')"),
                      command_line);
       else