ignore some stuff, yo.

2003-02-27  Chris Toshok  <toshok@ximian.com>

	* tools/.cvsignore: ignore some stuff, yo.

	* tools/Makefile.am: add in the evolution-launch-composer stuff.

	* tools/evolution-launch-composer.c: port this from the 1.2 branch.

svn path=/trunk/; revision=20098

4 files changed, 398 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index f57c146ea3..d1d53ae852 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-02-27  Chris Toshok  <toshok@ximian.com>
+
+	* tools/.cvsignore: ignore some stuff, yo.
+	
+	* tools/Makefile.am: add in the evolution-launch-composer stuff.
+
+	* tools/evolution-launch-composer.c: port this from the 1.2 branch.
+
 2003-02-27  JP Rosevear  <jpr@ximian.com>
 
 	* configure.in: export gnome-pilot cflags
diff --git a/tools/.cvsignore b/tools/.cvsignore
index 60825eed01..f2dfd277a5 100644
--- a/tools/.cvsignore
+++ b/tools/.cvsignore
@@ -1,3 +1,5 @@
+evolution-launch-composer
+Evolution-Composer*
 Makefile
 Makefile.in
 evolution-addressbook-abuse
@@ -5,4 +7,4 @@ evolution-addressbook-clean
 evolution-addressbook-import
 evolution-addressbook-export
 .deps
-.libs
\ No newline at end of file
+.libs
diff --git a/tools/Makefile.am b/tools/Makefile.am
index dd73df96f6..06820ca533 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,7 +8,8 @@ tools_SCRIPTS =				\
 
 tools_PROGRAMS =			\
 	evolution-addressbook-import	\
-	evolution-addressbook-export
+	evolution-addressbook-export	\
+	evolution-launch-composer
 
 noinst_PROGRAMS = evolution-addressbook-abuse
 
@@ -30,6 +31,20 @@ INCLUDES =						\
 EXTRA_DIST = $(tools_SCRIPTS) verify-evolution-install.sh \
 	evolution-addressbook-clean.in
 
+CORBA_SOURCE =                          \
+        Evolution-Composer.h            \
+        Evolution-Composer-common.c     \
+        Evolution-Composer-skels.c      \
+        Evolution-Composer-stubs.c
+
+BUILT_SOURCES = $(CORBA_SOURCE)
+
+idls =                                                          \
+        $(top_srcdir)/composer/Evolution-Composer.idl
+
+$(CORBA_SOURCE): $(idls)
+	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(idls)
+
 evolution_addressbook_import_LDADD =				\
 	$(GNOME_FULL_LIBS)					\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
@@ -41,7 +56,20 @@ evolution_addressbook_export_LDADD =				\
 evolution_addressbook_abuse_LDADD =				\
 	$(evolution_addressbook_import_LDADD)
 
-CLEANFILES = evolution-addressbook-clean
+evolution_launch_composer_SOURCES =                     \
+        $(CORBA_SOURCE)                                 \
+        evolution-launch-composer.c
+
+evolution_launch_composer_LDADD =                               \
+        $(GNOME_FULL_LIBS)                                      \
+        $(top_builddir)/addressbook/backend/ebook/libebook.la   \
+        $(top_builddir)/camel/libcamel.la                       \
+        $(top_builddir)/e-util/ename/libename.la                \
+        $(top_builddir)/libversit/libversit.a                   \
+        $(top_builddir)/e-util/libeutil.la                      \
+        $(top_builddir)/widgets/menus/libmenus.la
+
+CLEANFILES = evolution-addressbook-clean $(BUILD_SOURCES)
 
 
 evolution-addressbook-clean: evolution-addressbook-clean.in Makefile
