Accept "<WINDOWTYPE>" as a valid accel path. (#144427, Philip Kendall)

	* gtk/gtkaccelmap.c (_gtk_accel_path_is_valid): Accept
	"<WINDOWTYPE>" as a valid accel path.  (#144427, Philip
	Kendall)

diff --git a/ChangeLog b/ChangeLog
index d8f6f9e3a091a4174adcfe668d6fcd5f31731d73..9b1deeb05ef9f36e059f1b9f6ac23c18508cb652 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-06-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkaccelmap.c (_gtk_accel_path_is_valid): Accept
+       "<WINDOWTYPE>" as a valid accel path.  (#144427, Philip 
+       Kendall)        
+
        * gtk/gtkselection.c (GTK_SELECTION_MAX_SIZE): Make sure 
        this gets defined for all backends, so linux-fb has a 
        chance of compiling.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d8f6f9e3a091a4174adcfe668d6fcd5f31731d73..9b1deeb05ef9f36e059f1b9f6ac23c18508cb652 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2004-06-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkaccelmap.c (_gtk_accel_path_is_valid): Accept
+       "<WINDOWTYPE>" as a valid accel path.  (#144427, Philip 
+       Kendall)        
+
        * gtk/gtkselection.c (GTK_SELECTION_MAX_SIZE): Make sure 
        this gets defined for all backends, so linux-fb has a 
        chance of compiling.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d8f6f9e3a091a4174adcfe668d6fcd5f31731d73..9b1deeb05ef9f36e059f1b9f6ac23c18508cb652 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,9 @@
 2004-06-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkaccelmap.c (_gtk_accel_path_is_valid): Accept
+       "<WINDOWTYPE>" as a valid accel path.  (#144427, Philip 
+       Kendall)        
+
        * gtk/gtkselection.c (GTK_SELECTION_MAX_SIZE): Make sure 
        this gets defined for all backends, so linux-fb has a 
        chance of compiling.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d8f6f9e3a091a4174adcfe668d6fcd5f31731d73..9b1deeb05ef9f36e059f1b9f6ac23c18508cb652 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2004-06-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkaccelmap.c (_gtk_accel_path_is_valid): Accept
+       "<WINDOWTYPE>" as a valid accel path.  (#144427, Philip 
+       Kendall)        
+
        * gtk/gtkselection.c (GTK_SELECTION_MAX_SIZE): Make sure 
        this gets defined for all backends, so linux-fb has a 
        chance of compiling.

diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c
index d21bd6d42fa3ef3bb886e638a5e46ee99c671cd3..bfdc74af3021195f852019f12340dd95a23c2cf9 100644 (file)
--- a/gtk/gtkaccelmap.c
+++ b/gtk/gtkaccelmap.c
@@ -121,7 +121,7 @@ _gtk_accel_path_is_valid (const gchar *accel_path)
       accel_path[1] == '<' || accel_path[1] == '>' || !accel_path[1])
     return FALSE;
   p = strchr (accel_path, '>');
-  if (!p || p[1] != '/')
+  if (!p || (p[1] != 0 && p[1] != '/'))
     return FALSE;
   return TRUE;
 }