aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2004-04-01 08:31:03 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-04-01 08:31:03 +0800
commitac4ca10036ec7d3afb60a621c4d43dded203cea7 (patch)
treefcd63853700b0170f793394df50c682431b1debc
parent052b3979aea1184559f66cf914aa2da27a3345d3 (diff)
downloadgsoc2013-evolution-ac4ca10036ec7d3afb60a621c4d43dded203cea7.tar
gsoc2013-evolution-ac4ca10036ec7d3afb60a621c4d43dded203cea7.tar.gz
gsoc2013-evolution-ac4ca10036ec7d3afb60a621c4d43dded203cea7.tar.bz2
gsoc2013-evolution-ac4ca10036ec7d3afb60a621c4d43dded203cea7.tar.lz
gsoc2013-evolution-ac4ca10036ec7d3afb60a621c4d43dded203cea7.tar.xz
gsoc2013-evolution-ac4ca10036ec7d3afb60a621c4d43dded203cea7.tar.zst
gsoc2013-evolution-ac4ca10036ec7d3afb60a621c4d43dded203cea7.zip
Fixes #56120
2004-03-31 JP Rosevear <jpr@ximian.com> Fixes #56120 * gui/gnome-cal.c (append_category_cb): update the correct element (client_categories_changed_cb): pass the array, not a reference to it svn path=/trunk/; revision=25273
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/gnome-cal.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 1b1829c0b8..2b31debdbe 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-31 JP Rosevear <jpr@ximian.com>
+
+ Fixes #56120
+
+ * gui/gnome-cal.c (append_category_cb): update the correct element
+ (client_categories_changed_cb): pass the array, not a reference to
+ it
+
2004-03-31 Rodrigo Moya <rodrigo@ximian.com>
* gui/gnome-cal.c: fixed documentation typos.
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 8b9510dba5..eb7605d8df 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1838,7 +1838,7 @@ append_category_cb (gpointer key, gpointer value, gpointer data)
c = data;
g_ptr_array_set_size (c, c->len + 1);
- c->pdata[c->len] = g_strdup (category);
+ c->pdata[c->len - 1] = g_strdup (category);
}
@@ -1874,7 +1874,7 @@ client_categories_changed_cb (ECal *ecal, GPtrArray *categories, gpointer data)
merged = g_ptr_array_sized_new (g_hash_table_size (cat_hash));
g_ptr_array_set_size (merged, 0);
- g_hash_table_foreach (cat_hash, append_category_cb, &merged);
+ g_hash_table_foreach (cat_hash, append_category_cb, merged);
g_hash_table_destroy (cat_hash);
cal_search_bar_set_categories (CAL_SEARCH_BAR (priv->search_bar), merged);