callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

addressbook/gui/component/addressbook-migrate.c

Browse Source 
2004-12-08  Hans Petter Jansson  <hpj@novell.com>

	* addressbook/gui/component/addressbook-migrate.c
	* addressbook/gui/component/select-names/e-select-names-completion.c
	* addressbook/gui/component/select-names/e-select-names-manager.c
	* addressbook/gui/component/select-names/e-select-names-model.h
	* addressbook/gui/contact-list-editor/e-contact-list-editor.h
	* addressbook/gui/contact-list-editor/e-contact-list-model.h
	* addressbook/gui/widgets/e-minicard.c
	* addressbook/gui/widgets/eab-gui-util.c
	* addressbook/importers/evolution-ldif-importer.c
	* addressbook/importers/evolution-vcard-importer.c: Include
	<libebook/e-destination.h> from evolution-data-server.
	* addressbook/util/Makefile.am: Remove e-destination.[ch] from here.
	* addressbook/util/e-destination.[ch]: Removed.

	* plugins/shared-folder/share-folder-common.c: Include
	<libebook/e-destination.h> from evolution-data-server.

	* calendar/gui/e-meeting-list-view.c
	* calendar/gui/e-select-names-editable.c
	* calendar/gui/dialogs/alarm-dialog.c
	* calendar/gui/dialogs/e-delegate-dialog.c: Include
	<libebook/e-destination.h> from evolution-data-server.

	* composer/e-msg-composer-hdrs.h: Include <libebook/e-destination.h>
	from evolution-data-server.

	* mail/importers/pine-importer.c: Include <libebook/e-destination.h>
	from evolution-data-server.

svn path=/trunk/; revision=28094
This commit is contained in:
Hans Petter Jansson
2004-12-09 06:12:56 +00:00
committed by Hans Petter
parent f7e0e9ea97
commit 24ebfb0afc
24 changed files with 55 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-12-08 Hans Petter Jansson <hpj@novell.com>
* plugins/shared-folder/share-folder-common.c: Include
<libebook/e-destination.h> from evolution-data-server.
2004-12-03 Sivaiah Nallagatla <snallagatla@novell.com>
* configure.in : Add groupwise-account-setup to plguin

16
addressbook/ChangeLog
View File

@ -1,3 +1,19 @@
2004-12-08 Hans Petter Jansson <hpj@novell.com>
* gui/component/addressbook-migrate.c
* gui/component/select-names/e-select-names-completion.c
* gui/component/select-names/e-select-names-manager.c
* gui/component/select-names/e-select-names-model.h
* gui/contact-list-editor/e-contact-list-editor.h
* gui/contact-list-editor/e-contact-list-model.h
* gui/widgets/e-minicard.c
* gui/widgets/eab-gui-util.c
* importers/evolution-ldif-importer.c
* importers/evolution-vcard-importer.c: Include
<libebook/e-destination.h> from evolution-data-server.
* util/Makefile.am: Remove e-destination.[ch] from here.
* util/e-destination.[ch]: Removed.
2004-12-08 S.Çaglar Onur <caglar@uludag.org.tr>
* evolution-2.0.2/addressbook/gui/contact-editor/e-contact-editor.c

2
addressbook/gui/component/addressbook-migrate.c
View File

@ -33,7 +33,7 @@
#include <errno.h>
#include "addressbook-migrate.h"
#include "e-destination.h"
#include <libebook/e-destination.h>
#include <libebook/e-book.h>
#include <libgnome/gnome-i18n.h>
#include <gal/util/e-util.h>

2
addressbook/gui/component/select-names/e-select-names-completion.c
View File

@ -36,7 +36,7 @@
#include <libebook/e-contact.h>
#include <addressbook/util/eab-book-util.h>
#include <addressbook/util/e-destination.h>
#include <libebook/e-destination.h>
#include <addressbook/gui/merging/eab-contact-compare.h>
#include <libedataserver/e-sexp.h>

2
addressbook/gui/component/select-names/e-select-names-manager.c
View File

@ -25,7 +25,7 @@
#include "e-select-names-completion.h"
#include "e-select-names-popup.h"
#include <addressbook/util/eab-book-util.h>
#include <addressbook/util/e-destination.h>
#include <libebook/e-destination.h>
#include "addressbook/gui/component/addressbook.h"
#include <bonobo/bonobo-object.h>

2
addressbook/gui/component/select-names/e-select-names-model.h
View File

@ -16,7 +16,7 @@
#include <stdio.h>
#include <e-util/e-list.h>
#include <libebook/e-contact.h>
#include <addressbook/util/e-destination.h>
#include <libebook/e-destination.h>
#define E_TYPE_SELECT_NAMES_MODEL (e_select_names_model_get_type ())
#define E_SELECT_NAMES_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SELECT_NAMES_MODEL, ESelectNamesModel))

2
addressbook/gui/contact-list-editor/e-contact-list-editor.h
View File

