diff options
| author | Dan Winship <danw@src.gnome.org> | 2003-02-06 07:47:01 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2003-02-06 07:47:01 +0800 |
| commit | d8eca23e1012bafe459a339f59915cd2518b070d (patch) | |
| tree | 9f637d45d084486b0652c7aaa098760bdcfe9de6 | |
| parent | 4958846621bc7287ea3cca53aa6f060c6d1c294e (diff) | |
| download | gsoc2013-evolution-d8eca23e1012bafe459a339f59915cd2518b070d.tar gsoc2013-evolution-d8eca23e1012bafe459a339f59915cd2518b070d.tar.gz gsoc2013-evolution-d8eca23e1012bafe459a339f59915cd2518b070d.tar.bz2 gsoc2013-evolution-d8eca23e1012bafe459a339f59915cd2518b070d.tar.lz gsoc2013-evolution-d8eca23e1012bafe459a339f59915cd2518b070d.tar.xz gsoc2013-evolution-d8eca23e1012bafe459a339f59915cd2518b070d.tar.zst gsoc2013-evolution-d8eca23e1012bafe459a339f59915cd2518b070d.zip | |
Remove cruft (ldapschemadir): Use privdatadir (pasincludedir): Use
* backend/pas/Makefile.am (INCLUDES): Remove cruft
(ldapschemadir): Use privdatadir
(pasincludedir): Use privincludedir.
* backend/pas/pas-book-factory.c (pas_book_factory_activate):
Remove unused variable.
* backend/pas/pas-book-view.c (pas_book_view_new): Likewise
svn path=/trunk/; revision=19779
| -rw-r--r-- | addressbook/backend/pas/Makefile.am | 5 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-book-factory.c | 1 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-book-view.c | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am index d14b447c94..1180dc3f60 100644 --- a/addressbook/backend/pas/Makefile.am +++ b/addressbook/backend/pas/Makefile.am @@ -16,7 +16,6 @@ $(CORBA_SOURCE): $(idls) INCLUDES = \ $(DB3_CFLAGS) \ $(LDAP_CFLAGS) \ - -DGNOMELOCALEDIR=\""$(localedir)"\" \ -DG_LOG_DOMAIN=\"wombat-pas\" \ -I$(top_srcdir) \ -I$(top_srcdir)/addressbook/backend \ @@ -36,13 +35,13 @@ if ENABLE_LDAP LDAP_BACKEND = libpasldap.a endif -ldapschemadir = $(datadir)/evolution-$(BASE_VERSION) +ldapschemadir = $(privdatadir) ldapschema_DATA= $(LDAP_SCHEMA) privlib_LIBRARIES = libpas.a noinst_LIBRARIES = libpasfile.a $(LDAP_BACKEND) -pasincludedir = $(includedir)/evolution-$(BASE_VERSION)/pas +pasincludedir = $(privincludedir)/pas pasinclude_HEADERS = \ $(CORBA_SOURCE_H) \ diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c index 460e83e73a..2d6ed1e65b 100644 --- a/addressbook/backend/pas/pas-book-factory.c +++ b/addressbook/backend/pas/pas-book-factory.c @@ -439,7 +439,6 @@ gboolean pas_book_factory_activate (PASBookFactory *factory, const char *iid) { PASBookFactoryPrivate *priv; - CORBA_Object obj; Bonobo_RegistrationResult result; char *tmp_iid; diff --git a/addressbook/backend/pas/pas-book-view.c b/addressbook/backend/pas/pas-book-view.c index 22b32c4604..52af28c3bb 100644 --- a/addressbook/backend/pas/pas-book-view.c +++ b/addressbook/backend/pas/pas-book-view.c @@ -194,7 +194,6 @@ PASBookView * pas_book_view_new (GNOME_Evolution_Addressbook_BookViewListener listener) { PASBookView *book_view; - GNOME_Evolution_Addressbook_BookView corba_objref; book_view = g_object_new (PAS_TYPE_BOOK_VIEW, NULL); |