AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 13:11:13 +00:00
Code Issues Projects Releases Wiki Activity

replace g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.

Browse Source 
* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_scanner): replace
g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.

* gtk/gtkrc.c (gtk_rc_parse_any): here as well.
This commit is contained in:
Matthias Clasen 2001-10-01 18:23:32 +00:00
parent 58ed9e8bef
commit 4b83b73628
9 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2001-10-01 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_scanner): replace
g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.
* gtk/gtkrc.c (gtk_rc_parse_any): here as well.
Mon Oct 1 14:07:02 2001 Jonathan Blandford <jrb@redhat.com> Mon Oct 1 14:07:02 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): change * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change

7
ChangeLog.pre-2-0
View File

@ -1,3 +1,10 @@
2001-10-01 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_scanner): replace
g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.
* gtk/gtkrc.c (gtk_rc_parse_any): here as well.
Mon Oct 1 14:07:02 2001 Jonathan Blandford <jrb@redhat.com> Mon Oct 1 14:07:02 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): change * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
2001-10-01 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_scanner): replace
g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.
* gtk/gtkrc.c (gtk_rc_parse_any): here as well.
Mon Oct 1 14:07:02 2001 Jonathan Blandford <jrb@redhat.com> Mon Oct 1 14:07:02 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): change * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
2001-10-01 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_scanner): replace
g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.
* gtk/gtkrc.c (gtk_rc_parse_any): here as well.
Mon Oct 1 14:07:02 2001 Jonathan Blandford <jrb@redhat.com> Mon Oct 1 14:07:02 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): change * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
2001-10-01 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_scanner): replace
g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.
* gtk/gtkrc.c (gtk_rc_parse_any): here as well.
Mon Oct 1 14:07:02 2001 Jonathan Blandford <jrb@redhat.com> Mon Oct 1 14:07:02 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): change * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
2001-10-01 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_scanner): replace
g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.
* gtk/gtkrc.c (gtk_rc_parse_any): here as well.
Mon Oct 1 14:07:02 2001 Jonathan Blandford <jrb@redhat.com> Mon Oct 1 14:07:02 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): change * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
2001-10-01 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_scanner): replace
g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.
* gtk/gtkrc.c (gtk_rc_parse_any): here as well.
Mon Oct 1 14:07:02 2001 Jonathan Blandford <jrb@redhat.com> Mon Oct 1 14:07:02 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): change * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change

8
gtk/gtkitemfactory.c
View File

@ -1733,8 +1733,8 @@ gtk_item_factory_parse_rc_scanner (GScanner *scanner)
gtk_type_class (GTK_TYPE_ITEM_FACTORY); gtk_type_class (GTK_TYPE_ITEM_FACTORY);
saved_symbol = g_scanner_lookup_symbol (scanner, "menu-path"); saved_symbol = g_scanner_lookup_symbol (scanner, "menu-path");
g_scanner_remove_symbol (scanner, "menu-path"); g_scanner_scope_remove_symbol (scanner, 0, "menu-path");
g_scanner_add_symbol (scanner, "menu-path", gtk_item_factory_parse_menu_path); g_scanner_scope_add_symbol (scanner, 0, "menu-path", gtk_item_factory_parse_menu_path);
g_scanner_peek_next_token (scanner); g_scanner_peek_next_token (scanner);
@ -1747,8 +1747,8 @@ gtk_item_factory_parse_rc_scanner (GScanner *scanner)
g_scanner_peek_next_token (scanner); g_scanner_peek_next_token (scanner);
} }
g_scanner_remove_symbol (scanner, "menu-path"); g_scanner_scope_remove_symbol (scanner, 0, "menu-path");
g_scanner_add_symbol (scanner, "menu-path", saved_symbol); g_scanner_scope_add_symbol (scanner, 0, "menu-path", saved_symbol);
} }
void void

2
gtk/gtkrc.c
View File

@ -1724,7 +1724,7 @@ gtk_rc_parse_any (GtkRcContext *context,
scanner->input_name = input_name; scanner->input_name = input_name;
for (i = 0; i < G_N_ELEMENTS (symbols); i++) for (i = 0; i < G_N_ELEMENTS (symbols); i++)
g_scanner_add_symbol (scanner, symbols[i].name, GINT_TO_POINTER (symbols[i].token)); g_scanner_scope_add_symbol (scanner, 0, symbols[i].name, GINT_TO_POINTER (symbols[i].token));
done = FALSE; done = FALSE;
while (!done) while (!done)