Commit 4b83b736 authored by Matthias Clasen's avatar Matthias Clasen

replace g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.

* 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.
parent 58ed9e8b
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>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): change
......
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>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): change
......
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>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): change
......
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>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): change
......
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>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): change
......
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>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): change
......
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>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): change
......
......@@ -1733,8 +1733,8 @@ gtk_item_factory_parse_rc_scanner (GScanner *scanner)
gtk_type_class (GTK_TYPE_ITEM_FACTORY);
saved_symbol = g_scanner_lookup_symbol (scanner, "menu-path");
g_scanner_remove_symbol (scanner, "menu-path");
g_scanner_add_symbol (scanner, "menu-path", gtk_item_factory_parse_menu_path);
g_scanner_scope_remove_symbol (scanner, 0, "menu-path");
g_scanner_scope_add_symbol (scanner, 0, "menu-path", gtk_item_factory_parse_menu_path);
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_remove_symbol (scanner, "menu-path");
g_scanner_add_symbol (scanner, "menu-path", saved_symbol);
g_scanner_scope_remove_symbol (scanner, 0, "menu-path");
g_scanner_scope_add_symbol (scanner, 0, "menu-path", saved_symbol);
}
void
......
......@@ -1724,7 +1724,7 @@ gtk_rc_parse_any (GtkRcContext *context,
scanner->input_name = input_name;
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;
while (!done)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment