From 4b83b736284e36e24043533f69eb4bc374f5e141 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 1 Oct 2001 18:23:32 +0000 Subject: [PATCH] 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. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkitemfactory.c | 8 ++++---- gtk/gtkrc.c | 2 +- 9 files changed, 54 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a0bef6945..8010a2256d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-10-01 Matthias Clasen + + * 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 * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 7a0bef6945..8010a2256d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +2001-10-01 Matthias Clasen + + * 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 * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7a0bef6945..8010a2256d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2001-10-01 Matthias Clasen + + * 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 * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7a0bef6945..8010a2256d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2001-10-01 Matthias Clasen + + * 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 * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7a0bef6945..8010a2256d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2001-10-01 Matthias Clasen + + * 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 * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7a0bef6945..8010a2256d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2001-10-01 Matthias Clasen + + * 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 * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7a0bef6945..8010a2256d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2001-10-01 Matthias Clasen + + * 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 * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index f14612a3f3..a0b5d33cdd 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -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 diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index ad88bc4597..0985705bce 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -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)