From c93054bdef122eb853b476c345aa49cf7f41fed3 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Mon, 30 Jun 2003 14:33:25 +0000 Subject: removed libwombat from the build. 2003-06-30 Rodrigo Moya * configure.in: * Makefile.am: removed libwombat from the build. * evolution-calendar.pc.in: removed -lwombat. * libwombat/*: removed unused directory. svn path=/trunk/; revision=21692 --- libwombat/.cvsignore | 15 ----- libwombat/ChangeLog | 5 -- libwombat/ChangeLog.pre-1-4 | 55 ---------------- libwombat/Makefile.am | 40 ------------ libwombat/wombat-client.c | 150 -------------------------------------------- libwombat/wombat-client.h | 72 --------------------- 6 files changed, 337 deletions(-) delete mode 100644 libwombat/.cvsignore delete mode 100644 libwombat/ChangeLog delete mode 100644 libwombat/ChangeLog.pre-1-4 delete mode 100644 libwombat/Makefile.am delete mode 100644 libwombat/wombat-client.c delete mode 100644 libwombat/wombat-client.h (limited to 'libwombat') diff --git a/libwombat/.cvsignore b/libwombat/.cvsignore deleted file mode 100644 index b30c635228..0000000000 --- a/libwombat/.cvsignore +++ /dev/null @@ -1,15 +0,0 @@ -Makefile.in -Makefile -*.lo -Evolution-Wombat.h -Evolution-Wombat-common.c -Evolution-Wombat-skels.c -Evolution-Wombat-stubs.c -wombat.h -wombat-common.c -wombat-skels.c -wombat-stubs.c -.deps -.libs -libwombat.la -libwombat-static.la diff --git a/libwombat/ChangeLog b/libwombat/ChangeLog deleted file mode 100644 index 14a9ad136f..0000000000 --- a/libwombat/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -2003-06-16 Frederic Crozat - - * Makefile.am: - Add missing stub/skel to BUILD_SOURCES (bug #44717) - diff --git a/libwombat/ChangeLog.pre-1-4 b/libwombat/ChangeLog.pre-1-4 deleted file mode 100644 index a6e99553c9..0000000000 --- a/libwombat/ChangeLog.pre-1-4 +++ /dev/null @@ -1,55 +0,0 @@ -2003-02-05 Dan Winship - - * Makefile.am (wombatincludedir): Define in terms of - privincludedir - -2003-01-22 Ettore Perazzoli - - * Makefile.am: Install libwombat in $(privlibdir) and version the - include file path using $(BASE_VERSION). - -2002-11-04 Rodrigo Moya - - * Makefile.am: fixed flags for $(ORBIT_IDL). - - * wombat-client.[ch]: converted to BonoboObject. - -2002-11-01 Rodrigo Moya - - * wombat-client.h: compilation fixes for GNOME 2 porting. - -2002-07-12 Peter Williams - - * wombat-client.h: Oops, change wombat.h -> Evolution-Wombat.h - -2002-07-09 Peter Williams - - * Makefile.am: Reference the renamed Evolution-Wombat.idl - instead of wombat.idl. - -2002-01-27 Ettore Perazzoli - - * Makefile.am: Use WOMBAT_CFLAGS. - -2001-06-25 Peter Williams - - * Makefile.am (libwombat_static_la_SOURCES): Create a static - libwombat for the conduits. - -2001-06-23 Jason Leach - - * Makefile.am: builddir != srcdir fixes. - -2001-06-22 Rodrigo Moya - - * Makefile.am: added $(ORBIT_IDL) as a dependency to the IDL - files, so that the skels/stubs are rebuilt if a new version of - ORBit has been installed - -2001-06-21 JP Rosevear - - * Makefile.am: Add some includes - -2001-06-21 Rodrigo Moya - - * created new directory for the libwombat library diff --git a/libwombat/Makefile.am b/libwombat/Makefile.am deleted file mode 100644 index c3a347876c..0000000000 --- a/libwombat/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -INCLUDES = $(WOMBAT_CFLAGS) - -# CORBA stuff - -IDLS = $(top_srcdir)/wombat/Evolution-Wombat.idl -IDL_GENERATED = \ - Evolution-Wombat.h \ - Evolution-Wombat-common.c \ - Evolution-Wombat-skels.c \ - Evolution-Wombat-stubs.c - -$(IDLS): $(ORBIT_IDL) - -$(IDL_GENERATED): $(IDLS) - $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl $(IDL_INCLUDES) \ - $(top_srcdir)/wombat/Evolution-Wombat.idl - -# Wombat library -privlib_LTLIBRARIES = libwombat.la - -wombatincludedir = $(privincludedir)/wombat -wombatinclude_HEADERS = \ - wombat-client.h - -libwombat_la_SOURCES = \ - $(IDL_GENERATED) \ - wombat-client.c \ - $(wombatinclude_HEADERS) - -# Static lib for pilot conduits - -noinst_LTLIBRARIES = libwombat-static.la - -libwombat_static_la_SOURCES = $(libwombat_la_SOURCES) -libwombat_static_la_LDFLAGS = --all-static - -BUILT_SOURCES = $(IDL_GENERATED) -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = ChangeLog.pre-1-4 diff --git a/libwombat/wombat-client.c b/libwombat/wombat-client.c deleted file mode 100644 index c3a0280b60..0000000000 --- a/libwombat/wombat-client.c +++ /dev/null @@ -1,150 +0,0 @@ -/* Wombat client library - * - * Copyright (C) 2001 Ximian, Inc. - * - * Author: Rodrigo Moya - * - * 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. - */ - -#include "wombat-client.h" - -#define PARENT_TYPE BONOBO_TYPE_OBJECT - -struct _WombatClientPrivate { - WombatClientGetPasswordFn get_password; - WombatClientForgetPasswordFn forget_password; - gpointer fn_data; -}; - -static void wombat_client_class_init (WombatClientClass *klass); -static void wombat_client_init (WombatClient *client, WombatClientClass *klass); -static void wombat_client_finalize (GObject *objct); - -static GObjectClass *parent_class = NULL; - -/* - * CORBA interface implementation - */ -static CORBA_char * -impl_GNOME_Evolution_WombatClient_getPassword (PortableServer_Servant servant, - const CORBA_char *prompt, - const CORBA_char *key, - CORBA_Environment *ev) -{ - WombatClient *client; - - client = WOMBAT_CLIENT (bonobo_object_from_servant (servant)); - g_return_val_if_fail (WOMBAT_IS_CLIENT (client), NULL); - g_return_val_if_fail (client->priv != NULL, NULL); - - if (client->priv->get_password != NULL) - return client->priv->get_password (client, prompt, key, client->priv->fn_data); - - return NULL; -} - -static void -impl_GNOME_Evolution_WombatClient_forgetPassword (PortableServer_Servant servant, - const CORBA_char *key, - CORBA_Environment *ev) -{ - WombatClient *client; - - client = WOMBAT_CLIENT (bonobo_object_from_servant (servant)); - g_return_if_fail (WOMBAT_IS_CLIENT (client)); - g_return_if_fail (client->priv != NULL); - - if (client->priv->forget_password != NULL) - client->priv->forget_password (client, key, client->priv->fn_data); -} - -/* - * WombatClient class implementation - */ -static void -wombat_client_class_init (WombatClientClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS(klass); - POA_GNOME_Evolution_WombatClient__epv *epv = &klass->epv; - - parent_class = g_type_class_peek_parent (klass); - - object_class->finalize = wombat_client_finalize; - - epv->getPassword = impl_GNOME_Evolution_WombatClient_getPassword; - epv->forgetPassword = impl_GNOME_Evolution_WombatClient_forgetPassword; -} - -static void -wombat_client_init (WombatClient *client, WombatClientClass *klass) -{ - client->priv = g_new0 (WombatClientPrivate, 1); -} - -static void -wombat_client_finalize (GObject *object) -{ - WombatClient *client = (WombatClient *) object; - - g_return_if_fail (WOMBAT_IS_CLIENT (client)); - - /* free memory */ - if (client->priv != NULL) { - g_free (client->priv); - } - - /* call parent class' destroy handler */ - if (parent_class->finalize != NULL) - parent_class->finalize (object); -} - -BONOBO_TYPE_FUNC_FULL(WombatClient, GNOME_Evolution_WombatClient, PARENT_TYPE, wombat_client) - -/** - * wombat_client_construct - */ -WombatClient * -wombat_client_construct (WombatClient *client, - WombatClientGetPasswordFn get_password_fn, - WombatClientForgetPasswordFn forget_password_fn, - gpointer fn_data) -{ - g_return_val_if_fail (WOMBAT_IS_CLIENT (client), NULL); - g_return_val_if_fail (client->priv != NULL, NULL); - - client->priv->get_password = get_password_fn; - client->priv->forget_password = forget_password_fn; - client->priv->fn_data = fn_data; - - return client; -} - -/** - * wombat_client_new - */ -WombatClient * -wombat_client_new (WombatClientGetPasswordFn get_password_fn, - WombatClientForgetPasswordFn forget_password_fn, - gpointer fn_data) -{ - WombatClient *client; - - client = WOMBAT_CLIENT (g_object_new (WOMBAT_TYPE_CLIENT, NULL)); - return wombat_client_construct (client, - get_password_fn, - forget_password_fn, - fn_data); -} diff --git a/libwombat/wombat-client.h b/libwombat/wombat-client.h deleted file mode 100644 index 20afe4c1db..0000000000 --- a/libwombat/wombat-client.h +++ /dev/null @@ -1,72 +0,0 @@ -/* Wombat client library - * - * Copyright (C) 2001 Ximian, Inc. - * - * Author: Rodrigo Moya - * - * 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 WOMBAT_CLIENT_H -#define WOMBAT_CLIENT_H - -#include -#include "Evolution-Wombat.h" - -G_BEGIN_DECLS - -#define WOMBAT_TYPE_CLIENT (wombat_client_get_type()) -#define WOMBAT_CLIENT(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, WOMBAT_TYPE_CLIENT, WombatClient) -#define WOMBAT_CLIENT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, WOMBAT_TYPE_CLIENT, WombatClientClass) -#define WOMBAT_IS_CLIENT(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, WOMBAT_TYPE_CLIENT) -#define WOMBAT_IS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WOMBAT_TYPE_CLIENT)) - -typedef struct _WombatClient WombatClient; -typedef struct _WombatClientClass WombatClientClass; -typedef struct _WombatClientPrivate WombatClientPrivate; - -struct _WombatClient { - BonoboObject object; - WombatClientPrivate *priv; -}; - -struct _WombatClientClass { - BonoboObjectClass parent_class; - - POA_GNOME_Evolution_WombatClient__epv epv; -}; - -typedef gchar * (* WombatClientGetPasswordFn) (WombatClient *client, - const gchar *prompt, - const gchar *key, - gpointer user_data); -typedef void (* WombatClientForgetPasswordFn) (WombatClient *client, - const gchar *key, - gpointer user_data); - -GType wombat_client_get_type (void); - -WombatClient *wombat_client_construct (WombatClient *client, - WombatClientGetPasswordFn get_password_fn, - WombatClientForgetPasswordFn forget_password_fn, - gpointer fn_data); -WombatClient *wombat_client_new (WombatClientGetPasswordFn get_password_fn, - WombatClientForgetPasswordFn forget_password_fn, - gpointer fn_data); - - -G_END_DECLS - -#endif -- cgit v1.2.3