[evolution-patches] patch to remove libwombat

From: Rodrigo Moya <rodrigo ximian com>
To: Evolution Patches <evolution-patches ximian com>
Subject: [evolution-patches] patch to remove libwombat
Date: 30 Jun 2003 11:52:29 +0200

libwombat was created to add an authentication mechanism to the
calendar, but has never been used, so these patches removes it.

I don't know if that should go in the 1.4 branch or just only to HEAD?

cheers

? gui/alarm-notify/alarm-notify.gladep
? gui/dialogs/alarm-options.gladep
? gui/dialogs/alarm-page.gladep
? gui/dialogs/cal-prefs-dialog.gladep
? gui/dialogs/e-delegate-dialog.gladep
? gui/dialogs/event-page.gladep
? gui/dialogs/meeting-page.gladep
? gui/dialogs/recurrence-page.gladep
? gui/dialogs/schedule-page.gladep
? gui/dialogs/task-details-page.gladep
? gui/dialogs/task-page.gladep
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.1806
diff -u -p -r1.1806 ChangeLog
--- ChangeLog	29 Jun 2003 19:29:44 -0000	1.1806
+++ ChangeLog	30 Jun 2003 09:46:03 -0000
@@ -1,3 +1,19 @@
+2003-06-30  Rodrigo Moya <rodrigo ximian com>
+
+	* cal-client/cal-client.c: removed usage of WombatClient.
+	(client_get_password_cb, client_forget_password_cb): removed.
+	(real_open_calendar): don't create the WombatClient object.
+	(cal_client_init, cal_client_finalize): removed WombatClient
+	related code.
+	(cal_client_finalize): re-enabled call to destroy_factories.
+
+	* pcs/cal.c: removed usage of WombatClient interface.
+	(cal_construct): don't get a reference to the WombatClient.
+	(cal_get_password, cal_forget_password): removed unused functions.
+
+	* conduits/calendar/Makefile.am:
+	* cal-client/Makefile.am: removed references to libwombat.
+
 2003-06-27  Rodrigo Moya <rodrigo ximian com>
 
 	* gui/dialogs/send-comp.[ch] (send_component_dialog):
Index: cal-client/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/calendar/cal-client/Makefile.am,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile.am
--- cal-client/Makefile.am	21 Feb 2003 21:24:20 -0000	1.40
+++ cal-client/Makefile.am	30 Jun 2003 09:46:03 -0000
@@ -30,8 +30,6 @@ INCLUDES =						\
 	-I$(top_builddir)				\
 	-I$(top_builddir)/libical/src/libical		\
 	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libwombat			\
-	-I$(top_srcdir)/libwombat			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
 privlib_LTLIBRARIES = libcal-client.la
@@ -51,7 +49,6 @@ libcal_client_la_SOURCES =	\
 
 libcal_client_la_LIBADD =					\
 	$(top_builddir)/calendar/cal-util/libcal-util.la	\
-	$(top_builddir)/libwombat/libwombat.la			\
 	$(top_builddir)/e-util/libeutil.la
 
 libcal_clientinclude_HEADERS =		\
Index: cal-client/cal-client.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/cal-client/cal-client.c,v
retrieving revision 1.119
diff -u -p -r1.119 cal-client.c
--- cal-client/cal-client.c	24 Jun 2003 11:08:41 -0000	1.119
+++ cal-client/cal-client.c	30 Jun 2003 09:46:04 -0000
@@ -33,7 +33,6 @@
 #include "cal-client-types.h"
 #include "cal-client.h"
 #include "cal-listener.h"
-#include "wombat-client.h"
 
 
 