diff --git a/tools/evolution-launch-composer.c b/tools/evolution-launch-composer.c
new file mode 100644
index 0000000000..8c89dbe480
--- /dev/null
+++ b/tools/evolution-launch-composer.c
@@ -0,0 +1,357 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* 
+ * evolution-sendmail.c - 
+ * Copyright (C) 2002, Ximian, Inc.
+ *
+ * Authors:
+ *   Christopher James Lahey <clahey@ximian.com>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License
+ * as published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ **/
+
+#include <config.h>
+
+#include <Evolution-Composer.h>
+
+#include <string.h>
+#include <gal/util/e-util.h>
+#include <bonobo-activation/bonobo-activation.h>
+#include <gtk/gtkmain.h>
+
+#include <bonobo/bonobo-main.h>
+
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-ui-init.h>
+
+#include <libgnomevfs/gnome-vfs-ops.h>
+#include <libgnomevfs/gnome-vfs-uri.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
+#include <libgnomevfs/gnome-vfs-xfer.h>
+#include <libgnomevfs/gnome-vfs-init.h>
+
+#define READ_CHUNK_SIZE 8192
+
+#define E_SHELL_OAFIID  "OAFIID:GNOME_Evolution_Shell"
+#define COMPOSER_OAFIID "OAFIID:GNOME_Evolution_Mail_Composer"
+#define NOTNULL(x) ((x) ? (x) : "")
+
+typedef struct {
+	char *filename;
+	char *basename;
+	char *content;
+	int   size;
+	char *description;
+	char *content_type;
+	gboolean show_inline;
+} attachment_t;
+
+GList *attachments; /* Of type attachment_t */
+
+char *subject;
+
+static void
+free_attachment (attachment_t *attachment)
+{
+	g_free (attachment->content);
+	g_free (attachment->filename);
+	g_free (attachment->basename);
+	g_free (attachment->content_type);
+	g_free (attachment->description);
+	g_free (attachment);
+}
+
+static GnomeVFSResult
+elc_read_entire_file (const char *uri,
+		      int *file_size,
+		      char **file_contents,
+		      char **content_type)
+{
+	GnomeVFSResult result;
+	GnomeVFSHandle *handle;
+	char *buffer;
+	GnomeVFSFileSize total_bytes_read;
+	GnomeVFSFileSize bytes_read;
+
+	*file_size = 0;
+	*file_contents = NULL;
+
+	/* Open the file. */
+	result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
+	if (result != GNOME_VFS_OK) {
+		return result;
+	}
+
+	/* Read the whole thing. */
+	buffer = NULL;
+	total_bytes_read = 0;
+	do {
+		buffer = g_realloc (buffer, total_bytes_read + READ_CHUNK_SIZE);
+		result = gnome_vfs_read (handle,
+					 buffer + total_bytes_read,
+					 READ_CHUNK_SIZE,
+					 &bytes_read);
+		if (result != GNOME_VFS_OK && result != GNOME_VFS_ERROR_EOF) {
+			g_free (buffer);
+			gnome_vfs_close (handle);
+			return result;
+		}
+
+		/* Check for overflow. */
+		if (total_bytes_read + bytes_read < total_bytes_read) {
+			g_free (buffer);
+			gnome_vfs_close (handle);
+			return GNOME_VFS_ERROR_TOO_BIG;
+		}
+
+		total_bytes_read += bytes_read;
+	} while (result == GNOME_VFS_OK);
+
+	if (content_type) {
+		GnomeVFSFileInfo *info;
+
+		info = gnome_vfs_file_info_new ();
+		result = gnome_vfs_get_file_info_from_handle (handle, info,
+							      GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
+							      GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
+		if (result == GNOME_VFS_OK)
+			*content_type = g_strdup (gnome_vfs_file_info_get_mime_type (info));
+		else
+			*content_type = g_strdup ("application/octet-stream");
+
+		gnome_vfs_file_info_unref (info);
+	}
+
+	/* Close the file. */
+	result = gnome_vfs_close (handle);
+	if (result != GNOME_VFS_OK) {
+		g_free (buffer);
+		return result;
+	}
+
+	/* Return the file. */
+	*file_size = total_bytes_read;
+	*file_contents = g_realloc (buffer, total_bytes_read);
+	return GNOME_VFS_OK;
+}
+
+
+static void
+do_send (GNOME_Evolution_Composer composer_server)
+{
+	CORBA_Environment ev;
+
+	GNOME_Evolution_Composer_AttachmentData *attach_data;
+
+	GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
+
+	CORBA_exception_init (&ev);
+
+	attachments = g_list_reverse (attachments);
+
+	while (attachments) {
+		attachment_t *attachment = attachments->data;
+		GList *temp;
+
+		attach_data = GNOME_Evolution_Composer_AttachmentData__alloc();
+		attach_data->_maximum = attach_data->_length = attachment->size;
+		attach_data->_buffer = CORBA_sequence_CORBA_char_allocbuf (attach_data->_length);
+		strcpy (attach_data->_buffer, attachment->content);
+
+		GNOME_Evolution_Composer_attachData (composer_server, 
+						     NOTNULL (attachment->content_type),
+						     NOTNULL (attachment->basename),
+						     NOTNULL (attachment->description),
+						     attachment->show_inline,
+						     attach_data,
+						     &ev);
+
+		if (ev._major != CORBA_NO_EXCEPTION) {
+			g_printerr ("evolution-sendmail.c: I couldn't attach data to the composer via CORBA! Aagh.\n");
+			CORBA_exception_free (&ev);
+			return;
+		}
+
+		CORBA_free (attach_data);
+
+		free_attachment (attachment);
+
+		temp = attachments;
+		attachments = g_list_remove_link (attachments, attachments);
+		g_list_free_1 (temp);
+	}
+
+	to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
+	to_list->_maximum = to_list->_length = 0;
+
+	cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
+	cc_list->_maximum = cc_list->_length = 0;
+
+	bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
+	bcc_list->_maximum = bcc_list->_length = 0;
+
+	GNOME_Evolution_Composer_setHeaders (composer_server, "", to_list, cc_list, bcc_list, NOTNULL (subject), &ev);
+
+	CORBA_free (to_list);
+	CORBA_free (cc_list);
+	CORBA_free (bcc_list);
+
+	GNOME_Evolution_Composer_show (composer_server, &ev);
+
+	if (ev._major != CORBA_NO_EXCEPTION) {
+		g_printerr ("evolution-sendmail.c: I couldn't show the composer via CORBA! Aagh.\n");
+		CORBA_exception_free (&ev);
+		return;
+	}
+
+	CORBA_exception_free (&ev);
+}
+
+
+static GNOME_Evolution_Composer
+get_composer ()
+{
+	CORBA_Object shell;
+	GNOME_Evolution_Composer composer;
+
+	/* First, I obtain an object reference that represents the Shell, to make sure it's running. */
+	shell = bonobo_activation_activate_from_id (E_SHELL_OAFIID, 0, NULL, NULL);
+
+	printf ("shell == %p\n", shell);
+
+	g_return_val_if_fail (shell != CORBA_OBJECT_NIL, NULL);
+
+	/* Next, I obtain an object reference that represents the Composer. */
+	composer = bonobo_activation_activate_from_id (COMPOSER_OAFIID, 0, NULL, NULL);
+
+	printf ("composer == %p\n", composer);
+
+	return composer;
+}
+
+static gboolean
+composer_timeout (gpointer data)
+{
+	GNOME_Evolution_Composer composer;
+
+	composer = get_composer ();
+
+	if (composer != CORBA_OBJECT_NIL) {
+		do_send (composer);
+		gtk_main_quit ();
+		return FALSE;
+	} else {
+		return TRUE;
+	}
+}
+
+static void
+cb (poptContext con, 
+    enum poptCallbackReason reason,
+    /*@null@*/ const struct poptOption * opt,
+    /*@null@*/ const char * arg,
+    /*@null@*/ const void * data)
+{
+       const char *name = opt->longName;
+       if (!strcmp (name, "add-attachment")) {
+               attachment_t *new_attach = g_new (attachment_t, 1);
+               new_attach->filename = g_strdup (arg);
+               new_attach->basename = strrchr (new_attach->filename, '/');
+               if (new_attach->basename)
+                       new_attach->basename ++;
+               else
+                       new_attach->basename = new_attach->filename;
+               new_attach->basename = g_strdup (new_attach->basename);
+               if (new_attach->filename)
+                       elc_read_entire_file (new_attach->filename,
+                                             &new_attach->size,
+                                             &new_attach->content,
+                                             &new_attach->content_type);
+               new_attach->description = NULL;
+               new_attach->show_inline = FALSE;
+               if (new_attach->content) {
+                       attachments = g_list_prepend (attachments, new_attach);
+               } else {
+                       free_attachment (new_attach);
+               }
+       } else if (!strcmp (name, "file-name")) {
+               if (attachments) {
+                       attachment_t *attachment = attachments->data;
+                       g_free (attachment->basename);
+                       attachment->basename = g_strdup (arg);
+               } else {
+               }
+       } else if (!strcmp (name, "content-type")) {
+               if (attachments) {
+                       attachment_t *attachment = attachments->data;
+                       if (attachment->content_type) {
+                       }
+                       attachment->content_type = g_strdup (arg);
+               } else {
+               }
+       } else if (!strcmp (name, "description")) {
+               if (attachments) {
+                       attachment_t *attachment = attachments->data;
+                       if (attachment->description) {
+                       }
+                       attachment->description = g_strdup (arg);
+               } else {
+               }
+       } else if (!strcmp (name, "show-inline")) {
+               if (attachments) {
+                       attachment_t *attachment = attachments->data;
+                       if (attachment->show_inline) {
+                       }
+                       attachment->show_inline = TRUE;
+               } else {
+               }
+       }
+}
+
+static struct poptOption cap_options[] = {
+       { NULL, '\0', POPT_ARG_CALLBACK, cb, 0, NULL, NULL },
+       { "add-attachment", 'a', POPT_ARG_STRING, NULL, 0, N_("An attachment to add."), NULL },
+       { "content-type", 't', POPT_ARG_STRING, NULL, 0, N_("Content type of the attachment."), NULL },
+       { "file-name", 'f', POPT_ARG_STRING, NULL, 0, N_("The filename to display in the mail."), NULL },
+       { "description", 'd', POPT_ARG_STRING, NULL, 0, N_("Description of the attachment."), NULL },
+       { "show-inline", 'i', POPT_ARG_NONE, NULL, 0, N_("Mark attachment to be shown inline by default."), NULL },
+       { "subject", 's', POPT_ARG_STRING, &subject, 0, N_("Default subject for the message."), NULL },
+       { NULL, '\0', 0, NULL, 0 }
+};
+
+int
+main(int argc, char *argv[])
+{
+	GNOME_Evolution_Composer composer;
+
+        bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
+        textdomain (PACKAGE);
+
+	gnome_program_init ("evolution-launch-composer", VERSION,
+			    LIBGNOMEUI_MODULE, argc, argv,
+			    GNOME_PROGRAM_STANDARD_PROPERTIES,
+			    GNOME_PARAM_POPT_TABLE, cap_options,
+			    NULL);
+
+	composer = get_composer ();
+
+	if (composer != CORBA_OBJECT_NIL) {
+		do_send (composer);
+	} else {
+		g_timeout_add(1000, composer_timeout, NULL);
+		bonobo_main ();
+	}
+
+	return 0;
+}