aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2002-11-06 15:39:06 +0800
committerChris Toshok <toshok@src.gnome.org>2002-11-06 15:39:06 +0800
commit1b1d829e5e32c744565679b9733f1aeaf07d96af (patch)
tree813717aa9a44b26c1e1cc769c88200af6f4d6581 /addressbook/backend
parentc49c019456c41478f3368861ef7a0c02b037e0b1 (diff)
downloadgsoc2013-evolution-1b1d829e5e32c744565679b9733f1aeaf07d96af.tar.gz
gsoc2013-evolution-1b1d829e5e32c744565679b9733f1aeaf07d96af.tar.zst
gsoc2013-evolution-1b1d829e5e32c744565679b9733f1aeaf07d96af.zip
ignore the generated marshaller files.
2002-11-05 Chris Toshok <toshok@ximian.com> * backend/ebook/.cvsignore: ignore the generated marshaller files. * backend/ebook/e-destination.c (e_destination_dispose): rename e_destination_destroy. (e_destination_equal): ifdef this out for now, PENDING_PORT_WORK. (e_destination_get_name): same. (e_destination_get_email): same. (e_destination_get_address): same. (e_destination_get_textrep): same. * backend/ebook/Makefile.am: don't build the executables (importers and loaders) for now. Also, s/oaf/server, and use INTLTOOL_SERVER_RULE. * backend/ebook/e-book-util.c (e_book_get_config_database): un-#ifdef this. (e_book_default_book_open): un-#ifdef ths code in here that relies on the e_config_listener. svn path=/trunk/; revision=18586
Diffstat (limited to 'addressbook/backend')
-rw-r--r--addressbook/backend/ebook/.cvsignore4
-rw-r--r--addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in (renamed from addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in)0
-rw-r--r--addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in (renamed from addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in)0
-rw-r--r--addressbook/backend/ebook/Makefile.am76
-rw-r--r--addressbook/backend/ebook/e-book-util.c4
-rw-r--r--addressbook/backend/ebook/e-destination.c29
6 files changed, 62 insertions, 51 deletions
diff --git a/addressbook/backend/ebook/.cvsignore b/addressbook/backend/ebook/.cvsignore
index a90a07be40..2059a83c4c 100644
--- a/addressbook/backend/ebook/.cvsignore
+++ b/addressbook/backend/ebook/.cvsignore
@@ -21,7 +21,7 @@ Evolution-Composer-stubs.c
Evolution-Composer-skels.c
Evolution-Composer-common.c
Evolution-Composer.h
-GNOME_Evolution_Addressbook_VCard_Importer.oaf
-GNOME_Evolution_Addressbook_LDIF_Importer.oaf
+GNOME_Evolution_Addressbook_VCard_Importer.server
+GNOME_Evolution_Addressbook_LDIF_Importer.server
e-book-marshal.c
e-book-marshal.h
diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in
index b022dcde67..b022dcde67 100644
--- a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in
+++ b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in
diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in
index 9cd4699633..9cd4699633 100644
--- a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in
+++ b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index e4068d440d..720c1273a1 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -1,9 +1,10 @@
noinst_PROGRAMS = test-card test-client test-client-list
-#bin_PROGRAMS = evolution-vcard-importer \
-# evolution-ldif-importer \
-# load-pine-addressbook \
-# load-gnomecard-addressbook
+# PENDING_PORT_WORK
+# bin_PROGRAMS = evolution-vcard-importer \
+# evolution-ldif-importer \
+# load-pine-addressbook \
+# load-gnomecard-addressbook
CORBA_SOURCE = \
addressbook.h \
@@ -48,9 +49,9 @@ libebook_la_SOURCES = \
e-card-cursor.c \
e-card-simple.c \
e-card.c \
- e-card-compare.c
+ e-card-compare.c \
+ e-destination.c
-# e-destination.c
libebookincludedir = $(includedir)/evolution/ebook
@@ -90,35 +91,35 @@ e-book-marshal.c: e-book-marshal.h
MARSHAL_GENERATED = e-book-marshal.c e-book-marshal.h
-test_client_SOURCES = \
- test-client.c
+# test_client_SOURCES = \
+# test-client.c
-test_client_LDADD = \
- libebook.la \
- $(EVOLUTION_ADDRESSBOOK_LIBS) \
- $(top_builddir)/libversit/libversit.a \
- $(top_builddir)/e-util/ename/libename.la \
- $(top_builddir)/e-util/libeutil.la
+# test_client_LDADD = \
+# libebook.la \
+# $(EVOLUTION_ADDRESSBOOK_LIBS) \
+# $(top_builddir)/libversit/libversit.a \
+# $(top_builddir)/e-util/ename/libename.la \
+# $(top_builddir)/e-util/libeutil.la
-test_client_list_SOURCES = \
- test-client-list.c
+# test_client_list_SOURCES = \
+# test-client-list.c
-test_client_list_LDADD = \
- libebook.la \
- $(EVOLUTION_ADDRESSBOOK_LIBS) \
- $(top_builddir)/e-util/ename/libename.la \
- $(top_builddir)/libversit/libversit.a \
- $(top_builddir)/e-util/libeutil.la
+# test_client_list_LDADD = \
+# libebook.la \
+# $(EVOLUTION_ADDRESSBOOK_LIBS) \
+# $(top_builddir)/e-util/ename/libename.la \
+# $(top_builddir)/libversit/libversit.a \
+# $(top_builddir)/e-util/libeutil.la
-test_card_SOURCES = \
- test-card.c
+# test_card_SOURCES = \
+# test-card.c
-test_card_LDADD = \
- libebook.la \
- $(EVOLUTION_ADDRESSBOOK_LIBS) \
- $(top_builddir)/e-util/ename/libename.la \
- $(top_builddir)/libversit/libversit.a \
- $(top_builddir)/e-util/libeutil.la
+# test_card_LDADD = \
+# libebook.la \
+# $(EVOLUTION_ADDRESSBOOK_LIBS) \
+# $(top_builddir)/e-util/ename/libename.la \
+# $(top_builddir)/libversit/libversit.a \
+# $(top_builddir)/e-util/libeutil.la
# evolution_vcard_importer_SOURCES = \
# evolution-vcard-importer.c
@@ -175,14 +176,11 @@ CLEANFILES = $(BUILT_SOURCES)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
-oafdir = $(datadir)/oaf
-oaf_in_files = GNOME_Evolution_Addressbook_VCard_Importer.oaf.in \
- GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
+serversdir = $(libdir)/bonobo/servers
+server_in_files = GNOME_Evolution_Addressbook_VCard_Importer.server.in \
+ GNOME_Evolution_Addressbook_LDIF_Importer.server.in
+servers_DATA = $(server_in_files:.server.in=.server)
-# add this back when you add the file to the archive ;)
-# GNOME_Evolution_Addressbook_Pine_Importer.oafinfo
+@INTLTOOL_SERVER_RULE@
-EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) e-book-marshal.list
+EXTRA_DIST = $(server_in_files) $(servers_DATA) e-book-marshal.list
diff --git a/addressbook/backend/ebook/e-book-util.c b/addressbook/backend/ebook/e-book-util.c
index 75d9b913b0..38e8a4f166 100644
--- a/addressbook/backend/ebook/e-book-util.c
+++ b/addressbook/backend/ebook/e-book-util.c
@@ -118,7 +118,6 @@ e_book_use_address_book_by_uri (const char *uri, EBookCommonCallback cb, gpointe
}
}
-#if PENDING_PORT_WORK
EConfigListener *
e_book_get_config_database ()
{
@@ -129,7 +128,6 @@ e_book_get_config_database ()
return config_db;
}
-#endif
static EBook *common_default_book = NULL;
@@ -206,7 +204,6 @@ set_default_book_uri_local (void)
static void
set_default_book_uri_from_config_db (void)
{
-#if PENDING_PORT_WORK
char *val;
EConfigListener* config_db;
@@ -217,7 +214,6 @@ set_default_book_uri_from_config_db (void)
default_book_uri = e_book_expand_uri (val);
g_free (val);
} else
-#endif
set_default_book_uri_local ();
}
diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c
index 1c85efa6fb..ec2b24f8a1 100644
--- a/addressbook/backend/ebook/e-destination.c
+++ b/addressbook/backend/ebook/e-destination.c
@@ -31,6 +31,7 @@
#include <ctype.h>
#include <string.h>
#include "e-book.h"
+#include "e-book-marshal.h"
#include "e-book-util.h"
#include <gal/widgets/e-unicode.h>
#include <gnome-xml/parser.h>
@@ -90,7 +91,7 @@ static void e_destination_clear_strings (EDestination *);
static GObjectClass *parent_class;
static void
-e_destination_destroy (GObject *obj)
+e_destination_dispose (GObject *obj)
{
EDestination *dest = E_DESTINATION (obj);
@@ -114,7 +115,7 @@ e_destination_class_init (EDestinationClass *klass)
parent_class = g_type_class_ref (G_TYPE_OBJECT);
- object_class->destroy = e_destination_destroy;
+ object_class->dispose = e_destination_dispose;
e_destination_signals[CHANGED] =
g_signal_new ("changed",
@@ -162,9 +163,9 @@ e_destination_get_type (void)
sizeof (EDestination),
0, /* n_preallocs */
(GInstanceInitFunc) e_destination_init
-
- dest_type = g_type_register_static (G_TYPE_OBJECT, "EDestination", &dest_info, 0);
};
+
+ dest_type = g_type_register_static (G_TYPE_OBJECT, "EDestination", &dest_info, 0);
}
return dest_type;
@@ -370,6 +371,7 @@ e_destination_is_valid (const EDestination *dest)
gboolean
e_destination_equal (const EDestination *a, const EDestination *b)
{
+#ifdef PENDING_PORT_WORK
const struct _EDestinationPrivate *pa, *pb;
const char *na, *nb;
@@ -401,7 +403,7 @@ e_destination_equal (const EDestination *a, const EDestination *b)
if (!g_strcasecmp (e_destination_get_email (a), e_destination_get_email (b)))
return TRUE;
-
+#endif
return FALSE;
}
@@ -680,6 +682,7 @@ e_destination_get_email_num (const EDestination *dest)
const gchar *
e_destination_get_name (const EDestination *dest)
{
+#ifdef PENDING_PORT_WORK
struct _EDestinationPrivate *priv;
g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
@@ -717,12 +720,15 @@ e_destination_get_name (const EDestination *dest)
}
return priv->name;
-
+#else
+ return "e_destination_get_name needs port work";
+#endif
}
const gchar *
e_destination_get_email (const EDestination *dest)
{
+#ifdef PENDING_PORT_WORK
struct _EDestinationPrivate *priv;
g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
@@ -767,11 +773,15 @@ e_destination_get_email (const EDestination *dest)
}
return priv->email;
+#else
+ return "e_destination_get_email needs port work";
+#endif
}
const gchar *
e_destination_get_address (const EDestination *dest)
{
+#ifdef PENDING_PORT_WORK
struct _EDestinationPrivate *priv;
g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
@@ -813,6 +823,9 @@ e_destination_get_address (const EDestination *dest)
}
return priv->addr;
+#else
+ return "e_destination_get_address needs port work";
+#endif
}
void
@@ -835,6 +848,7 @@ e_destination_set_raw (EDestination *dest, const gchar *raw)
const gchar *
e_destination_get_textrep (const EDestination *dest)
{
+#ifdef PENDING_PORT_WORK
const char *name, *email;
g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
@@ -865,6 +879,9 @@ e_destination_get_textrep (const EDestination *dest)
return email;
return "";
+#else
+ return "e_destination_get_textrep needs port work";
+#endif
}
gboolean