summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2003-08-24 02:31:20 +0000
committerOwen Taylor <otaylor@src.gnome.org>2003-08-24 02:31:20 +0000
commitf977168c41038b53559d6302efed68f4ed91cd21 (patch)
tree023ce3c0c31678a6bb4fb243251acd7911671200
parenta8ea1bc42096ab0f0e52b139b756ff95d7e8c46e (diff)
downloadgdk-pixbuf-f977168c41038b53559d6302efed68f4ed91cd21.tar.gz
Fix problem where rc_file->directory wasn't always getting set. (#120549,
Sat Aug 23 21:40:18 2003 Owen Taylor <otaylor@redhat.com> * gtk/gtkrc.c (gtk_rc_context_parse_one_file): Fix problem where rc_file->directory wasn't always getting set. (#120549, Luis Villa)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--ChangeLog.pre-2-46
-rw-r--r--ChangeLog.pre-2-66
-rw-r--r--ChangeLog.pre-2-86
-rw-r--r--gtk/gtkrc.c3
6 files changed, 32 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0582adca5..c4a4ca7f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Aug 23 21:40:18 2003 Owen Taylor <otaylor@redhat.com>
+
+ * 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 Christian Rose <menthos@menthos.com>
* configure.in: Added "ne" to ALL_LINGUAS.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0582adca5..c4a4ca7f9 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Aug 23 21:40:18 2003 Owen Taylor <otaylor@redhat.com>
+
+ * 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 Christian Rose <menthos@menthos.com>
* configure.in: Added "ne" to ALL_LINGUAS.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0582adca5..c4a4ca7f9 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sat Aug 23 21:40:18 2003 Owen Taylor <otaylor@redhat.com>
+
+ * 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 Christian Rose <menthos@menthos.com>
* configure.in: Added "ne" to ALL_LINGUAS.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0582adca5..c4a4ca7f9 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Aug 23 21:40:18 2003 Owen Taylor <otaylor@redhat.com>
+
+ * 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 Christian Rose <menthos@menthos.com>
* configure.in: Added "ne" to ALL_LINGUAS.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0582adca5..c4a4ca7f9 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Aug 23 21:40:18 2003 Owen Taylor <otaylor@redhat.com>
+
+ * 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 Christian Rose <menthos@menthos.com>
* configure.in: Added "ne" to ALL_LINGUAS.
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 0f4c6e01b..9de0ef632 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