@@ -68,9 +67,6 @@ struct _CalClientPrivate {
 	CalClientAuthFunc auth_func;
 	gpointer auth_user_data;
 
-	/* The WombatClient */
-	WombatClient *w_client;
-
 	/* A cache of timezones retrieved from the server, to avoid getting
 	   them repeatedly for each get_object() call. */
 	GHashTable *timezones;
@@ -102,13 +98,6 @@ static void cal_client_class_init (CalCl
 static void cal_client_init (CalClient *client, CalClientClass *klass);
 static void cal_client_finalize (GObject *object);
 
-static char *client_get_password_cb (WombatClient *w_client,
-				     const gchar *prompt,
-				     const gchar *key,
-				     gpointer user_data);
-static void  client_forget_password_cb (WombatClient *w_client,
-					const gchar *key,
-					gpointer user_data);
 static void cal_client_get_object_timezones_cb (icalparameter *param,
 						void *data);
 
@@ -319,7 +308,6 @@ cal_client_init (CalClient *client, CalC
 	priv->capabilities = FALSE;
 	priv->factories = NULL;
 	priv->timezones = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->w_client = NULL;
 	priv->default_zone = icaltimezone_get_utc_timezone ();
 	priv->comp_listener = NULL;
 }
@@ -440,8 +428,7 @@ cal_client_finalize (GObject *object)
 		priv->comp_listener = NULL;
 	}
 
-	priv->w_client = NULL;
-	/* destroy_factories (client); */
+	destroy_factories (client);
 	destroy_cal (client);
 
 	priv->load_state = CAL_CLIENT_LOAD_NOT_LOADED;
@@ -689,41 +676,6 @@ categories_changed_cb (CalListener *list
 	g_ptr_array_free (cats, TRUE);
 }
 
-
-/* Handle the get_password signal from the Wombatclient */
-static gchar *
-client_get_password_cb (WombatClient *w_client,
-                        const gchar *prompt,
-                        const gchar *key,
-                        gpointer user_data)
-{
-        CalClient *client;
-
-        client = CAL_CLIENT (user_data);
-        g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-        if (client->priv->auth_func)
-                return client->priv->auth_func (client, prompt, key, client->priv->auth_user_data);
-
-        return NULL;
-}
-
-/* Handle the forget_password signal from the WombatClient */
-static void
-client_forget_password_cb (WombatClient *w_client,
-                           const gchar *key,
-                           gpointer user_data)
-{
-        CalClient *client;
-
-        client = CAL_CLIENT (user_data);
-        g_return_if_fail (IS_CAL_CLIENT (client));
-
-        g_signal_emit (G_OBJECT (client),
-		       cal_client_signals [FORGET_PASSWORD],
-		       0, key);
-}
-
 
 
 static GList *
@@ -874,14 +826,6 @@ real_open_calendar (CalClient *client, c
 		g_message ("cal_client_open_calendar(): could not create the listener");
 		return FALSE;
 	}
-
-	/* create the WombatClient */
-	priv->w_client = wombat_client_new (
-		(WombatClientGetPasswordFn) client_get_password_cb,
-                (WombatClientForgetPasswordFn) client_forget_password_cb,
-                (gpointer) client);
-	bonobo_object_add_interface (BONOBO_OBJECT (priv->listener),
-				     BONOBO_OBJECT (priv->w_client));
 
 	corba_listener = (GNOME_Evolution_Calendar_Listener) (BONOBO_OBJREF (priv->listener));
 
Index: conduits/calendar/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/calendar/conduits/calendar/Makefile.am,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile.am
--- conduits/calendar/Makefile.am	19 Jun 2003 14:24:26 -0000	1.31
+++ conduits/calendar/Makefile.am	30 Jun 2003 09:46:04 -0000
@@ -22,7 +22,6 @@ libecalendar_conduit_la_LIBADD = 					\
 	$(top_builddir)/calendar/cal-util/libcal-util-static.la		\
 	$(top_builddir)/libversit/libversit.la				\
 	$(top_builddir)/libical/src/libical/libical-static.la		\
-	$(top_builddir)/libwombat/libwombat-static.la		 	\
 	$(top_builddir)/e-util/libeconduit.la	 			\
 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
 
Index: pcs/cal.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/pcs/cal.c,v
retrieving revision 1.72
diff -u -p -r1.72 cal.c
--- pcs/cal.c	26 Apr 2003 16:44:49 -0000	1.72
+++ pcs/cal.c	30 Jun 2003 09:46:05 -0000
@@ -26,7 +26,6 @@
 #include "cal.h"
 #include "cal-backend.h"
 #include "query.h"
-#include "Evolution-Wombat.h"
 
 #define PARENT_TYPE         BONOBO_TYPE_OBJECT
 
@@ -39,9 +38,6 @@ struct _CalPrivate {
 
 	/* Listener on the client we notify */
 	GNOME_Evolution_Calendar_Listener listener;
-
-	/* A reference to the WombatClient interface */
-	GNOME_Evolution_WombatClient wombat_client;
 };
 
 
@@ -762,19 +758,6 @@ cal_construct (Cal *cal,
 
 	CORBA_exception_free (&ev);
 
-	/* obtain the WombatClient interface */
-	CORBA_exception_init (&ev);
-	priv->wombat_client = Bonobo_Unknown_queryInterface (
-		priv->listener,
-		"IDL:GNOME/Evolution/WombatClient:1.0",
-		&ev);
-	if (BONOBO_EX (&ev)) {
-		g_message ("cal_construct: could not get the WombatClient interface");
-		priv->wombat_client = CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-
 	priv->backend = backend;
 
 	return cal;
@@ -1047,86 +1030,6 @@ cal_notify_categories_changed (Cal *cal,
 	if (BONOBO_EX (&ev))
 		g_message ("cal_notify_categories_changed(): Could not notify the listener "
 			   "about the current set of categories");
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * cal_get_password:
- * @cal: A calendar client interface.
- * @prompt: The message to show to the user when asking for the password.
- * @key: A key associated with the password being asked.
- *
- * Gets a password from the calendar client this Cal knows about. It does
- * so by using the WombatClient interface being used by the corresponding
- * CalClient.
- *
- * Returns: a password entered by the user.
- */
-char *
-cal_get_password (Cal *cal, const char *prompt, const char *key)
-{
-	CalPrivate *priv;
-	CORBA_Environment ev;
-	CORBA_char *pwd;
-
-	g_return_val_if_fail (cal != NULL, NULL);
-	g_return_val_if_fail (IS_CAL (cal), NULL);
-
-	priv = cal->priv;
-	g_return_val_if_fail (priv->wombat_client != CORBA_OBJECT_NIL, NULL);
-
-	CORBA_exception_init (&ev);
-	pwd = GNOME_Evolution_WombatClient_getPassword (
-		priv->wombat_client,
-		(const CORBA_char *) prompt,
-		(const CORBA_char *) key,
-		&ev);
-	if (BONOBO_EX (&ev)) {
-		g_message ("cal_get_password: could not get password from associated WombatClient");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return pwd;
-}
-
-/**
- * cal_forget_password:
- * @cal: A calendar client interface.
- * @key: A key associated with the password to be forgotten.
- *
- * Notifies the associated calendar client that it should forget
- * about the password identified by @key, so that next time the backend
- * asks the client about it, the client would ask again the user for it.
- * This is done in cases where the password supplied the first time
- * was not a valid password and the backend needs the user to enter
- * a new one.
- */
-void
-cal_forget_password (Cal *cal, const char *key)
-{
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (IS_CAL (cal));
-
-	priv = cal->priv;
-	g_return_if_fail (priv->wombat_client != CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_WombatClient_forgetPassword (
-		priv->wombat_client,
-		(const CORBA_char *) key,
-		&ev);
-
-	if (BONOBO_EX (&ev)) {
-		g_message ("cal_forget_password: could not notify WombatClient about "
-			   "password to be forgotten");
-	}
 
 	CORBA_exception_free (&ev);
 }
Index: pcs/cal.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/pcs/cal.h,v
retrieving revision 1.21
diff -u -p -r1.21 cal.h
--- pcs/cal.h	7 Nov 2002 13:07:37 -0000	1.21
+++ pcs/cal.h	30 Jun 2003 09:46:05 -0000
@@ -69,9 +69,6 @@ void cal_notify_error (Cal *cal, const c
 
 void cal_notify_categories_changed (Cal *cal, GNOME_Evolution_Calendar_StringSeq *categories);
 
-char *cal_get_password (Cal *cal, const char *prompt, const char *key);
-void  cal_forget_password (Cal *cal, const char *key);
-
 
 
 G_END_DECLS

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1215
diff -u -p -r1.1215 ChangeLog
--- ChangeLog	25 Jun 2003 20:11:49 -0000	1.1215
+++ ChangeLog	30 Jun 2003 09:45:46 -0000
@@ -1,3 +1,8 @@
+2003-06-30  Rodrigo Moya <rodrigo ximian com>
+
+	* configure.in:
+	* Makefile.am: removed libwombat from the build.
+
 == Version 1.4.1 ==
 
 2003-06-25  Ettore Perazzoli  <ettore ximian com>
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.591
diff -u -p -r1.591 configure.in
--- configure.in	25 Jun 2003 20:11:49 -0000	1.591
+++ configure.in	30 Jun 2003 09:45:48 -0000
@@ -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
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/Makefile.am,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile.am
--- Makefile.am	12 Jun 2003 21:22:41 -0000	1.81
+++ Makefile.am	30 Jun 2003 09:45:48 -0000
@@ -32,7 +32,6 @@ SUBDIRS = 			\
         shell                   \
 	camel			\
 	filter			\
-	libwombat		\
 	addressbook		\
 	calendar		\
 	my-evolution		\

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/wombat/ChangeLog,v
retrieving revision 1.85
diff -u -p -r1.85 ChangeLog
--- ChangeLog	16 Jun 2003 17:19:59 -0000	1.85
+++ ChangeLog	30 Jun 2003 09:46:16 -0000
@@ -1,3 +1,9 @@
+2003-06-26  Rodrigo Moya <rodrigo ximian com>
+
+	* Evolution-Wombat.idl: removed WombatClient interface.
+
+	* Makefile.am: don't link libwombat in.
+
 2003-06-16  Frederic Crozat  <fcrozat mandrakesoft com>
 
 	* Makefile.am:
Index: Evolution-Wombat.idl
===================================================================
RCS file: /cvs/gnome/evolution/wombat/Evolution-Wombat.idl,v
retrieving revision 1.2
diff -u -p -r1.2 Evolution-Wombat.idl
--- Evolution-Wombat.idl	28 Mar 2003 21:41:44 -0000	1.2
+++ Evolution-Wombat.idl	30 Jun 2003 09:46:16 -0000
@@ -9,11 +9,6 @@
 module GNOME {
 module Evolution {
 
-	interface WombatClient {
-		string getPassword (in string prompt, in string key);
-		void   forgetPassword (in string key);
-	};
-
 	interface Config {
 	};
 
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/wombat/Makefile.am,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile.am
--- Makefile.am	16 Jun 2003 17:19:59 -0000	1.66
+++ Makefile.am	30 Jun 2003 09:46:16 -0000
@@ -61,7 +61,6 @@ evolution_wombat_LDADD =						\
 	$(top_builddir)/calendar/cal-util/libcal-util.la		\
 	$(top_builddir)/e-util/libedb3util.la				\
 	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libwombat/libwombat.la				\
 	$(WOMBAT_LIBS)
 
 if ENABLE_LDAP

Follow-Ups:
- Re: [evolution-patches] patch to remove libwombat
  - From: Dan Winship

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]