@ -30,7 +30,7 @@
#include <libebook/e-book.h>
#include <libebook/e-contact.h>
#include "addressbook/util/e-destination.h"
#include <libebook/e-destination.h>
G_BEGIN_DECLS

2
addressbook/gui/contact-list-editor/e-contact-list-model.h
View File

@ -4,7 +4,7 @@
#include <gal/e-table/e-table-model.h>
#include <libebook/e-contact.h>
#include "addressbook/util/e-destination.h"
#include <libebook/e-destination.h>
G_BEGIN_DECLS

2
addressbook/gui/widgets/e-minicard.c
View File

@ -40,7 +40,7 @@
#include "e-minicard-view.h"
#include "e-contact-editor.h"
#include <e-util/e-icon-factory.h>
#include "util/e-destination.h"
#include <libebook/e-destination.h>
static void e_minicard_init (EMinicard *card);
static void e_minicard_class_init (EMinicardClass *klass);

2
addressbook/gui/widgets/eab-gui-util.c
View File

@ -30,7 +30,7 @@
#include <gal/util/e-util.h>
#include "eab-gui-util.h"
#include "util/eab-book-util.h"
#include "util/e-destination.h"
#include <libebook/e-destination.h>
#include "widgets/misc/e-error.h"
#include "widgets/misc/e-image-chooser.h"
#include <e-util/e-icon-factory.h>

2
addressbook/importers/evolution-ldif-importer.c
View File

@ -32,7 +32,7 @@
#include <importer/evolution-importer.h>
#include <importer/GNOME_Evolution_Importer.h>
#include <util/e-destination.h>
#include <libebook/e-destination.h>
#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory:" BASE_VERSION
#define COMPONENT_IID "OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer:" BASE_VERSION

2
addressbook/importers/evolution-vcard-importer.c
View File

@ -46,7 +46,7 @@
#include <importer/evolution-importer.h>
#include <importer/GNOME_Evolution_Importer.h>
#include <util/eab-book-util.h>
#include <util/e-destination.h>
#include <libebook/e-destination.h>
#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory:" BASE_VERSION
#define COMPONENT_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_Importer:" BASE_VERSION

2
addressbook/util/Makefile.am
View File

@ -14,8 +14,6 @@ noinst_LTLIBRARIES = libeabutil.la
libeabutil_la_SOURCES = \
eab-marshal.c \
e-destination.c \
e-destination.h \
eab-book-util.c \
eab-book-util.h

1259
addressbook/util/e-destination.c
View File

File diff suppressed because it is too large Load Diff

124
addressbook/util/e-destination.h
View File

@ -1,124 +0,0 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* e-destination.h
*
* Copyright (C) 2001-2004 Ximian, Inc.
*
* Authors: Jon Trowbridge <trow@ximian.com>
* Chris Toshok <toshok@ximian.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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA.
*/
#ifndef __E_DESTINATION_H__
#define __E_DESTINATION_H__
#include <glib.h>
#include <glib-object.h>
#include <libebook/e-contact.h>
#include <libebook/e-book.h>
#include <libxml/tree.h>
#define E_TYPE_DESTINATION (e_destination_get_type ())
#define E_DESTINATION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_DESTINATION, EDestination))
#define E_DESTINATION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), E_TYPE_DESTINATION, EDestinationClass))
#define E_IS_DESTINATION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_DESTINATION))
#define E_IS_DESTINATION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_DESTINATION))
#define E_DESTINATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_DESTINATION, EDestinationClass))
typedef struct _EDestination EDestination;
typedef struct _EDestinationClass EDestinationClass;
struct _EDestinationPrivate;
struct _EDestination {
GObject object;
struct _EDestinationPrivate *priv;
};
struct _EDestinationClass {
GObjectClass parent_class;
/* Padding for future expansion */
void (*_ebook_reserved0) (void);
void (*_ebook_reserved1) (void);
void (*_ebook_reserved2) (void);
void (*_ebook_reserved3) (void);
void (*_ebook_reserved4) (void);
};
GType e_destination_get_type (void);
EDestination *e_destination_new (void);
EDestination *e_destination_copy (const EDestination *);
gboolean e_destination_empty (const EDestination *);
gboolean e_destination_equal (const EDestination *a, const EDestination *b);
/* for use with EDestinations that wrap a particular contact */
void e_destination_set_contact (EDestination *, EContact *contact, int email_num);
void e_destination_set_contact_uid (EDestination *dest, const char *uid, gint email_num);
void e_destination_set_book (EDestination *, EBook *book);
EContact *e_destination_get_contact (const EDestination *);
const char *e_destination_get_source_uid (const EDestination *);
const char *e_destination_get_contact_uid (const EDestination *);
int e_destination_get_email_num (const EDestination *);
/* for use with EDestinations built up from strings (not corresponding to contacts in a user's address books) */
void e_destination_set_name (EDestination *, const char *name);
void e_destination_set_email (EDestination *, const char *email);
const char *e_destination_get_name (const EDestination *); /* "Jane Smith" */
const char *e_destination_get_email (const EDestination *); /* "jane@assbarn.com" */
const char *e_destination_get_address (const EDestination *); /* "Jane Smith <jane@assbarn.com>" (or a comma-sep set of such for a list) */
gboolean e_destination_is_evolution_list (const EDestination *);
gboolean e_destination_list_show_addresses (const EDestination *);
/* If true, they want HTML mail. */
void e_destination_set_html_mail_pref (EDestination *dest, gboolean flag);
gboolean e_destination_get_html_mail_pref (const EDestination *);
/* used by the evolution composer to manage automatic recipients
XXX should probably be implemented using a more neutral/extensible
approach instead of a hardcoded evolution-only flag. */
gboolean e_destination_is_auto_recipient (const EDestination *);
void e_destination_set_auto_recipient (EDestination *, gboolean value);
/* parse out an EDestination (name/email, not contact) from a free form string. */
void e_destination_set_raw (EDestination *, const char *free_form_string);
/* generate a plain-text representation of an EDestination* or EDestination** */
const char *e_destination_get_textrep (const EDestination *, gboolean include_email); /* "Jane Smith" or "jane@assbarn.com" */
char *e_destination_get_textrepv (EDestination **);
/* XML export/import routines. */
char *e_destination_export (const EDestination *);
char *e_destination_exportv (EDestination **);
EDestination *e_destination_import (const char *str);
EDestination **e_destination_importv (const char *str);
/* EVCard "export" routines */
void e_destination_export_to_vcard_attribute (EDestination *dest, EVCardAttribute *attr);
void e_destination_freev (EDestination **);
#endif /* __E_DESTINATION_H__ */

