gui/dialogs/cal-attachment-bar.h Remove unused files from CVS.

2005-12-17  Tor Lillqvist  <tml@novell.com>

	* gui/dialogs/cal-attachment-bar.h
	* gui/dialogs/cal-attachment-bar.c: Remove unused files from CVS.

svn path=/trunk/; revision=30815

2 files changed, 0 insertions, 1201 deletions

diff --git a/calendar/gui/dialogs/cal-attachment-bar.c b/calendar/gui/dialogs/cal-attachment-bar.c
deleted file mode 100644
index 17679549f7..0000000000
--- a/calendar/gui/dialogs/cal-attachment-bar.c
+++ /dev/null
@@ -1,1115 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/*
- *  Authors: Harish Krishnaswamy <kharish@novell.com>
- *
- *  Copyright 2004  Novell, Inc. (www.novell.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-/* Much of this file has been shamelessly copied from the mail attachment
- * handling code, including the fixmes. Modifications/Additions that are
- * specific to the calendar component have been flagged by some comments
- * fwiw */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <gtk/gtk.h>
-#include <glade/glade.h>
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnome/gnome-i18n.h>
-#include "comp-editor.h"
-#include "cal-attachment-select-file.h"
-#include "cal-attachment.h"
-#include "cal-attachment-bar.h"
-
-#include <libedataserver/e-iconv.h>
-
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-null.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-bestenc.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-file-utils.h>
-
-#include "e-util/e-gui-utils.h"
-#include "e-util/e-icon-factory.h"
-#include "e-util/e-error.h"
-#include "e-util/e-mktemp.h"
-#include "../e-cal-popup.h"
-
-#define ICON_WIDTH 64
-#define ICON_SEPARATORS " /-_"
-#define ICON_SPACING 2
-#define ICON_ROW_SPACING ICON_SPACING
-#define ICON_COL_SPACING ICON_SPACING
-#define ICON_BORDER 2
-#define ICON_TEXT_SPACING 2
-
-static GnomeIconListClass *parent_class = NULL;
-
-struct _CalAttachmentBarPrivate {
-	GSList *attachments;
-	guint num_attachments;
-	/* The persistent copies of the attachments
-	 * derive their location and name from the 
-	 * local_attachment_store and the comp_uid.
-	 */
-	char *local_attachment_store;
-	char *comp_uid;
-	char *path;
-};
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-static void update (CalAttachmentBar *bar);
-
-static char *
-size_to_string (gulong size)
-{
-	char *size_string;
-	
-	/* FIXME: The following should probably go into a separate module, as
-           we might have to do the same thing in other places as well.  Also,
-	   I am not sure this will be OK for all the languages.  */
-	
-	if (size < 1e3L) {
-		size_string = NULL;
-	} else {
-		gdouble displayed_size;
-		
-		if (size < 1e6L) {
-			displayed_size = (gdouble) size / 1.0e3;
-			size_string = g_strdup_printf (_("%.0fK"), displayed_size);
-		} else if (size < 1e9L) {
-			displayed_size = (gdouble) size / 1.0e6;
-			size_string = g_strdup_printf (_("%.0fM"), displayed_size);
-		} else {
-			displayed_size = (gdouble) size / 1.0e9;
-			size_string = g_strdup_printf (_("%.0fG"), displayed_size);
-		}
-	}
-	
-	return size_string;
-}
-
-/* Attachment handling functions.  */
-
-static void
-free_attachment_list (CalAttachmentBar *bar)
-{
-	CalAttachmentBarPrivate *priv;
-	GSList *p;
-	
-	priv = bar->priv;
-	
-	for (p = priv->attachments; p != NULL; p = p->next)
-		g_object_unref (p->data);
-	
-	priv->attachments = NULL;
-}
-
-static void
-attachment_changed_cb (CalAttachment *attachment,
-		       gpointer data)
-{
-	update (CAL_ATTACHMENT_BAR (data));
-}
-
-static void
-add_common (CalAttachmentBar *bar,
-	    CalAttachment *attachment)
-{
-	g_return_if_fail (attachment != NULL);
-	
-	g_signal_connect (attachment, "changed",
-			  G_CALLBACK (attachment_changed_cb),
-			  bar);
-	
-	bar->priv->attachments = g_slist_append (bar->priv->attachments,
-						attachment);
-	bar->priv->num_attachments++;
-	
-	update (bar);
-	
-	g_signal_emit (bar, signals[CHANGED], 0);
-}
-
-static void
-add_from_mime_part (CalAttachmentBar *bar,
-		    CamelMimePart *part)
-{
-	add_common (bar, cal_attachment_new_from_mime_part (part));
-}
-
-static void
-add_from_file (CalAttachmentBar *bar,
-	       const char *file_name,
-	       const char *disposition)
-{
-	CalAttachment *attachment;
-	CamelException ex;
-	
-	camel_exception_init (&ex);
-	attachment = cal_attachment_new (file_name, disposition, &ex);
-	if (attachment) {
-		add_common (bar, attachment);
-	} else {
-		e_error_run((GtkWindow *)gtk_widget_get_toplevel((GtkWidget *)bar), "mail-composer:no-attach",
-			    file_name, camel_exception_get_description(&ex), NULL);
-		camel_exception_clear (&ex);
-	}
-}
-
-static void
-remove_attachment (CalAttachmentBar *bar,
-		   CalAttachment *attachment)
-{
-	g_return_if_fail (E_IS_CAL_ATTACHMENT_BAR (bar));
-	g_return_if_fail (g_slist_find (bar->priv->attachments, attachment) != NULL);
-
-	bar->priv->attachments = g_slist_remove (bar->priv->attachments,
-						attachment);
-	bar->priv->num_attachments--;
-	if (attachment->editor_gui != NULL) {
-		GtkWidget *dialog = glade_xml_get_widget (attachment->editor_gui, "dialog");
-		g_signal_emit_by_name (dialog, "response", GTK_RESPONSE_CLOSE);
-	}
-	
-	g_object_unref(attachment);
-	
-	g_signal_emit (bar, signals[CHANGED], 0);
-}
-
-/* Icon list contents handling.  */
-
-static void
-update (CalAttachmentBar *bar)
-{
-	CalAttachmentBarPrivate *priv;
-	GnomeIconList *icon_list;
-	GSList *p;
-	
-	priv = bar->priv;
-	icon_list = GNOME_ICON_LIST (bar);
-	
-	gnome_icon_list_freeze (icon_list);
-	
-	gnome_icon_list_clear (icon_list);
-	
-	for (p = priv->attachments; p != NULL; p = p->next) {
-		CalAttachment *attachment;
-		CamelContentType *content_type;
-		char *size_string, *label;
-		GdkPixbuf *pixbuf=NULL;
-		const char *desc;
-		
-		attachment = p->data;
-
-		if (!attachment->is_available_local) {
-			/* stock_attach would be better, but its fugly scaled up */
-			pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG);
-			if (pixbuf) {
-				attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, "");
-				g_object_unref(pixbuf);
-			}
-			continue;
-		}
-
-		content_type = camel_mime_part_get_content_type (attachment->body);
-		/* Get the image out of the attachment 
-		   and create a thumbnail for it */
-		pixbuf = attachment->pixbuf_cache;
-		if (pixbuf) {
-			g_object_ref(pixbuf);
-		} else if (camel_content_type_is(content_type, "image", "*")) {
-			CamelDataWrapper *wrapper;
-			CamelStreamMem *mstream;
-			GdkPixbufLoader *loader;
-			gboolean error = TRUE;
-			
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body));
-			mstream = (CamelStreamMem *) camel_stream_mem_new ();
-			
-			camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream);
-			
-			/* Stream image into pixbuf loader */
-			loader = gdk_pixbuf_loader_new ();
-			error = !gdk_pixbuf_loader_write (loader, mstream->buffer->data, mstream->buffer->len, NULL);
-			gdk_pixbuf_loader_close (loader, NULL);
-			
-			if (!error) {
-				int ratio, width, height;
-				
-				/* Shrink pixbuf */
-				pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-				width = gdk_pixbuf_get_width (pixbuf);
-				height = gdk_pixbuf_get_height (pixbuf);
-				if (width >= height) {
-					if (width > 48) {
-						ratio = width / 48;
-						width = 48;
-						height = height / ratio;
-					}
-				} else {
-					if (height > 48) {
-						ratio = height / 48;
-						height = 48;
-						width = width / ratio;
-					}
-				}
-				
-				attachment->pixbuf_cache = gdk_pixbuf_scale_simple 
-					(pixbuf,
-					 width,
-					 height,
-					 GDK_INTERP_BILINEAR);
-				pixbuf = attachment->pixbuf_cache;
-				g_object_ref(pixbuf);
-			} else {
-				pixbuf = NULL;
-				g_warning ("GdkPixbufLoader Error");
-			}
-			
-			/* Destroy everything */
-			g_object_unref (loader);
-			camel_object_unref (mstream);
-		}
-		
-		desc = camel_mime_part_get_description (attachment->body);
-		if (!desc || *desc == '\0')
-			desc = camel_mime_part_get_filename (attachment->body);
-		
-		if (!desc)
-			desc = _("attachment");
-		
-		if (attachment->size
-		    && (size_string = size_to_string (attachment->size))) {
-			label = g_strdup_printf ("%s (%s)", desc, size_string);
-			g_free (size_string);
-		} else
-			label = g_strdup (desc);
-		
-		if (pixbuf == NULL) {
-			char *mime_type;
-			
-			mime_type = camel_content_type_simple (content_type);
-			pixbuf = e_icon_for_mime_type (mime_type, 48);
-			if (pixbuf == NULL) {
-				g_warning("cannot find icon for mime type %s (installation problem?)", mime_type);
-				/* stock_attach would be better, but its fugly scaled up */
-				pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG);
-			}
-			g_free (mime_type);
-		}
-
-		if (pixbuf) {
-			gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, label);
-			g_object_unref(pixbuf);
-		}
-		
-		g_free (label);
-	}	
-	gnome_icon_list_thaw (icon_list);
-}
-
-static void
-update_remote_file (CalAttachmentBar *bar, CalAttachment *attachment, char *msg)
-{
-	CalAttachmentBarPrivate *priv;
-	GnomeIconList *icon_list;
-	GnomeIconTextItem *item;
-	
-	priv = bar->priv;
-	icon_list = GNOME_ICON_LIST (bar);
-	
-	gnome_icon_list_freeze (icon_list);
-
-	item = gnome_icon_list_get_icon_text_item (icon_list, attachment->index);
-	if (!item->is_text_allocated)
-		g_free (item->text);
-		
-	gnome_icon_text_item_configure (item, item->x, item->y, item->width, item->fontname, msg, item->is_editable, TRUE);
-
-	gnome_icon_list_thaw (icon_list);
-}
-
-static void
-remove_selected (CalAttachmentBar *bar)
-{
-	GnomeIconList *icon_list;
-	CalAttachment *attachment;
-	GSList *attachment_list, *l;
-	GList *p;
-	int num = 0, left, dlen;
-	
-	icon_list = GNOME_ICON_LIST (bar);
-	
-	attachment_list = NULL;
-	p = gnome_icon_list_get_selection (icon_list);
-	dlen = g_list_length (p);
-	for ( ; p != NULL; p = p->next) {
-		num = GPOINTER_TO_INT (p->data);
-		attachment = CAL_ATTACHMENT (g_slist_nth_data (bar->priv->attachments, num));
-
-		if (g_slist_find (attachment_list, attachment) == NULL) {
-			attachment_list = g_slist_prepend (attachment_list, attachment);
-		}
-	}
-	
-	for (l = attachment_list; l != NULL; l = l->next)
-		remove_attachment (bar, CAL_ATTACHMENT (l->data));
-	
-	g_slist_free (attachment_list);
-	
-	update (bar);
-	
-	left = gnome_icon_list_get_num_icons (icon_list);
-	num = num - dlen + 1;
-	if (left > 0)
-		gnome_icon_list_focus_icon (icon_list, left > num ? num : left - 1);
-}
-
-static void
-edit_selected (CalAttachmentBar *bar)
-{
-	GnomeIconList *icon_list;
-	GList *selection;
-	GSList *attach;
-	int num;
-	
-	icon_list = GNOME_ICON_LIST (bar);
-	
-	selection = gnome_icon_list_get_selection (icon_list);
-	if (selection) {
-		num = GPOINTER_TO_INT (selection->data);
-		attach = g_slist_nth (bar->priv->attachments, num);
-		if (attach)
-			cal_attachment_edit ((CalAttachment *)attach->data, GTK_WIDGET (bar));
-	}
-}
-
-/* "Attach" dialog.  */
-
-static void
-add_from_user (CalAttachmentBar *bar)
-{
-	CompEditor *editor;
-	GPtrArray *file_list;
-	gboolean is_inline = FALSE;
-	int i;
-	
-	editor = COMP_EDITOR (gtk_widget_get_toplevel (GTK_WIDGET (bar)));
-	
-	
-	file_list = comp_editor_select_file_attachments (editor, &is_inline);
-	/*TODO add a good implementation here */
-	if (!file_list)
-		return;
-	
-	for (i = 0; i < file_list->len; i++) {
-		add_from_file (bar, file_list->pdata[i], is_inline ? "inline" : "attachment");
-		g_free (file_list->pdata[i]);
-	}
-	
-	g_ptr_array_free (file_list, TRUE);
-}
-
-/* Callbacks.  */
-
-static void
-cab_add(EPopup *ep, EPopupItem *item, void *data)
-{
-	CalAttachmentBar *bar = data;
-
-	add_from_user(bar);
-}
-
-static void
-cab_properties(EPopup *ep, EPopupItem *item, void *data)
-{
-	CalAttachmentBar *bar = data;
-	
-	edit_selected(bar);
-}
-
-static void
-cab_remove(EPopup *ep, EPopupItem *item, void *data)
-{
-	CalAttachmentBar *bar = data;
-
-	remove_selected(bar);
-}
-
-/* Popup menu handling.  */
-static EPopupItem cab_popups[] = {
-	{ E_POPUP_ITEM, "10.attach", N_("_Remove"), cab_remove, NULL, GTK_STOCK_REMOVE, E_CAL_POPUP_ATTACHMENTS_MANY },
-	{ E_POPUP_ITEM, "20.attach", N_("_Properties"), cab_properties, NULL, GTK_STOCK_PROPERTIES, E_CAL_POPUP_ATTACHMENTS_ONE },
-	{ E_POPUP_BAR, "30.attach.00", NULL, NULL, NULL, NULL, E_CAL_POPUP_ATTACHMENTS_MANY|E_CAL_POPUP_ATTACHMENTS_ONE },
-	{ E_POPUP_ITEM, "30.attach.01", N_("_Add attachment..."), cab_add, NULL, GTK_STOCK_ADD, 0 },
-};
-
-static void
-cab_popup_position(GtkMenu *menu, int *x, int *y, gboolean *push_in, gpointer user_data)
-{
-	CalAttachmentBar *bar = user_data;
-	GnomeIconList *icon_list = user_data;
-	GList *selection;
-	GnomeCanvasPixbuf *image;
-	
-	gdk_window_get_origin (((GtkWidget*) bar)->window, x, y);
-	
-	selection = gnome_icon_list_get_selection (icon_list);
-	if (selection == NULL)
-		return;
-	
-	image = gnome_icon_list_get_icon_pixbuf_item (icon_list, (gint)selection->data);
-	if (image == NULL)
-		return;
-	
-	/* Put menu to the center of icon. */
-	*x += (int)(image->item.x1 + image->item.x2) / 2;
-	*y += (int)(image->item.y1 + image->item.y2) / 2;
-}
-
-static void
-cab_popups_free(EPopup *ep, GSList *l, void *data)
-{
-	g_slist_free(l);
-}
-
-/* if id != -1, then use it as an index for target of the popup */
-static void
-cab_popup(CalAttachmentBar *bar, GdkEventButton *event, int id)
-{
-	GList *p;
-	GSList *attachments = NULL, *menus = NULL;
-	int i;
-	ECalPopup *ecp;
-	ECalPopupTargetAttachments *t;
-	GtkMenu *menu;
-	CalAttachment *attachment;
-
-	if (id == -1
-	    || (attachment = g_slist_nth_data(bar->priv->attachments, id)) == NULL) {
-		p = gnome_icon_list_get_selection((GnomeIconList *)bar);
-		for ( ; p != NULL; p = p->next) {
-			int num = GPOINTER_TO_INT(p->data);
-			CalAttachment *attachment = g_slist_nth_data(bar->priv->attachments, num);
-			
-			if (attachment && g_slist_find(attachments, attachment) == NULL) {
-				g_object_ref(attachment);
-				attachments = g_slist_prepend(attachments, attachment);
-			}
-		}
-		attachments = g_slist_reverse(attachments);
-	} else {
-		g_object_ref(attachment);
-		attachments = g_slist_prepend(attachments, attachment);
-	}
-
-	for (i=0;i<sizeof(cab_popups)/sizeof(cab_popups[0]);i++)
-		menus = g_slist_prepend(menus, &cab_popups[i]);
-
-	/** @HookPoint-ECalPopup: Calendar Attachment Bar Context Menu
-	 * @Id: org.gnome.evolution.calendar.attachmentbar.popup
-	 * @Class: org.gnome.evolution.mail.popup:1.0
-	 * @Target: ECalPopupTargetAttachments
-	 *
-	 * This is the context menu on the calendar attachment bar.
-	 */
-	ecp = e_cal_popup_new("org.gnome.evolution.calendar.attachmentbar.popup");
-	e_popup_add_items((EPopup *)ecp, menus, NULL, cab_popups_free, bar);
-	t = e_cal_popup_target_new_attachments(ecp, attachments);
-	t->target.widget = (GtkWidget *)bar;
-	menu = e_popup_create_menu_once((EPopup *)ecp, (EPopupTarget *)t, 0);
-
-	if (event == NULL)
-		gtk_menu_popup(menu, NULL, NULL, cab_popup_position, bar, 0, gtk_get_current_event_time());
-	else
-		gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event->button, event->time);
-}
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	CalAttachmentBar *bar;
-	
-	bar = CAL_ATTACHMENT_BAR (object);
-	
-	if (bar->priv) {
-		free_attachment_list (bar);
-		if (bar->priv->local_attachment_store)
-			g_free (bar->priv->local_attachment_store);
-		if (bar->priv->comp_uid)
-			g_free (bar->priv->comp_uid);
-		if (bar->priv->path)
-			g_free (bar->priv->path);
-		g_free (bar->priv);
-		bar->priv = NULL;
-	}
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/* GtkWidget methods.  */
-
-static gboolean 
-popup_menu_event (GtkWidget *widget)
-{
-	cab_popup((CalAttachmentBar *)widget, NULL, -1);
-	return TRUE;
-}
-
-
-static int
-button_press_event (GtkWidget *widget, GdkEventButton *event)
-{
-	CalAttachmentBar *bar = (CalAttachmentBar *)widget;
-	GnomeIconList *icon_list = GNOME_ICON_LIST(widget);
-	int icon_number;
-	
-	if (event->button != 3)
-		return GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, event);
-	
-	icon_number = gnome_icon_list_get_icon_at (icon_list, event->x, event->y);
-	if (icon_number >= 0) {
-		gnome_icon_list_unselect_all(icon_list);
-		gnome_icon_list_select_icon (icon_list, icon_number);
-	}
-
-	cab_popup(bar, event, icon_number);
-	
-	return TRUE;
-}
-
-static gint
-key_press_event(GtkWidget *widget, GdkEventKey *event)
-{
-        CalAttachmentBar *bar = CAL_ATTACHMENT_BAR (widget);
-
-        if (event->keyval == GDK_Delete) {
-                remove_selected (bar);
-                return TRUE;
-        }
-                                                                                
-        return GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event);
-}
-
-/* Initialization.  */
-
-static void
-class_init (CalAttachmentBarClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	GnomeIconListClass *icon_list_class;
-	
-	object_class = GTK_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
-	icon_list_class = GNOME_ICON_LIST_CLASS (klass);
-	
-	parent_class = g_type_class_ref (gnome_icon_list_get_type ());
-	
-	object_class->destroy = destroy;
-	
-	widget_class->button_press_event = button_press_event;
-	widget_class->popup_menu = popup_menu_event;
-	widget_class->key_press_event = key_press_event;
-
-	/* Setup signals.  */
-	
-	signals[CHANGED] =
-		g_signal_new ("changed",
-			      E_TYPE_CAL_ATTACHMENT_BAR,
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (CalAttachmentBarClass, changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-}
-
-static void
-init (CalAttachmentBar *bar)
-{
-	CalAttachmentBarPrivate *priv;
-	
-	priv = g_new (CalAttachmentBarPrivate, 1);
-	
-	priv->attachments = NULL;
-	priv->num_attachments = 0;
-	priv->local_attachment_store = NULL;
-	priv->comp_uid = NULL;
-	priv->path = NULL;
-	
-	bar->priv = priv;
-}
-
-GType
-cal_attachment_bar_get_type (void)
-{
-	static GType type = 0;
-	
-	if (type == 0) {
-		static const GTypeInfo info = {
-			sizeof (CalAttachmentBarClass),
-			NULL, NULL,
-			(GClassInitFunc) class_init,
-			NULL, NULL,
-			sizeof (CalAttachmentBar),
-			0,
-			(GInstanceInitFunc) init,
-		};
-		
-		type = g_type_register_static (GNOME_TYPE_ICON_LIST, "CalAttachmentBar", &info, 0);
-	}
-	
-	return type;
-}
-
-GtkWidget *
-cal_attachment_bar_new (GtkAdjustment *adj)
-{
-	CalAttachmentBar *new;
-	GnomeIconList *icon_list;
-	int width, height, icon_width, window_height;
-	PangoFontMetrics *metrics;
-	PangoContext *context;
-	
-	new = g_object_new (cal_attachment_bar_get_type (), NULL);
-	
-	icon_list = GNOME_ICON_LIST (new);
-	
-	context = gtk_widget_get_pango_context ((GtkWidget *) new);
-	metrics = pango_context_get_metrics (context, ((GtkWidget *) new)->style->font_desc, pango_context_get_language (context));
-	width = PANGO_PIXELS (pango_font_metrics_get_approximate_char_width (metrics)) * 15;
-	/* This should be *2, but the icon list creates too much space above ... */
-	height = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) + pango_font_metrics_get_descent (metrics)) * 3;
-	pango_font_metrics_unref (metrics);
-	
-	icon_width = ICON_WIDTH + ICON_SPACING + ICON_BORDER + ICON_TEXT_SPACING;
-	icon_width = MAX (icon_width, width);
-	
-	gnome_icon_list_construct (icon_list, icon_width, adj, 0);
-	
-	window_height = ICON_WIDTH + ICON_SPACING + ICON_BORDER + ICON_TEXT_SPACING + height;
-	gtk_widget_set_size_request (GTK_WIDGET (new), icon_width * 4, window_height);
-	
-	gnome_icon_list_set_separators (icon_list, ICON_SEPARATORS);
-	gnome_icon_list_set_row_spacing (icon_list, ICON_ROW_SPACING);
-	gnome_icon_list_set_col_spacing (icon_list, ICON_COL_SPACING);
-	gnome_icon_list_set_icon_border (icon_list, ICON_BORDER);
-	gnome_icon_list_set_text_spacing (icon_list, ICON_TEXT_SPACING);
-	gnome_icon_list_set_selection_mode (icon_list, GTK_SELECTION_MULTIPLE);
-
-	atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (new)), 
-				_("Attachment Bar"));
-	
-	return GTK_WIDGET (new);
-}
-
-static char *
-get_default_charset (void)
-{
-	GConfClient *gconf;
-	const char *locale;
-	char *charset;
-	
-	gconf = gconf_client_get_default ();
-	charset = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL);
-	
-	if (!charset || charset[0] == '\0') {
-		g_free (charset);
-		charset = gconf_client_get_string (gconf, "/apps/evolution/mail/format/charset", NULL);
-		if (charset && charset[0] == '\0') {
-			g_free (charset);
-			charset = NULL;
-		}
-	}
-	
-	g_object_unref (gconf);
-	
-	if (!charset && (locale = e_iconv_locale_charset ()))
-		charset = g_strdup (locale);
-	
-	return charset ? charset : g_strdup ("us-ascii");
-}
-
-void 
-cal_attachment_bar_set_local_attachment_store (CalAttachmentBar *bar,
-		const char *attachment_store)
-{
-	if (bar->priv->local_attachment_store) 
-		g_free (bar->priv->local_attachment_store);
-	bar->priv->local_attachment_store = 
-		g_strconcat (attachment_store, "/", NULL);
-}
-
-void 
-cal_attachment_bar_set_comp_uid (CalAttachmentBar *bar, char *comp_uid)
-{
-	if (bar->priv->comp_uid) 
-		g_free (bar->priv->comp_uid);
-	bar->priv->comp_uid = comp_uid;	
-}
-
-guint
-cal_attachment_bar_get_num_attachments (CalAttachmentBar *bar)
-{
-	g_return_val_if_fail (bar != NULL, 0);
-	g_return_val_if_fail (E_IS_CAL_ATTACHMENT_BAR (bar), 0);
-	
-	return bar->priv->num_attachments;
-}
-
-void
-cal_attachment_bar_attach_mime_part (CalAttachmentBar *bar,
-						CamelMimePart *part)
-{
-	g_return_if_fail (E_IS_CAL_ATTACHMENT_BAR (bar));
-	
-	add_from_mime_part (bar, part);
-}
-
-void
-cal_attachment_bar_attach (CalAttachmentBar *bar,
-				      const gchar *file_name)
-{
-	g_return_if_fail (E_IS_CAL_ATTACHMENT_BAR (bar));
-	
-	if (file_name == NULL)
-		add_from_user (bar);
-	else
-		add_from_file (bar, file_name, "attachment");
-}
-
-typedef struct DownloadInfo {
-	CalAttachment *attachment;
-	CalAttachmentBar *bar;
-	gchar *file_name;
-}DownloadInfo;
-
-static int
-async_progress_update_cb (GnomeVFSAsyncHandle      *handle,
-			  GnomeVFSXferProgressInfo *info,
-			  DownloadInfo *download_info)
-{
-	int percent=0;
-	switch (info->status) {
-	case GNOME_VFS_XFER_PROGRESS_STATUS_OK:
-	{
-		gchar *base_path =  g_path_get_basename(download_info->attachment->file_name);
-		if (info->file_size) {
-			percent = info->bytes_copied*100/info->file_size;
-			update_remote_file (download_info->bar, 
-					    download_info->attachment, 
-					    g_strdup_printf("%s (%d\%)", base_path, percent));
-		} else {
-			update_remote_file (download_info->bar, 
-					    download_info->attachment, 
-					    g_strdup_printf("%s (%d\%)", base_path, percent));	
-		}
-		g_free (base_path);
-		
-		if (info->phase == GNOME_VFS_XFER_PHASE_COMPLETED) {
-			CamelException ex;
-			
-			download_info->attachment->is_available_local = TRUE;
-			download_info->attachment->handle = NULL;
-			camel_exception_init (&ex);
-			cal_attachment_build_remote_file (download_info->file_name, download_info->attachment, "attachment", &ex);
-			update(download_info->bar);
-			g_free (download_info->file_name);
-			g_free (download_info);
-		}
-		return TRUE;
-		break;
-	}
-	case GNOME_VFS_XFER_PROGRESS_STATUS_VFSERROR:
-		gnome_vfs_async_cancel (handle);
-		g_free (download_info->file_name);
-		g_free (download_info);
-		return FALSE;
-		break;
-
-	default:
-		break;
-	}
-
-	return TRUE;
-}
-
-static void
-download_to_local_path (GnomeVFSURI  *source_uri, GnomeVFSURI  *target_uri, DownloadInfo *download_info)
-			
-{
-	GnomeVFSResult       result;
-	GList               *source_uri_list = NULL;
-	GList               *target_uri_list = NULL;
-
-	source_uri_list = g_list_prepend (source_uri_list, source_uri);
-	target_uri_list = g_list_prepend (target_uri_list, target_uri);
-
-	/* Callback info */
-	result = gnome_vfs_async_xfer (&download_info->attachment->handle,                        /* handle_return   */
-				       source_uri_list,                       /* source_uri_list */
-				       target_uri_list,                       /* target_uri_list */
-				       GNOME_VFS_XFER_DEFAULT,                /* xfer_options    */
-				       GNOME_VFS_XFER_ERROR_MODE_ABORT,       /* error_mode      */ 
-				       GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, /* overwrite_mode  */ 
-				       GNOME_VFS_PRIORITY_DEFAULT,            /* priority        */
-				       async_progress_update_cb,              /* progress_update_callback */
-				       download_info,                         /* update_callback_data     */
-				       NULL,                                  /* progress_sync_callback   */
-				       NULL);                                 /* sync_callback_data       */
-}
-
-
-int 
-cal_attachment_bar_get_download_count (CalAttachmentBar *bar)
-{
-	CalAttachmentBarPrivate *priv;
-	GList *p;
-	int count=0;
-	
-	priv = bar->priv;
-	
-	for (p = priv->attachments; p != NULL; p = p->next) {
-		CalAttachment *attachment;
-		
-		attachment = p->data;
-		if (!attachment->is_available_local)
-			count++;
-	}
-
-	return count;
-}
-
-void 
-cal_attachment_bar_attach_remote_file (CalAttachmentBar *bar,
-				       const gchar *url)
-{
-	CalAttachment *attachment;
-	CamelException ex;
-	gchar *tmpfile;
-	gchar *base;
-
-	if (!bar->priv->path)
-		bar->priv->path = e_mkdtemp("attach-XXXXXX");
-	base = g_path_get_basename (url);
-	
-	g_return_if_fail (E_IS_CAL_ATTACHMENT_BAR (bar));
-	tmpfile = g_build_filename (bar->priv->path, base, NULL);
-
-	g_free (base);
-
-	camel_exception_init (&ex);
-	attachment = cal_attachment_new_remote_file (tmpfile, "attachment", &ex);
-	if (attachment) {
-		DownloadInfo *download_info;
-		download_info = g_new (DownloadInfo, 1);
-		download_info->attachment = attachment;
-		download_info->bar =bar;
-		download_info->file_name = g_strdup (tmpfile);
-		add_common (bar, attachment);
-		download_to_local_path (gnome_vfs_uri_new(url), gnome_vfs_uri_new(tmpfile), download_info);
-
-	} else {
-		e_error_run((GtkWindow *)gtk_widget_get_toplevel((GtkWidget *)bar), "mail-composer:no-attach",
-			    attachment->file_name, camel_exception_get_description(&ex), NULL);
-		camel_exception_clear (&ex);
-	}
-
-	g_free (tmpfile);
-	
-}
-
-/*
- *  TODO  write a good documentation
- *  this method serializes the attached files on the filesystem
- *  and sets the urls to the component
- */
-GSList *
-cal_attachment_bar_get_attachment_list (CalAttachmentBar *bar)
-{
-	CalAttachmentBarPrivate *priv;
-	CalAttachment *attachment;
-	GSList *list = NULL, *p;
-
-	priv = bar->priv;
-	for (p = priv->attachments; p != NULL; p = p->next) {
-		CamelDataWrapper *wrapper;
-		CamelStreamMem *mstream;
-		unsigned char *buffer = NULL;
-		int fd;
-		char *attach_file_url;
-	
-		attachment = p->data;
-
-		if (!attachment->is_available_local)
-			continue;
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body));
-		mstream = (CamelStreamMem *) camel_stream_mem_new ();
-			
-		camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream);
-		buffer = g_memdup (mstream->buffer->data, mstream->buffer->len);
-
-
-		/* Extract the content from the stream and write it down
-		 * as a mime part file into the directory denoting the
-		 * calendar source */
-		attach_file_url = g_strconcat (priv->local_attachment_store,
-				priv->comp_uid,  "-",
-			 camel_file_util_safe_filename
-			 (camel_mime_part_get_filename (attachment->body)), NULL); 
-
-		fd = open (attach_file_url+7, O_RDWR|O_CREAT|O_TRUNC, 0600);
-		if (fd == -1) {
-			/* TODO handle error conditions */
-			g_message ("DEBUG: could not open the file descriptor\n");
-			continue;
-		}
-
-		/* write the camel mime part  (attachment->body) into the file*/
-		if (camel_write (fd, buffer, mstream->buffer->len) == -1) {
-			/* TODO handle error condition */
-			g_message ("DEBUG: camel write failed.\n");
-			continue;
-		}
-		list = g_slist_append (list, g_strdup (attach_file_url));
-		/* do i need to close the fd */
-		g_free (attach_file_url);
-	}	
-	
-	return list;
-}
-
-char *
-cal_attachment_bar_get_nth_attachment_filename (CalAttachmentBar *bar, int n)
-{
-	CalAttachment *attach;
-
-	g_return_val_if_fail (bar != NULL, 0);
-	g_return_val_if_fail (E_IS_CAL_ATTACHMENT_BAR (bar), 0);
-	
-	attach = g_slist_nth_data (bar->priv->attachments, n);
-	return g_strconcat (bar->priv->local_attachment_store, bar->priv->comp_uid, "-", camel_mime_part_get_filename
-			(attach->body), NULL);
-}
-
-/* TODO (sigh) this loads the attachments
- * from the file system just for displaying the iconlist
- * need a better approach here.
- */
-void
-cal_attachment_bar_set_attachment_list (CalAttachmentBar *bar, GSList *attach_list)
-{
-	CalAttachmentBarPrivate *priv;
-	GSList  *p;
-
-	priv = bar->priv;
-
-	if (priv->attachments) {
-		/* To prevent repopulating the
-		 * bar due to redraw functions in fill_widget. 
-		 * Assumes it can be set only once.
-		 */		
-		return; 
-	}
-
-	for (p = attach_list; p != NULL; p = p->next) {
-		char *attach_filename;
-		CalAttachment *attach;
-		
-		attach_filename = (char *) p->data;
-		/* should we assert if g_str_has_prefix (attach_filename, "file://")) 
-		 * here
-		*/
-		/* get url sans protocol and add it to the bar.
-		 * how to set the filename properly */
-		cal_attachment_bar_attach (bar, attach_filename +7);
-		/* set file name correctly on the display */
-		attach =  g_slist_nth_data (priv->attachments,
-				priv->num_attachments-1);
-		if (attach) {
-			camel_mime_part_set_filename (attach->body,
-					attach_filename + strlen (priv->local_attachment_store)+ 
-					strlen (priv->comp_uid) + 1); 
-			update (bar);
-		}
-	}
-}
-
-GSList *
-cal_attachment_bar_get_mime_attach_list (CalAttachmentBar *bar)
-{
-	CalAttachmentBarPrivate *priv;
-	struct CalMimeAttach *cal_mime_attach;
-	GSList *attach_list = NULL, *l;
-
-	/* TODO assert sanity of bar */
-	priv = bar->priv;	
-	for (l = priv->attachments; l ; l = l->next) {
-		
-		CalAttachment *attach = (CalAttachment *) l->data;
-		CamelDataWrapper *wrapper;
-		CamelStreamMem *mstream;
-		unsigned char *buffer = NULL;
-		char *desc;
-
-		if (!attach->is_available_local)
-			continue;
-		
-		cal_mime_attach = g_malloc0 (sizeof (struct CalMimeAttach));
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (attach->body));
-		mstream = (CamelStreamMem *) camel_stream_mem_new ();
-			
-		camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream);
-		buffer = g_memdup (mstream->buffer->data, mstream->buffer->len);
-		
-		cal_mime_attach->encoded_data = buffer;
-		cal_mime_attach->length = mstream->buffer->len;
-		cal_mime_attach->filename = g_strdup (camel_mime_part_get_filename
-			((CamelMimePart *) attach->body));
-		desc = camel_mime_part_get_description ((CamelMimePart *) attach->body);
-		if (!desc || *desc == '\0')
-			desc = _("attachment");
-		cal_mime_attach->description = g_strdup (desc);
-		cal_mime_attach->content_type = g_strdup (camel_data_wrapper_get_mime_type (wrapper));
-		
-		attach_list = g_slist_append (attach_list, cal_mime_attach);
-		
-	}
-
-	return attach_list;
-}
diff --git a/calendar/gui/dialogs/cal-attachment-bar.h b/calendar/gui/dialogs/cal-attachment-bar.h
deleted file mode 100644
index 3eb1dff95c..0000000000
--- a/calendar/gui/dialogs/cal-attachment-bar.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* msg-composer-attachment-bar.h
- *
- * Copyright (C) 2004  Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
- * License as published by the Free Software Foundation.
- *
- * This program 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 program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Harish Krishnaswamy <kharish@novell.com>
- */
-
-#ifndef __CAL_ATTACHMENT_BAR_H__
-#define __CAL_ATTACHMENT_BAR_H__
-
-#include <libgnomeui/gnome-icon-list.h>
-#include <camel/camel-multipart.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_CAL_ATTACHMENT_BAR \
-	(cal_attachment_bar_get_type ())
-#define CAL_ATTACHMENT_BAR(obj)   \
-	(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_ATTACHMENT_BAR, CalAttachmentBar))
-#define CAL_ATTACHMENT_BAR_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CAL_ATTACHMENT_BAR, CalAttachmentBarClass))
-#define E_IS_CAL_ATTACHMENT_BAR(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_ATTACHMENT_BAR))
-#define E_IS_CAL_ATTACHMENT_BAR_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CAL_ATTACHMENT_BAR))
-
-typedef struct _CalAttachmentBar CalAttachmentBar;
-typedef struct _CalAttachmentBarClass CalAttachmentBarClass;
-typedef struct _CalAttachmentBarPrivate CalAttachmentBarPrivate;
-
-struct _CalAttachmentBar {
-	GnomeIconList parent;
-	
-	CalAttachmentBarPrivate *priv;
-};
-
-struct _CalAttachmentBarClass {
-	GnomeIconListClass parent_class;
-	
-	void (* changed) (CalAttachmentBar *bar);
-};
-
-
-GtkType cal_attachment_bar_get_type (void);
-
-GtkWidget *cal_attachment_bar_new (GtkAdjustment *adj);
-void cal_attachment_bar_to_multipart (CalAttachmentBar *bar, CamelMultipart *multipart,
-						 const char *default_charset);
-guint cal_attachment_bar_get_num_attachments (CalAttachmentBar *bar);
-void cal_attachment_bar_attach (CalAttachmentBar *bar, const char *file_name);
-void cal_attachment_bar_attach_mime_part (CalAttachmentBar *bar, CamelMimePart *part);
-void cal_attachment_bar_attach_remote_file (CalAttachmentBar *bar, const gchar *url);
-int cal_attachment_bar_get_download_count (CalAttachmentBar *bar);
-GSList *cal_attachment_bar_get_attachment_list (CalAttachmentBar *bar);
-char * cal_attachment_bar_get_nth_attachment_filename (CalAttachmentBar *bar, int n);
-GSList *cal_attachment_bar_get_mime_attach_list (CalAttachmentBar *bar);
-void cal_attachment_bar_set_attachment_list (CalAttachmentBar *bar, GSList *attach_list);
-void cal_attachment_bar_set_local_attachment_store (CalAttachmentBar *bar, 
-		const char *attachment_store);
-void cal_attachment_bar_set_comp_uid (CalAttachmentBar *bar, char *comp_uid);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CAL_ATTACHMENT_BAR_H__ */