aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/pcs
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@ximian.com>2003-06-30 22:36:49 +0800
committerRodrigo Moya <rodrigo@src.gnome.org>2003-06-30 22:36:49 +0800
commit08d464a7e31d36c504c4d62762ce52d92d569e73 (patch)
treef6d5dc96b1c200526c9c764d4f03fe281bf3d40d /calendar/pcs
parentc93054bdef122eb853b476c345aa49cf7f41fed3 (diff)
downloadgsoc2013-evolution-08d464a7e31d36c504c4d62762ce52d92d569e73.tar
gsoc2013-evolution-08d464a7e31d36c504c4d62762ce52d92d569e73.tar.gz
gsoc2013-evolution-08d464a7e31d36c504c4d62762ce52d92d569e73.tar.bz2
gsoc2013-evolution-08d464a7e31d36c504c4d62762ce52d92d569e73.tar.lz
gsoc2013-evolution-08d464a7e31d36c504c4d62762ce52d92d569e73.tar.xz
gsoc2013-evolution-08d464a7e31d36c504c4d62762ce52d92d569e73.tar.zst
gsoc2013-evolution-08d464a7e31d36c504c4d62762ce52d92d569e73.zip
removed usage of WombatClient. (client_get_password_cb,
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. svn path=/trunk/; revision=21693
Diffstat (limited to 'calendar/pcs')
-rw-r--r--calendar/pcs/cal.c97
-rw-r--r--calendar/pcs/cal.h3
2 files changed, 0 insertions, 100 deletions
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