From f69d5ec14310f4903a8b88224f7c82cfa1de014a Mon Sep 17 00:00:00 2001 From: Iain Holmes Date: Wed, 22 Nov 2000 00:34:39 +0000 Subject: Big patch. Evolution-services rewrite, services updated for new system, Big patch. Evolution-services rewrite, services updated for new system, Fixes to Executive Summary and other things. See some changelogs svn path=/trunk/; revision=6644 --- executive-summary/component/Makefile.am | 1 - executive-summary/component/e-summary-factory.c | 89 +-- executive-summary/component/e-summary-factory.h | 4 +- executive-summary/component/e-summary-url.c | 206 ++++-- executive-summary/component/e-summary.c | 911 ++++++++++++++++++------ executive-summary/component/e-summary.h | 55 +- 6 files changed, 855 insertions(+), 411 deletions(-) (limited to 'executive-summary/component') diff --git a/executive-summary/component/Makefile.am b/executive-summary/component/Makefile.am index 937b58c8fa..ba77a68238 100644 --- a/executive-summary/component/Makefile.am +++ b/executive-summary/component/Makefile.am @@ -61,7 +61,6 @@ evolution_executive_summary_LDADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/executive-summary/evolution-services/libevolution-services.la \ - $(top_builddir)/executive-summary/widgets/libesummary-widgets.a \ $(BONOBO_VFS_GNOME_LIBS) \ $(EXTRA_GNOME_LIBS) \ $(GTKHTML_LIBS) \ diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c index cf4f010fdc..3f3a3bba89 100644 --- a/executive-summary/component/e-summary-factory.c +++ b/executive-summary/component/e-summary-factory.c @@ -42,11 +42,9 @@ #include "e-summary.h" #include "Evolution.h" -#include #include -#include #include -#include +#include static GList *control_list = NULL; @@ -170,51 +168,6 @@ control_destroy_cb (BonoboControl *control, gtk_object_destroy (GTK_OBJECT (esummary)); } -static void -update (ExecutiveSummary *summary, - int id, - const char *html, - ESummary *esummary) -{ - ExecutiveSummaryComponentView *view; - - view = e_summary_view_from_id (esummary, id); - executive_summary_component_view_set_html (view, html); - e_summary_update_window (esummary, summary, html); -} - -static void -set_title (ExecutiveSummary *summary, - int id, - const char *title, - ESummary *esummary) -{ - ExecutiveSummaryComponentView *view; - - view = e_summary_view_from_id (esummary, id); - executive_summary_component_view_set_title (view, title); -} - -static void -flash (ExecutiveSummary *summary, - int id, - gpointer user_data) -{ - g_print ("FLASH!\n"); -} - -static void -view_destroyed (ExecutiveSummaryComponentView *view, - ExecutiveSummaryComponentClient *client) -{ - int id; - - g_print ("%s\n", __FUNCTION__); - id = executive_summary_component_view_get_id (view); - g_print ("%d\n", id); - executive_summary_component_client_destroy_view (client, view); -} - /* A ********very******** temporary function to embed something */ @@ -222,7 +175,7 @@ void embed_service (GtkWidget *widget, ESummary *esummary) { - char *required_interfaces[2] = {"IDL:GNOME/Evolution:SummaryComponent:1.0", + char *required_interfaces[2] = {"IDL:GNOME/Evolution:Summary:ComponentFactory:1.0", NULL}; char *obj_id; @@ -234,37 +187,23 @@ embed_service (GtkWidget *widget, e_summary_factory_embed_service_from_id (esummary, obj_id); } -void +ESummaryWindow * e_summary_factory_embed_service_from_id (ESummary *esummary, const char *obj_id) { - ExecutiveSummaryComponentClient *client; - ExecutiveSummary *summary; - ExecutiveSummaryComponentView *view; - int id; - - client = executive_summary_component_client_new (obj_id); + GNOME_Evolution_Summary_Component component; + ExecutiveSummaryComponentFactoryClient *client; + ESummaryWindow *window; + CORBA_Environment ev; + + client = executive_summary_component_factory_client_new (obj_id); + + component = executive_summary_component_factory_client_create_view (client); - g_return_if_fail (client != NULL); - - /* Set the owner */ - summary = EXECUTIVE_SUMMARY (executive_summary_new ()); - executive_summary_component_client_set_owner (client, summary); - gtk_signal_connect (GTK_OBJECT (summary), "flash", - GTK_SIGNAL_FUNC (flash), esummary); - gtk_signal_connect (GTK_OBJECT (summary), "set_title", - GTK_SIGNAL_FUNC (set_title), esummary); - gtk_signal_connect (GTK_OBJECT (summary), "update", - GTK_SIGNAL_FUNC (update), esummary); - - /* Create view */ - id = executive_summary_component_create_unique_id (); - view = executive_summary_component_client_create_view (client, id); - gtk_signal_connect (GTK_OBJECT (view), "destroy", - GTK_SIGNAL_FUNC (view_destroyed), client); - - e_summary_add_service (esummary, summary, view, obj_id); + window = e_summary_add_service (esummary, component, obj_id); e_summary_rebuild_page (esummary); + + return window; } BonoboControl * diff --git a/executive-summary/component/e-summary-factory.h b/executive-summary/component/e-summary-factory.h index 4c704e46ee..a9489d06a4 100644 --- a/executive-summary/component/e-summary-factory.h +++ b/executive-summary/component/e-summary-factory.h @@ -29,7 +29,7 @@ BonoboControl *e_summary_factory_new_control (const char *uri, const GNOME_Evolution_Shell shell); -void e_summary_factory_embed_service_from_id (ESummary *esummary, - const char *obj_id); +ESummaryWindow *e_summary_factory_embed_service_from_id (ESummary *esummary, + const char *obj_id); #endif diff --git a/executive-summary/component/e-summary-url.c b/executive-summary/component/e-summary-url.c index 9dfff28713..f99db8b42e 100644 --- a/executive-summary/component/e-summary-url.c +++ b/executive-summary/component/e-summary-url.c @@ -39,7 +39,6 @@ #include "e-summary-url.h" #include "e-summary-util.h" -#include #include "Composer.h" typedef enum _ESummaryProtocol { @@ -101,7 +100,8 @@ e_summary_url_request (GtkHTML *html, gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR); return; } - + + g_print ("Filename: %s\n", filename); result = gnome_vfs_open (&handle, filename, GNOME_VFS_OPEN_READ); if (result != GNOME_VFS_OK) { @@ -143,10 +143,10 @@ parse_uri (const char *uri, ESummaryProtocol protocol, ESummary *esummary) { - ExecutiveSummaryComponentView *view; char *parsed; char *p; - int id; + int address; + ESummaryWindow *window; switch (protocol) { @@ -184,39 +184,39 @@ parse_uri (const char *uri, break; case PROTOCOL_CLOSE: - id = atoi (uri + 8); - view = e_summary_view_from_id (esummary, id); - parsed = g_strdup (executive_summary_component_view_get_title (view)); + address = atoi (uri + 8); + window = (ESummaryWindow *) GINT_TO_POINTER (address); + parsed = g_strdup (window->title); break; case PROTOCOL_LEFT: - id = atoi (uri + 7); - view = e_summary_view_from_id (esummary, id); - parsed = g_strdup (executive_summary_component_view_get_title (view)); + address = atoi (uri + 7); + window = (ESummaryWindow *) GINT_TO_POINTER (address); + parsed = g_strdup (window->title); break; case PROTOCOL_RIGHT: - id = atoi (uri + 8); - view = e_summary_view_from_id (esummary, id); - parsed = g_strdup (executive_summary_component_view_get_title (view)); + address = atoi (uri + 8); + window = (ESummaryWindow *) GINT_TO_POINTER (address); + parsed = g_strdup (window->title); break; case PROTOCOL_UP: - id = atoi (uri + 5); - view = e_summary_view_from_id (esummary, id); - parsed = g_strdup (executive_summary_component_view_get_title (view)); + address = atoi (uri + 5); + window = (ESummaryWindow *) GINT_TO_POINTER (address); + parsed = g_strdup (window->title); break; case PROTOCOL_DOWN: - id = atoi (uri + 7); - view = e_summary_view_from_id (esummary, id); - parsed = g_strdup (executive_summary_component_view_get_title (view)); + address = atoi (uri + 7); + window = (ESummaryWindow *) GINT_TO_POINTER (address); + parsed = g_strdup (window->title); break; case PROTOCOL_CONFIGURE: - id = atoi (uri + 12); - view = e_summary_view_from_id (esummary, id); - parsed = g_strdup (executive_summary_component_view_get_title (view)); + address = atoi (uri + 12); + window = (ESummaryWindow *) GINT_TO_POINTER (address); + parsed = g_strdup (window->title); break; case PROTOCOL_NONE: @@ -325,10 +325,9 @@ e_summary_url_click (GtkWidget *widget, ESummary *esummary) { ESummaryProtocol protocol; - ExecutiveSummaryComponentView *view; - gpointer window; /* FIXME */ char *parsed; - int id; + int address; + ESummaryWindow *window; protocol = get_protocol (url); @@ -352,22 +351,20 @@ e_summary_url_click (GtkWidget *widget, case PROTOCOL_CLOSE: /* Close the window. */ - id = atoi (url + 8); - view = e_summary_view_from_id (esummary, id); - if (view == NULL) + address = atoi (url + 8); + window = (ESummaryWindow *) GINT_TO_POINTER (address); + if (window->iid == NULL) return; - window = e_summary_window_from_view (esummary, view); - e_summary_window_remove_from_ht (window, esummary); - e_summary_window_free (window, esummary); + e_summary_remove_window (esummary, window); e_summary_rebuild_page (esummary); break; case PROTOCOL_CONFIGURE: /* Configure the window. . . */ - id = atoi (url + 12); - view = e_summary_view_from_id (esummary, id); - if (view == NULL) + address = atoi (url + 12); + window = (ESummaryWindow *) GINT_TO_POINTER (address); + if (window->iid == NULL) return; /* Issue the configure command some how :) */ @@ -375,50 +372,41 @@ e_summary_url_click (GtkWidget *widget, case PROTOCOL_LEFT: /* Window left */ - id = atoi (url + 7); - view = e_summary_view_from_id (esummary, id); - - if (view == NULL) + address = atoi (url + 7); + window = (ESummaryWindow *) GINT_TO_POINTER (address); + if (window->iid == NULL) return; - window = e_summary_window_from_view (esummary, view); - e_summary_window_move_left (esummary, window); e_summary_rebuild_page (esummary); break; case PROTOCOL_RIGHT: - id = atoi (url + 8); - view = e_summary_view_from_id (esummary, id); - if (view == NULL) + address = atoi (url + 8); + window = (ESummaryWindow *) GINT_TO_POINTER (address); + if (window->iid == NULL) return; - window = e_summary_window_from_view (esummary, view); - e_summary_window_move_right (esummary, window); e_summary_rebuild_page (esummary); break; case PROTOCOL_UP: - id = atoi (url + 5); - view = e_summary_view_from_id (esummary, id); - if (view == NULL) + address = atoi (url + 5); + window = (ESummaryWindow *) GINT_TO_POINTER (address); + if (window->iid == NULL) return; - window = e_summary_window_from_view (esummary, view); - e_summary_window_move_up (esummary, window); e_summary_rebuild_page (esummary); break; case PROTOCOL_DOWN: - id = atoi (url + 7); - view = e_summary_view_from_id (esummary, id); - if (view == NULL) + address = atoi (url + 7); + window = (ESummaryWindow *) GINT_TO_POINTER (address); + if (window->iid == NULL) return; - window = e_summary_window_from_view (esummary, view); - e_summary_window_move_down (esummary, window); e_summary_rebuild_page (esummary); break; @@ -437,16 +425,75 @@ e_summary_url_click (GtkWidget *widget, g_free (parsed); } +static void +parse_mail_url (char *url, + GList **cc, + GList **bcc, + char **subject) +{ + char **options; + int i = 0; + + options = g_strsplit (url, "&", 0); + while (options[i] != NULL) { + char **params; + + params = g_strsplit (options[i], "=", 2); + if (strcmp (params[0], "subject") == 0) { + *subject = g_strdup (params[1]); + } else if (strcmp (params[0], "cc") == 0) { + *cc = g_list_prepend (*cc, g_strdup (params[1])); + } else if (strcmp (params[1], "bcc") == 0) { + *bcc = g_list_prepend (*bcc, g_strdup (params[1])); + } + + g_strfreev (params); + i++; + } + + g_strfreev (options); + /* Reverse the list so it's in the correct order */ + *cc = g_list_reverse (*cc); + *bcc = g_list_reverse (*bcc); +} + +static void +recipients_from_list (GNOME_Evolution_Composer_RecipientList *recipients, + GList *list) +{ + GList *t; + int i; + + for (i = 0, t = list; t; i++, t = t->next) { + GNOME_Evolution_Composer_Recipient *recipient; + char *address = (char *)t->data; + + recipient = recipients->_buffer + i; + recipient->name = CORBA_string_dup (""); + recipient->address = CORBA_string_dup (address ? address : ""); + } +} + +static void +free_list (GList *list) +{ + for (; list; list = list->next) { + g_free (list->data); + } +} + gboolean e_summary_url_mail_compose (ESummary *esummary, const char *url) { CORBA_Object composer; CORBA_Environment ev; + char *full_address, *address, *proto, *q; GNOME_Evolution_Composer_RecipientList *to, *cc, *bcc; GNOME_Evolution_Composer_Recipient *recipient; - char *address, *proto; CORBA_char *subject; + GList *gcc = NULL, *gbcc = NULL; + char *gsubject = NULL; CORBA_exception_init (&ev); @@ -459,12 +506,20 @@ e_summary_url_mail_compose (ESummary *esummary, } if ( (proto = strstr (url, "://")) != NULL){ - address = proto + 3; + full_address = proto + 3; } else { if (strncmp (url, "mailto:", 7) == 0) - address = (char *) (url + 7); + full_address = (char *) (url + 7); else - address = (char *) url; + full_address = (char *) url; + } + + q = strchr (full_address, '?'); + if (q != NULL) { + address = g_strndup (full_address, q - full_address); + parse_mail_url (q + 1, &gcc, &gbcc, &gsubject); + } else { + address = g_strdup (full_address); } to = GNOME_Evolution_Composer_RecipientList__alloc (); @@ -475,31 +530,48 @@ e_summary_url_mail_compose (ESummary *esummary, recipient = to->_buffer; recipient->name = CORBA_string_dup (""); recipient->address = CORBA_string_dup (address?address:""); - + g_free (address); + /* FIXME: Get these out of the URL */ cc = GNOME_Evolution_Composer_RecipientList__alloc (); - cc->_length = 0; - cc->_maximum = 0; + cc->_length = g_list_length (gcc); + cc->_maximum = cc->_length; cc->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (cc->_maximum); + recipients_from_list (cc, gcc); + free_list (gcc); + g_list_free (gcc); + bcc = GNOME_Evolution_Composer_RecipientList__alloc (); - bcc->_length = 0; - bcc->_maximum = 0; + bcc->_length = g_list_length (gbcc); + bcc->_maximum = bcc->_length; bcc->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (bcc->_maximum); - subject = CORBA_string_dup (""); - + recipients_from_list (bcc, gbcc); + free_list (gbcc); + g_list_free (gbcc); + + subject = CORBA_string_dup (gsubject ? gsubject : ""); + g_free (gsubject); + CORBA_exception_init (&ev); GNOME_Evolution_Composer_setHeaders (composer, to, cc, bcc, subject, &ev); if (ev._major != CORBA_NO_EXCEPTION) { CORBA_exception_free (&ev); CORBA_free (to); + CORBA_free (cc); + CORBA_free (bcc); + CORBA_free (subject); + g_warning ("%s(%d): Error setting headers", __FUNCTION__, __LINE__); return FALSE; } CORBA_free (to); - + CORBA_free (cc); + CORBA_free (bcc); + CORBA_free (subject); + CORBA_exception_init (&ev); GNOME_Evolution_Composer_show (composer, &ev); if (ev._major != CORBA_NO_EXCEPTION) { diff --git a/executive-summary/component/e-summary.c b/executive-summary/component/e-summary.c index f8de1752be..e9bf104fd1 100644 --- a/executive-summary/component/e-summary.c +++ b/executive-summary/component/e-summary.c @@ -34,6 +34,8 @@ #include #include #include +#include +#include #include "e-summary.h" #include "e-summary-factory.h" @@ -42,6 +44,10 @@ #define PARENT_TYPE (gtk_vbox_get_type ()) +#define STORAGE_TYPE "efs" +#define IID_FILE "oaf.id" +#define DATA_FILE "data" + /* From component-factory.c */ extern char *evolution_dir; @@ -54,15 +60,17 @@ struct _ESummaryPrivate { GtkWidget *html_scroller; GtkWidget *html; - GHashTable *id_to_view; - GHashTable *view_to_window; - GHashTable *summary_to_window; - GList *window_list; - guint idle; GtkHTMLStream *stream; gboolean grabbed; + + GList *window_list; + + char *header; + int header_len; + char *footer; + int footer_len; }; static gboolean on_object_requested (GtkHTML *html, @@ -72,23 +80,29 @@ static void e_summary_save_state (ESummary *esummary, const char *path); static void e_summary_load_state (ESummary *esummary, const char *path); - -/* GtkObject methods */ -static void -s2w_foreach (gpointer *key, - gpointer *value, - ESummary *esummary) -{ - e_summary_window_free ((ESummaryWindow *) value, esummary); - g_free (value); -} +/* Used to distinguish dead windows */ +static ESummaryWindow dead_window = { + CORBA_OBJECT_NIL, + CORBA_OBJECT_NIL, + CORBA_OBJECT_NIL, + CORBA_OBJECT_NIL, + CORBA_OBJECT_NIL, + CORBA_OBJECT_NIL, + NULL, + NULL, + NULL, + NULL +}; + +/* GtkObject methods */ static void e_summary_destroy (GtkObject *object) { ESummary *esummary = E_SUMMARY (object); ESummaryPrivate *priv; + GList *l; char *prefix; priv = esummary->private; @@ -99,12 +113,12 @@ e_summary_destroy (GtkObject *object) e_summary_save_state (esummary, prefix); g_free (prefix); - g_hash_table_foreach (priv->summary_to_window, - (GHFunc) s2w_foreach, esummary); - g_hash_table_destroy (priv->summary_to_window); - g_hash_table_destroy (priv->id_to_view); - g_hash_table_destroy (priv->view_to_window); + for (l = priv->window_list; l; l = l->next) + e_summary_window_free (l->data); + g_list_free (priv->window_list); + g_free (priv->header); + g_free (priv->footer); g_free (esummary->private); esummary->private = NULL; @@ -120,51 +134,64 @@ e_summary_class_init (GtkObjectClass *object_class) } static void -e_summary_start_load (ESummary *summary) +e_summary_start_load (ESummary *esummary) { ESummaryPrivate *priv; - char *header = ""; - priv = summary->private; + g_return_if_fail (esummary != NULL); + g_return_if_fail (IS_E_SUMMARY (esummary)); + + priv = esummary->private; priv->stream = gtk_html_begin (GTK_HTML (priv->html)); /* Hack to stop page returning to the top */ GTK_HTML (priv->html)->engine->newPage = FALSE; - - gtk_html_write (GTK_HTML (priv->html), priv->stream, - header, strlen (header)); } static void -load_default (ESummary *summary) +load_default_header (ESummary *esummary) { ESummaryPrivate *priv; - char *def = "
" + char *def = "" + "
" "
" "
" "Submit a bug report" "
"; - g_return_if_fail (summary != NULL); - g_return_if_fail (IS_E_SUMMARY (summary)); + g_return_if_fail (esummary != NULL); + g_return_if_fail (IS_E_SUMMARY (esummary)); - priv = summary->private; + priv = esummary->private; g_return_if_fail (priv->stream != NULL); gtk_html_write (GTK_HTML (priv->html), priv->stream, def, strlen (def)); } - static void -e_summary_end_load (ESummary *summary) +load_default_footer (ESummary *esummary) { ESummaryPrivate *priv; char *footer = "

