From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 12 Jul 2005 15:28:45 +0000 (+0000)
Subject: Accept dashes in demo titles.
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=d3f9744fddb68981968b6948c9e5e3bf662189ff;p=~andy%2Fgtk

Accept dashes in demo titles.

2005-07-12  Matthias Clasen  <mclasen@redhat.com>

	* demos/gtk-demo/geninclude.pl.in: Accept dashes in demo titles.
---

diff --git a/ChangeLog b/ChangeLog
index 15497e07b..e8461bbae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* demos/gtk-demo/geninclude.pl.in: Accept dashes in demo titles.
+
 2005-07-12  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/theme-bits/decompose-bits.c: 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 15497e07b..e8461bbae 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2005-07-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* demos/gtk-demo/geninclude.pl.in: Accept dashes in demo titles.
+
 2005-07-12  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/theme-bits/decompose-bits.c: 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 15497e07b..e8461bbae 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2005-07-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* demos/gtk-demo/geninclude.pl.in: Accept dashes in demo titles.
+
 2005-07-12  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/theme-bits/decompose-bits.c: 
diff --git a/demos/gtk-demo/geninclude.pl.in b/demos/gtk-demo/geninclude.pl.in
index fb81c96f0..b41e92668 100755
--- a/demos/gtk-demo/geninclude.pl.in
+++ b/demos/gtk-demo/geninclude.pl.in
@@ -35,7 +35,7 @@ for $file (@ARGV) {
 
 # generate a list of 'parent names'
 foreach $href (@demos) {
-    if ($href->{"title"} =~ m|^([\w\s]+)/[\w\s]+$|) {
+    if ($href->{"title"} =~ m|^([-\w\s]+)/[-\w\s]+$|) {
 	my $parent_name = $1;
 	my $do_next = 0;
 
@@ -77,7 +77,7 @@ if (defined @parents) {
 		next;
 	    }
 	    
-	    if ($demos[$j]{"title"} =~ m|^$parents[$i]/([\w\s]+)$|) {
+	    if ($demos[$j]{"title"} =~ m|^$parents[$i]/([-\w\s]+)$|) {
 		if ($first) {
 		    $first = 0;
 		} else {