From c922073e07108cd81b51ff10cc6e26fb08bfd66d Mon Sep 17 00:00:00 2001 From: Suman Manjunath Date: Sat, 5 Jan 2008 16:42:34 +0000 Subject: Fixes bug #270605 (Hide disabled accounts in memo-editor) + Show organizers of assigned tasks correctly. svn path=/trunk/; revision=34763 --- calendar/gui/dialogs/event-page.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'calendar/gui/dialogs/event-page.c') diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 2c1eea16ce..10dbd5cbec 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -83,7 +83,6 @@ struct _EventPagePrivate { EAccountList *accounts; GList *address_strings; EMeetingAttendee *ia; - char *default_address; char *user_add; ECalComponent *comp; @@ -256,7 +255,6 @@ event_page_init (EventPage *epage) priv->accounts = NULL; priv->address_strings = NULL; priv->ia = NULL; - priv->default_address = NULL; priv->invite = NULL; priv->model = NULL; @@ -3136,6 +3134,7 @@ event_page_select_organizer (EventPage *epage, const char *backend_address) GList *l; EAccount *def_account; gchar *def_address = NULL; + const char *default_address; gboolean subscribed_cal = FALSE; ESource *source = NULL; const char *user_addr = NULL; @@ -3155,25 +3154,27 @@ event_page_select_organizer (EventPage *epage, const char *backend_address) else user_addr = (backend_address && *backend_address) ? backend_address : NULL; - priv->default_address = NULL; + default_address = NULL; if (user_addr) - for (l = priv->address_strings; l != NULL && user_addr; l = l->next) + for (l = priv->address_strings; l != NULL; l = l->next) if (g_strrstr ((gchar *) l->data, user_addr) != NULL) { - priv->default_address = (gchar *) l->data; + default_address = (const char *) l->data; break; } - if (!priv->default_address && def_address) - priv->default_address = def_address; + if (!default_address && def_address) + default_address = def_address; - if (priv->default_address) { + if (default_address) { if (!priv->comp || !e_cal_component_has_organizer (priv->comp)) { - gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->organizer)->entry), priv->default_address); + gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->organizer)->entry), default_address); /* FIXME: Use accessor functions to access private members of a GtkCombo widget */ gtk_widget_set_sensitive (GTK_WIDGET (GTK_COMBO (priv->organizer)->button), !subscribed_cal); } } else g_warning ("No potential organizers!"); + + g_free (def_address); } /** @@ -3224,7 +3225,6 @@ event_page_construct (EventPage *epage, EMeetingStore *model, ECal *client) a = (EAccount *)e_iterator_get(it); - /* skip disabled accounts */ if (!a->enabled) continue; -- cgit v1.2.3