** Remove dead files from source control. The dates below indicate when

2007-11-03  Matthew Barnes  <mbarnes@redhat.com>

	** Remove dead files from source control.  The dates below
	   indicate when the file was removed from Makefile.am.
	   Fixes part of bug #478704.

	* addressbook/printing/e-contact-print-envelope.c	(Apr 2007)
	* addressbook/printing/e-contact-print-envelope.h	(Apr 2007)
	* addressbook/tools/evolution-addressbook-abuse.c	(May 2004)
	* addressbook/tools/evolution-addressbook-import.c	(no history)
	* calendar/gui/dialogs/calendar-setup.glade		(Nov 2004)
	* calendar/gui/dialogs/meeting-page.etspec		(Sep 2003)
	* calendar/gui/dialogs/new-calendar.glade		(Jan 2003)
	* calendar/gui/dialogs/new-task-list.glade		(Jan 2004)
	* calendar/gui/dialogs/url-editor-dialog.c		(Dec 2005)
	* calendar/gui/dialogs/url-editor-dialog.glade		(Dec 2005)
	* calendar/gui/dialogs/url-editor-dialog.h		(Dec 2005)
	* calendar/gui/e-pub-utils.c				(Dec 2005)
	* calendar/gui/e-pub-utils.h				(Dec 2005)
	* calendar/gui/gnome-calendar-conduit.png		(May 2000)
	* e-util/e-categories-master-list-wombat.c		(Jun 2005)
	* e-util/e-categories-master-list-wombat.h		(Jun 2005)
	* tools/evolution-launch-composer.c			(Jun 2003)

	* configure.in:
	Remove plugins/mail-remote/Makefile from AC_OUTPUT.
	Fixes a distcheck error.

	* po/POTFILES.in: Remove files for mail-remote plugin.


svn path=/trunk/; revision=34487

24 files changed, 53 insertions, 3755 deletions

diff --git a/ChangeLog b/ChangeLog
index f06c7f4ddb..ff0ff1c3ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-11-03  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Remove dead files from source control.  The dates below
+	   indicate when the file was removed from Makefile.am.
+	   Fixes part of bug #478704.
+
+	* tools/evolution-launch-composer.c	(Jun 2003)
+
+	* configure.in:
+	Remove plugins/mail-remote/Makefile from AC_OUTPUT.
+	Fixes a distcheck error.
+
 2007-10-31  Priit Laes  <plaes@svn.gnome.org>
 	
 	* addressbook/gui/widgets/eab-vcard-control.c: Remove debugging output.
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 2ce3cf36f8..c2431f1143 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-03  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Remove dead files from source control.  The dates below
+	   indicate when the file was removed from Makefile.am.
+	   Fixes part of bug #478704.
+
+	* printing/e-contact-print-envelope.c	(Apr 2007)
+	* printing/e-contact-print-envelope.h	(Apr 2007)
+	* tools/evolution-addressbook-abuse.c	(May 2004)
+	* tools/evolution-addressbook-import.c	(no history)
+
 2007-10-31  Michael Monreal  <mmonreal@svn.gnome.org>
 
 	** Fix for bug #484064
diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c
deleted file mode 100644
index f9ff1efc0f..0000000000
--- a/addressbook/printing/e-contact-print-envelope.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-envelope.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/* XXX Keeping the rendering code around for future reference,
- *     but it needs a lot of work to make it usable again. */
-
-#if 0
-
-#include <config.h>
-#include "addressbook/printing/e-contact-print-envelope.h"
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <time.h>
-#include <e-util/e-print.h>
-
-#define ENVELOPE_HEIGHT (72.0 * 4.0)
-#define ENVELOPE_WIDTH (72.0 * 9.5)
-
-typedef struct {
-	int start;
-	int length;
-} EcpeLine;
-
-static void
-startset(void *pointer, EcpeLine **iterator)
-{
-	(*iterator)--;
-	(*iterator)->start = GPOINTER_TO_INT(pointer);
-}
-
-static void
-lengthset(void *pointer, EcpeLine **iterator)
-{
-	(*iterator)--;
-	(*iterator)->length = GPOINTER_TO_INT(pointer);
-}
-
-static EcpeLine *
-ecpe_break(char *address)
-{
-	int i;
-	int length = 0;
-	int laststart = 0;
-	GList *startlist = NULL;
-	GList *lengthlist = NULL;
-	EcpeLine *ret_val;
-	EcpeLine *iterator;
-
-	for (i = 0; address[i]; i++) {
-		if (address[i] == '\n') {
-			startlist = g_list_prepend (startlist, GINT_TO_POINTER(laststart));
-			lengthlist = g_list_prepend (lengthlist, GINT_TO_POINTER(i - laststart));
-			length ++;
-			laststart = i + 1;
-		}
-	}
-	startlist = g_list_prepend (startlist, GINT_TO_POINTER(laststart));
-	lengthlist = g_list_prepend (lengthlist, GINT_TO_POINTER(i - laststart));
-	length ++;
-
-	ret_val = g_new(EcpeLine, length + 1);
-
-	iterator = ret_val + length;
-	g_list_foreach(startlist, (GFunc) startset, &iterator);
-	g_list_free(startlist);
-
-	iterator = ret_val + length;
-	g_list_foreach(lengthlist, (GFunc) lengthset, &iterator);
-	g_list_free(lengthlist);
-
-	ret_val[length].start = -1;
-	ret_val[length].length = -1;
-
-	return ret_val;
-}
-
-static void
-ecpe_linelist_dimensions(GnomeFont *font, char *address, EcpeLine *linelist, double *widthp, double *heightp)
-{
-	double width = 0;
-	int i;
-	if (widthp) {
-		for (i = 0; linelist[i].length != -1; i++) {
-			width = MAX(width, gnome_font_get_width_utf8_sized (font, address + linelist[i].start, linelist[i].length));
-		}
-		*widthp = width;
-	} else {
-		for (i = 0; linelist[i].length != -1; i++)
-			/* Intentionally empty */;
-	}
-	if (heightp) {
-		*heightp = gnome_font_get_size(font) * i;
-	}
-}
-
-static void
-ecpe_linelist_print(GnomePrintContext *pc, GnomeFont *font, char *address, EcpeLine *linelist, double x, double y)
-{
-	int i;
-	gnome_print_setfont(pc, font);
-	for (i = 0; linelist[i].length != -1; i++) {
-		gnome_print_moveto(pc, x, y + gnome_font_get_ascender(font));
-		gnome_print_show_sized (pc, address + linelist[i].start, linelist[i].length);
-		y -= gnome_font_get_size(font);
-	}
-}
-
-static void
-ecpe_print(GnomePrintContext *pc, EContact *contact, gboolean as_return)
-{
-	char *address;
-	EcpeLine *linelist;
-	double x;
-	double y;
-	GnomeFont *font;
-	
-
-	gnome_print_rotate(pc, 90);
-	gnome_print_translate(pc, 72.0 * 11.0 - ENVELOPE_WIDTH, -72.0 * 8.5 + (72.0 * 8.5 - ENVELOPE_HEIGHT) / 2);
-
-	address = e_contact_get(contact, E_CONTACT_ADDRESS_LABEL_WORK);
-	linelist = ecpe_break(address);
-	if (as_return)
-		font = gnome_font_find ("Sans", 9);
-	else
-		font = gnome_font_find ("Sans", 12);
-	ecpe_linelist_dimensions(font, address, linelist, NULL, &y);
-	if (as_return) {
-		x = 36;
-		y = ENVELOPE_HEIGHT - 36;
-	} else {
-		x = ENVELOPE_WIDTH / 2;
-		y = (ENVELOPE_HEIGHT - y) / 2;
-	}
-	ecpe_linelist_print(pc, font, address, linelist, x, y);
-	g_object_unref(font);
-	g_free(linelist);
-
-	g_free(address);
-
-	gnome_print_showpage(pc);
-	gnome_print_context_close(pc);
-}
-
-#endif
diff --git a/addressbook/printing/e-contact-print-envelope.h b/addressbook/printing/e-contact-print-envelope.h
deleted file mode 100644
index ff647af5c2..0000000000
--- a/addressbook/printing/e-contact-print-envelope.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-envelope.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef E_CONTACT_PRINT_ENVELOPE_H
-#define E_CONTACT_PRINT_ENVELOPE_H
-
-/* XXX Currently unused */
-
-#endif /* E_CONTACT_PRINT_ENVELOPE_H */
diff --git a/addressbook/tools/evolution-addressbook-abuse.c b/addressbook/tools/evolution-addressbook-abuse.c
deleted file mode 100644
index 3446e15938..0000000000
--- a/addressbook/tools/evolution-addressbook-abuse.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-
-#include <bonobo/bonobo-main.h>
-
-#include <backend/ebook/e-book.h>
-#include <gnome.h>
-
-#define CONTACTS_TO_ADD 2000
-
-static gchar *
-make_random_string (void)
-{
-	const gchar *elements = " abcdefghijklmnopqrstuvwxyz1234567890  ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-	gint len = strlen (elements);
-	gint i, N = 5 + (random () % 10);
-	gchar *str = g_malloc (N+1);
-
-	for (i = 0; i < N; ++i) {
-		str[i] = elements[random () % len];
-	}
-	str[i] = '\0';
-
-	return str;
-}
-
-static gchar *
-make_random_vcard (void)
-{
-	gchar *fa = make_random_string ();
-	gchar *name = make_random_string ();
-	gchar *email = make_random_string ();
-	gchar *org = make_random_string ();
-
-	gchar *vcard;
-
-	vcard = g_strdup_printf ("BEGIN:VCARD\n"
-				 "X-EVOLUTION-FILE-AS:%s\n"
-				 "N:%s\n"
-				 "EMAIL;INTERNET:%s\n"
-				 "ORG:%s\n"
-				 "END:VCARD",
-				 fa, name, email, org);
-	g_free (fa);
-	g_free (name);
-	g_free (email);
-	g_free (org);
-
-	return vcard;
-}
-
-int
-main (int argc, char *argv[])
-{
-	EBook *book;
-	int i;
-
-	if (getenv ("ABUSE_THE_WOMBAT") == NULL) {
-		g_print ("You probably don't want to use this program.\n"
-			 "It isn't very nice.\n");
-		exit(0);
-	}
-
-	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
-	gnome_program_init ("evolution-addressbook-abuse", VERSION,
-			    LIBGNOMEUI_MODULE, argc, argv, 
-			    GNOME_PROGRAM_STANDARD_PROPERTIES,
-			    NULL);
-
-	if (!e_book_get_default_addressbook (&book, NULL)) {
-		g_warning ("couldn't open addressbook");
-		exit (1);
-	}
-
-	for (i = 0; i < CONTACTS_TO_ADD; ++i) {
-		gchar *vcard = make_random_vcard ();
-		EContact *contact = e_contact_new_from_vcard (vcard);
-		g_message ("adding %d", i);
-		if (!e_book_add_contact (book, contact, NULL)) {
-			g_warning ("something went wrong...");
-			exit (1);
-		}
-		g_free (vcard);
-		g_object_unref (contact);
-	}
-
-	return 0;
-}
diff --git a/addressbook/tools/evolution-addressbook-import.c b/addressbook/tools/evolution-addressbook-import.c
deleted file mode 100644
index 28871efd96..0000000000
--- a/addressbook/tools/evolution-addressbook-import.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-
-#include <bonobo-activation/bonobo-activation.h>
-#include <bonobo/bonobo-main.h>
-#include <backend/ebook/e-book-async.h>
-#include <gnome.h>
-
-static int exec_ref_count = 0;
-
-static void
-ref_executable (void)
-{
-	exec_ref_count ++;
-}
-
-static void
-unref_executable (void)
-{
-	exec_ref_count --;
-	if (exec_ref_count == 0)
-		g_main_loop_quit (0);
-}
-
-static void
-add_cb (EBook *book, EBookStatus status, const char *id, gpointer closure)
-{
-	switch (status) {
-	case E_BOOK_ERROR_OK:
-		unref_executable ();
-		break;
-	default:
-		g_main_loop_quit (NULL);
-		break;
-	}
-}
-
-static void
-use_addressbook (EBook *book, gpointer closure)
-{
-	GList *cards, *list;
-	char *filename = closure;
-
-	if (book == NULL)
-		g_error (_("Error loading default addressbook."));
-
-	cards = e_card_load_cards_from_file (filename);
-
-	ref_executable ();
-
-	for (list = cards; list; list = list->next) {
-		ref_executable ();
-		e_book_add_card (book, list->data, add_cb, closure);
-	}
-	sync();
-
-	unref_executable ();
-}
-
-int
-main (int argc, char *argv[])
-{
-	char *filename = NULL;
-
-	struct poptOption options[] = {
-		{ "input-file", '\0', POPT_ARG_STRING, &filename, 0, N_("Input File"), NULL },
-		POPT_AUTOHELP
-		{ NULL, '\0', 0, NULL, 0, NULL, NULL }
-	};
-
-	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
-	gnome_program_init ("evolution-addressbook-import", VERSION,
-			    LIBGNOMEUI_MODULE, argc, argv, 
-			    GNOME_PROGRAM_STANDARD_PROPERTIES,
-			    GNOME_PARAM_POPT_TABLE, options,
-			    NULL);
-
-	if (filename == NULL) {
-		g_error (_("No filename provided."));
-	}
-
-	e_book_async_get_default_addressbook (use_addressbook, filename);
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 296ff4f5da..995aa60543 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,20 @@
+2007-11-03  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Remove dead files from source control.  The dates below
+	   indicate when the file was removed from Makefile.am.
+	   Fixes part of bug #478704.
+
+	* gui/dialogs/calendar-setup.glade	(Nov 2004)
+	* gui/dialogs/meeting-page.etspec	(Sep 2003)
+	* gui/dialogs/new-calendar.glade	(Jan 2003)
+	* gui/dialogs/new-task-list.glade	(Jan 2004)
+	* gui/dialogs/url-editor-dialog.c	(Dec 2005)
+	* gui/dialogs/url-editor-dialog.glade	(Dec 2005)
+	* gui/dialogs/url-editor-dialog.h	(Dec 2005)
+	* gui/e-pub-utils.c			(Dec 2005)
+	* gui/e-pub-utils.h			(Dec 2005)
+	* gui/gnome-calendar-conduit.png	(May 2000)
+
 2007-11-02  Damien Carbery  <damien.carbery@sun.com>
 
 	** Fixes bug #492058
diff --git a/calendar/gui/dialogs/calendar-setup.glade b/calendar/gui/dialogs/calendar-setup.glade
deleted file mode 100644
index 75631fe1fc..0000000000
--- a/calendar/gui/dialogs/calendar-setup.glade
+++ /dev/null
@@ -1,920 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkWindow" id="add-calendar-window">
-  <property name="title" translatable="yes">Add Calendar</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">320</property>
-  <property name="default_height">240</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-
-  <child>
-    <widget class="GtkVBox" id="vbox1">
-      <property name="border_width">12</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">12</property>
-
-      <child>
-	<widget class="GtkTable" id="settings-table">
-	  <property name="visible">True</property>
-	  <property name="n_rows">5</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkEntry" id="name-entry">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="uri-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_URL:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="refresh-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Refresh:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkAlignment" id="refresh-hbox">
-	      <property name="visible">True</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xscale">0</property>
-	      <property name="yscale">1</property>
-	      <property name="top_padding">0</property>
-	      <property name="bottom_padding">0</property>
-	      <property name="left_padding">0</property>
-	      <property name="right_padding">0</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox2">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkSpinButton" id="refresh-spin">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="climb_rate">1</property>
-		      <property name="digits">0</property>
-		      <property name="numeric">False</property>
-		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		      <property name="snap_to_ticks">False</property>
-		      <property name="wrap">False</property>
-		      <property name="adjustment">30 0 100 1 10 10</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkOptionMenu" id="refresh-optionmenu">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child>
-			<widget class="GtkMenu" id="menu3">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="minutes1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">minutes</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_minutes1_activate" last_modification_time="Tue, 17 Feb 2004 17:39:35 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="hours1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">hours</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_hours1_activate" last_modification_time="Tue, 17 Feb 2004 17:39:35 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="days1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">days</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_days1_activate" last_modification_time="Tue, 17 Feb 2004 17:39:35 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="weeks1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">weeks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_weeks1_activate" last_modification_time="Tue, 17 Feb 2004 17:39:35 GMT"/>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label35">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">C_olor:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">source-color</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="uri-hbox">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkEntry" id="uri-entry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkOptionMenu" id="group-optionmenu">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="history">-1</property>
-
-	      <child>
-		<widget class="GtkMenu" id="menu1">
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="group-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Type:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">group-optionmenu</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="name-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Name:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">name-entry</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkColorButton" id="source-color">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="use_alpha">False</property>
-	      <property name="title" translatable="yes">Pick a color</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">10</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="add-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment1">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox1">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkImage" id="image1">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-add</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label3">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Add Calendar</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="add-task-list-window">
-  <property name="title" translatable="yes">Add Task List</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">320</property>
-  <property name="default_height">240</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-
-  <child>
-    <widget class="GtkVBox" id="vbox87">
-      <property name="border_width">12</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">12</property>
-
-      <child>
-	<widget class="GtkTable" id="settings-table">
-	  <property name="visible">True</property>
-	  <property name="n_rows">5</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkEntry" id="name-entry">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="uri-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_URL:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="refresh-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Refresh:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label593">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">C_olor:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">source-color</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkColorButton" id="source-color">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="use_alpha">False</property>
-	      <property name="title" translatable="yes">Pick a color</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="uri-hbox">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkEntry" id="uri-entry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkOptionMenu" id="group-optionmenu">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="history">-1</property>
-
-	      <child>
-		<widget class="GtkMenu" id="menu5">
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label594">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Type:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">group-optionmenu</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label595">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Name:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">name-entry</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkAlignment" id="refresh-hbox">
-	      <property name="visible">True</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xscale">0</property>
-	      <property name="yscale">1</property>
-	      <property name="top_padding">0</property>
-	      <property name="bottom_padding">0</property>
-	      <property name="left_padding">0</property>
-	      <property name="right_padding">0</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox130">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkSpinButton" id="refresh-spin">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="climb_rate">1</property>
-		      <property name="digits">0</property>
-		      <property name="numeric">False</property>
-		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		      <property name="snap_to_ticks">False</property>
-		      <property name="wrap">False</property>
-		      <property name="adjustment">30 0 100 1 10 10</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkOptionMenu" id="refresh-optionmenu">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child>
-			<widget class="GtkMenu" id="menu6">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="menuitem7">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">minutes</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_minutes1_activate" last_modification_time="Tue, 17 Feb 2004 17:39:35 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="menuitem8">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">hours</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_hours1_activate" last_modification_time="Tue, 17 Feb 2004 17:39:35 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="menuitem9">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">days</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_days1_activate" last_modification_time="Tue, 17 Feb 2004 17:39:35 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="menuitem10">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">weeks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_weeks1_activate" last_modification_time="Tue, 17 Feb 2004 17:39:35 GMT"/>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox22">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">10</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="add-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment48">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox129">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkImage" id="image12">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-add</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="add-label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Add Task List</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/meeting-page.etspec b/calendar/gui/dialogs/meeting-page.etspec
deleted file mode 100644
index a52c874cd2..0000000000
--- a/calendar/gui/dialogs/meeting-page.etspec
+++ /dev/null
@@ -1,21 +0,0 @@
-<ETableSpecification click-to-add="true" click-to-add-end="true" _click-to-add-message="Click here to add an attendee" draw-grid="true">
-  <ETableColumn model_col= "0" _title="Attendee" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
-  <ETableColumn model_col= "1" _title="Member" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
-  <ETableColumn model_col= "2" _title="Type" expansion="1.0" minimum_width="10" resizable="true" cell="typeedit" compare="collate"/>
-  <ETableColumn model_col= "3" _title="Role" expansion="1.0" minimum_width="10" resizable="true" cell="roleedit" compare="collate"/>
-  <ETableColumn model_col= "4" _title="RSVP" expansion="1.0" minimum_width="10" resizable="true" cell="rsvpedit" compare="collate"/>
-  <ETableColumn model_col= "5" _title="Delegated To" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
-  <ETableColumn model_col= "6" _title="Delegated From" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
-  <ETableColumn model_col= "7" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="statusedit" compare="collate"/>
-  <ETableColumn model_col= "8" _title="Common Name" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
-  <ETableColumn model_col= "9" _title="Language" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
-
-  <ETableState>
-     <column source="0"/>
-     <column source="2"/>
-     <column source="3"/>
-     <column source="4"/>
-     <column source="7"/>
-     <grouping></grouping>
-  </ETableState>
-</ETableSpecification>
diff --git a/calendar/gui/dialogs/new-calendar.glade b/calendar/gui/dialogs/new-calendar.glade
deleted file mode 100644
index 264d115d06..0000000000
--- a/calendar/gui/dialogs/new-calendar.glade
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="new-calendar-dialog">
-  <property name="border_width">12</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Add New Calendar</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
-  <property name="modal">False</property>
-  <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancelbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="okbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table1">
-	  <property name="visible">True</property>
-	  <property name="n_rows">4</property>
-	  <property name="n_columns">3</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label2">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Calendar Group</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkOptionMenu" id="calendar-group">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="history">-1</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="calendar-name">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_padding">6</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Calendar options&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_padding">6</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label3">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Calendar Name</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="calendar-source-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Calendar Location</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="calendar-location">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_padding">6</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">4</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/new-task-list.glade b/calendar/gui/dialogs/new-task-list.glade
deleted file mode 100644
index c827868a6d..0000000000
--- a/calendar/gui/dialogs/new-task-list.glade
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkDialog" id="new-task-list-dialog">
-  <property name="border_width">12</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Add New Task List</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
-  <property name="modal">False</property>
-  <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancelbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="okbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table1">
-	  <property name="visible">True</property>
-	  <property name="n_rows">3</property>
-	  <property name="n_columns">3</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label2">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Task List Group</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkOptionMenu" id="task-list-group">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="history">-1</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="task-list-name">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_padding">6</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Task List Options&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_padding">6</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label3">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Task List Name</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">4</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/url-editor-dialog.c b/calendar/gui/dialogs/url-editor-dialog.c
deleted file mode 100644
index 32f78a5a3f..0000000000
--- a/calendar/gui/dialogs/url-editor-dialog.c
+++ /dev/null
@@ -1,394 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Gary Ekker <gekker@novell.com>
- *
- * Copyright 2004 Ximian, 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
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
-
-/*
- * UrlEditorDialog - a GtkObject which handles a libglade-loaded dialog
- * to edit the calendar preference settings.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
-#include "cal-prefs-dialog.h"
-#include "url-editor-dialog.h"
-
-#include <gtk/gtk.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtktogglebutton.h>
-#include <libgnomeui/gnome-color-picker.h>
-#include <libedataserverui/e-passwords.h>
-#include <glade/glade.h>
-#include <e-util/e-dialog-widgets.h>
-#include <e-util/e-icon-factory.h>
-#include <e-util/e-util-private.h>
-#include <misc/e-dateedit.h>
-#include <stdlib.h>
-#include <string.h>
-
-static gboolean get_widgets (UrlDialogData *data);
-static void init_widgets (UrlDialogData *data);
-
-static void url_editor_dialog_fb_url_changed (GtkEntry *url_entry, void *data);
-static void url_editor_dialog_fb_daily_toggled (GtkWidget *button, void *data);
-static void url_editor_dialog_fb_url_activated (GtkEntry *url_entry, void *data);
-static void url_editor_dialog_fb_ok_enable (GtkWidget *widget, void *data);
-
-/**
- * url_editor_dialog_new:
- *
- * Creates a new #UrlEditorDialog.
- *
- * Return value: a new #UrlEditorDialog.
- **/
-gboolean
-url_editor_dialog_new (DialogData *dialog_data, EPublishUri *uri)
-{
-	int b;
-	char *gladefile;
-	UrlDialogData *url_dlg_data = g_new0 (UrlDialogData, 1);
-
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
-				      "url-editor-dialog.glade",
-				      NULL);
-	url_dlg_data->xml = glade_xml_new (gladefile, NULL, NULL);
-	g_free (gladefile);
-
-	if (!url_dlg_data->xml) {
-		g_message ("url_editor_dialog_construct(): Could not load the Glade XML file!");
-		return FALSE;
-	}
-
-	if (!get_widgets (url_dlg_data)) {
-		g_message ("url_editor_dialog_construct(): Could not find all widgets in the XML file!");
-		return FALSE;
-	}
-	
-	url_dlg_data->url_dialog = (GtkWidget *) dialog_data;
-	url_dlg_data->url_data = uri;
-	
-	init_widgets (url_dlg_data);
-	
-	if (uri->location && uri->username) {
-		if (strlen(uri->location) != 0) {
-			gtk_entry_set_text (url_dlg_data->url_entry, 
-					    uri->location);
-		}
-		if (strlen(uri->username) != 0) {
-			gtk_entry_set_text (url_dlg_data->username_entry, 
-					    uri->username);
-		}
-	}
-	
-	uri->password = e_passwords_get_password ("Calendar", url_dlg_data->url_data->location);
-	
-	if (uri->password) {
-		if (strlen(uri->password) != 0) {
-			gtk_entry_set_text (url_dlg_data->password_entry, 
-					    uri->password);
-
-			e_dialog_toggle_set (url_dlg_data->remember_pw, TRUE);
-		} else {
-			e_dialog_toggle_set (url_dlg_data->remember_pw, FALSE);
-		}
-	}
-	
-	switch (uri->publish_freq) {
-		case URI_PUBLISH_DAILY:
-			e_dialog_radio_set (url_dlg_data->daily, 
-						URI_PUBLISH_DAILY, 
-						pub_frequency_type_map);
-			break;
-		case URI_PUBLISH_WEEKLY:
-			e_dialog_radio_set (url_dlg_data->daily, 
-						URI_PUBLISH_WEEKLY, 
-						pub_frequency_type_map);
-			break;
-		case URI_PUBLISH_USER:
-		default:
-			e_dialog_radio_set (url_dlg_data->daily, 
-						URI_PUBLISH_USER, 
-						pub_frequency_type_map);
-	}
-
-	dialog_data->url_editor=TRUE; 
-	dialog_data->url_editor_dlg = (GtkWidget *) url_dlg_data;
-	gtk_widget_set_sensitive ((GtkWidget *) url_dlg_data->ok, FALSE);
-	
-	b = gtk_dialog_run ((GtkDialog *) url_dlg_data->url_editor);
-	
-	if (b == GTK_RESPONSE_OK) {
-		if ((GtkEntry *) url_dlg_data->url_entry) {
-			url_editor_dialog_fb_url_activated (url_dlg_data->url_entry, url_dlg_data);
-			url_dlg_data->url_data->username = g_strdup (gtk_entry_get_text ((GtkEntry *) url_dlg_data->username_entry));
-			url_dlg_data->url_data->password = g_strdup (gtk_entry_get_text ((GtkEntry *) url_dlg_data->password_entry));
-			if (e_dialog_toggle_get (url_dlg_data->remember_pw)) {
-				e_passwords_add_password (url_dlg_data->url_data->location, url_dlg_data->url_data->password);
-				e_passwords_remember_password ("Calendar", url_dlg_data->url_data->location);				
-			} else {
-				e_passwords_forget_password ("Calendar", url_dlg_data->url_data->location);
-			}
-		}
-	}
-	
-	gtk_widget_destroy (url_dlg_data->url_editor);
-	g_object_unref (url_dlg_data->xml);
-	g_free (url_dlg_data);
-	url_dlg_data = NULL;
-	
-	return FALSE;
-}
-
-static gboolean
-get_widgets (UrlDialogData *data)
-{
-#define GW(name) glade_xml_get_widget (data->xml, name)
-
-	data->url_editor = GW ("url_editor");
-	data->calendar_list_label = GW ("calendar_list_label");
-	data->url_dialog = GW ("fb_dialog");
-	data->url_entry = GTK_ENTRY (GW ("url_entry"));
-	data->daily = GW ("daily");
-	data->weekly = GW ("weekly");
-	data->user_publish = GW ("user_publish");
-	data->scrolled_window =  GW ("scrolled_window");
-	data->username_entry = GTK_ENTRY (GW ("username_entry"));
-	data->password_entry = GTK_ENTRY (GW ("password_entry"));
-	data->remember_pw = GW ("remember_pw");
-	data->cancel = GW ("cancel");
-	data->ok = GW ("ok");
-
-#undef GW
-
-	return (data ->url_editor
-		&& data->calendar_list_label
-		&& data->url_entry
-		&& data->daily
-		&& data->weekly
-		&& data->user_publish
-		&& data->scrolled_window
-		&& data->username_entry
-		&& data->password_entry
-		&& data->remember_pw
-		&& data->cancel
-		&& data->ok);
-}
-
-static void
-selection_changed_callback (ESourceSelector *selector,
-			    void *data)
-{
-	UrlDialogData *url_dlg_data  = (UrlDialogData *) data;
-	GSList *selection = e_source_selector_get_selection (selector);
-	
-	if (selection != NULL) {
-		GSList *p, *l =  NULL;
-		
-		for (p = selection; p != NULL; p = p->next) {
-			ESource *source = E_SOURCE(p->data);
-			gchar* source_uid = g_strdup(e_source_peek_uid(source));
-			
-			l = g_slist_append (l, source_uid);
-		}
-		url_dlg_data->url_data->calendars = l;
-	}
-	
-	e_source_selector_free_selection (selection);
-	gtk_widget_set_sensitive ((GtkWidget *) url_dlg_data->ok, TRUE);
-}
-
-/* Connects any necessary signal handlers. */
-static void
-init_widgets (UrlDialogData *url_dlg_data)
-{
-	GtkWidget *selector;
-	ESourceList *source_list;
-	GConfClient *gconf_client;
-	GList *icon_list;
-	GSList *p;
-	
-	gtk_widget_ensure_style (url_dlg_data->url_editor);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (url_dlg_data->url_editor)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (url_dlg_data->url_editor)->action_area), 12);
-
-	g_signal_connect (url_dlg_data->url_entry, "changed", 
-			  G_CALLBACK (url_editor_dialog_fb_url_changed), 
-			  url_dlg_data);
-	
-	g_signal_connect (url_dlg_data->username_entry, "changed", 
-			  G_CALLBACK (url_editor_dialog_fb_ok_enable), 
-			  url_dlg_data);
-	
-	g_signal_connect (url_dlg_data->password_entry, "changed", 
-			  G_CALLBACK (url_editor_dialog_fb_ok_enable), 
-			  url_dlg_data);
-	
-	g_signal_connect (url_dlg_data->remember_pw, "toggled",
-			  G_CALLBACK (url_editor_dialog_fb_ok_enable),
-			  url_dlg_data);
-	
-	g_signal_connect (url_dlg_data->url_entry, "activate",
-			  G_CALLBACK (url_editor_dialog_fb_url_activated), 
-			  url_dlg_data);
-		  
-	g_signal_connect (url_dlg_data->daily, "toggled",
-			  G_CALLBACK (url_editor_dialog_fb_daily_toggled),
-			  url_dlg_data);
-	
-	g_signal_connect (url_dlg_data->weekly, "toggled",
-			  G_CALLBACK (url_editor_dialog_fb_daily_toggled),
-			  url_dlg_data);
-
-	g_signal_connect (url_dlg_data->user_publish, "toggled",
-			  G_CALLBACK (url_editor_dialog_fb_daily_toggled),
-			  url_dlg_data);
-
-
-	if (url_dlg_data->url_data->calendars) {
-		ESource *source;
-		
-		gconf_client = gconf_client_get_default ();
-		source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/calendar/sources");
-		selector = e_source_selector_new (source_list);
-		
-		p = url_dlg_data->url_data->calendars;
-		for (; p != NULL; p = p->next) {
-			gchar *source_uid;
-
-			source_uid = g_strdup (p->data);
-			source =  e_source_list_peek_source_by_uid (source_list, source_uid);			
-			e_source_selector_select_source ((ESourceSelector *)selector, source);
-			g_free (source_uid);
-		}
-	} else {
-		gconf_client = gconf_client_get_default ();
-		source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/calendar/sources");
-		selector = e_source_selector_new (source_list);
-	}
-	e_source_selector_show_selection ((ESourceSelector *) selector, TRUE);
-	g_signal_connect (selector, "selection_changed", 
-			  G_CALLBACK (selection_changed_callback), 
-			  url_dlg_data);
-
-	gtk_label_set_mnemonic_widget (GTK_LABEL (url_dlg_data->calendar_list_label),
-				       selector);
-	gtk_widget_show (selector);
-	gtk_container_add (GTK_CONTAINER (url_dlg_data->scrolled_window), 
-			   selector);
-
-	icon_list = e_icon_factory_get_icon_list ("stock_calendar");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (url_dlg_data->url_editor), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
-	
-	gtk_widget_show (url_dlg_data->scrolled_window);
-
-	g_object_unref (gconf_client);
-}
-
-static void
-url_editor_dialog_fb_daily_toggled (GtkWidget *button,
-				      void *data)
-{
-	UrlDialogData *url_dlg_data  = (UrlDialogData *) data;
-	enum publish_frequency frequency;
-	
-	frequency = e_dialog_radio_get (url_dlg_data->daily, 
-					pub_frequency_type_map);
-	url_dlg_data->url_data->publish_freq = frequency;
-	gtk_widget_set_sensitive ((GtkWidget *) url_dlg_data->ok, TRUE);
-}
-
-static gboolean
-is_valid_url (const gchar *url)
-{
-	const gchar *p = url;
-
-	if (strlen (url) == 0) {
-		return FALSE;
-	}
-	while (*p) {
-		if ((*p == '\\') || (*p == ' ')) {
-			return FALSE;
-		}
-		p++;
-	}
-	return TRUE;
-}
-
-static void
-url_editor_dialog_fb_url_activated (GtkEntry *url_entry, void *data)
-{
-	UrlDialogData *url_dlg_data = (UrlDialogData *) data;
-	
-	url_dlg_data->url_data->location = g_strdup (gtk_entry_get_text ((GtkEntry *) url_entry));
-}
-
-static void
-url_editor_dialog_fb_url_changed (GtkEntry *url_entry, void *data)
-{
-	UrlDialogData *url_dlg_data = (UrlDialogData *) data;
-	DialogData *url_dialog = (DialogData *) url_dlg_data->url_dialog;
-	
-	const gchar *entry_contents;
-	GtkListStore *model;
-	GtkTreeIter iter;
-	gboolean valid;
-
-	model = (GtkListStore *) gtk_tree_view_get_model (url_dialog->url_list);
-	
-	entry_contents = gtk_entry_get_text ((GtkEntry *) url_entry);
-	if (!is_valid_url (entry_contents)) {
-		gtk_widget_set_sensitive ((GtkWidget *) url_dlg_data->ok, FALSE);
-		return;
-	}
-	/* duplicate check */
-	valid = gtk_tree_model_get_iter_first ((GtkTreeModel *) model, &iter);
-	while (valid) {
-		gchar *url_name;
-		gtk_tree_model_get ((GtkTreeModel *) model, &iter, 
-				    URL_LIST_LOCATION_COLUMN, &url_name, 
-				    -1);
-
-		if (!g_ascii_strcasecmp (url_name, entry_contents)) {
-			gtk_widget_set_sensitive ((GtkWidget *) url_dlg_data->ok, FALSE);
-			return;
-		}
-		valid = gtk_tree_model_iter_next ((GtkTreeModel *) model, &iter);
-	}
-	/* valid and unique */
-	gtk_widget_set_sensitive (GTK_WIDGET (url_dlg_data->ok), TRUE);
-	gtk_widget_grab_default (GTK_WIDGET (url_dlg_data->ok));
-	gtk_entry_set_activates_default ((GtkEntry*) url_dlg_data->url_entry, 
-					TRUE);
-}
-
-static void url_editor_dialog_fb_ok_enable (GtkWidget *widget, void *data) {
-	UrlDialogData *url_dlg_data = (UrlDialogData *) data;
-	
-	gtk_widget_set_sensitive (GTK_WIDGET (url_dlg_data->ok), TRUE);
-}
diff --git a/calendar/gui/dialogs/url-editor-dialog.glade b/calendar/gui/dialogs/url-editor-dialog.glade
deleted file mode 100644
index b260d10067..0000000000
--- a/calendar/gui/dialogs/url-editor-dialog.glade
+++ /dev/null
@@ -1,551 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkDialog" id="url_editor">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Free/Busy Publishing Settings</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-  <property name="modal">False</property>
-  <property name="default_width">380</property>
-  <property name="default_height">508</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="ok">
-	      <property name="visible">True</property>
-	      <property name="sensitive">False</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox13">
-	  <property name="border_width">12</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">12</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label26">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Publishing _Location&lt;/b&gt;</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">url_entry</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox9">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label18">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="url_entry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label25">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Publishing Frequency&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox10">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label29">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox12">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkRadioButton" id="daily">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Daily</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkRadioButton" id="weekly">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Weekly</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		      <property name="group">daily</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkRadioButton" id="user_publish">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Manual</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		      <property name="group">daily</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="calendar_list_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Free/Busy C_alendars&lt;/b&gt;</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox11">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label30">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkScrolledWindow" id="scrolled_window">
-		  <property name="height_request">150</property>
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		  <child>
-		    <placeholder/>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label27">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Authentication&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox12">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label31">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkTable" id="table1">
-		  <property name="visible">True</property>
-		  <property name="n_rows">3</property>
-		  <property name="n_columns">2</property>
-		  <property name="homogeneous">False</property>
-		  <property name="row_spacing">6</property>
-		  <property name="column_spacing">12</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label13">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Username:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">username_entry</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label14">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Password:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">password_entry</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkEntry" id="username_entry">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkEntry" id="password_entry">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">False</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="remember_pw">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Remember password</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">2</property>
-		      <property name="bottom_attach">3</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/url-editor-dialog.h b/calendar/gui/dialogs/url-editor-dialog.h
deleted file mode 100644
index 2ec3c61fd1..0000000000
--- a/calendar/gui/dialogs/url-editor-dialog.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Gary Ekker <gekker@novell.com>
- *
- * Copyright 2004, Ximian, 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 
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
-
-/*
- * UrlEditorDialog - a GtkObject which handles a libglade-loaded dialog
- * to edit the calendar preference settings.
- */
-
-#ifndef _URL_EDITOR_DIALOG_H_
-#define _URL_EDITOR_DIALOG_H_
-
-G_BEGIN_DECLS
-
-#include <gtk/gtk.h>
-#include <glade/glade.h>
-
-#include "cal-prefs-dialog.h"
-#include <libedataserverui/e-source-selector.h>
-
-struct _UrlDialogData {
-	/* Glade XML data */
-	GladeXML *xml;
-	GtkWidget *url_editor;
-	GtkWidget *url_dialog;
-
-	GtkEntry *url_entry;
-	GtkWidget *daily;
-	GtkWidget *weekly;
-	GtkWidget *user_publish;
-	
-	GtkWidget *calendar_list_label;
-	GtkWidget *scrolled_window;
-	
-	GtkEntry *username_entry;
-	GtkEntry *password_entry;
-	GtkWidget *remember_pw;
-	
-	GtkWidget *cancel;
-	GtkWidget *ok;
-	EPublishUri *url_data;
-};
-typedef struct _UrlDialogData UrlDialogData;
-
-gboolean			
-url_editor_dialog_new (DialogData *dialog_data, EPublishUri *pub_uri);
-
-G_END_DECLS
-
-#endif /* _URL_EDITOR_DIALOG_H_ */
diff --git a/calendar/gui/e-pub-utils.c b/calendar/gui/e-pub-utils.c
deleted file mode 100644
index 6133713ba2..0000000000
--- a/calendar/gui/e-pub-utils.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar Free/Busy utilities and types
- *
- * Copyright (C) 2004 Ximian, Inc.
- *
- * Author: Gary Ekker <gekker@novell.com>
- *
- * This program 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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <string.h>
-#include <glib.h>
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-#include <libedataserver/e-source.h>
-#include <libedataserver/e-source-list.h>
-#include <libedataserverui/e-passwords.h>
-#include <libecal/e-cal-time-util.h>
-#include <glib/gi18n.h>
-#include "calendar-config.h"
-#include "common/authentication.h"
-#include "itip-utils.h"
-#include "e-pub-utils.h"
-
-static gboolean updated_last_pub_time = FALSE;
-
-void
-e_pub_uri_from_xml (EPublishUri *uri, const gchar *xml)
-{
-	xmlDocPtr doc;
-	xmlNodePtr root, p;
-	xmlChar *location, *enabled, *frequency;
-	xmlChar *username, *publish_time;
-	GSList *l = NULL;
-	
-	uri->location = NULL;
-	doc = xmlParseDoc ((char *)xml);
-	if (doc == NULL) {
-		uri->location = NULL;
-		return;
-	}
-	
-	root = doc->children;
-	if (strcmp (root->name, "uri") != 0) {
-		return;
-	}
-	location = xmlGetProp (root, "location");
-	enabled = xmlGetProp (root, "enabled");
-	frequency = xmlGetProp (root, "frequency");
-	username = xmlGetProp (root, "username");
-	publish_time = xmlGetProp (root, "publish_time");
-	
-	if (location != NULL)
-		uri->location = g_strdup (location);
-	if (enabled != NULL)
-		uri->enabled = atoi (enabled);
-	if (frequency != NULL)
-		uri->publish_freq = atoi (frequency);
-	if (username != NULL)
-		uri->username = g_strdup (username);
-	if (publish_time != NULL)
-		uri->last_pub_time = g_strdup (publish_time);
-	
-	uri->password = g_strdup ("");
-
-	for (p = root->children; p != NULL; p = p->next) {
-		xmlChar *uid = xmlGetProp (p, "uid");
-
-		l = g_slist_append (l, uid);
-	}	
-	uri->calendars = l;
-	
-	xmlFree(location);
-	xmlFree(enabled);
-	xmlFreeDoc(doc);
-	return;
-}
-
-gchar *
-e_pub_uri_to_xml (EPublishUri *uri)
-{
-	xmlDocPtr doc;
-	xmlNodePtr root;
-	gchar *enabled, *frequency;
-	GSList *cals = NULL;
-	xmlChar *xml_buffer;
-	char *returned_buffer;
-	int xml_buffer_size;
-
-	g_return_val_if_fail (uri != NULL, NULL);
-	g_return_val_if_fail (uri->location != NULL, NULL);
-
-	doc = xmlNewDoc ("1.0");
-
-	root = xmlNewDocNode (doc, NULL, "uri", NULL);
-	enabled = g_strdup_printf ("%d", uri->enabled);
-	frequency = g_strdup_printf ("%d", uri->publish_freq);
-	xmlSetProp (root, "location", uri->location);
-	xmlSetProp (root, "enabled", enabled);
-	xmlSetProp (root, "frequency", frequency);
-	xmlSetProp (root, "username", uri->username);
-	xmlSetProp (root, "publish_time", uri->last_pub_time);
-	
-	for (cals = uri->calendars; cals != NULL; cals = cals->next) {
-		xmlNodePtr node;
-		
-		node = xmlNewChild (root, NULL, "source", NULL);
-		xmlSetProp (node, "uid", cals->data);
-	}
-	xmlDocSetRootElement (doc, root);
-
-	xmlDocDumpMemory (doc, &xml_buffer, &xml_buffer_size);
-	xmlFreeDoc (doc);
-
-	returned_buffer = g_malloc (xml_buffer_size + 1);
-	memcpy (returned_buffer, xml_buffer, xml_buffer_size);
-	returned_buffer [xml_buffer_size] = '\0';
-	xmlFree (xml_buffer);
-	g_free (enabled);
-
-	return returned_buffer;
-}
-
-static gboolean 
-is_publish_time (EPublishUri *uri) {
-	icaltimezone *utc;
-	struct icaltimetype current_itt;
-
-	utc = icaltimezone_get_utc_timezone ();
-	current_itt = icaltime_current_time_with_zone (utc);		
-
-	if (!uri->last_pub_time ||(strlen (uri->last_pub_time)== 0)) {
-		uri->last_pub_time = g_strdup (icaltime_as_ical_string (current_itt));
-		return TRUE;
-		
-	} else {
-		struct icaltimetype adjust_itt = icaltime_from_string (uri->last_pub_time);
-		
-		switch (uri->publish_freq) {
-			case URI_PUBLISH_DAILY:
-				icaltime_adjust (&adjust_itt, 1, 0, 0, 0);
-				if (icaltime_compare_date_only (adjust_itt, current_itt ) < 0) {
-					uri->last_pub_time = g_strdup (icaltime_as_ical_string (current_itt));
-					return TRUE;
-				}
-				break;
-			case URI_PUBLISH_WEEKLY:
-				icaltime_adjust (&adjust_itt, 7, 0, 0, 0);
-				if (icaltime_compare_date_only (adjust_itt, current_itt ) < 0) {
-					uri->last_pub_time = g_strdup (icaltime_as_ical_string (current_itt));
-					return TRUE;
-				}
-				break;
-		}
-	}
-	
-	return FALSE;
-}
-
-/* FIXME we need to add a timeout function to check if the next publishing time is reached. 
-   If the freqency is daily and evolution runs continuously for more than one day, the freebusy
-   will only be published for the first day */
-void
-e_pub_publish (gboolean publish) {
-	icaltimezone *utc;
-	time_t start = time (NULL), end;
-	GSList *uri_config_list, *l, *uri_list = NULL;
-	ESourceList *source_list;
-	GConfClient *gconf_client;
-	gboolean published = FALSE;
-	
-	gconf_client = gconf_client_get_default ();
-	source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/calendar/sources");
-	g_object_unref (gconf_client);
-	
-	utc = icaltimezone_get_utc_timezone ();	
-	start = time_day_begin_with_zone (start, utc);
-	end = time_add_week_with_zone (start, 6, utc);
-		
-	uri_config_list = calendar_config_get_free_busy ();
-
-	for (l = uri_config_list; l != NULL; l = l->next) {
-		GSList *p = NULL, *q;
-		EPublishUri *uri;
-		ECalComponent *clone = NULL;
-		gboolean cloned = FALSE;
-		ECal *client = NULL;
-		char *prompt;
-		gboolean remember = FALSE;
-		gchar *password;
-
-		gchar *xml = (gchar *)l->data;
-		
-		uri = g_new0 (EPublishUri, 1);		
-		e_pub_uri_from_xml (uri, xml);
-	
-		/*FIXME this is just a hack to avoid publishing again and again 
-		  we need to make the last publish time a seperate key */
-		if (updated_last_pub_time) {
-			updated_last_pub_time = FALSE;
-			return;
-		}	
-		
-		/* TODO: make sure we're online */
-		/* skip this url if it isn't enabled or if it is manual */
-		if (!uri->enabled) {
-			uri_config_list = g_slist_next (uri_config_list);
-			continue;
-		}	
-		
-		if (!publish) {
-			/* a g_idle publish, make sure we are not set to user only */
-			if (uri->publish_freq == URI_PUBLISH_USER) {
-				uri_config_list = g_slist_next (uri_config_list);
-				continue;
-			}
-			
-			/* If not is it time to publish again? */
-			publish = is_publish_time (uri);
-				
-		}
-		
-		/* User published or config change */
-		if (publish) {
-			/* We still need to set the last_pub_time */
-			uri->last_pub_time = 0;
-			is_publish_time (uri);
-			q = NULL;
-			for (p = uri->calendars; p != NULL; p = p->next) {
-				
-				GList *comp_list = NULL;
-				gchar *source_uid;
-				ESource * source;
-				char *email = NULL;
-				GError *error = NULL;
-				GList *users = NULL;
-	
-				source_uid = g_strdup (p->data);
-				source =  e_source_list_peek_source_by_uid (source_list, source_uid);
-
-				if (source)
-					client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT);
-
-				if (!client) {
-					g_warning (G_STRLOC ": Could not publish Free/Busy: Calendar backend no longer exists");
-					g_free (source_uid);
-					g_free (p->data);
-					q = g_slist_append (q, p);
-
-					continue;
-				}
-			
-				if (!e_cal_open (client, TRUE, &error)) {
-					g_warning ("Could not open the calendar %s \n", error->message);
-					g_error_free (error);
-					error = NULL;
-
-					g_object_unref (client);
-					client = NULL;
-					g_free (source_uid);
-					continue;
-				}
-				
-				if (e_cal_get_cal_address (client, &email, &error)) {
-					if (email && *email)	
-						users = g_list_append (users, email);
-				} else {
-					g_warning ("Could not get the email: %s \n", error->message);
-					g_error_free (error);
-					error = NULL;
-				}
-
-				if (e_cal_get_free_busy ((ECal *) client, users,
-							 start, end, 
-							 &comp_list, &error)) {
-					GList *list;
-
-					for (list = comp_list; list; list = list->next) {
-						ECalComponent *comp = E_CAL_COMPONENT (list->data);
-					
-						cloned = itip_publish_begin (comp, (ECal *) client, cloned, &clone);
-						g_object_unref (comp);
-					}
-					g_list_free (comp_list);
-				} else {
-					g_warning ("Could not get the free busy information %s \n", error->message);
-					g_error_free (error);
-					error = NULL;
-				}
-				
-				if (users) 
-					g_list_free (users);
-
-				g_free (email);
-				g_object_unref (client);
-				client = NULL;
-				g_free (source_uid);
-			} 
-		}
-
-		for(p = q; p!=NULL; p = p->next) {
-			uri->calendars = g_slist_delete_link (uri->calendars, p->data);
-		}
-		g_slist_free (q);
-		
-		/* add password to the uri */
-		password = e_passwords_get_password ("Calendar", 
-				(gchar *)uri->location);
-
-		if (!password) {
-			prompt = g_strdup_printf (_("Enter the password for %s"), (gchar *)uri->location);
-			password = e_passwords_ask_password (_("Enter password"), 
-					"Calendar", (gchar *)uri->location, 
-					prompt,
-					E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE,
-					&remember, NULL);
-
-			g_free (prompt);
-
-			if (!password) {
-				g_slist_free (p);
-				continue;
-			}
-		}
-
-		g_slist_free (p);
-
-		if (cloned && clone)
-			published = itip_publish_comp ((ECal *) client,
-					uri->location,
-					uri->username, 
-					password, &clone);
-
-		xml = e_pub_uri_to_xml (uri);
-		if (xml != NULL) {
-			uri_list = g_slist_append (uri_list, xml);
-		}
-		g_free (uri);
-	}
-	
-	if (published) {
-		/* Update gconf so we have the last_pub_time */
-		calendar_config_set_free_busy (uri_list);
-		updated_last_pub_time = TRUE;
-	}
-		
-	g_slist_free (uri_config_list);
-	g_slist_free (uri_list);
-}
diff --git a/calendar/gui/e-pub-utils.h b/calendar/gui/e-pub-utils.h
deleted file mode 100644
index 98e36d8758..0000000000
--- a/calendar/gui/e-pub-utils.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar Free/Busy utilities and types
- *
- * Copyright (C) 2004 Ximian, Inc.
- *
- * Author: Gary Ekker <gekker@novell.com>
- *
- * This program 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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef E_CAL_FB_UTIL_H
-#define E_CAL_FB_UTIL_H
-
-#include <glib.h>
-#include <libxml/tree.h>
-
-G_BEGIN_DECLS
-
-enum publish_frequency{
-	URI_PUBLISH_DAILY,
-	URI_PUBLISH_WEEKLY,
-	URI_PUBLISH_USER
-};
-
-static const int pub_frequency_type_map[] = {
-	URI_PUBLISH_DAILY,
-	URI_PUBLISH_WEEKLY,
-	URI_PUBLISH_USER,
-	-1
-};
-
-struct _EPublishUri {
-	gint enabled;
-	gchar *location;
-	gint publish_freq;
-	gchar *username;
-	gchar *password;
-	GSList *calendars;
-	gchar *last_pub_time;
-};
-
-typedef struct _EPublishUri EPublishUri;
-
-void e_pub_uri_from_xml (EPublishUri *uri, const gchar *xml);
-gchar  *e_pub_uri_to_xml (EPublishUri *uri);
-void e_pub_publish (gboolean publish) ;
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/gnome-calendar-conduit.png b/calendar/gui/gnome-calendar-conduit.png
deleted file mode 100644
index e867ba90b2..0000000000
--- a/calendar/gui/gnome-calendar-conduit.png
+++ /dev/null
diff --git a/configure.in b/configure.in
index 22eef17744..451ee68b74 100644
--- a/configure.in
+++ b/configure.in
@@ -1959,7 +1959,6 @@ plugins/attachment-reminder/Makefile
 plugins/mail-notification/Makefile
 plugins/mail-to-meeting/Makefile
 plugins/mail-to-task/Makefile
