[evolution-patches] calendar patch for new EDestination stuff

[Chris Toshok <toshok ximian com>]

reverts from using EABDestination to EDestination.

Chris

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2242
diff -u -r1.2242 ChangeLog
--- ChangeLog	7 Apr 2004 20:36:48 -0000	1.2242
+++ ChangeLog	8 Apr 2004 03:34:22 -0000
@@ -1,3 +1,23 @@
+2004-04-07  Chris Toshok  <toshok ximian com>
+
+	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
+	EABDestination -> EDestination.
+	(e_delegate_dialog_get_delegate): same.
+	(e_delegate_dialog_get_delegate_name): same.
+
+	* gui/dialogs/alarm-options.c (alarm_to_malarm_widgets):
+	EABDestination -> EDestination.
+	(malarm_widgets_to_alarm): same.
+
+	* gui/e-select-names-editable.c
+	(e_select_names_editable_get_address): EABDestination ->
+	EDestination.
+	(e_select_names_editable_get_name): same.
+
+	* gui/e-meeting-list-view.c (process_section): EABDestination ->
+	EDestination.
+	(select_names_ok_cb): same.
+
 2004-04-07  Jeffrey Stedfast  <fejj ximian com>
 
 	* gui/dialogs/cal-prefs-dialog.c: Fixed to be instant-apply.
Index: gui/e-meeting-list-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-list-view.c,v
retrieving revision 1.8
diff -u -r1.8 e-meeting-list-view.c
--- gui/e-meeting-list-view.c	23 Mar 2004 21:51:41 -0000	1.8
+++ gui/e-meeting-list-view.c	8 Apr 2004 03:34:22 -0000
@@ -43,7 +43,7 @@
 #include "calendar-config.h"
 #include "e-meeting-list-view.h"
 #include <misc/e-cell-renderer-combo.h>
-#include <addressbook/util/eab-destination.h>
+#include <addressbook/util/e-destination.h>
 #include "e-select-names-renderer.h"
 
 #define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames:" BASE_VERSION
@@ -328,7 +328,7 @@
 }
 
 static void