8
calendar/ChangeLog
View File

@ -1,3 +1,11 @@
2004-12-08 Hans Petter Jansson <hpj@novell.com>
* gui/e-meeting-list-view.c
* gui/e-select-names-editable.c
* gui/dialogs/alarm-dialog.c
* gui/dialogs/e-delegate-dialog.c: Include <libebook/e-destination.h>
from evolution-data-server.
2004-12-08 Harish Krishnaswamy <kharish@novell.com>
* gui/e-week.c (time_range_changed_cb, e_week_view_set_first_day_shown):

2
calendar/gui/dialogs/alarm-dialog.c
View File

@ -51,7 +51,7 @@
#include <libecal/e-cal-time-util.h>
#include "e-util/e-dialog-widgets.h"
#include "e-util/e-icon-factory.h"
#include <addressbook/util/e-destination.h>
#include <libebook/e-destination.h>
#include "Evolution-Addressbook-SelectNames.h"
#include "../calendar-config.h"
#include "comp-editor-util.h"

2
calendar/gui/dialogs/e-delegate-dialog.c
View File

@ -35,7 +35,7 @@
#include <libical/ical.h>
#include <glade/glade.h>
#include <widgets/misc/e-map.h>
#include <addressbook/util/e-destination.h>
#include <libebook/e-destination.h>
#include "Evolution-Addressbook-SelectNames.h"
#include "e-delegate-dialog.h"

2
calendar/gui/e-meeting-list-view.c
View File

@ -43,7 +43,7 @@
#include "calendar-config.h"
#include "e-meeting-list-view.h"
#include <misc/e-cell-renderer-combo.h>
#include <addressbook/util/e-destination.h>
#include <libebook/e-destination.h>
#include "e-select-names-renderer.h"
#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames:" BASE_VERSION

2
calendar/gui/e-select-names-editable.c
View File

@ -25,7 +25,7 @@
#include <gtk/gtkcelleditable.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-widget.h>
#include <addressbook/util/e-destination.h>
#include <libebook/e-destination.h>
#include "e-select-names-editable.h"
#include "Evolution-Addressbook-SelectNames.h"

5
composer/ChangeLog
View File

@ -1,3 +1,8 @@
2004-12-08 Hans Petter Jansson <hpj@novell.com>
* e-msg-composer-hdrs.h: Include <libebook/e-destination.h> from
evolution-data-server.
2004-12-07 Not Zed <NotZed@Ximian.com>
* e-msg-composer.c: include camel-cipher-context.h so we build if

2
composer/e-msg-composer-hdrs.h
View File

@ -31,7 +31,7 @@
#include <e-util/e-account.h>
#include <camel/camel-mime-message.h>
#include <addressbook/util/e-destination.h>
#include <libebook/e-destination.h>
#ifdef __cplusplus
extern "C" {

5
mail/ChangeLog
View File

@ -1,3 +1,8 @@
2004-12-08 Hans Petter Jansson <hpj@novell.com>
* importers/pine-importer.c: Include <libebook/e-destination.h> from
evolution-data-server.
2004-12-08 Rodney Dawes <dobey@novell.com>
* em-folder-tree.c:

2
mail/importers/pine-importer.c
View File

@ -62,7 +62,7 @@
#include "mail/mail-component.h"
#include <libebook/e-book.h>
#include <addressbook/util/e-destination.h>
#include <libebook/e-destination.h>
#define KEY "pine-mail-imported"