aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/dialogs/meeting-page.c7
2 files changed, 12 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 016b1f0422..6e847e6de4 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-09 Zbigniew Chyla <cyba@gnome.pl>
+
+ * gui/dialogs/meeting-page.c
+ (meeting_page_fill_widgets): Convert strings to GTK+ encoding.
+ (meeting_page_destroy): Free allocated strings before freeing the list
+ itself.
+
2001-11-08 JP Rosevear <jpr@ximian.com>
* gui/e-meeting-time-sel.c
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index 8f5f5f6e68..51cfe045d9 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -254,6 +254,7 @@ meeting_page_destroy (GtkObject *object)
g_ptr_array_free (priv->deleted_attendees, FALSE);
itip_addresses_free (priv->addresses);
+ g_list_foreach (priv->address_strings, (GFunc) g_free, NULL);
g_list_free (priv->address_strings);
gtk_object_unref (GTK_OBJECT (priv->model));
@@ -352,10 +353,12 @@ meeting_page_fill_widgets (CompEditorPage *page, CalComponent *comp)
priv->addresses = itip_addresses_get ();
for (l = priv->addresses; l != NULL; l = l->next) {
ItipAddress *a = l->data;
+ char *s;
- priv->address_strings = g_list_append (priv->address_strings, a->full);
+ s = e_utf8_to_gtk_string (GTK_COMBO (priv->organizer)->entry, a->full);
+ priv->address_strings = g_list_append (priv->address_strings, s);
if (a->default_address)
- priv->default_address = a->full;
+ priv->default_address = s;
}
gtk_combo_set_popdown_strings (GTK_COMBO (priv->organizer), priv->address_strings);