aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--calendar/ChangeLog16
-rw-r--r--calendar/cal-client/Makefile.am3
-rw-r--r--calendar/cal-client/cal-client.c58
-rw-r--r--calendar/conduits/calendar/Makefile.am1
-rw-r--r--calendar/pcs/cal.c97
-rw-r--r--calendar/pcs/cal.h3
6 files changed, 17 insertions, 161 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 07a77c9320..08113b3b36 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -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):
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;
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index 84efaaa23e..1ba960c896 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -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)
diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
index 7726540d5a..03f85eba32 100644
--- a/calendar/pcs/cal.c
+++ b/calendar/pcs/cal.c
@@ -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;
@@ -1050,83 +1033,3 @@ cal_notify_categories_changed (Cal *cal, GNOME_Evolution_Calendar_StringSeq *cat
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);
-}
diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h
index 61db51abf6..35f64f278f 100644
--- a/calendar/pcs/cal.h
+++ b/calendar/pcs/cal.h
@@ -69,9 +69,6 @@ void cal_notify_error (Cal *cal, const char *message);
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 01:19:29 +0800