From 835d88d174304c8745208093792f26ce463f72a7 Mon Sep 17 00:00:00 2001
From: Shreyas Srinivasan <sshreyas@novell.com>
Date: Wed, 24 Aug 2005 11:41:48 +0000
Subject: Revert patch

2005-08-24  Shreyas Srinivasan  <sshreyas@novell.com>

	* Revert patch

svn path=/trunk/; revision=30242
---
 plugins/groupwise-features/ChangeLog |  5 -----
 plugins/groupwise-features/proxy.c   | 25 ++++---------------------
 2 files changed, 4 insertions(+), 26 deletions(-)

(limited to 'plugins/groupwise-features')

diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 273370eee1..16ac13ba5c 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -40,11 +40,6 @@
 	mails in it)
 	export SHARED_FOLDER if you want to have it
 
-2005-08-22  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	* proxy.c (org_gnome_proxy): Dont try to connect when the account is
-	offline.
-	
 2005-08-11  Veerapuram Varadhan <vvaradhan@novell.com>
 
 	* proxy.c:
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 0440b3f1aa..ab48483dc8 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -54,13 +54,11 @@
 #include <mail/em-config.h>
 #include <mail/mail-component.h>
 #include <mail/mail-ops.h>
-#include <mail/mail-session.h>
 #include <e-util/e-account.h>
 #include <e-util/e-account-list.h>
 #include <e-util/e-icon-factory.h>
 
 #include <camel/camel-url.h>
-#include <camel/camel-offline-store.h>
 #include <libedataserverui/e-passwords.h>
 #include <libedataserverui/e-name-selector.h>
 #include <proxy.h>
@@ -635,24 +633,17 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 	GtkButton *addProxy, *removeProxy, *editProxy;
 	proxyDialog *prd;
 	proxyDialogPrivate *priv;
-	CamelOfflineStore *store;
-	CamelException ex;
 
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	account = target_account->account;
-
-	if (!(store = (CamelOfflineStore *) camel_session_get_service (session, e_account_get_string(account, E_ACCOUNT_SOURCE_URL), CAMEL_PROVIDER_STORE, &ex))) {	  
-		camel_exception_clear (&ex);
-		return NULL;
-	}
-
-	if (g_strrstr (e_account_get_string(account, E_ACCOUNT_SOURCE_URL), "groupwise://")) {
+	if (g_strrstr (e_account_get_string(account, E_ACCOUNT_SOURCE_URL), "groupwise://"))
+	{
 		prd = proxy_dialog_new ();
 		g_object_set_data_full ((GObject *) account, "prd", prd, (GDestroyNotify) g_object_unref);
 		priv = prd->priv;
 		priv->xml_tab = glade_xml_new (EVOLUTION_GLADEDIR "/proxy-listing.glade", "proxy_vbox", NULL);
 
-		if (account->enabled && (store->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL)) {	
+		if (account->enabled) {	
 			priv->tab_dialog = GTK_WIDGET (glade_xml_get_widget (priv->xml_tab, "proxy_vbox"));
 			priv->tree = GTK_TREE_VIEW (glade_xml_get_widget (priv->xml_tab, "proxy_access_list"));
 			priv->store =  gtk_tree_store_new (2,
@@ -675,13 +666,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 			if (e_gw_connection_get_proxy_access_list(prd->cnc, &priv->proxy_list)!= E_GW_CONNECTION_STATUS_OK) 
 				return NULL;
 			proxy_update_tree_view (account);
-		} else if (account->enabled){
-			GtkWidget *label;
-			priv->tab_dialog = gtk_vbox_new (TRUE, 10);
-			label = gtk_label_new (_("The Proxy tab will be available only when the account is online."));
-			gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10);	
-		}
-		else {
+		} else {
 			GtkWidget *label;
 			priv->tab_dialog = gtk_vbox_new (TRUE, 10);
 			label = gtk_label_new (_("The Proxy tab will be available only when the account is enabled."));
@@ -702,8 +687,6 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 			}
 		}	
 	}
-
-	camel_object_unref (store);
 	return NULL;
 }
 
-- 
cgit v1.2.3