From 08d464a7e31d36c504c4d62762ce52d92d569e73 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Mon, 30 Jun 2003 14:36:49 +0000 Subject: removed usage of WombatClient. (client_get_password_cb, 2003-06-30 Rodrigo Moya * 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. svn path=/trunk/; revision=21693 --- calendar/cal-client/Makefile.am | 3 --- calendar/cal-client/cal-client.c | 58 +--------------------------------------- 2 files changed, 1 insertion(+), 60 deletions(-) (limited to 'calendar/cal-client') diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am index 9efc3f13e7..b1c3f486f6 100644 --- a/calendar/cal-client/Makefile.am +++ b/calendar/cal-client/Makefile.am @@ -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 = \ diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c index 9e96c78d0e..075186b056 100644 --- a/calendar/cal-client/cal-client.c +++ b/calendar/cal-client/cal-client.c @@ -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 (CalClientClass *klass); 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, CalClientClass *klass) 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 *listener, const GNOME_Evolution_Calendar_Str 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 * @@ -875,14 +827,6 @@ real_open_calendar (CalClient *client, const char *str_uri, gboolean only_if_exi 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)); priv->load_state = CAL_CLIENT_LOAD_LOADING; -- cgit v1.2.3