All Executive Summary comments to Iain Holmes (iain@helixcode.com)

"; - priv = summary->private; + g_return_if_fail (esummary != NULL); + g_return_if_fail (IS_E_SUMMARY (esummary)); + + priv = esummary->private; gtk_html_write (GTK_HTML (priv->html), priv->stream, footer, strlen (footer)); +} + +static void +e_summary_end_load (ESummary *esummary) +{ + ESummaryPrivate *priv; + + g_return_if_fail (esummary != NULL); + g_return_if_fail (IS_E_SUMMARY (esummary)); + + priv = esummary->private; gtk_html_end (GTK_HTML (priv->html), priv->stream, GTK_HTML_STREAM_OK); priv->stream = NULL; @@ -195,7 +222,7 @@ e_summary_init (ESummary *esummary) GTK_SIGNAL_FUNC (on_object_requested), esummary); gtk_signal_connect (GTK_OBJECT (priv->html), "link-clicked", GTK_SIGNAL_FUNC (e_summary_url_click), esummary); - gtk_signal_connect (GTK_OBJECT (priv->html), "on_url", + gtk_signal_connect (GTK_OBJECT (priv->html), "on-url", GTK_SIGNAL_FUNC (e_summary_url_over), esummary); gtk_container_add (GTK_CONTAINER (priv->html_scroller), priv->html); @@ -206,11 +233,6 @@ e_summary_init (ESummary *esummary) /* Pack stuff */ gtk_box_pack_start (GTK_BOX (esummary), priv->html_scroller, TRUE, TRUE, 0); - - /* Init hashtables */ - priv->summary_to_window = g_hash_table_new (NULL, NULL); - priv->id_to_view = g_hash_table_new (NULL, NULL); - priv->view_to_window = g_hash_table_new (NULL, NULL); } E_MAKE_TYPE (e_summary, "ESummary", ESummary, e_summary_class_init, @@ -237,40 +259,172 @@ e_summary_new (const GNOME_Evolution_Shell shell) return GTK_WIDGET (esummary); } +#if 0 +static void +control_unrealize (GtkHTMLEmbedded *eb, + GtkWidget *widget) +{ + g_print ("Removing\n"); +} + +static void +being_unrealized (GtkWidget *widget, + GtkHTMLEmbedded *eb) +{ + g_warning ("Widget is being unrealized"); + gtk_container_remove (GTK_CONTAINER (eb), widget); +} + +static void +being_realized (GtkWidget *widget, + gpointer user_data) +{ + gdk_window_ref (widget->window); +} +#endif + static gboolean on_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, - ESummary *summary) + ESummary *esummary) { - ESummaryWindow *window; - int type; +#if 0 + static GtkWidget *widget = NULL; + int id; - if (sscanf (eb->classid, "cid:%d-%p", &type, &window) != 2) { - g_warning ("Could not get the window reference\n"); + if (sscanf (eb->classid, "cid:%d", &id) != 1) { + g_warning ("Could not get the view id: eb->classid = %s", + eb->classid); return FALSE; } - switch (type) { - case 1: - g_assert_not_reached (); - break; - - case 2: - g_warning ("Bonobo services are not supported in this version."); - break; + if (widget == NULL || !GTK_IS_WIDGET (widget)) { + g_print ("Create new\n"); + widget = executive_summary_component_view_get_widget (view); +/* widget = gtk_button_new_with_label ("Hello?"); */ + gtk_signal_connect (GTK_OBJECT (widget), "realize", + GTK_SIGNAL_FUNC (being_realized), NULL); + gtk_signal_connect (GTK_OBJECT (widget), "unrealize", + GTK_SIGNAL_FUNC (being_unrealized), eb); + g_print ("New widget: %p\n", GTK_BIN (widget)->child); + } else { + g_print ("No new\n"); + } - default: - g_assert_not_reached (); + if (widget == NULL) { + g_warning ("View %d has no GtkWidget.", id); + return FALSE; } + gtk_signal_connect (GTK_OBJECT (eb), "unrealize", + GTK_SIGNAL_FUNC (control_unrealize), widget); + gtk_widget_show_all (widget); + gtk_widget_ref (widget); + + if (widget->parent == NULL) + gtk_container_add (GTK_CONTAINER (eb), widget); + return TRUE; +#endif +} + +/* Generates the window controls and works out + if they should be disabled or not */ +static char * +make_control_html (ESummaryWindow *window, + int row, + int col, + int numwindows) +{ + char *html, *tmp; + int id = GPOINTER_TO_INT (window); + gboolean u, d, l, r, config; + + u = d = l = r = config = TRUE; + + if (window->propertycontrol == CORBA_OBJECT_NIL) + config = FALSE; + + if (row == 0) /* Top row */ + u = FALSE; + + if (row >= numwindows - 3) /* Bottom row */ + d = FALSE; + + if (col == 0) /* Leftmost column */ + l = FALSE; + + if (col == 2 || ((row * 3) + col) == numwindows - 1) /* Rightmost column */ + r = FALSE; + + html = g_strdup_printf ("
" + "" + "", id); + + tmp = html; + if (!config) { + html = g_strdup_printf ("%s" + "
", tmp); + } else { + html = g_strdup_printf ("%s" + "" + "
", tmp, id); + } + g_free (tmp); + + tmp = html; + if (!l) { + html = g_strdup_printf ("%s" + "", tmp); + } else { + html = g_strdup_printf ("%s" + "" + "", tmp, id); + } + g_free (tmp); + + tmp = html; + if (!r) { + html = g_strdup_printf ("%s" + "
", tmp); + } else { + html = g_strdup_printf ("%s" + "" + "
", tmp, id); + } + g_free (tmp); + + tmp = html; + if (!d) { + html = g_strdup_printf ("%s" + "", tmp); + } else { + html = g_strdup_printf ("%s" + "" + "", tmp, id); + } + g_free (tmp); + + tmp = html; + if (!u) { + html = g_strdup_printf ("%s" + "
", tmp); + } else { + html = g_strdup_printf ("%s" + "" + "
", tmp, id); + } + g_free (tmp); + + return html; } static void e_summary_display_window (ESummary *esummary, ESummaryWindow *window, int row, - int col) + int col, + int numwindows) { ESummaryPrivate *priv; char *footer = ""; @@ -280,52 +434,50 @@ e_summary_display_window (ESummary *esummary, "edeeeb"}; char *title_colour[2] = {"bac1b6", "cdd1c7"}; - const char *title, *icon, *html; - int id; priv = esummary->private; - title = executive_summary_component_view_get_title (window->view); - icon = executive_summary_component_view_get_icon (window->view); - html = executive_summary_component_view_get_html (window->view); - id = executive_summary_component_view_get_id (window->view); - - /** FIXME: Make this faster by caching it? */ - - control_html = g_strdup_printf - ("" - "" - "" - "" - "" - "
" - "
", id, id, id, id, id, id); - + control_html = make_control_html (window, row, col, numwindows); title_html = g_strdup_printf ("" "
" - "" "
" + "" "
" "" "%s%s
", - title_colour[col % 2], icon, title, - control_html, colour[col % 2]); + title_colour[col % 2], window->icon, + window->title, control_html, + colour[col % 2]); g_free (control_html); gtk_html_write (GTK_HTML (priv->html), priv->stream, title_html, strlen (title_html)); g_free (title_html); - if (html != NULL && *html != '\0') { + if (window->html != CORBA_OBJECT_NIL) { + char *html; + CORBA_Environment ev; + + CORBA_exception_init (&ev); + html = GNOME_Evolution_Summary_HTMLView_getHtml (window->html, + &ev); + if (ev._major != CORBA_NO_EXCEPTION) { + g_warning ("Cannot get HTML."); + return; + } + CORBA_exception_free (&ev); + gtk_html_write (GTK_HTML (priv->html), priv->stream, html, strlen (html)); } else { - g_warning ("Bonobo executive summary components are not supported at this time."); #if 0 - body_cid = g_strdup_printf ("", window); + char *body_cid; + + body_cid = g_strdup_printf ("", id); gtk_html_write (GTK_HTML (priv->html), priv->stream, body_cid, strlen (body_cid)); + g_free (body_cid); #endif } @@ -340,6 +492,7 @@ e_summary_rebuild_page (ESummary *esummary) GList *windows; char *service_table = ""; int loc; + int numwindows; g_return_val_if_fail (esummary != NULL, FALSE); g_return_val_if_fail (IS_E_SUMMARY (esummary), FALSE); @@ -354,13 +507,20 @@ e_summary_rebuild_page (ESummary *esummary) gtk_layout_freeze (GTK_LAYOUT (priv->html)); e_summary_start_load (esummary); - load_default (esummary); + + if (priv->header == NULL) { + load_default_header (esummary); + } else { + gtk_html_write (GTK_HTML (priv->html), priv->stream, + priv->header, priv->header_len); + } /* Load the start of the services */ gtk_html_write (GTK_HTML (priv->html), priv->stream, service_table, strlen (service_table)); /* Load each of the services */ loc = 0; + numwindows = g_list_length (priv->window_list); for (windows = priv->window_list; windows; windows = windows->next) { ESummaryWindow *window; char *td = "", 5); loc++; @@ -388,6 +548,14 @@ e_summary_rebuild_page (ESummary *esummary) gtk_html_write (GTK_HTML (priv->html), priv->stream, "
"; @@ -380,7 +540,7 @@ e_summary_rebuild_page (ESummary *esummary) td, strlen (td)); e_summary_display_window (esummary, window, - (loc / 3), (loc % 3)); + (loc / 3), (loc % 3), numwindows); gtk_html_write (GTK_HTML (priv->html), priv->stream, "
", 13); + + if (priv->footer == NULL) { + load_default_footer (esummary); + } else { + gtk_html_write (GTK_HTML (priv->html), priv->stream, + priv->footer, priv->footer_len); + } + e_summary_end_load (esummary); gtk_layout_thaw (GTK_LAYOUT (priv->html)); @@ -395,169 +563,187 @@ e_summary_rebuild_page (ESummary *esummary) return FALSE; } -void -e_summary_add_service (ESummary *esummary, - ExecutiveSummary *summary, - ExecutiveSummaryComponentView *view, - const char *iid) +static void +prop_changed_cb (BonoboPropertyListener *listener, + char *name, + BonoboArg *arg, + ESummaryWindow *window) { - ESummaryWindow *window; - ESummaryPrivate *priv; - int id; - - g_return_if_fail (esummary != NULL); - g_return_if_fail (IS_E_SUMMARY (esummary)); - g_return_if_fail (summary != NULL); - g_return_if_fail (IS_EXECUTIVE_SUMMARY (summary)); - g_return_if_fail (view != NULL); - g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view)); - - window = g_new0 (ESummaryWindow, 1); - window->summary = summary; - window->iid = g_strdup (iid); - window->view = view; + if (strcmp (name, "window_title") == 0) { + if (window->title != NULL) + g_free (window->title); + window->title = g_strdup (BONOBO_ARG_GET_STRING (arg)); + return; + } - priv = esummary->private; - priv->window_list = g_list_append (priv->window_list, window); - g_hash_table_insert (priv->summary_to_window, summary, window); - - id = executive_summary_component_view_get_id (view); - g_hash_table_insert (priv->id_to_view, GINT_TO_POINTER (id), view); - g_hash_table_insert (priv->view_to_window, view, window); + if (strcmp (name, "window_icon") == 0) { + if (window->icon != NULL) + g_free (window->icon); + window->icon = g_strdup (BONOBO_ARG_GET_STRING (arg)); + return; + } } - -#if 0 -void -e_summary_add_html_service (ESummary *esummary, - ExecutiveSummary *summary, - ExecutiveSummaryComponentClient *client, - const char *html, - const char *title, - const char *icon) + +ESummaryWindow * +e_summary_add_service (ESummary *esummary, + GNOME_Evolution_Summary_Component component, + const char *iid) { ESummaryWindow *window; ESummaryPrivate *priv; + Bonobo_Unknown unknown = CORBA_OBJECT_NIL; + Bonobo_PropertyListener corba_listener; + CORBA_Environment ev; - window = g_new0 (ESummaryWindow, 1); - window->type = E_SUMMARY_WINDOW_HTML; - window->html = g_strdup (html); - window->title = g_strdup (title); - window->icon = icon ? g_strdup (icon) : NULL; - window->client = client; + g_return_val_if_fail (esummary != NULL, NULL); + g_return_val_if_fail (IS_E_SUMMARY (esummary), NULL); + g_return_val_if_fail (component != CORBA_OBJECT_NIL, NULL); - window->summary = summary; priv = esummary->private; - priv->window_list = g_list_append (priv->window_list, window); - - g_hash_table_insert (priv->summary_to_window, summary, window); -} -void -e_summary_add_bonobo_service (ESummary *esummary, - ExecutiveSummary *summary, - ExecutiveSummaryComponentClient *client, - GtkWidget *control, - const char *title, - const char *icon) -{ - ESummaryWindow *window; - ESummaryPrivate *priv; - window = g_new0 (ESummaryWindow, 1); - window->type = E_SUMMARY_WINDOW_BONOBO; - window->control = control; + window->component = component; + window->iid = g_strdup (iid); - window->client = client; + /* See what interfaces our component supports */ + CORBA_exception_init (&ev); + unknown = Bonobo_Unknown_queryInterface (component, + "IDL:Bonobo/Control:1.0", &ev); + window->control = (Bonobo_Control) unknown; + + unknown = Bonobo_Unknown_queryInterface (component, + "IDL:GNOME/Evolution/Summary/HTMLView:1.0", + &ev); + window->html = (GNOME_Evolution_Summary_HTMLView) unknown; + + /* Check at least one of the above interfaces was supported */ + if (window->html == CORBA_OBJECT_NIL && + window->control == CORBA_OBJECT_NIL) { + CORBA_Environment ev2; + g_warning ("This component does not support either" + "Bonobo/Control:1.0 or GNOME/Evolution/Summary/HTMLView:1.0"); + + CORBA_exception_init (&ev2); + CORBA_Object_release (component, &ev2); + CORBA_exception_free (&ev2); + + g_free (window); + return NULL; + } - window->title = g_strdup (title); - window->summary = summary; - window->icon = icon ? g_strdup (icon): NULL; + unknown = Bonobo_Unknown_queryInterface (component, + "IDL:Bonobo/PropertyBag:1.0", + &ev); + window->propertybag = (Bonobo_PropertyBag) unknown; + + unknown = Bonobo_Unknown_queryInterface (component, + "IDL:Bonobo/PersistStream:1.0", + &ev); + window->persiststream = (Bonobo_PersistStream) unknown; + + unknown = Bonobo_Unknown_queryInterface (component, + "IDL:Bonobo/PropertyControl:1.0", + &ev); + window->propertycontrol = (Bonobo_PropertyControl) unknown; + + /* Cache the title and icon */ + window->title = g_strdup (bonobo_property_bag_client_get_value_string ( + window->propertybag, + "window_title", + NULL)); + window->icon = g_strdup (bonobo_property_bag_client_get_value_string ( + window->propertybag, + "window_icon", NULL)); + /* Listen to changes */ + window->listener = bonobo_property_listener_new (); + gtk_signal_connect (GTK_OBJECT (window->listener), "prop_changed", + GTK_SIGNAL_FUNC (prop_changed_cb), window); + corba_listener = bonobo_object_corba_objref (BONOBO_OBJECT (window->listener)); + Bonobo_PropertyBag_addChangeListener (window->propertybag, + "window_title", + corba_listener, &ev); + + Bonobo_PropertyBag_addChangeListener (window->propertybag, + "window_icon", + corba_listener, &ev); + CORBA_exception_free (&ev); - priv = esummary->private; priv->window_list = g_list_append (priv->window_list, window); - g_hash_table_insert (priv->summary_to_window, summary, window); + return window; } -#endif void -e_summary_window_free (ESummaryWindow *window, - ESummary *esummary) +e_summary_window_free (ESummaryWindow *window) { - ESummaryPrivate *priv; + CORBA_Environment ev; g_return_if_fail (window != NULL); - g_return_if_fail (esummary != NULL); - g_return_if_fail (IS_E_SUMMARY (esummary)); - priv = esummary->private; g_free (window->iid); + g_free (window->icon); + g_free (window->title); - priv->window_list = g_list_remove (priv->window_list, window); + CORBA_exception_init (&ev); + Bonobo_Unknown_unref (window->component, &ev); + CORBA_Object_release (window->component, &ev); - bonobo_object_unref (BONOBO_OBJECT (window->summary)); - gtk_object_unref (GTK_OBJECT (window->view)); -} + if (window->control != CORBA_OBJECT_NIL) { + CORBA_Object_release (window->control, &ev); + } -/* Call this before e_summary_window_free, execpt when you are freeing - the hash table */ -void -e_summary_window_remove_from_ht (ESummaryWindow *window, - ESummary *esummary) -{ - ESummaryPrivate *priv; + if (window->html != CORBA_OBJECT_NIL) { + CORBA_Object_release (window->html, &ev); + } - priv = esummary->private; - g_hash_table_remove (priv->summary_to_window, window->summary); + if (window->propertybag != CORBA_OBJECT_NIL) { + CORBA_Object_release (window->propertybag, &ev); + } + + if (window->persiststream != CORBA_OBJECT_NIL) { + CORBA_Object_release (window->persiststream, &ev); + } + + if (window->propertycontrol != CORBA_OBJECT_NIL) { + CORBA_Object_release (window->propertycontrol, &ev); + } + + CORBA_exception_free (&ev); + + g_free (window); + + /* The contents of window are set to dead_window + so we know if we're trying to access a window + that no longer exists */ + *window = dead_window; } void -e_summary_update_window (ESummary *esummary, - ExecutiveSummary *summary, - const char *html) +e_summary_remove_window (ESummary *esummary, + ESummaryWindow *window) { ESummaryPrivate *priv; - + g_return_if_fail (esummary != NULL); g_return_if_fail (IS_E_SUMMARY (esummary)); - g_return_if_fail (summary != NULL); - - priv = esummary->private; - - if (priv->idle != 0) - return; - - priv->idle = g_idle_add ((GSourceFunc) e_summary_rebuild_page, esummary); -} - -ExecutiveSummaryComponentView * -e_summary_view_from_id (ESummary *esummary, - int id) -{ - ESummaryPrivate *priv; - ExecutiveSummaryComponentView *view; - - g_return_val_if_fail (esummary != NULL, NULL); - g_return_val_if_fail (IS_E_SUMMARY (esummary), NULL); - g_return_val_if_fail (id > 0, NULL); + g_return_if_fail (window != NULL); priv = esummary->private; - view = g_hash_table_lookup (priv->id_to_view, GINT_TO_POINTER (id)); - - return view; + priv->window_list = g_list_remove (priv->window_list, window); + e_summary_window_free (window); } - + void -e_summary_set_shell_view_interface (ESummary *summary, +e_summary_set_shell_view_interface (ESummary *esummary, GNOME_Evolution_ShellView svi) { ESummaryPrivate *priv; - g_return_if_fail (summary != NULL); - g_return_if_fail (IS_E_SUMMARY (summary)); + g_return_if_fail (esummary != NULL); + g_return_if_fail (IS_E_SUMMARY (esummary)); g_return_if_fail (svi != CORBA_OBJECT_NIL); - priv = summary->private; + priv = esummary->private; priv->shell_view_interface = svi; } @@ -653,73 +839,330 @@ e_summary_set_title (ESummary *esummary, CORBA_exception_free (&ev); } +static void +load_html_page (ESummary *esummary, + const char *filename) +{ + ESummaryPrivate *priv; + GnomeVFSHandle *handle = NULL; + GnomeVFSResult result; + GtkWidget *toplevel; + GString *string; + char *str, *comment; + + g_return_if_fail (esummary != NULL); + g_return_if_fail (IS_E_SUMMARY (esummary)); + + priv = esummary->private; + + /* Pass NULL to reset the page to the default */ + if (filename == NULL || *filename == '\0') { + g_free (priv->header); + g_free (priv->footer); + return; + } + + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (esummary)); + string = g_string_new (""); + result = gnome_vfs_open (&handle, filename, GNOME_VFS_OPEN_READ); + if (result != GNOME_VFS_OK) { + e_notice (GTK_WINDOW (toplevel), GNOME_MESSAGE_BOX_WARNING, + _("Cannot open the HTML file:\n%s"), filename); + return; + } + + while (1) { + char buffer[4096]; + GnomeVFSFileSize size; + + memset (buffer, 0x00, 4096); + result = gnome_vfs_read (handle, buffer, 4096, &size); + if (result != GNOME_VFS_OK && result != GNOME_VFS_ERROR_EOF) { + e_notice (GTK_WINDOW (toplevel), GNOME_MESSAGE_BOX_WARNING, + _("Error reading data:\n%s"), + gnome_vfs_result_to_string (result)); + gnome_vfs_close (handle); + return; + } + if (size == 0) + break; /* EOF */ + + string = g_string_append (string, buffer); + } + + gnome_vfs_close (handle); + str = string->str; + g_string_free (string, FALSE); + + comment = strstr (str, ""); + if (comment == NULL) { + e_notice (GTK_WINDOW (toplevel), GNOME_MESSAGE_BOX_WARNING, + _("File does not have a place for the services.\n")); + g_free (str); + return; + } + + priv->header = g_strndup (str, comment - str); + priv->header_len = strlen (priv->header); + priv->footer = g_strdup (comment); + priv->footer_len = strlen (priv->footer); + g_free (str); +} + +static char * +load_component_id_stream_read (Bonobo_Stream stream, + CORBA_Environment *ev) +{ + Bonobo_Stream_iobuf *buffer; + GString *str; + char *ans; + + str = g_string_sized_new (256); +#define READ_CHUNK_SIZE 65536 + do { + int i; + Bonobo_Stream_read (stream, READ_CHUNK_SIZE, &buffer, ev); + if (ev->_major != CORBA_NO_EXCEPTION) + return NULL; + + /* FIXME: make better PLEASE!!!*/ + for (i = 0; i < buffer->_length; i++) + g_string_append_c (str, buffer->_buffer[i]); + + if (buffer->_length <= 0) + break; + CORBA_free (buffer); + } while (1); +#undef READ_CHUNK_SIZE + CORBA_free (buffer); + + ans = str->str; + g_string_free (str, FALSE); + + return ans; +} + +static char * +load_component_id (Bonobo_Storage corba_storage, + CORBA_Environment *ev) +{ + Bonobo_Stream corba_stream; + char *iid; + + corba_stream = Bonobo_Storage_openStream (corba_storage, IID_FILE, + Bonobo_Storage_READ, ev); + if (ev->_major != CORBA_NO_EXCEPTION) + return NULL; + + if (corba_stream) { + iid = load_component_id_stream_read (corba_stream, ev); + Bonobo_Unknown_unref (corba_stream, ev); + CORBA_Object_release (corba_stream, ev); + } else { + g_warning ("Cannot find `%s'", IID_FILE); + return NULL; + } + + return iid; +} + +static void +load_component (ESummary *esummary, + BonoboStorage *storage, + int index) +{ + char *curdir; + char *iid; + Bonobo_Storage corba_subdir; + Bonobo_Storage corba_storage; + ESummaryWindow *window; + CORBA_Environment ev; + + curdir = g_strdup_printf ("%08d", index); + corba_storage = bonobo_object_corba_objref (BONOBO_OBJECT (storage)); + CORBA_exception_init (&ev); + + corba_subdir = Bonobo_Storage_openStorage (corba_storage, curdir, + Bonobo_Storage_READ, &ev); + iid = load_component_id (corba_subdir, &ev); + + if (iid) { + Bonobo_Stream corba_stream; + + window = e_summary_factory_embed_service_from_id (esummary, iid); + if (window) { + if (window->persiststream) { + corba_stream = Bonobo_Storage_openStream + (corba_subdir, + DATA_FILE, + Bonobo_Storage_READ, &ev); + if (ev._major != CORBA_NO_EXCEPTION) + return; + + Bonobo_PersistStream_load (window->persiststream, + corba_stream, + "", &ev); + if (ev._major != CORBA_NO_EXCEPTION) + g_warning ("Could not load `%s'", iid); + + } + } + + g_free (iid); + } + + CORBA_exception_free (&ev); + g_free (curdir); +} + static void e_summary_load_state (ESummary *esummary, const char *path) { char *fullpath; - char **argv; - int argc, i; + char *htmlpage = NULL; + BonoboStorage *storage; + Bonobo_Storage corba_storage; + Bonobo_Storage_DirectoryList *list; + CORBA_Environment ev; + int i; g_return_if_fail (esummary != NULL); g_return_if_fail (IS_E_SUMMARY (esummary)); - fullpath = g_strdup_printf ("=%s=/services/iids", path); - gnome_config_get_vector (fullpath, &argc, &argv); + fullpath = g_strdup_printf ("%s", path); + storage = bonobo_storage_open (STORAGE_TYPE, fullpath, + Bonobo_Storage_READ | + Bonobo_Storage_WRITE, + 0664); + if (storage != NULL) { + CORBA_exception_init (&ev); + + corba_storage = bonobo_object_corba_objref (BONOBO_OBJECT (storage)); + list = Bonobo_Storage_listContents (corba_storage, "/", 0, &ev); + if (!list) { + CORBA_exception_free (&ev); + bonobo_object_unref (BONOBO_OBJECT (storage)); + return; + } + + for (i = 0; i < list->_length; i++) + load_component (esummary, storage, i); + + CORBA_free (list); + bonobo_object_unref (BONOBO_OBJECT (storage)); + } - for (i = 0; i < argc; i++) { - e_summary_factory_embed_service_from_id (esummary, argv[i]); + g_free (fullpath); + + /* Load the html page */ + fullpath = g_strdup_printf ("=%s=/executive-summary/page", path); + htmlpage = gnome_config_get_string (fullpath); + g_print ("htmlpage: %s\n", htmlpage); + if (htmlpage) { + load_html_page (esummary, htmlpage); } - - g_free (argv); g_free (fullpath); + g_free (htmlpage); } +static void +save_component (BonoboStorage *storage, + ESummaryWindow *window, + int index) +{ + char *curdir = g_strdup_printf ("%08d", index); + Bonobo_Storage corba_storage; + Bonobo_Storage corba_subdir; + CORBA_Environment ev; + + corba_storage = bonobo_object_corba_objref (BONOBO_OBJECT (storage)); + CORBA_exception_init (&ev); + + corba_subdir = Bonobo_Storage_openStorage (corba_storage, curdir, + Bonobo_Storage_CREATE, &ev); + if (ev._major != CORBA_NO_EXCEPTION) { + g_warning ("Cannot create '%s'", curdir); + } else { + Bonobo_Stream corba_stream; + + corba_stream = Bonobo_Storage_openStream + (corba_subdir, IID_FILE, Bonobo_Storage_CREATE, &ev); + if (ev._major != CORBA_NO_EXCEPTION) { + g_warning ("EEk: %s", CORBA_exception_id (&ev)); + return; + } + + bonobo_stream_client_write_string (corba_stream, + window->iid, TRUE, &ev); + Bonobo_Unknown_unref (corba_stream, &ev); + CORBA_Object_release (corba_stream, &ev); + + corba_stream = Bonobo_Storage_openStream (corba_subdir, DATA_FILE, + Bonobo_Storage_CREATE, + &ev); + if (window->persiststream != CORBA_OBJECT_NIL) { + Bonobo_PersistStream_save (window->persiststream, + corba_stream, "", &ev); + if (ev._major != CORBA_NO_EXCEPTION) { + g_warning ("Unable to save %s", window->iid); + } + } + + Bonobo_Unknown_unref (corba_stream, &ev); + CORBA_Object_release (corba_stream, &ev); + + Bonobo_Unknown_unref (corba_subdir, &ev); + CORBA_Object_release (corba_subdir, &ev); + } + + g_free (curdir); + CORBA_exception_free (&ev); +} + static void e_summary_save_state (ESummary *esummary, const char *path) { ESummaryPrivate *priv; + BonoboStorage *storage; + Bonobo_Storage corba_storage; + CORBA_Environment ev; GList *windows; char *fullpath; - char **argv; - int argc, i; + int i; g_return_if_fail (esummary != NULL); g_return_if_fail (IS_E_SUMMARY (esummary)); - fullpath = g_strdup_printf("=%s=/services/iids", path); priv = esummary->private; - argc = g_list_length (priv->window_list); - argv = g_new (char *, argc); +#if 0 + fullpath = g_strdup_printf("%s", path); + g_print ("fullpath: %s\n", fullpath); + unlink (fullpath); - for (windows = priv->window_list, i = 0; windows; - windows = windows->next, i++) { - ESummaryWindow *window; + storage = bonobo_storage_open (STORAGE_TYPE, fullpath, + Bonobo_Storage_READ | + Bonobo_Storage_WRITE | + Bonobo_Storage_CREATE, 0660); + g_return_if_fail (storage); - window = windows->data; - g_print ("%s: IID: %s\n", path, window->iid); - argv[i] = window->iid; + CORBA_exception_init (&ev); + corba_storage = bonobo_object_corba_objref (BONOBO_OBJECT (storage)); + + i = 0; + for (windows = priv->window_list; windows; windows = windows->next) { + save_component (storage, windows->data, i); + i++; } - gnome_config_set_vector (fullpath, argc, (const char **)argv); - - gnome_config_sync (); - gnome_config_drop_all (); + Bonobo_Storage_commit (corba_storage, &ev); + CORBA_exception_free (&ev); + bonobo_object_unref (BONOBO_OBJECT (storage)); g_free (fullpath); - g_free (argv); -} - -ESummaryWindow * -e_summary_window_from_view (ESummary *esummary, - ExecutiveSummaryComponentView *view) -{ - ESummaryPrivate *priv; - - priv = esummary->private; - return g_hash_table_lookup (priv->view_to_window, view); +#endif } void diff --git a/executive-summary/component/e-summary.h b/executive-summary/component/e-summary.h index 2e930cd692..5eae27ea0c 100644 --- a/executive-summary/component/e-summary.h +++ b/executive-summary/component/e-summary.h @@ -24,13 +24,11 @@ #ifndef _E_SUMMARY_H__ #define _E_SUMMARY_H__ -#include #include #include #include -#include -#include +#include #include #define E_SUMMARY_TYPE (e_summary_get_type ()) @@ -45,9 +43,20 @@ typedef struct _ESummaryClass ESummaryClass; typedef struct _ESummaryWindow ESummaryWindow; struct _ESummaryWindow { - ExecutiveSummary *summary; - ExecutiveSummaryComponentView *view; + GNOME_Evolution_Summary_Component component; + + Bonobo_Control control; + GNOME_Evolution_Summary_HTMLView html; + + Bonobo_PersistStream persiststream; + Bonobo_PropertyBag propertybag; + Bonobo_PropertyControl propertycontrol; + + BonoboPropertyListener *listener; + char *iid; + char *title; + char *icon; }; struct _ESummary { @@ -63,31 +72,14 @@ struct _ESummaryClass { GtkType e_summary_get_type (void); GtkWidget *e_summary_new (const GNOME_Evolution_Shell shell); int e_summary_rebuild_page (ESummary *esummary); -void e_summary_add_html_service (ESummary *esummary, - ExecutiveSummary *summary, - ExecutiveSummaryComponentClient *client, - const char *html, - const char *title, - const char *icon); -void e_summary_add_bonobo_service (ESummary *esummary, - ExecutiveSummary *summary, - ExecutiveSummaryComponentClient *client, - GtkWidget *control, - const char *title, - const char *icon); -void e_summary_update_window (ESummary *esummary, - ExecutiveSummary *summary, - const char *html); -void e_summary_window_free (ESummaryWindow *window, - ESummary *esummary); -void e_summary_window_remove_from_ht (ESummaryWindow *window, - ESummary *esummary); -void e_summary_add_service (ESummary *esummary, - ExecutiveSummary *summary, - ExecutiveSummaryComponentView *view, - const char *iid); -ExecutiveSummaryComponentView * e_summary_view_from_id (ESummary *esummary, - int id); + +void e_summary_window_free (ESummaryWindow *window); +void e_summary_remove_window (ESummary *esummary, + ESummaryWindow *window); +ESummaryWindow *e_summary_add_service (ESummary *esummary, + GNOME_Evolution_Summary_Component component, + const char *iid); + void e_summary_set_shell_view_interface (ESummary *summary, GNOME_Evolution_ShellView svi); void e_summary_set_message (ESummary *esummary, @@ -98,8 +90,7 @@ void e_summary_change_current_view (ESummary *esummary, const char *uri); void e_summary_set_title (ESummary *esummary, const char *title); -ESummaryWindow *e_summary_window_from_view (ESummary *esummary, - ExecutiveSummaryComponentView *view); + void e_summary_window_move_left (ESummary *esummary, ESummaryWindow *window); void e_summary_window_move_right (ESummary *esummary, -- cgit