Commit f4fc70e3 authored by Sebastian Wilhelmi's avatar Sebastian Wilhelmi Committed by Sebastian Wilhelmi

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.
parent 2c8fc56d
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.
2000-09-04 Elliot Lee <sopwith@redhat.com>
* gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning.
......
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.
2000-09-04 Elliot Lee <sopwith@redhat.com>
* gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning.
......
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.
2000-09-04 Elliot Lee <sopwith@redhat.com>
* gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning.
......
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.
2000-09-04 Elliot Lee <sopwith@redhat.com>
* gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning.
......
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.
2000-09-04 Elliot Lee <sopwith@redhat.com>
* gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning.
......
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.
2000-09-04 Elliot Lee <sopwith@redhat.com>
* gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning.
......
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.
2000-09-04 Elliot Lee <sopwith@redhat.com>
* gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning.
......
......@@ -122,11 +122,9 @@ binding_entry_new (GtkBindingSet *binding_set,
binding_set->entries = entry;
entry->hash_next = g_hash_table_lookup (binding_entry_hash_table, entry);
g_hash_table_freeze (binding_entry_hash_table);
if (entry->hash_next)
g_hash_table_remove (binding_entry_hash_table, entry->hash_next);
g_hash_table_insert (binding_entry_hash_table, entry, entry);
g_hash_table_thaw (binding_entry_hash_table);
return entry;
}
......@@ -205,10 +203,8 @@ binding_entry_destroy (GtkBindingEntry *entry)
g_hash_table_remove (binding_entry_hash_table, entry);
else if (begin != o_entry)
{
g_hash_table_freeze (binding_entry_hash_table);
g_hash_table_remove (binding_entry_hash_table, entry);
g_hash_table_insert (binding_entry_hash_table, begin, begin);
g_hash_table_thaw (binding_entry_hash_table);
}
entry->destroyed = TRUE;
......
......@@ -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)
......
......@@ -1218,7 +1218,7 @@ buffer_pretty_name (Buffer *buffer)
if (buffer->filename)
{
char *p;
char *result = g_strdup (g_basename (buffer->filename));
char *result = g_path_get_basename (buffer->filename);
p = strchr (result, '/');
if (p)
*p = '\0';
......
......@@ -1218,7 +1218,7 @@ buffer_pretty_name (Buffer *buffer)
if (buffer->filename)
{
char *p;
char *result = g_strdup (g_basename (buffer->filename));
char *result = g_path_get_basename (buffer->filename);
p = strchr (result, '/');
if (p)
*p = '\0';
......
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