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 15497e07b7a15174cbdb500af24cf5ecee8f9d18..e8461bbae13718edefbbe214626e62f78258d1ba 100644 (file)
--- 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 15497e07b7a15174cbdb500af24cf5ecee8f9d18..e8461bbae13718edefbbe214626e62f78258d1ba 100644 (file)
--- 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 15497e07b7a15174cbdb500af24cf5ecee8f9d18..e8461bbae13718edefbbe214626e62f78258d1ba 100644 (file)
--- 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 fb81c96f04eb575701ac05192cf03a045ac37032..b41e926684d3348bfa714c7bc34ad7307502bab7 100755 (executable)
--- 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 {