[evolution-ews] gw code cleanup

[Punit Jain <jpunit src gnome org>]

commit dadf8115f39bbf94bba740e2ad24329723b777e8
Author: Punit Jain <jpunit novell com>
Date:   Thu Mar 8 12:21:11 2012 +0530

    gw code cleanup

 src/addressbook/e-book-backend-ews.c |   14 +++++++-------
 src/calendar/e-cal-backend-ews.c     |   10 +++++-----
 src/camel/camel-ews-folder.c         |    2 +-
 src/camel/camel-ews-folder.h         |    2 +-
 src/camel/camel-ews-provider.c       |    2 +-
 src/camel/camel-ews-store.c          |    2 +-
 src/camel/camel-ews-store.h          |    4 ++--
 src/camel/camel-ews-summary.h        |   10 +++++-----
 src/camel/camel-ews-transport.c      |    2 +-
 src/camel/camel-ews-transport.h      |    2 +-
 10 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-ews.c b/src/addressbook/e-book-backend-ews.c
index deb0198..5cc68dd 100644
--- a/src/addressbook/e-book-backend-ews.c
+++ b/src/addressbook/e-book-backend-ews.c
@@ -2565,7 +2565,7 @@ e_book_backend_ews_authenticate_user (EBookBackend *backend,
                                       GCancellable *cancellable,
                                       ECredentials *credentials)
 {
-	EBookBackendEws *ebgw;
+	EBookBackendEws *ebews;
 	EBookBackendEwsPrivate *priv;
 	EEwsConnection *cnc = NULL;
 	ESource *esource;
@@ -2576,10 +2576,10 @@ e_book_backend_ews_authenticate_user (EBookBackend *backend,
 	const gchar *host_url;
 	const gchar *read_only;
 
-	ebgw = E_BOOK_BACKEND_EWS (backend);
-	priv = ebgw->priv;
+	ebews = E_BOOK_BACKEND_EWS (backend);
+	priv = ebews->priv;
 
-	if (!ebgw->priv->is_online) {
+	if (!ebews->priv->is_online) {
 		e_book_backend_notify_opened (backend, EDB_ERROR (SUCCESS));
 		return;
 	}
@@ -2744,11 +2744,11 @@ e_book_backend_ews_new (void)
 static void
 e_book_backend_ews_dispose (GObject *object)
 {
-	EBookBackendEws *bgw;
+	EBookBackendEws *bews;
 	EBookBackendEwsPrivate *priv;
 
-	bgw = E_BOOK_BACKEND_EWS (object);
-	priv = bgw->priv;
+	bews = E_BOOK_BACKEND_EWS (object);
+	priv = bews->priv;
 
 	if (priv->cnc) {
 		g_object_unref (priv->cnc);
diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
index 2edb6da..981eef0 100644
--- a/src/calendar/e-cal-backend-ews.c
+++ b/src/calendar/e-cal-backend-ews.c
@@ -3678,7 +3678,7 @@ e_cal_backend_ews_get_backend_property (ECalBackend *backend,
 
 		prop_value = g_strdup (priv->user_email);
 	} else if (g_str_equal (prop_name, CAL_BACKEND_PROPERTY_ALARM_EMAIL_ADDRESS)) {
-		/* group wise does not support email based alarms */
+		/* ews does not support email based alarms */
 		prop_value = NULL;
 	} else if (g_str_equal (prop_name, CAL_BACKEND_PROPERTY_DEFAULT_OBJECT)) {
 		ECalComponent *comp;
@@ -3713,12 +3713,12 @@ static void
 e_cal_backend_ews_notify_online_cb (ECalBackend *backend,
                                     GParamSpec *spec)
 {
-	ECalBackendEws *cbgw;
+	ECalBackendEws *cbews;
 	ECalBackendEwsPrivate *priv;
 	gboolean is_online;
 
-	cbgw = E_CAL_BACKEND_EWS (backend);
-	priv = cbgw->priv;
+	cbews = E_CAL_BACKEND_EWS (backend);
+	priv = cbews->priv;
 
 	is_online = e_backend_get_online (E_BACKEND (backend));
 
@@ -3840,7 +3840,7 @@ e_cal_backend_ews_init (ECalBackendEws *cbews)
 		G_CALLBACK (e_cal_backend_ews_notify_online_cb), NULL);
 }
 
-/* Class initialization function for the gw backend */
+/* Class initialization function for the ews backend */
 static void
 e_cal_backend_ews_class_init (ECalBackendEwsClass *class)
 {
diff --git a/src/camel/camel-ews-folder.c b/src/camel/camel-ews-folder.c
index f43e55f..291708a 100644
--- a/src/camel/camel-ews-folder.c
+++ b/src/camel/camel-ews-folder.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-ews-folder.c: class for an groupwise folder */
+/* camel-ews-folder.c: class for an ews folder */
 
 /*
  * Authors:
diff --git a/src/camel/camel-ews-folder.h b/src/camel/camel-ews-folder.h
index 8a89470..8591f3c 100644
--- a/src/camel/camel-ews-folder.h
+++ b/src/camel/camel-ews-folder.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-ews-folder.h: class for an groupwise folder */
+/* camel-ews-folder.h: class for an ews folder */
 
 /*
  * Authors:
diff --git a/src/camel/camel-ews-provider.c b/src/camel/camel-ews-provider.c
index 9b01ab1..557b38b 100644
--- a/src/camel/camel-ews-provider.c
+++ b/src/camel/camel-ews-provider.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-ews-provider.c: GroupWise provider registration code */
+/* camel-ews-provider.c: EWS provider registration code */
 
 /*
  *  Authors: Jeffrey Stedfast <fejj ximian com>
diff --git a/src/camel/camel-ews-store.c b/src/camel/camel-ews-store.c
index b71a577..5708a9e 100644
--- a/src/camel/camel-ews-store.c
+++ b/src/camel/camel-ews-store.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-ews-store.c : class for an groupwise store */
+/* camel-ews-store.c : class for an ews store */
 
 /*
  *  Authors:
diff --git a/src/camel/camel-ews-store.h b/src/camel/camel-ews-store.h
index 65497b1..a159325 100644
--- a/src/camel/camel-ews-store.h
+++ b/src/camel/camel-ews-store.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-ews-store.h : class for an groupwise store */
+/* camel-ews-store.h : class for an ews store */
 
 /*
  * Authors: Chenthill Palanisamy <pchenthill novell com>
@@ -48,7 +48,7 @@
 	(G_TYPE_INSTANCE_GET_CLASS \
 	((obj), CAMEL_TYPE_EWS_STORE, CamelEwsStoreClass))
 
-#define GW_PARAM_FILTER_INBOX		(1 << 0)
+#define EWS_PARAM_FILTER_INBOX		(1 << 0)
 
 G_BEGIN_DECLS
 
diff --git a/src/camel/camel-ews-summary.h b/src/camel/camel-ews-summary.h
index a6a889a..57300a8 100644
--- a/src/camel/camel-ews-summary.h
+++ b/src/camel/camel-ews-summary.h
@@ -19,8 +19,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef CAMEL_GW_SUMMARY_H
-#define CAMEL_GW_SUMMARY_H
+#ifndef CAMEL_EWS_SUMMARY_H
+#define CAMEL_EWS_SUMMARY_H
 
 #include <camel/camel.h>
 
@@ -52,8 +52,8 @@ typedef struct _CamelEwsMessageContentInfo CamelEwsMessageContentInfo;
 
 /* extra summary flags*/
 enum {
-	CAMEL_GW_MESSAGE_JUNK = 1 << 17,
-	CAMEL_GW_MESSAGE_NOJUNK = 1 << 18
+	CAMEL_EWS_MESSAGE_JUNK = 1 << 17,
+	CAMEL_EWS_MESSAGE_NOJUNK = 1 << 18
 };
 
 struct _CamelEwsMessageInfo {
@@ -101,4 +101,4 @@ void	ews_summary_clear		(CamelFolderSummary *summary,
 
 G_END_DECLS
 
-#endif /* CAMEL_GW_SUMMARY_H */
+#endif /* CAMEL_EWS_SUMMARY_H */
diff --git a/src/camel/camel-ews-transport.c b/src/camel/camel-ews-transport.c
index 0e1068b..96154f0 100644
--- a/src/camel/camel-ews-transport.c
+++ b/src/camel/camel-ews-transport.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-ews-transport.c : class for an groupwise transport */
+/* camel-ews-transport.c : class for an ews transport */
 
 /*
  * Authors: Sivaiah Nallagatla <snallagatla novell com>
diff --git a/src/camel/camel-ews-transport.h b/src/camel/camel-ews-transport.h
index 12edb0b..62479d8 100644
--- a/src/camel/camel-ews-transport.h
+++ b/src/camel/camel-ews-transport.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-ews-transport.h : class for an groupwise transport */
+/* camel-ews-transport.h : class for an ews transport */
 
 /*
  * Authors: Sivaiah Nallagatla <snallagatla novell com>