diff --git a/ChangeLog b/ChangeLog index 0db36ff822..fa8e5b2f7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Aug 23 21:40:18 2003 Owen Taylor + + * gtk/gtkrc.c (gtk_rc_context_parse_one_file): Fix + problem where rc_file->directory wasn't always getting + set. (#120549, Luis Villa) + 2003-08-22 Samúel Jón Gunnarsson * configure.in: Added "is" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0db36ff822..fa8e5b2f7f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Aug 23 21:40:18 2003 Owen Taylor + + * gtk/gtkrc.c (gtk_rc_context_parse_one_file): Fix + problem where rc_file->directory wasn't always getting + set. (#120549, Luis Villa) + 2003-08-22 Samúel Jón Gunnarsson * configure.in: Added "is" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0db36ff822..fa8e5b2f7f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Aug 23 21:40:18 2003 Owen Taylor + + * gtk/gtkrc.c (gtk_rc_context_parse_one_file): Fix + problem where rc_file->directory wasn't always getting + set. (#120549, Luis Villa) + 2003-08-22 Samúel Jón Gunnarsson * configure.in: Added "is" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0db36ff822..fa8e5b2f7f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Aug 23 21:40:18 2003 Owen Taylor + + * gtk/gtkrc.c (gtk_rc_context_parse_one_file): Fix + problem where rc_file->directory wasn't always getting + set. (#120549, Luis Villa) + 2003-08-22 Samúel Jón Gunnarsson * configure.in: Added "is" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0db36ff822..fa8e5b2f7f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Aug 23 21:40:18 2003 Owen Taylor + + * gtk/gtkrc.c (gtk_rc_context_parse_one_file): Fix + problem where rc_file->directory wasn't always getting + set. (#120549, Luis Villa) + 2003-08-22 Samúel Jón Gunnarsson * configure.in: Added "is" to ALL_LINGUAS. diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index e80ad6a72c..1f299b045f 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -779,9 +779,10 @@ gtk_rc_context_parse_one_file (GtkRcContext *context, cwd = g_get_current_dir (); rc_file->canonical_name = g_build_filename (cwd, rc_file->name, NULL); - rc_file->directory = g_path_get_dirname (rc_file->canonical_name); g_free (cwd); } + + rc_file->directory = g_path_get_dirname (rc_file->canonical_name); } /* If the file is already being parsed (recursion), do nothing