[evolution-patches] Exchange Connector: OOF error message while enabling the account.

[Sushma Rai <rsushma novell com>]

Hi,

While enabling an account the oof error message was being shown,
even if the account is not marked as oof or not authenticated.
(Not sure if there is any bug filed on this.)

Also not compiling exchange-oof.c in evolution-exchange/storage,
which is actually done in e-d-s.

Removed idle_do_interactive(), xid, and commented out
impl_interactive(), which are not being used anymore.

I'll add the ChangeLog entry while committing the patch.

Please review,
Thanks,
-Sushma.

Index: evolution/plugins/exchange-operations/exchange-account-setup.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-account-setup.c,v
retrieving revision 1.21
diff -u -p -r1.21 exchange-account-setup.c
--- evolution/plugins/exchange-operations/exchange-account-setup.c	28 Sep 2005 14:30:54 -0000	1.21
+++ evolution/plugins/exchange-operations/exchange-account-setup.c	23 Nov 2005 12:04:50 -0000
@@ -174,7 +174,7 @@ org_gnome_exchange_settings(EPlugin *epl
 	CamelURL *url;
 	const char *source_url;
 	char *message = NULL, *txt = NULL, *oof_message;
-	gboolean oof_state;
+	gboolean oof_state = FALSE;
 
 	GtkVBox *vbox_settings;
 
@@ -232,7 +232,7 @@ org_gnome_exchange_settings(EPlugin *epl
 
 	/* See if oof info found already */
 	
-	if (!exchange_oof_get (account, &oof_state, &message)) {
+	if (account && !exchange_oof_get (account, &oof_state, &message)) {
 
 		e_error_run (NULL, ERROR_DOMAIN ":state-read-error", NULL);
 
Index: evolution-exchange/storage/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/Makefile.am,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile.am
--- evolution-exchange/storage/Makefile.am	27 Oct 2005 09:28:32 -0000	1.23
+++ evolution-exchange/storage/Makefile.am	23 Nov 2005 12:05:14 -0000
@@ -38,8 +38,6 @@ evolution_exchange_storage_SOURCES =				
 	exchange-hierarchy-foreign.h				\
 	exchange-migrate.c					\
 	exchange-migrate.h					\
-	exchange-oof.c						\
-	exchange-oof.h						\
 	exchange-storage.c					\
 	exchange-storage.h					\
 	main.c							
Index: evolution-exchange/storage/exchange-component.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/exchange-component.c,v
retrieving revision 1.18
diff -u -p -r1.18 exchange-component.c
--- evolution-exchange/storage/exchange-component.c	28 Sep 2005 13:46:01 -0000	1.18
+++ evolution-exchange/storage/exchange-component.c	23 Nov 2005 12:05:30 -0000
@@ -32,7 +32,6 @@
 #include <exchange-account.h>
 #include <exchange-constants.h>
 #include "exchange-config-listener.h"
-#include "exchange-oof.h"
 #include <e-folder-exchange.h>
 #include <e-shell-marshal.h>
 
@@ -45,7 +44,6 @@
 
 #define PARENT_TYPE bonobo_object_get_type ()
 static BonoboObjectClass *parent_class = NULL;
-static gboolean idle_do_interactive (gpointer user_data);
 static void e_filename_make_safe (gchar *string);
 static void exchange_component_update_accounts (ExchangeComponent *component,
 							gboolean status);
@@ -57,8 +55,6 @@ static void ex_migrate_esources (Exchang
 static guint linestatus_signal_id;
 
 struct ExchangeComponentPrivate {
-	GdkNativeWindow xid;
-
 	ExchangeConfigListener *config_listener;
 
 	EDataCalFactory *cal_factory;
@@ -219,28 +215,14 @@ impl_quit (PortableServer_Servant servan
 	return TRUE;
 }
 
-static gboolean
-idle_do_interactive (gpointer user_data)
-{
-	ExchangeComponent *component = user_data;
-	ExchangeComponentPrivate *priv = component->priv;
-	ExchangeComponentAccount *baccount;
-	GSList *acc;
-
-	for (acc = priv->accounts; acc; acc = acc->next) {
-		baccount = acc->data;
-		if (exchange_component_is_interactive (component))
-			exchange_oof_init (baccount->account, priv->xid);
-	}
-	return FALSE;
-}
-
+/* This interface is not being used anymore */
 static void
 impl_interactive (PortableServer_Servant servant,
 		  const CORBA_boolean now_interactive,
 		  const CORBA_unsigned_long new_view_xid,
 		  CORBA_Environment *ev)
 {
+/*
 	ExchangeComponent *component = EXCHANGE_COMPONENT (bonobo_object_from_servant (servant));
 	ExchangeComponentPrivate *priv = component->priv;
 
@@ -248,9 +230,9 @@ impl_interactive (PortableServer_Servant
 
 	if (now_interactive) {
 		priv->xid = new_view_xid;
-		g_idle_add (idle_do_interactive, component);
 	} else
 		priv->xid = 0;
+*/
 }
 
 static void
@@ -398,9 +380,6 @@ config_listener_account_created (Exchang
 	g_free (path);
 
 	priv->accounts = g_slist_prepend (priv->accounts, baccount);
-
-	if (priv->xid)
-		exchange_oof_init (account, priv->xid);
 }
 
 static void
@@ -533,11 +512,13 @@ exchange_component_is_offline (ExchangeC
 	*state = component->priv->linestatus ? ONLINE_MODE : OFFLINE_MODE;
 }
 
+/*
 gboolean
 exchange_component_is_interactive (ExchangeComponent *component)
 {
 	return component->priv->xid != 0;
 }
+*/
 
 void
 exchange_component_set_factories (ExchangeComponent *component,
Index: evolution-exchange/storage/main.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/main.c,v
retrieving revision 1.18
diff -u -p -r1.18 main.c
--- evolution-exchange/storage/main.c	19 Aug 2005 16:32:20 -0000	1.18
+++ evolution-exchange/storage/main.c	23 Nov 2005 12:05:44 -0000
@@ -53,7 +53,6 @@
 
 #include "exchange-autoconfig-wizard.h"
 #include "exchange-component.h"
-#include "exchange-oof.h"
 
 static BonoboGenericFactory *component_factory = NULL;
 static EDataCalFactory *cal_factory = NULL;