From 1e8598508370616825c165c4b3e03da66d35cbf6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 7 Sep 2007 19:57:33 +0000 Subject: [PATCH] Don't use image->attach_points where image->n_attach_points was meant. 2007-09-07 Matthias Clasen * gtk/updateiconcache.c (get_image_meta_data_size): Don't use image->attach_points where image->n_attach_points was meant. Pointed out by Albert Chin. svn path=/trunk/; revision=18756 --- ChangeLog | 6 ++++++ gtk/updateiconcache.c | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38ae4d4baa..a7f236d2d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-09-07 Matthias Clasen + + * gtk/updateiconcache.c (get_image_meta_data_size): Don't + use image->attach_points where image->n_attach_points was meant. + Pointed out by Albert Chin. + 2007-09-07 Wouter Bolsterlee * modules/printbackends/cups/gtkcupsutils.c: diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c index d11f11f909..d44d93e5e0 100644 --- a/gtk/updateiconcache.c +++ b/gtk/updateiconcache.c @@ -971,7 +971,7 @@ get_image_meta_data_size (Image *image) data->size = 0; if (data->has_embedded_rect || - data->attach_points > 0 || + data->n_attach_points > 0 || data->n_display_names > 0) data->size += 12; @@ -997,11 +997,8 @@ get_image_meta_data_size (Image *image) * pool in case the same string occurs twice * during a get_single_node_size() calculation. */ - //g_print ("adding non-written out string %s\n", data->display_names[i]); add_string (data->display_names[i], -1); } - //else - //g_print ("found string %s in pool: %d\n", data->display_names[i], poolv); } }