-process_section (EMeetingListView *view, EABDestination **cards, icalparameter_role role)
+process_section (EMeetingListView *view, EDestination **cards, icalparameter_role role)
 {
 	EMeetingListViewPrivate *priv;
 	int i;
@@ -338,7 +338,7 @@
 		const char *name, *attendee = NULL;
 		char *attr = NULL;
 
-		name = eab_destination_get_name (cards[i]);
+		name = e_destination_get_name (cards[i]);
 
 		/* Get the field as attendee from the backend */
 		if (e_cal_get_ldap_attribute (e_meeting_store_get_e_cal (priv->store),
@@ -348,8 +348,8 @@
 				EContact *contact;
 
 				/* FIXME: this does not work, have to use first
-				   eab_destination_use_contact() */
-				contact = eab_destination_get_contact (cards[i]);
+				   e_destination_use_contact() */
+				contact = e_destination_get_contact (cards[i]);
 				if (contact) {
 					attendee = e_contact_get (contact, E_CONTACT_FREEBUSY_URL);
 					if (!attendee)
@@ -360,7 +360,7 @@
 
 		/* If we couldn't get the attendee prior, get the email address as the default */
 		if (attendee == NULL || *attendee == '\0') {
-			attendee = eab_destination_get_email (cards[i]);
+			attendee = e_destination_get_email (cards[i]);
 		}
 		
 		if (attendee == NULL || *attendee == '\0')
@@ -385,7 +385,7 @@
 	int i;
 	
 	for (i = 0; sections[i] != NULL; i++) {
-		EABDestination **destv;
+		EDestination **destv;
 		char *string = NULL;
 		Bonobo_Control corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection 
 			(view->priv->corba_select_names, sections[i], ev);
@@ -393,7 +393,7 @@
 
 		bonobo_widget_get_property (BONOBO_WIDGET (control_widget), "destinations",
 					    TC_CORBA_string, &string, NULL);
-		destv = eab_destination_importv (string);
+		destv = e_destination_importv (string);
  		if (destv) {
  			process_section (view, destv, roles[i]);
  			g_free (destv);
Index: gui/e-select-names-editable.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-select-names-editable.c,v
retrieving revision 1.5
diff -u -r1.5 e-select-names-editable.c
--- gui/e-select-names-editable.c	24 Dec 2003 17:39:03 -0000	1.5
+++ gui/e-select-names-editable.c	8 Apr 2004 03:34:23 -0000
@@ -25,7 +25,7 @@
 #include <gtk/gtkcelleditable.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-widget.h>
-#include <addressbook/util/eab-destination.h>
+#include <addressbook/util/e-destination.h>
 
 #include "e-select-names-editable.h"
 #include "Evolution-Addressbook-SelectNames.h"
@@ -191,17 +191,17 @@
 gchar *
 e_select_names_editable_get_address (ESelectNamesEditable *esne)
 {
-	EABDestination **dest;
+	EDestination **dest;
 	gchar *dest_str;
 	gchar *result = NULL;
 
 	g_return_val_if_fail (E_SELECT_NAMES_EDITABLE (esne), NULL);
 
 	dest_str = bonobo_pbclient_get_string (esne->priv->bag, "destinations", NULL);
-	dest = eab_destination_importv (dest_str);
+	dest = e_destination_importv (dest_str);
 	if (dest)
-		result = g_strdup (eab_destination_get_email (*dest));
-	eab_destination_freev (dest);
+		result = g_strdup (e_destination_get_email (*dest));
+	e_destination_freev (dest);
 
 	return result;
 }
@@ -209,17 +209,17 @@
 gchar *
 e_select_names_editable_get_name (ESelectNamesEditable *esne)
 {
-	EABDestination **dest;
+	EDestination **dest;
 	gchar *dest_str;
 	gchar *result = NULL;
 
 	g_return_val_if_fail (E_SELECT_NAMES_EDITABLE (esne), NULL);
 
 	dest_str = bonobo_pbclient_get_string (esne->priv->bag, "destinations", NULL);
-	dest = eab_destination_importv (dest_str);
+	dest = e_destination_importv (dest_str);
 	if (dest)
-		result = g_strdup (eab_destination_get_name (*dest));
-	eab_destination_freev (dest);
+		result = g_strdup (e_destination_get_name (*dest));
+	e_destination_freev (dest);
 
 	return result;
 }
Index: gui/dialogs/alarm-options.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/alarm-options.c,v
retrieving revision 1.23
diff -u -r1.23 alarm-options.c
--- gui/dialogs/alarm-options.c	23 Mar 2004 09:38:27 -0000	1.23
+++ gui/dialogs/alarm-options.c	8 Apr 2004 03:34:23 -0000
@@ -39,7 +39,7 @@
 #include <bonobo/bonobo-widget.h>
 #include <libgnomeui/gnome-file-entry.h>
 #include <glade/glade.h>
-#include <addressbook/util/eab-destination.h>
+#include <addressbook/util/e-destination.h>
 #include "Evolution-Addressbook-SelectNames.h"
 #include "e-util/e-dialog-widgets.h"
 #include "alarm-options.h"
@@ -307,7 +307,7 @@
 	ECalComponentText description;
 	GtkTextBuffer *text_buffer;	
 	GSList *attendee_list, *l;
-	EABDestination **destv;
+	EDestination **destv;
 	int len, i;
 	
 	/* Recipients */
@@ -315,22 +315,22 @@
 	len = g_slist_length (attendee_list);
 
 	if (len <= 0) {
-		destv = g_new0 (EABDestination *, 2);
-		destv[0] = eab_destination_new ();
-		eab_destination_set_email (destv[0], dialog->email);
+		destv = g_new0 (EDestination *, 2);
+		destv[0] = e_destination_new ();
+		e_destination_set_email (destv[0], dialog->email);
 		destv[1] = NULL;
 		len = 1;
 	} else {
-		destv = g_new0 (EABDestination *, len + 1);
+		destv = g_new0 (EDestination *, len + 1);
 		for (l = attendee_list, i = 0; l != NULL; l = l->next, i++) {
 			ECalComponentAttendee *a = l->data;
-			EABDestination *dest;
+			EDestination *dest;
 			
-			dest = eab_destination_new ();
+			dest = e_destination_new ();
 			if (a->cn != NULL && *a->cn)
-				eab_destination_set_name (dest, a->cn);
+				e_destination_set_name (dest, a->cn);
 			if (a->value != NULL && *a->value)
-				eab_destination_set_email (dest, a->value);
+				e_destination_set_email (dest, a->value);
 			
 			destv[i] = dest;
 		}
@@ -338,7 +338,7 @@
 	}
 	
 	bonobo_widget_set_property (BONOBO_WIDGET (dialog->malarm_addresses), 
-				    "destinations", eab_destination_exportv (destv), NULL);
+				    "destinations", e_destination_exportv (destv), NULL);
 
 	for (i = 0; i < len; i++)
 		g_object_unref (GTK_OBJECT (destv[i]));
@@ -617,7 +617,7 @@
 	char *str;
 	ECalComponentText description;
 	GSList *attendee_list = NULL;
-	EABDestination **destv;
+	EDestination **destv;
 	GtkTextBuffer *text_buffer;
 	GtkTextIter text_iter_start, text_iter_end;
 	icalcomponent *icalcomp;
@@ -627,18 +627,18 @@
 	/* Attendees */
 	bonobo_widget_get_property (BONOBO_WIDGET (dialog->malarm_addresses), "destinations", 
 				    TC_CORBA_string, &str, NULL);
-	destv = eab_destination_importv (str);
+	destv = e_destination_importv (str);
 	g_free (str);
 	
 	for (i = 0; destv[i] != NULL; i++) {
-		EABDestination *dest;
+		EDestination *dest;
 		ECalComponentAttendee *a;
 
 		dest = destv[i];
 		
 		a = g_new0 (ECalComponentAttendee, 1);
-		a->value = eab_destination_get_email (dest);
-		a->cn = eab_destination_get_name (dest);
+		a->value = e_destination_get_email (dest);
+		a->cn = e_destination_get_name (dest);
 
 		attendee_list = g_slist_append (attendee_list, a);
 	}
@@ -646,7 +646,7 @@
 	e_cal_component_alarm_set_attendee_list (alarm, attendee_list);
 
 	e_cal_component_free_attendee_list (attendee_list);
-	eab_destination_freev (destv);	
+	e_destination_freev (destv);	
 
 	/* Description */
 	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->malarm_description));
Index: gui/dialogs/e-delegate-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/e-delegate-dialog.c,v
retrieving revision 1.17
diff -u -r1.17 e-delegate-dialog.c
--- gui/dialogs/e-delegate-dialog.c	1 Dec 2003 22:14:26 -0000	1.17
+++ gui/dialogs/e-delegate-dialog.c	8 Apr 2004 03:34:23 -0000
@@ -33,7 +33,7 @@
 #include <glade/glade.h>
 #include <gal/util/e-util.h>
 #include <widgets/misc/e-map.h>
-#include <addressbook/util/eab-destination.h>
+#include <addressbook/util/e-destination.h>
 #include "Evolution-Addressbook-SelectNames.h"
 #include "e-delegate-dialog.h"
 
@@ -126,8 +126,8 @@
 e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char *address)
 {
 	EDelegateDialogPrivate *priv;
-	EABDestination *dest;
-	EABDestination *destv[2] = {NULL, NULL};
+	EDestination *dest;
+	EDestination *destv[2] = {NULL, NULL};
 	Bonobo_Control corba_control;
 	CORBA_Environment ev;
 	char *str;
@@ -178,13 +178,13 @@
 	gtk_widget_show (priv->entry);
 	gtk_box_pack_start (GTK_BOX (priv->hbox), priv->entry, TRUE, TRUE, 6);
 
-	dest = eab_destination_new ();
+	dest = e_destination_new ();
 	destv[0] = dest;
 	if (name != NULL && *name)
-		eab_destination_set_name (dest, name);
+		e_destination_set_name (dest, name);
 	if (address != NULL && *address)
-		eab_destination_set_email (dest, address);
-	str = eab_destination_exportv(destv);
+		e_destination_set_email (dest, address);
+	str = e_destination_exportv(destv);
 	bonobo_widget_set_property (BONOBO_WIDGET (priv->entry), "destinations", TC_CORBA_string, str, NULL);
 	g_free(str);
 	g_object_unref (dest);
@@ -256,7 +256,7 @@
 e_delegate_dialog_get_delegate		(EDelegateDialog  *edd)
 {
 	EDelegateDialogPrivate *priv;
-	EABDestination **destv;
+	EDestination **destv;
 	char *string = NULL;
 	
 	g_return_val_if_fail (edd != NULL, NULL);
@@ -265,11 +265,11 @@
 	priv = edd->priv;
 	
 	bonobo_widget_get_property (BONOBO_WIDGET (priv->entry), "destinations", TC_CORBA_string, &string, NULL);
-	destv = eab_destination_importv (string);
+	destv = e_destination_importv (string);
 	
 	if (destv && destv[0] != NULL) {
 		g_free (priv->address);
-		priv->address = g_strdup (eab_destination_get_email (destv[0]));
+		priv->address = g_strdup (e_destination_get_email (destv[0]));
 		g_free (destv);
 	}
 	
@@ -283,7 +283,7 @@
 e_delegate_dialog_get_delegate_name		(EDelegateDialog  *edd)
 {
 	EDelegateDialogPrivate *priv;
-	EABDestination **destv;
+	EDestination **destv;
 	char *string = NULL;
 	
 	g_return_val_if_fail (edd != NULL, NULL);
@@ -292,13 +292,13 @@
 	priv = edd->priv;
 
 	bonobo_widget_get_property (BONOBO_WIDGET (priv->entry), "destinations", TC_CORBA_string, &string, NULL);
-	destv = eab_destination_importv (string);
+	destv = e_destination_importv (string);
 	
 	g_message ("importv: [%s]", string);
 	
 	if (destv && destv[0] != NULL) {
 		g_free (priv->name);
-		priv->name = g_strdup (eab_destination_get_name (destv[0]));
+		priv->name = g_strdup (e_destination_get_name (destv[0]));
 		g_free (destv);
 	}