-plugins/mail-remote/Makefile
 plugins/mono/Makefile
 plugins/new-mail-notify/Makefile
 plugins/subject-thread/Makefile
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index dbf484b09f..d32f66f2f9 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-03  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Remove dead files from source control.  The dates below
+	   indicate when the file was removed from Makefile.am.
+	   Fixes part of bug #478704.
+
+	* e-categories-master-list-wombat.c	(Jun 2005)
+	* e-categories-master-list-wombat.h	(Jun 2005)
+
 2007-10-26  Sankar P  <psankar@novell.com>
 
 	** Fix for bug #461272
diff --git a/e-util/e-categories-master-list-wombat.c b/e-util/e-categories-master-list-wombat.c
deleted file mode 100644
index 9e45199877..0000000000
--- a/e-util/e-categories-master-list-wombat.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-categories-master-list.c: the master list of categories.
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 1999, 2000 Ximian, Inc.
- */
-#include <config.h>
-
-#include "e-categories-master-list-wombat.h"
-#include "e-categories-config.h"
-#include "e-config-listener.h"
-
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-
-#define PARENT_TYPE e_categories_master_list_array_get_type ()
-
-#define d(x)
-
-struct _ECategoriesMasterListWombatPriv {
-	EConfigListener *listener;
-	guint listener_id;
-};
-
-static ECategoriesMasterListArrayClass *parent_class;
-
-static void
-ecmlw_load (ECategoriesMasterListWombat *ecmlw)
-{
-	char *string;
-	gboolean def;
-
-	string = e_config_listener_get_string_with_default (ecmlw->priv->listener,
-							    "/apps/evolution/general/category_master_list",
-							    NULL,
-							    &def);
-	/* parse the XML string */
-	if (!def) {
-		e_categories_master_list_array_from_string (E_CATEGORIES_MASTER_LIST_ARRAY (ecmlw),
-							    string);
-	}
-
-	d(g_print ("load: %s\n", string?string:"(nil)"));
-
-	g_free (string);
-}
-
-static void
-ecmlw_save (ECategoriesMasterListWombat *ecmlw)
-{
-	char *string;
-
-	string = e_categories_master_list_array_to_string (E_CATEGORIES_MASTER_LIST_ARRAY (ecmlw));
-
-	d(g_print ("save: %s\n", string));
-
-	e_config_listener_set_string (ecmlw->priv->listener,
-				      "/apps/evolution/general/category_master_list",
-				      string);
-
-	g_free (string);
-}
-
-/**
- * ecmlw_commit:
- * @ecml: the master list to remove from.
- */
-static void
-ecmlw_commit (ECategoriesMasterList *ecml)
-{
-	ECategoriesMasterListWombat *ecmlw = E_CATEGORIES_MASTER_LIST_WOMBAT (ecml);
-
-	((ECategoriesMasterListClass *) parent_class)->commit (ecml);
-
-	ecmlw_save (ecmlw);
-}
-
-
-/**
- * ecmlw_reset:
- * @ecml: the master list to reset.
- */
-static void
-ecmlw_reset (ECategoriesMasterList *ecml)
-{
-	ECategoriesMasterListWombat *ecmlw = E_CATEGORIES_MASTER_LIST_WOMBAT (ecml);
-
-	((ECategoriesMasterListClass *) parent_class)->reset (ecml);
-
-	ecmlw_save (ecmlw);
-}
-
-static void
-ecmlw_dispose (GObject *object)
-{
-	ECategoriesMasterListWombat *ecmlw = E_CATEGORIES_MASTER_LIST_WOMBAT (object);
-
-	if (ecmlw->priv) {
-		/* remove the listener */
-		g_signal_handler_disconnect (ecmlw->priv->listener,
-					     ecmlw->priv->listener_id);				     
-
-		g_object_unref (ecmlw->priv->listener);
-
-		g_free (ecmlw->priv);
-		ecmlw->priv = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-
-static void
-ecmlw_class_init (GObjectClass *object_class)
-{
-	ECategoriesMasterListClass *ecml_class = E_CATEGORIES_MASTER_LIST_CLASS(object_class);
-
-	parent_class          = g_type_class_ref (PARENT_TYPE);
-
-	ecml_class->commit    = ecmlw_commit;
-
-	ecml_class->reset     = ecmlw_reset ;
-
-	object_class->dispose = ecmlw_dispose;
-}
-
-static void 
-property_change_cb (EConfigListener   *listener,
-		    char              *key,
-		    gpointer           user_data)
-{
-	ecmlw_load (user_data);
-}
-
-static void
-ecmlw_init (ECategoriesMasterListWombat *ecmlw)
-{
-	ecmlw->priv = g_new (ECategoriesMasterListWombatPriv, 1);
-	ecmlw->priv->listener = e_config_listener_new ();
-
-	/* add a listener */
-	ecmlw->priv->listener_id =
-		g_signal_connect (ecmlw->priv->listener,
-				  "key_changed",
-				  G_CALLBACK (property_change_cb),
-				  ecmlw);
-
-	ecmlw_load (ecmlw);
-}
-
-GType
-e_categories_master_list_wombat_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (ECategoriesMasterListWombatClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) ecmlw_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (ECategoriesMasterListWombat),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) ecmlw_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "ECategoriesMasterListWombat", &info, 0);
-	}
-
-	return type;
-}
-
-ECategoriesMasterList *
-e_categories_master_list_wombat_new       (void)
-{
-	return E_CATEGORIES_MASTER_LIST (g_object_new (E_TYPE_CATEGORIES_MASTER_LIST_WOMBAT, NULL));
-}
diff --git a/e-util/e-categories-master-list-wombat.h b/e-util/e-categories-master-list-wombat.h
deleted file mode 100644
index bf951f9150..0000000000
--- a/e-util/e-categories-master-list-wombat.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_CATEGORIES_MASTER_LIST_WOMBAT_H_
-#define _E_CATEGORIES_MASTER_LIST_WOMBAT_H_
-
-#include <misc/e-categories-master-list-array.h>
-
-G_BEGIN_DECLS
-
-#define E_TYPE_CATEGORIES_MASTER_LIST_WOMBAT        (e_categories_master_list_wombat_get_type ())
-#define E_CATEGORIES_MASTER_LIST_WOMBAT(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_CATEGORIES_MASTER_LIST_WOMBAT, ECategoriesMasterListWombat))
-#define E_CATEGORIES_MASTER_LIST_WOMBAT_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_CATEGORIES_MASTER_LIST_WOMBAT, ECategoriesMasterListWombatClass))
-#define E_IS_CATEGORIES_MASTER_LIST_WOMBAT(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_CATEGORIES_MASTER_LIST_WOMBAT))
-#define E_IS_CATEGORIES_MASTER_LIST_WOMBAT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_CATEGORIES_MASTER_LIST_WOMBAT))
-
-typedef struct _ECategoriesMasterListWombatPriv ECategoriesMasterListWombatPriv;
-
-typedef struct {
-	ECategoriesMasterListArray       base;
-	ECategoriesMasterListWombatPriv *priv;
-} ECategoriesMasterListWombat;
-
-typedef struct {
-	ECategoriesMasterListArrayClass parent_class;
-} ECategoriesMasterListWombatClass;
-
-GType                  e_categories_master_list_wombat_get_type  (void);
-ECategoriesMasterList *e_categories_master_list_wombat_new       (void);
-
-G_END_DECLS
-
-#endif /* _E_CATEGORIES_MASTER_LIST_WOMBAT_H_ */
diff --git a/po/ChangeLog b/po/ChangeLog
index 0b97eb95e8..aaf44509fc 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-03  Matthew Barnes  <mbarnes@redhat.com>
+
+	* POTFILES.in: Remove files for mail-remote plugin.
+
 2007-11-01  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
         * es.po: Updated Spanish translation
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9cc9eb3442..1df63116df 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -362,10 +362,6 @@ plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
 plugins/mail-notification/apps-evolution-mail-notification.schemas.in
 plugins/mail-notification/mail-notification.c
 plugins/mail-notification/org-gnome-mail-notification.eplug.xml
-plugins/mail-remote/client.c
-plugins/mail-remote/e-corba-utils.c
-plugins/mail-remote/evolution-mail-store.c
-plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml
 plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml
 plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
 plugins/mail-to-task/org-gnome-mail-to-task.xml
diff --git a/tools/evolution-launch-composer.c b/tools/evolution-launch-composer.c
deleted file mode 100644
index 6242394238..0000000000
--- a/tools/evolution-launch-composer.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/* -*- 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- **/
-
-#include <config.h>
-
-#include <Evolution-Composer.h>
-
-#include <string.h>
-#include <e-util/e-util.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <gtk/gtkmain.h>
-
-#include <bonobo/bonobo-main.h>
-
-#include <glib/gi18n.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;
-
-		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);
-
-		attachments = g_list_delete_link (attachments, attachments);
-	}
-
-	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;
-}