From d36df18dee814c690fd5736729ea54175b3be628 Mon Sep 17 00:00:00 2001
From: Owen Taylor <otaylor@gtk.org>
Date: Tue, 16 Jun 1998 03:40:04 +0000
Subject: Moved font lists from the klass structure to a static structure in

Mon Jun 15 23:39:44 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkfontsel.[ch] (gtk_font_selection_dialog_init): Moved font
	lists from the klass structure to a static structure
	in gtkfontsel.c; cleans up global the namespace.

Mon Jun 15 22:16:10 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/makeenums.pl (parse_entries): Fix (untriggered)
	bug with /*< skip >*/ and remove warning.
---
 gtk/makeenums.pl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'gtk/makeenums.pl')

diff --git a/gtk/makeenums.pl b/gtk/makeenums.pl
index 21bb8d4fcd..d070d3da66 100755
--- a/gtk/makeenums.pl
+++ b/gtk/makeenums.pl
@@ -73,13 +73,13 @@ sub parse_entries {
 	    if (!defined $flags && defined $value && $value =~ /<</) {
 		$seenbitshift = 1;
 	    }
-	    if (!defined $options{skip}) {
-		if (defined $options) {
-		    my %options = parse_options($options);
+	    if (defined $options) {
+		my %options = parse_options($options);
+		if (!defined $options{skip}) {
 		    push @entries, [ $name, $options{nick} ];
-		} else {
-		    push @entries, [ $name ];
 		}
+	    } else {
+		push @entries, [ $name ];
 	    }
 	} else {
 	    print STDERR "Can't understand: $_\n";
-- 
cgit v1.2.1