diff --git a/ChangeLog b/ChangeLog index 4d4dc54b3ebc8c936eb47f8f9c6dc357086cc6c8..f2920f5c41e0b3bebf7ff4197267cfb5c6a73383 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Sep 10 06:58:56 2001 Owen Taylor + + * gtk/gtkrc.c (insert_rc_property): Fix blank line + in the wrong place. + Mon Sep 10 06:50:39 2001 Owen Taylor * gtk/gtkstyle.c (_gtk_style_peek_property_value): Don't diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4d4dc54b3ebc8c936eb47f8f9c6dc357086cc6c8..f2920f5c41e0b3bebf7ff4197267cfb5c6a73383 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Mon Sep 10 06:58:56 2001 Owen Taylor + + * gtk/gtkrc.c (insert_rc_property): Fix blank line + in the wrong place. + Mon Sep 10 06:50:39 2001 Owen Taylor * gtk/gtkstyle.c (_gtk_style_peek_property_value): Don't diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4d4dc54b3ebc8c936eb47f8f9c6dc357086cc6c8..f2920f5c41e0b3bebf7ff4197267cfb5c6a73383 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Sep 10 06:58:56 2001 Owen Taylor + + * gtk/gtkrc.c (insert_rc_property): Fix blank line + in the wrong place. + Mon Sep 10 06:50:39 2001 Owen Taylor * gtk/gtkstyle.c (_gtk_style_peek_property_value): Don't diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4d4dc54b3ebc8c936eb47f8f9c6dc357086cc6c8..f2920f5c41e0b3bebf7ff4197267cfb5c6a73383 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Mon Sep 10 06:58:56 2001 Owen Taylor + + * gtk/gtkrc.c (insert_rc_property): Fix blank line + in the wrong place. + Mon Sep 10 06:50:39 2001 Owen Taylor * gtk/gtkstyle.c (_gtk_style_peek_property_value): Don't diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4d4dc54b3ebc8c936eb47f8f9c6dc357086cc6c8..f2920f5c41e0b3bebf7ff4197267cfb5c6a73383 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Sep 10 06:58:56 2001 Owen Taylor + + * gtk/gtkrc.c (insert_rc_property): Fix blank line + in the wrong place. + Mon Sep 10 06:50:39 2001 Owen Taylor * gtk/gtkstyle.c (_gtk_style_peek_property_value): Don't diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4d4dc54b3ebc8c936eb47f8f9c6dc357086cc6c8..f2920f5c41e0b3bebf7ff4197267cfb5c6a73383 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Sep 10 06:58:56 2001 Owen Taylor + + * gtk/gtkrc.c (insert_rc_property): Fix blank line + in the wrong place. + Mon Sep 10 06:50:39 2001 Owen Taylor * gtk/gtkstyle.c (_gtk_style_peek_property_value): Don't diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4d4dc54b3ebc8c936eb47f8f9c6dc357086cc6c8..f2920f5c41e0b3bebf7ff4197267cfb5c6a73383 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Sep 10 06:58:56 2001 Owen Taylor + + * gtk/gtkrc.c (insert_rc_property): Fix blank line + in the wrong place. + Mon Sep 10 06:50:39 2001 Owen Taylor * gtk/gtkstyle.c (_gtk_style_peek_property_value): Don't diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 6a13c2ffd343cc5c1cd3f557f080278f4f91f799..8cc3ce36d5d9ef9a23f4ad0d1acd6aeff4b3122b 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -1180,8 +1180,8 @@ insert_rc_property (GtkRcStyle *style, while (i < style->rc_properties->len) { gint cmp = gtk_rc_properties_cmp (&key, &g_array_index (style->rc_properties, GtkRcProperty, i)); + if (cmp == 0) - { if (replace) {