Make it compile with C89 compilers.

Fri Jun 27 03:56:59 2003  Soeren Sandmann  <sandmann@daimi.au.dk>

	* io-gif-animation.c (gdk_pixbuf_gif_anim_frame_composite): Make
	it compile with C89 compilers.

Thu Jun 26 21:41:16 2003  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtktreeviewcolumn.c
	(gtk_tree_view_column_cell_set_cell_data): only set "is_expander"
	and "is_expanded" if the new value is different fromt he old one.

diff --git a/ChangeLog b/ChangeLog
index a37d97c0c23d5c0b3089e4b33078f27d2fb6bf4d..0f0ec2b01d0b7185d7da171a3925bf9cd2803850 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 26 21:41:16 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktreeviewcolumn.c
+       (gtk_tree_view_column_cell_set_cell_data): only set "is_expander"
+       and "is_expanded" if the new value is different fromt he old one.
+
 Wed Jun 25 18:59:15 BST 2003  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Fix typos. Update

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a37d97c0c23d5c0b3089e4b33078f27d2fb6bf4d..0f0ec2b01d0b7185d7da171a3925bf9cd2803850 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Jun 26 21:41:16 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktreeviewcolumn.c
+       (gtk_tree_view_column_cell_set_cell_data): only set "is_expander"
+       and "is_expanded" if the new value is different fromt he old one.
+
 Wed Jun 25 18:59:15 BST 2003  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Fix typos. Update

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a37d97c0c23d5c0b3089e4b33078f27d2fb6bf4d..0f0ec2b01d0b7185d7da171a3925bf9cd2803850 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Jun 26 21:41:16 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktreeviewcolumn.c
+       (gtk_tree_view_column_cell_set_cell_data): only set "is_expander"
+       and "is_expanded" if the new value is different fromt he old one.
+
 Wed Jun 25 18:59:15 BST 2003  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Fix typos. Update

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a37d97c0c23d5c0b3089e4b33078f27d2fb6bf4d..0f0ec2b01d0b7185d7da171a3925bf9cd2803850 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Jun 26 21:41:16 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktreeviewcolumn.c
+       (gtk_tree_view_column_cell_set_cell_data): only set "is_expander"
+       and "is_expanded" if the new value is different fromt he old one.
+
 Wed Jun 25 18:59:15 BST 2003  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Fix typos. Update

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a37d97c0c23d5c0b3089e4b33078f27d2fb6bf4d..0f0ec2b01d0b7185d7da171a3925bf9cd2803850 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Jun 26 21:41:16 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktreeviewcolumn.c
+       (gtk_tree_view_column_cell_set_cell_data): only set "is_expander"
+       and "is_expanded" if the new value is different fromt he old one.
+
 Wed Jun 25 18:59:15 BST 2003  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Fix typos. Update

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 873ce86edcd9c2bc972fe9975f73fee975b9bd98..9f6efbd3c4089b81fdc8fc6b136f95b1ca6971bc 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 27 03:56:59 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * io-gif-animation.c (gdk_pixbuf_gif_anim_frame_composite): Make
+       it compile with C89 compilers.
+
 2003-06-23  Matthias Clasen  <maclas@gmx.de>
 
        * io-gif.c (gif_get_frame_info): Remove the pointless refusal to load images with dubious 

diff --git a/gdk-pixbuf/io-gif-animation.c b/gdk-pixbuf/io-gif-animation.c
index bf50a9363cffdb0f6652fc239049939c33710de6..96c0139e5ea5618164a44e544a958a6dbf5fe712 100644 (file)
--- a/gdk-pixbuf/io-gif-animation.c
+++ b/gdk-pixbuf/io-gif-animation.c
@@ -439,11 +439,13 @@ gdk_pixbuf_gif_anim_frame_composite (GdkPixbufGifAnim *gif_anim,
                                 f->need_recomposite = FALSE;
                         } else {
                                 GdkPixbufFrame *prev_frame;
+                                gint prev_clipped_width;
+                                gint prev_clipped_height;
                                 
                                 prev_frame = tmp->prev->data;
 
-                                gint prev_clipped_width = MIN (gif_anim->width - prev_frame->x_offset, gdk_pixbuf_get_width (prev_frame->pixbuf));
-                                gint prev_clipped_height = MIN (gif_anim->height - prev_frame->y_offset, gdk_pixbuf_get_height (prev_frame->pixbuf));
+                                prev_clipped_width = MIN (gif_anim->width - prev_frame->x_offset, gdk_pixbuf_get_width (prev_frame->pixbuf));
+                                prev_clipped_height = MIN (gif_anim->height - prev_frame->y_offset, gdk_pixbuf_get_height (prev_frame->pixbuf));
 
                                 /* Init f->composited with what we should have after the previous
                                  * frame

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 15db9fc133d742a8461c9e719eb0c87a95c00eb2..ba372b88aefff0c69baef59a5a5215b55f09bb1f 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -2368,7 +2368,12 @@ gtk_tree_view_column_cell_set_cell_data (GtkTreeViewColumn *tree_column,
       list = info->attributes;
 
       g_object_freeze_notify (cell);
-      g_object_set (cell, "is_expander", is_expander, "is_expanded", is_expanded, NULL);
+
+      if (info->cell->is_expander != is_expander)
+       g_object_set (cell, "is_expander", is_expander, NULL);
+
+      if (info->cell->is_expanded != is_expanded)
+       g_object_set (cell, "is_expanded", is_expanded, NULL);
 
       while (list && list->next)
        {