summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2005-10-04 04:20:02 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-10-04 04:20:02 +0000
commitd42232ec1905c23e15995de0ea768fccfe91b651 (patch)
tree8340f871db24a5e59e3687fb6421adeefe515b61
parent8098c5666c40acbefd5f82044d98fbcfeadf7169 (diff)
downloadgtk+-d42232ec1905c23e15995de0ea768fccfe91b651.tar.gz
Revert the change from yesterday, since it leads to assertion failures.
2005-10-04 Matthias Clasen <mclasen@redhat.com> * gtk/gtkrc.c (gtk_rc_clear_realized_style): Revert the change from yesterday, since it leads to assertion failures. (#317879, Sebastian Bacher)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--gtk/gtkrc.c3
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 63eadd987e..6c75b25181 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-04 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkrc.c (gtk_rc_clear_realized_style): Revert the change
+ from yesterday, since it leads to assertion failures. (#317879,
+ Sebastian Bacher)
+
2005-10-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcalendar.c (gtk_calendar_init): Call
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 63eadd987e..6c75b25181 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-10-04 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkrc.c (gtk_rc_clear_realized_style): Revert the change
+ from yesterday, since it leads to assertion failures. (#317879,
+ Sebastian Bacher)
+
2005-10-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcalendar.c (gtk_calendar_init): Call
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index d02f289601..ee0899d3e6 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -1337,9 +1337,6 @@ gtk_rc_clear_realized_style (gpointer key,
{
GSList *rc_styles = key;
GSList *tmp_list = rc_styles;
- GtkStyle *style = value;
-
- g_object_unref (style);
while (tmp_list)
{