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

removed libwombat from the build.

Browse Source 
2003-06-30  Rodrigo Moya <rodrigo@ximian.com>

	* configure.in:
	* Makefile.am: removed libwombat from the build.

	* evolution-calendar.pc.in: removed -lwombat.

	* libwombat/*: removed unused directory.

svn path=/trunk/; revision=21692
This commit is contained in:
Rodrigo Moya
2003-06-30 14:33:25 +00:00
committed by Rodrigo Moya
parent 33919c667b
commit c93054bdef
10 changed files with 10 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2003-06-30 Rodrigo Moya <rodrigo@ximian.com>
* configure.in:
* Makefile.am: removed libwombat from the build.
* evolution-calendar.pc.in: removed -lwombat.
* libwombat/*: removed unused directory.
== Version 1.4.1 ==
2003-06-25 Ettore Perazzoli <ettore@ximian.com>

1
Makefile.am
View File

@ -32,7 +32,6 @@ SUBDIRS = \
shell \
camel \
filter \
libwombat \
addressbook \
calendar \
my-evolution \

1
configure.in
View File

@ -1362,7 +1362,6 @@ widgets/e-timezone-dialog/Makefile
widgets/menus/Makefile
widgets/misc/Makefile
wombat/Makefile
libwombat/Makefile
calendar/Makefile
calendar/importers/Makefile
calendar/idl/Makefile

2
evolution-calendar.pc.in
View File

@ -13,5 +13,5 @@ Name: evolution-calendar
Description: libraries needed for Evolution calendar backends
Version: @VERSION@
Requires: libgnome-2.0 libbonobo-2.0 gal-2.0 >= @GAL_REQUIRED@ gnome-vfs-2.0
Libs: -L${privlibdir} -lpcs -lcal-util -lcal-client -lical-evolution -lwombat -leutil
Libs: -L${privlibdir} -lpcs -lcal-util -lcal-client -lical-evolution -leutil
Cflags: -I${privincludedir}

15
libwombat/.cvsignore
View File

@ -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

5
libwombat/ChangeLog
View File

@ -1,5 +0,0 @@
2003-06-16 Frederic Crozat <fcrozat@mandrakesoft.com>
* Makefile.am:
Add missing stub/skel to BUILD_SOURCES (bug #44717)

55
libwombat/ChangeLog.pre-1-4
View File

@ -1,55 +0,0 @@
2003-02-05 Dan Winship <danw@ximian.com>
* Makefile.am (wombatincludedir): Define in terms of
privincludedir
2003-01-22 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am: Install libwombat in $(privlibdir) and version the
include file path using $(BASE_VERSION).
2002-11-04 Rodrigo Moya <rodrigo@ximian.com>
* Makefile.am: fixed flags for $(ORBIT_IDL).
* wombat-client.[ch]: converted to BonoboObject.
2002-11-01 Rodrigo Moya <rodrigo@ximian.com>
* wombat-client.h: compilation fixes for GNOME 2 porting.
2002-07-12 Peter Williams <peterw@ximian.com>
* wombat-client.h: Oops, change wombat.h -> Evolution-Wombat.h
2002-07-09 Peter Williams <peterw@ximian.com>
* Makefile.am: Reference the renamed Evolution-Wombat.idl
instead of wombat.idl.
2002-01-27 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am: Use WOMBAT_CFLAGS.
2001-06-25 Peter Williams <peterw@ximian.com>
* Makefile.am (libwombat_static_la_SOURCES): Create a static
libwombat for the conduits.
2001-06-23 Jason Leach <jleach@ximian.com>
* Makefile.am: builddir != srcdir fixes.
2001-06-22 Rodrigo Moya <rodrigo@ximian.com>
* 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 <jpr@ximian.com>
* Makefile.am: Add some includes
2001-06-21 Rodrigo Moya <rodrigo@ximian.com>
* created new directory for the libwombat library

40
libwombat/Makefile.am
View File

@ -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

150
libwombat/wombat-client.c
View File

@ -1,150 +0,0 @@
/* Wombat client library
*
* Copyright (C) 2001 Ximian, Inc.
*
* Author: Rodrigo Moya <rodrigo@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.
*/
#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);
}

72
libwombat/wombat-client.h
View File

@ -1,72 +0,0 @@
/* Wombat client library
*
* Copyright (C) 2001 Ximian, Inc.
*
* Author: Rodrigo Moya <rodrigo@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 WOMBAT_CLIENT_H
#define WOMBAT_CLIENT_H
#include <bonobo/bonobo-object.h>
#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