From 5c2e292a57bbdd2465f1580d6fa9401b6a8b614a Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Fri, 27 Aug 2004 18:10:22 +0000 Subject: Fixes #62911, #54101 2004-08-27 JP Rosevear Fixes #62911, #54101 * gui/e-itip-control.c (set_ok_sens): util routine to set sensitivity of OK button (cal_opened_cb): cal back when calendar opens, sensitize ok button (start_calendar_server): open async and take call back arg (source_selected_cb): desensitize ok button until calendar is loaded (find_cal_opened_cb): check to see if the calendar contains the object we are looking for, if none do show the source selector option menu (find_server): search async for the server (destroy): clean up html widget (finalize): instead of here (get_publish_options): use only object tag (get_request_options): ditto (get_request_fb_options): ditto (get_reply_options): ditto (get_refresh_options): ditto (get_cancel_options): ditto (show_current_event): use new options, remove groupwise NEEDS ACTION check, handle async loading (show_current_todo): use new options, handle async loading (option_activated_cb): record action (add_option): add action item (insert_boxes): layout widgets (insert_label): insert label (rsvp_clicked_cb): record rsvp status (insert_rsvp): insert rsvp check box (insert_ok): insert ok button (publish_options_object): spit out relevant options (request_options_object): ditto (freebusy_options_object): ditto (reply_options_object): ditto (refresh_options_object): ditto (cancel_options_object): ditto (object_requested_cb): handle object requests (ok_clicked_cb): use recorded actions svn path=/trunk/; revision=27043 --- calendar/gui/e-itip-control.c | 821 +++++++++++++++++++++++++++++------------- 1 file changed, 564 insertions(+), 257 deletions(-) (limited to 'calendar/gui/e-itip-control.c') diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 23ca5f9301..983b56b4e0 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -66,6 +67,13 @@ struct _EItipControlPrivate { ECal *current_ecal; ECalSourceType type; + char action; + gboolean rsvp; + + GtkWidget *ok; + GtkWidget *hbox; + GtkWidget *vbox; + char *vcalendar; ECalComponent *comp; icalcomponent *main_comp; @@ -90,6 +98,8 @@ struct _EItipControlPrivate { gboolean destroyed; }; +#define ACTION_DATA "EItipControl:Action" + /* HTML Strings */ #define HTML_BODY_START "" #define HTML_SEP "

