summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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/gtkiconfactory.c5
6 files changed, 34 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b58f0d512..7aa55df795 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 4 21:53:46 2004 Matthias Clasen <maclas@gmx.de>
+
+ * gtk/gtkiconfactory.c (copy_cache): Increment the reference
+ count of the style when copying the cached icon. (#135890, Crispin
+ Flowerday)
+
Thu Mar 4 21:45:43 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c: In list mode, set the background color
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6b58f0d512..7aa55df795 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Mar 4 21:53:46 2004 Matthias Clasen <maclas@gmx.de>
+
+ * gtk/gtkiconfactory.c (copy_cache): Increment the reference
+ count of the style when copying the cached icon. (#135890, Crispin
+ Flowerday)
+
Thu Mar 4 21:45:43 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c: In list mode, set the background color
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6b58f0d512..7aa55df795 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Mar 4 21:53:46 2004 Matthias Clasen <maclas@gmx.de>
+
+ * gtk/gtkiconfactory.c (copy_cache): Increment the reference
+ count of the style when copying the cached icon. (#135890, Crispin
+ Flowerday)
+
Thu Mar 4 21:45:43 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c: In list mode, set the background color
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6b58f0d512..7aa55df795 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Mar 4 21:53:46 2004 Matthias Clasen <maclas@gmx.de>
+
+ * gtk/gtkiconfactory.c (copy_cache): Increment the reference
+ count of the style when copying the cached icon. (#135890, Crispin
+ Flowerday)
+
Thu Mar 4 21:45:43 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c: In list mode, set the background color
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6b58f0d512..7aa55df795 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Mar 4 21:53:46 2004 Matthias Clasen <maclas@gmx.de>
+
+ * gtk/gtkiconfactory.c (copy_cache): Increment the reference
+ count of the style when copying the cached icon. (#135890, Crispin
+ Flowerday)
+
Thu Mar 4 21:45:43 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c: In list mode, set the background color
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index b7b5521fa2..0f7bac65a1 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -2702,7 +2702,10 @@ copy_cache (GtkIconSet *icon_set,
*icon_copy = *icon;
if (icon_copy->style)
- attach_to_style (copy_recipient, icon_copy->style);
+ {
+ attach_to_style (copy_recipient, icon_copy->style);
+ g_object_ref (icon_copy->style);
+ }
g_object_ref (icon_copy->pixbuf);