diff options
| author | Sebastian Wilhelmi <wilhelmi@ira.uka.de> | 2000-09-05 12:13:24 +0000 |
|---|---|---|
| committer | Sebastian Wilhelmi <wilhelmi@src.gnome.org> | 2000-09-05 12:13:24 +0000 |
| commit | f4fc70e3c72c3db162ce5d863020ece9b0aa7dbe (patch) | |
| tree | d8d0c6fa0fd0c82430c1333b4059dd4dd1f780e2 /gtk/gtkrc.c | |
| parent | 2c8fc56d21b696053b6c48bbfcc18a948ebaed22 (diff) | |
| download | gtk+-f4fc70e3c72c3db162ce5d863020ece9b0aa7dbe.tar.gz | |
Use g_path_get_dirname instead of g_dirname, which is deprecated.
2000-09-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gtk/gtkrc.c (gtk_rc_parse_file): Use g_path_get_dirname instead
of g_dirname, which is deprecated.
(gtk_rc_parse_any): Removed calls to
g_scanner_{freeze,thaw}_symbol_table, which are deprecated.
* gtk/gtkbindings.c (binding_entry_new, binding_entry_destroy):
Removed calls to g_hash_table_{freeze,thaw}, as they are
deprecated now.
* gtk/testtext.c (buffer_pretty_name): Use g_path_get_basename
instead of g_basename.
Diffstat (limited to 'gtk/gtkrc.c')
| -rw-r--r-- | gtk/gtkrc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index c31fc5062d..495fbbd411 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -679,8 +679,9 @@ gtk_rc_parse_file (const gchar *filename, gboolean reload) /* Temporarily push directory name for this file on * a stack of directory names while parsing it */ - rc_dir_stack = g_slist_prepend (rc_dir_stack, - g_dirname (rc_file->canonical_name)); + rc_dir_stack = + g_slist_prepend (rc_dir_stack, + g_path_get_dirname (rc_file->canonical_name)); gtk_rc_parse_any (filename, fd, NULL); tmp_list = rc_dir_stack; @@ -1234,10 +1235,8 @@ gtk_rc_parse_any (const gchar *input_name, } scanner->input_name = input_name; - g_scanner_freeze_symbol_table (scanner); for (i = 0; i < n_symbols; i++) g_scanner_add_symbol (scanner, symbols[i].name, GINT_TO_POINTER (symbols[i].token)); - g_scanner_thaw_symbol_table (scanner); done = FALSE; while (!done) |