" @@ -101,9 +111,10 @@ static void init (EItipControl *itip); static void destroy (GtkObject *obj); static void finalize (GObject *obj); +static void find_my_address (EItipControl *itip, icalcomponent *ical_comp, icalparameter_partstat *status); static void url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data); static gboolean object_requested_cb (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data); -static void ok_clicked_cb (GtkHTML *html, const gchar *method, const gchar *url, const gchar *encoding, gpointer data); +static void ok_clicked_cb (GtkWidget *widget, gpointer data); static GtkVBoxClass *parent_class = NULL; @@ -126,28 +137,78 @@ class_init (EItipControlClass *klass) object_class->finalize = finalize; } +static void +set_ok_sens (EItipControl *itip) +{ + EItipControlPrivate *priv; + gboolean read_only = TRUE; + + priv = itip->priv; + + if (!priv->ok) + return; + + if (priv->current_ecal) + e_cal_is_read_only (priv->current_ecal, &read_only, NULL); + + gtk_widget_set_sensitive (priv->ok, priv->current_ecal != NULL && !read_only); +} + +static void +cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data) +{ + EItipControl *itip = data; + EItipControlPrivate *priv; + ESource *source; + ECalSourceType source_type; + icaltimezone *zone; + + priv = itip->priv; + + source_type = e_cal_get_source_type (ecal); + source = e_cal_get_source (ecal); + + g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, cal_opened_cb, NULL); + + if (status != E_CALENDAR_STATUS_OK) { + g_hash_table_remove (priv->ecals[source_type], e_source_peek_uid (source)); + + return; + } + + g_message ("Opened single calendar"); + + zone = calendar_config_get_icaltimezone (); + e_cal_set_default_timezone (ecal, zone, NULL); + + priv->current_ecal = ecal; + set_ok_sens (itip); +} + +typedef void (* EItipControlOpenFunc) (ECal *ecal, ECalendarStatus status, gpointer data); + static ECal * -start_calendar_server (EItipControl *itip, ESource *source, ECalSourceType type) +start_calendar_server (EItipControl *itip, ESource *source, ECalSourceType type, EItipControlOpenFunc func, gpointer data) { EItipControlPrivate *priv; ECal *ecal; - icaltimezone *zone; priv = itip->priv; ecal = g_hash_table_lookup (priv->ecals[type], e_source_peek_uid (source)); - if (ecal) - return ecal; + if (ecal) { + priv->current_ecal = ecal; + set_ok_sens (itip); + return ecal; + } ecal = auth_new_cal_from_source (source, type); - if (!e_cal_open (ecal, TRUE, NULL)) - return NULL; - - zone = calendar_config_get_icaltimezone (); - e_cal_set_default_timezone (ecal, zone, NULL); + g_signal_connect (G_OBJECT (ecal), "cal_opened", G_CALLBACK (func), data); g_hash_table_insert (priv->ecals[type], g_strdup (e_source_peek_uid (source)), ecal); + e_cal_open_async (ecal, TRUE); + return ecal; } @@ -164,16 +225,123 @@ start_calendar_server_by_uid (EItipControl *itip, const char *uid, ECalSourceTyp source = e_source_list_peek_source_by_uid (priv->source_lists[i], uid); if (source) - return start_calendar_server (itip, source, type); + return start_calendar_server (itip, source, type, cal_opened_cb, itip); } return NULL; } -static ECal * -find_server (EItipControl *itip, ECalComponent *comp) +typedef struct { + EItipControl *itip; + char *uid; + int count; + gboolean show_selector; +} EItipControlFindData; + +static void +source_selected_cb (ESourceOptionMenu *esom, ESource *source, gpointer data) +{ + EItipControl *itip = data; + EItipControlPrivate *priv; + + priv = itip->priv; + + if (priv->ok) + gtk_widget_set_sensitive (priv->ok, FALSE); + + start_calendar_server (itip, source, priv->type, cal_opened_cb, itip); +} + +static void +find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data) { + EItipControlFindData *fd = data; EItipControlPrivate *priv; + ESource *source; + ECalSourceType source_type; + icalcomponent *icalcomp; + icaltimezone *zone; + + source_type = e_cal_get_source_type (ecal); + source = e_cal_get_source (ecal); + + priv = fd->itip->priv; + + fd->count--; + + g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, find_cal_opened_cb, NULL); + + if (status != E_CALENDAR_STATUS_OK) { + g_hash_table_remove (priv->ecals[source_type], e_source_peek_uid (source)); + + goto cleanup; + } + + g_message ("Opened find calendar"); + + if (e_cal_get_object (ecal, fd->uid, NULL, &icalcomp, NULL)) { + icalcomponent_free (icalcomp); + + priv->current_ecal = ecal; + set_ok_sens (fd->itip); + } + + zone = calendar_config_get_icaltimezone (); + e_cal_set_default_timezone (ecal, zone, NULL); + + cleanup: + if (fd->count == 0) { + if (fd->show_selector && !priv->current_ecal && priv->vbox) { + GtkWidget *esom; + ESource *source = NULL; + char *uid; + + switch (priv->type) { + case E_CAL_SOURCE_TYPE_EVENT: + uid = calendar_config_get_primary_calendar (); + break; + case E_CAL_SOURCE_TYPE_TODO: + uid = calendar_config_get_primary_tasks (); + break; + default: + uid = NULL; + g_assert_not_reached (); + } + + if (uid) { + source = e_source_list_peek_source_by_uid (priv->source_lists[priv->type], uid); + g_free (uid); + } + + /* Try to create a default if there isn't one */ + if (!source) + source = e_source_list_peek_source_any (priv->source_lists[priv->type]); + + esom = e_source_option_menu_new (priv->source_lists[priv->type]); + g_signal_connect_object (esom, "source_selected", + G_CALLBACK (source_selected_cb), + fd->itip, 0); + + gtk_box_pack_start (GTK_BOX (priv->vbox), esom, FALSE, TRUE, 0); + gtk_widget_show (esom); + + /* FIXME What if there is no source? */ + if (source) + e_source_option_menu_select (E_SOURCE_OPTION_MENU (esom), source); + } else { + /* FIXME Display error message to user */ + } + + g_free (fd->uid); + g_free (fd); + } +} + +static void +find_server (EItipControl *itip, ECalComponent *comp, gboolean show_selector) +{ + EItipControlPrivate *priv; + EItipControlFindData *fd = NULL; GSList *groups, *l; const char *uid; @@ -192,20 +360,20 @@ find_server (EItipControl *itip, ECalComponent *comp) for (m = sources; m; m = m->next) { ESource *source; ECal *ecal; - icalcomponent *icalcomp; source = m->data; - ecal = start_calendar_server (itip, source, priv->type); - if (ecal && e_cal_get_object (ecal, uid, NULL, &icalcomp, NULL)) { - icalcomponent_free (icalcomp); - - return ecal; + if (!fd) { + fd = g_new0 (EItipControlFindData, 1); + fd->itip = itip; + fd->uid = g_strdup (uid); + fd->show_selector = show_selector; } + fd->count++; + + ecal = start_calendar_server (itip, source, priv->type, find_cal_opened_cb, fd); } } - - return NULL; } static void @@ -266,7 +434,7 @@ init (EItipControl *itip) gtk_widget_show (scrolled_window); gtk_container_add (GTK_CONTAINER (scrolled_window), priv->html); - gtk_object_weakref (GTK_OBJECT (priv->html), html_destroyed, itip); + g_object_weak_ref (G_OBJECT (priv->html), (GWeakNotify)html_destroyed, itip); gtk_widget_set_usize (scrolled_window, 600, 400); gtk_box_pack_start (GTK_BOX (itip), scrolled_window, FALSE, FALSE, 6); @@ -326,9 +494,14 @@ destroy (GtkObject *obj) { EItipControl *itip = E_ITIP_CONTROL (obj); EItipControlPrivate *priv; - + priv = itip->priv; + if (priv->html) { + g_signal_handlers_disconnect_matched (priv->html, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, itip); + g_object_weak_unref (G_OBJECT (priv->html), (GWeakNotify)html_destroyed, itip); + } + priv->destroyed = TRUE; (* GTK_OBJECT_CLASS (parent_class)->destroy) (obj); @@ -345,9 +518,6 @@ finalize (GObject *obj) clean_up (itip); - if (priv->html) - gtk_object_weakunref (GTK_OBJECT (priv->html), html_destroyed, itip); - priv->accounts = NULL; for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++) { @@ -1040,99 +1210,33 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title, static char* -get_publish_options (gboolean selector) -{ - char *html; - - html = g_strdup_printf ("", - _("Choose an action:"), - _("Update"), - _("OK")); - - if (selector) { - char *sel; - - sel = g_strconcat (html, "