Increment the reference count of the style when copying the cached icon.

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)

diff --git a/ChangeLog b/ChangeLog
index 6b58f0d512df80163c4508dd0d9f59ea44fd2165..7aa55df7950ad4650514c8ea14f965ca747e6efc 100644 (file)
--- 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 6b58f0d512df80163c4508dd0d9f59ea44fd2165..7aa55df7950ad4650514c8ea14f965ca747e6efc 100644 (file)
--- 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 6b58f0d512df80163c4508dd0d9f59ea44fd2165..7aa55df7950ad4650514c8ea14f965ca747e6efc 100644 (file)
--- 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 6b58f0d512df80163c4508dd0d9f59ea44fd2165..7aa55df7950ad4650514c8ea14f965ca747e6efc 100644 (file)
--- 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 6b58f0d512df80163c4508dd0d9f59ea44fd2165..7aa55df7950ad4650514c8ea14f965ca747e6efc 100644 (file)
--- 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 b7b5521fa240f25ec5f8d9768d62888836eb67af..0f7bac65a198641bc6f43a38d9a3ed7dc267601c 100644 (file)
--- 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);