[evolution-data-server] CamelNNTPStore cleanups.

[Matthew Barnes <mbarnes src gnome org>]

commit 464d164f2ea75396272291ce90c459a867a11085
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Jul 15 13:14:36 2011 -0400

    CamelNNTPStore cleanups.

 camel/providers/nntp/camel-nntp-private.h |    4 ---
 camel/providers/nntp/camel-nntp-store.c   |   13 ++++++++--
 camel/providers/nntp/camel-nntp-store.h   |   34 ++++++++++++++++++++++------
 3 files changed, 36 insertions(+), 15 deletions(-)
---
diff --git a/camel/providers/nntp/camel-nntp-private.h b/camel/providers/nntp/camel-nntp-private.h
index a4d8744..0139b87 100644
--- a/camel/providers/nntp/camel-nntp-private.h
+++ b/camel/providers/nntp/camel-nntp-private.h
@@ -32,10 +32,6 @@
 
 G_BEGIN_DECLS
 
-struct _CamelNNTPStorePrivate {
-	gint dummy;
-};
-
 #define CAMEL_NNTP_STORE_LOCK(f, l) (e_mutex_lock(((CamelNNTPStore *)f)->priv->l))
 #define CAMEL_NNTP_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelNNTPStore *)f)->priv->l))
 
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index f9e8c8b..1d5e37a 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -45,6 +45,10 @@
 #include <ws2tcpip.h>
 #endif
 
+#define CAMEL_NNTP_STORE_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), CAMEL_TYPE_NNTP_STORE, CamelNNTPStorePrivate))
+
 #define w(x)
 #define dd(x) (camel_debug("nntp")?(x):0)
 
@@ -53,6 +57,10 @@
 
 #define DUMP_EXTENSIONS
 
+struct _CamelNNTPStorePrivate {
+	gint placeholder;
+};
+
 static GInitableIface *parent_initable_interface;
 
 /* Forward Declarations */
@@ -1462,12 +1470,11 @@ camel_nntp_store_init (CamelNNTPStore *nntp_store)
 {
 	CamelStore *store = CAMEL_STORE (nntp_store);
 
+	nntp_store->priv = CAMEL_NNTP_STORE_GET_PRIVATE (nntp_store);
+
 	store->flags = CAMEL_STORE_SUBSCRIPTIONS;
 
 	nntp_store->mem = (CamelStreamMem *) camel_stream_mem_new ();
-
-	nntp_store->priv = G_TYPE_INSTANCE_GET_PRIVATE (
-		nntp_store, CAMEL_TYPE_NNTP_STORE, CamelNNTPStorePrivate);
 }
 
 /* Enter owning lock */
diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h
index 7d58ad7..6d16071 100644
--- a/camel/providers/nntp/camel-nntp-store.h
+++ b/camel/providers/nntp/camel-nntp-store.h
@@ -85,7 +85,6 @@ enum nntp_capabilities {
 
 struct _CamelNNTPStore {
 	CamelDiscoStore parent;
-
 	CamelNNTPStorePrivate *priv;
 
 	guint32 extensions;
@@ -110,15 +109,34 @@ struct _CamelNNTPStore {
 
 struct _CamelNNTPStoreClass {
 	CamelDiscoStoreClass parent_class;
-
 };
 
-GType camel_nntp_store_get_type (void);
-
-gint camel_nntp_raw_commandv (CamelNNTPStore *store, GCancellable *cancellable, GError **error, gchar **line, const gchar *fmt, va_list ap);
-gint camel_nntp_raw_command (CamelNNTPStore *store, GCancellable *cancellable, GError **error, gchar **line, const gchar *fmt, ...);
-gint camel_nntp_raw_command_auth (CamelNNTPStore *store, GCancellable *cancellable, GError **error, gchar **line, const gchar *fmt, ...);
-gint camel_nntp_command (CamelNNTPStore *store, GCancellable *cancellable, GError **error, struct _CamelNNTPFolder *folder, gchar **line, const gchar *fmt, ...);
+GType		camel_nntp_store_get_type	(void);
+gint		camel_nntp_raw_commandv		(CamelNNTPStore *store,
+						 GCancellable *cancellable,
+						 GError **error,
+						 gchar **line,
+						 const gchar *fmt,
+						 va_list ap);
+gint		camel_nntp_raw_command		(CamelNNTPStore *store,
+						 GCancellable *cancellable,
+						 GError **error,
+						 gchar **line,
+						 const gchar *fmt,
+						 ...);
+gint		camel_nntp_raw_command_auth	(CamelNNTPStore *store,
+						 GCancellable *cancellable,
+						 GError **error,
+						 gchar **line,
+						 const gchar *fmt,
+						 ...);
+gint		camel_nntp_command		(CamelNNTPStore *store,
+						 GCancellable *cancellable,
+						 GError **error,
+						 struct _CamelNNTPFolder *folder,
+						 gchar **line,
+						 const gchar *fmt,
+						 ...);
 
 G_END_DECLS