This commit was manufactured by cvs2svn to create tagMERGE_TO_HEAD_1

'MERGE_TO_HEAD_1'.

svn path=/tags/MERGE_TO_HEAD_1/; revision=12887

1 files changed, 0 insertions, 331 deletions

diff --git a/my-evolution/e-summary-calendar.c b/my-evolution/e-summary-calendar.c
deleted file mode 100644
index 789cff124a..0000000000
--- a/my-evolution/e-summary-calendar.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * e-summary-calendar.c:
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * Authors:  Iain Holmes  <iain@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-
-#include "e-summary-calendar.h"
-#include "e-summary.h"
-#include <cal-client/cal-client.h>
-#include <cal-util/timeutil.h>
-
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include <bonobo-conf/bonobo-config-database.h>
-
-struct _ESummaryCalendar {
-	CalClient *client;
-
-	char *html;
-	gboolean wants24hr;
-};
-
-const char *
-e_summary_calendar_get_html (ESummary *summary)
-{
-	if (summary->calendar == NULL) {
-		return NULL;
-	}
-
-	return summary->calendar->html;
-}
-
-typedef struct {
-	CalComponent *comp;
-	CalComponentDateTime dt;
-	icaltimezone *zone;
-} ESummaryCalEvent;
-
-static int
-e_summary_calendar_event_sort_func (const void *e1,
-				    const void *e2)
-{
-	ESummaryCalEvent *event1, *event2;
-
-	event1 = (ESummaryCalEvent *) e1;
-	event2 = (ESummaryCalEvent *) e2;
-
-	return icaltime_compare (*event1->dt.value, *event2->dt.value);
-}
-
-static GPtrArray *
-uids_to_array (ESummary *summary,
-	       CalClient *client,
-	       GList *uids)
-{
-	GList *p;
-	GPtrArray *array;
-
-	g_return_val_if_fail (IS_E_SUMMARY (summary), NULL);
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (uids != NULL, NULL);
-
-	array = g_ptr_array_new ();
-	for (p = uids; p; p = p->next) {
-		ESummaryCalEvent *event;
-		CalClientGetStatus status;
-
-		event = g_new (ESummaryCalEvent, 1);
-
-		status = cal_client_get_object (client, p->data, &event->comp);
-		if (status != CAL_CLIENT_GET_SUCCESS) {
-			g_free (event);
-			continue;
-		}
-
-		cal_component_get_dtstart (event->comp, &event->dt);
-
-		status = cal_client_get_timezone (client, event->dt.tzid, &event->zone);
-		if (status != CAL_CLIENT_GET_SUCCESS) {
-			gtk_object_unref (GTK_OBJECT (event->comp));
-			g_free (event);
-			continue;
-		}
-
-		icaltimezone_convert_time (event->dt.value, event->zone, summary->tz);
-		g_ptr_array_add (array, event);
-	}
-
-	qsort (array->pdata, array->len, sizeof (ESummaryCalEvent), e_summary_calendar_event_sort_func);
-
-	return array;
-}
-
-static void
-free_event_array (GPtrArray *array)
-{
-	int i;
-
-	for (i = 0; i < array->len; i++) {
-		ESummaryCalEvent *event;
-		
-		event = array->pdata[i];
-		gtk_object_unref (GTK_OBJECT (event->comp));
-	}
-
-	g_ptr_array_free (array, TRUE);
-}
-
-static gboolean
-generate_html (gpointer data)
-{
-	ESummary *summary = data;
-	ESummaryCalendar *calendar = summary->calendar;
-	GList *uids;
-	GString *string;
-	char *tmp;
-	time_t t, begin, end, f;
-
-	t = time (NULL);
-	begin = time_day_begin_with_zone (t, summary->tz);
-	switch (summary->preferences->days) {
-	case E_SUMMARY_CALENDAR_ONE_DAY:
-		end = time_day_end_with_zone (t, summary->tz);
-		break;
-
-	case E_SUMMARY_CALENDAR_FIVE_DAYS:
-		f = time_add_day (t, 5);
-		end = time_day_end_with_zone (f, summary->tz);
-		break;
-	
-	case E_SUMMARY_CALENDAR_ONE_WEEK:
-		f = time_add_week (t, 1);
-		end = time_day_end_with_zone (f, summary->tz);
-		break;
-
-	case E_SUMMARY_CALENDAR_ONE_MONTH:
-	default:
-		f = time_add_month (t, 1);
-		end = time_day_end_with_zone (f, summary->tz);
-		break;
-	}
-
-	uids = cal_client_get_objects_in_range (calendar->client, 
-						CALOBJ_TYPE_EVENT, begin, end);
-	if (uids == NULL) {
-		char *s1, *s2;
-
-		s1 = e_utf8_from_locale_string (_("Appointments"));
-		s2 = e_utf8_from_locale_string (_("No appointments"));
-		g_free (calendar->html);
-		calendar->html = g_strconcat ("<dl><dt><img src=\"myevo-appointments.png\" align=\"middle\" "
-		                              "alt=\"\" width=\"48\" height=\"48\"> <b><a href=\"evolution:/local/Calendar\">",
-		                              s1, "</a></b></dt><dd><b>", s2, "</b></dd></dl>", NULL);
-		g_free (s1);
-		g_free (s2);
-
-		e_summary_draw (summary);
-		return FALSE;
-	} else {
-		GPtrArray *uidarray;
-		int i;
-		char *s;
-
-		string = g_string_new ("<dl><dt><img src=\"myevo-appointments.png\" align=\"middle\" "
-		                       "alt=\"\" width=\"48\" height=\"48\"> <b><a href=\"evolution:/local/Calendar\">");
-		s = e_utf8_from_locale_string (_("Appointments"));
-		g_string_append (string, s);
-		g_free (s);
-		g_string_append (string, "</a></b></dt><dd>");
-
-		uidarray = uids_to_array (summary, calendar->client, uids);
-		for (i = 0; i < uidarray->len; i++) {
-			ESummaryCalEvent *event;
-			CalComponentText text;
-			time_t start_t;
-			struct tm *start_tm;
-			char *start_str;
-
-			event = uidarray->pdata[i];
-			cal_component_get_summary (event->comp, &text);
-			start_t = icaltime_as_timet (*event->dt.value);
-
-			start_str = g_new (char, 20);
-			start_tm = localtime (&start_t);
-			if (calendar->wants24hr == TRUE) {
-				strftime (start_str, 19, _("%k%M %d %B"), start_tm);
-			} else {
-				strftime (start_str, 19, _("%l:%M %d %B"), start_tm);
-			}
-
-			tmp = g_strdup_printf ("<img align=\"middle\" src=\"new_appointment.xpm\" "
-					       "alt=\"\" width=\"16\" height=\"16\">  &#160; "
-					       "<font size=\"-1\"><a href=\"evolution:/local/Calendar\">%s, %s</a></font><br>", 
-					       start_str, text.value);
-			g_free (start_str);
-			
-			g_string_append (string, tmp);
-			g_free (tmp);
-		}
-
-		free_event_array (uidarray);
-		g_string_append (string, "</dd></dl>");
-	}
-
-	if (calendar->html) {
-		g_free (calendar->html);
-	}
-	calendar->html = string->str;
-	g_string_free (string, FALSE);
-
-	e_summary_draw (summary);
-	return FALSE;
-}
-
-static void
-cal_opened_cb (CalClient *client,
-	       CalClientOpenStatus status,
-	       ESummary *summary)
-{
-	if (status == CAL_CLIENT_OPEN_SUCCESS) {
-		g_idle_add (generate_html, summary);
-	} else {
-		/* Need to work out what to do if there's an error */
-	}
-}
-static void
-obj_changed_cb (CalClient *client,
-		const char *uid,
-		gpointer data)
-{
-	g_idle_add (generate_html, data);
-}
-
-static void
-e_summary_calendar_protocol (ESummary *summary,
-			     const char *uri,
-			     void *closure)
-{
-
-}
-
-static gboolean
-locale_uses_24h_time_format (void)
-{
-	char s[16];
-	time_t t = 0;
-
-	strftime (s, sizeof s, "%p", gmtime (&t));
-	return s[0] == '\0';
-}
-
-void
-e_summary_calendar_init (ESummary *summary)
-{
-	Bonobo_ConfigDatabase db;
-	CORBA_Environment ev;
-	ESummaryCalendar *calendar;
-	gboolean result;
-	char *uri;
-
-	g_return_if_fail (summary != NULL);
-
-	calendar = g_new (ESummaryCalendar, 1);
-	summary->calendar = calendar;
-	calendar->html = NULL;
-
-	calendar->client = cal_client_new ();
-	if (calendar->client == NULL) {
-		g_warning ("Error making the client");
-		return;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (calendar->client), "cal-opened",
-			    GTK_SIGNAL_FUNC (cal_opened_cb), summary);
-	gtk_signal_connect (GTK_OBJECT (calendar->client), "obj-updated",
-			    GTK_SIGNAL_FUNC (obj_changed_cb), summary);
-	gtk_signal_connect (GTK_OBJECT (calendar->client), "obj-removed",
-			    GTK_SIGNAL_FUNC (obj_changed_cb), summary);
-
-	uri = gnome_util_prepend_user_home ("evolution/local/Calendar/calendar.ics");
-	result = cal_client_open_calendar (calendar->client, uri, FALSE);
-	g_free (uri);
-	if (result == FALSE) {
-		g_message ("Open calendar failed");
-	}
-	
-	e_summary_add_protocol_listener (summary, "calendar", e_summary_calendar_protocol, calendar);
-	
-	CORBA_exception_init (&ev);
-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev);
-	if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) {
-		CORBA_exception_free (&ev);
-		g_warning ("Error getting Wombat. Using defaults");
-		return;
-	}
-
-	calendar->wants24hr = bonobo_config_get_boolean_with_default (db, "/Calendar/Display/Use24HourFormat", locale_uses_24h_time_format (), NULL);
-	bonobo_object_release_unref (db, NULL);
-	CORBA_exception_free (&ev);
-}
-
-void
-e_summary_calendar_reconfigure (ESummary *summary)
-{
-	generate_html (summary);
-}
-
-void
-e_summary_calendar_free (ESummary *summary)
-{
-	ESummaryCalendar *calendar;
-
-	g_return_if_fail (summary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (summary));
-
-	calendar = summary->calendar;
-	gtk_object_unref (GTK_OBJECT (calendar->client));
-	g_free (calendar->html);
-
-	g_free (calendar);
-	summary->calendar = NULL;
-}