diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 4 | ||||
| -rwxr-xr-x | demos/gtk-demo/geninclude.pl.in | 4 |
4 files changed, 14 insertions, 2 deletions
@@ -1,5 +1,9 @@ 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: * gtk/gtkfilechooserembed.c: * gtk/gtktextmarkprivate.h: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 15497e07b7..e8461bbae1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 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: * gtk/gtkfilechooserembed.c: * gtk/gtktextmarkprivate.h: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 15497e07b7..e8461bbae1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 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: * gtk/gtkfilechooserembed.c: * gtk/gtktextmarkprivate.h: diff --git a/demos/gtk-demo/geninclude.pl.in b/demos/gtk-demo/geninclude.pl.in index fb81c96f04..b41e926684 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 { |