[evolution-patches] Fix to avoid API break in network-manager integration code

["Veerapuram Varadhan" <vvaradhan novell com>]

Hi,

Attached patch fixes API/ABI break in the network-manager integration
code.

Let me know your comments.

Thanks,

V. Varadhan

Index: camel/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/ChangeLog,v
retrieving revision 1.2515
diff -u -p -r1.2515 ChangeLog
--- camel/ChangeLog	10 Jan 2006 07:56:46 -0000	1.2515
+++ camel/ChangeLog	16 Jan 2006 13:18:48 -0000
@@ -1,3 +1,13 @@
+2006-01-16  Veerapuram Varadhan <vvaradhan novell com>
+
+	* camel-session.h:
+	  camel-private.h: Move 'network_state' flag to
+	  CamelSessionPrivate structure.  This will not break API/ABI.
+	* camel-session.c: (camel_session_init)
+	(camel_session_get_network_state)
+	(camel_session_set_network_state): Use network_state from priv
+	member.
+	
 2006-01-10  Simon Zheng  <simon zheng sun com>
 
 	* camel-file-utils.h: 
Index: camel/camel-session.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-session.h,v
retrieving revision 1.53
diff -u -p -r1.53 camel-session.h
--- camel/camel-session.h	22 Dec 2005 01:48:30 -0000	1.53
+++ camel/camel-session.h	16 Jan 2006 13:18:48 -0000
@@ -68,7 +68,6 @@ struct _CamelSession
 
 	gboolean online:1;
 	gboolean check_junk:1;
-	gboolean network_state:1;
 };
 
 typedef struct _CamelSessionThreadOps CamelSessionThreadOps;
Index: camel/camel-session.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-session.c,v
retrieving revision 1.117
diff -u -p -r1.117 camel-session.c
--- camel/camel-session.c	10 Jan 2006 07:56:46 -0000	1.117
+++ camel/camel-session.c	16 Jan 2006 13:18:48 -0000
@@ -69,7 +69,6 @@ static void
 camel_session_init (CamelSession *session)
 {
 	session->online = TRUE;
-	session->network_state = TRUE;
 	session->priv = g_malloc0(sizeof(*session->priv));
 	
 	session->priv->lock = g_mutex_new();
@@ -77,6 +76,7 @@ camel_session_init (CamelSession *sessio
 	session->priv->thread_id = 1;
 	session->priv->thread_active = g_hash_table_new(NULL, NULL);
 	session->priv->thread_queue = NULL;
+	session->priv->network_state = TRUE;
 }
 
 static void
@@ -686,14 +686,16 @@ gboolean
 camel_session_get_network_state (CamelSession *session)
 {
 	g_return_val_if_fail (CAMEL_IS_SESSION(session), FALSE);
+	g_return_val_if_fail (session->priv != NULL, FALSE);
 	
-	return session->network_state;
+	return session->priv->network_state;
 }
 
 void
 camel_session_set_network_state (CamelSession *session, gboolean network_state)
 {
 	g_return_if_fail (CAMEL_IS_SESSION(session));
-	
-	session->network_state = network_state;
+	g_return_if_fail (session->priv != NULL);
+
+	session->priv->network_state = network_state;
 }
Index: camel/camel-private.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-private.h,v
retrieving revision 1.37
diff -u -p -r1.37 camel-private.h
--- camel/camel-private.h	8 Dec 2005 08:59:32 -0000	1.37
+++ camel/camel-private.h	16 Jan 2006 13:18:49 -0000
@@ -85,6 +85,9 @@ struct _CamelSessionPrivate {
 	EThread *thread_queue;
 
 	GHashTable *thread_msg_op;
+
+	/* different camel session flags */
+	gboolean network_state:1; /* specifies the state of network connection */
 };
 
 #define CAMEL_SESSION_LOCK(f, l) (g_mutex_lock(((CamelSession *)f)->priv->l))