Make the Class structures private

6 files changed, 74 insertions, 43 deletions

diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am
index 1d8aaa5..42e0bbe 100644
--- a/libgupnp-igd/Makefile.am
+++ b/libgupnp-igd/Makefile.am
@@ -19,6 +19,7 @@ libgupnp_igd_inc_HEADERS = \
 libgupnp_igd_1_0_la_SOURCES = \
 	gupnp-simple-igd.c \
 	gupnp-simple-igd-thread.c \
+	gupnp-simple-igd-priv.h \
 	gupnp-enum-types.c \
 	gupnp-enum-types.h \
 	$(BUILT_SOURCES)
diff --git a/libgupnp-igd/gupnp-simple-igd-priv.h b/libgupnp-igd/gupnp-simple-igd-priv.h
new file mode 100644
index 0000000..34d4cb1
--- /dev/null
+++ b/libgupnp-igd/gupnp-simple-igd-priv.h
@@ -0,0 +1,56 @@
+/*
+ * GUPnP Simple IGD abstraction
+ *
+ * Copyright 2008 Collabora Ltd.
+ *  @author: Olivier Crete <olivier.crete@collabora.co.uk>
+ * Copyright 2008 Nokia Corp.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#ifndef __GUPNP_SIMPLE_IGD_PRIV_H__
+#define __GUPNP_SIMPLE_IGD_PRIV_H__
+
+#include "gupnp-simple-igd.h"
+
+/**
+ * GUPnPSimpleIgdClass:
+ * @parent_class: Our parent
+ * @add_port: An implementation of the add_port function
+ * @remove_port: An implementation of the delete_port function
+ *
+ * The Raw UDP component transmitter class
+ */
+
+struct _GUPnPSimpleIgdClass
+{
+  GObjectClass parent_class;
+
+  /*virtual functions */
+
+  void (*add_port) (GUPnPSimpleIgd *self,
+      const gchar *protocol,
+      guint16 external_port,
+      const gchar *local_ip,
+      guint16 local_port,
+      guint32 lease_duration,
+      const gchar *description);
+
+  void (*remove_port) (GUPnPSimpleIgd *self,
+      const gchar *protocol,
+      guint external_port);
+};
+
+#endif /* __GUPNP_SIMPLE_IGD_PRIV_H__ */
diff --git a/libgupnp-igd/gupnp-simple-igd-thread.c b/libgupnp-igd/gupnp-simple-igd-thread.c
index d47ef89..0adb64d 100644
--- a/libgupnp-igd/gupnp-simple-igd-thread.c
+++ b/libgupnp-igd/gupnp-simple-igd-thread.c
@@ -35,8 +35,24 @@
 #endif
 
 #include "gupnp-simple-igd-thread.h"
+#include "gupnp-simple-igd-priv.h"
 
 
+/**
+ * GUPnPSimpleIgdThreadClass:
+ * @parent_class: Our parent
+ *
+ * The Raw UDP component transmitter class
+ */
+
+struct _GUPnPSimpleIgdThreadClass
+{
+  GUPnPSimpleIgdClass parent_class;
+
+  /*virtual functions */
+  /*< private >*/
+};
+
 struct thread_data
 {
   gint refcount;
diff --git a/libgupnp-igd/gupnp-simple-igd-thread.h b/libgupnp-igd/gupnp-simple-igd-thread.h
index db520df..a9025da 100644
--- a/libgupnp-igd/gupnp-simple-igd-thread.h
+++ b/libgupnp-igd/gupnp-simple-igd-thread.h
@@ -50,20 +50,6 @@ typedef struct _GUPnPSimpleIgdThread GUPnPSimpleIgdThread;
 typedef struct _GUPnPSimpleIgdThreadClass GUPnPSimpleIgdThreadClass;
 typedef struct _GUPnPSimpleIgdThreadPrivate GUPnPSimpleIgdThreadPrivate;
 
-/**
- * GUPnPSimpleIgdThreadClass:
- * @parent_class: Our parent
- *
- * The Raw UDP component transmitter class
- */
-
-struct _GUPnPSimpleIgdThreadClass
-{
-  GUPnPSimpleIgdClass parent_class;
-
-  /*virtual functions */
-  /*< private >*/
-};
 
 /**
  * GUPnPSimpleIgdThread:
diff --git a/libgupnp-igd/gupnp-simple-igd.c b/libgupnp-igd/gupnp-simple-igd.c
index 6d0ce57..efc231a 100644
--- a/libgupnp-igd/gupnp-simple-igd.c
+++ b/libgupnp-igd/gupnp-simple-igd.c
@@ -40,6 +40,7 @@
 #endif
 
 #include "gupnp-simple-igd.h"
+#include "gupnp-simple-igd-priv.h"
 #include "gupnp-simple-igd-marshal.h"
 
 #include <arpa/inet.h>
diff --git a/libgupnp-igd/gupnp-simple-igd.h b/libgupnp-igd/gupnp-simple-igd.h
index f9d6b5a..96d096a 100644
--- a/libgupnp-igd/gupnp-simple-igd.h
+++ b/libgupnp-igd/gupnp-simple-igd.h
@@ -51,35 +51,6 @@ typedef struct _GUPnPSimpleIgd GUPnPSimpleIgd;
 typedef struct _GUPnPSimpleIgdClass GUPnPSimpleIgdClass;
 typedef struct _GUPnPSimpleIgdPrivate GUPnPSimpleIgdPrivate;
 
-/**
- * GUPnPSimpleIgdClass:
- * @parent_class: Our parent
- * @add_port: An implementation of the add_port function
- * @remove_port: An implementation of the delete_port function
- *
- * The Raw UDP component transmitter class
- */
-
-struct _GUPnPSimpleIgdClass
-{
-  GObjectClass parent_class;
-
-  /*virtual functions */
-
-  void (*add_port) (GUPnPSimpleIgd *self,
-      const gchar *protocol,
-      guint16 external_port,
-      const gchar *local_ip,
-      guint16 local_port,
-      guint32 lease_duration,
-      const gchar *description);
-
-  void (*remove_port) (GUPnPSimpleIgd *self,
-      const gchar *protocol,
-      guint external_port);
-
-  /*< private >*/
-};
 
 /**
  * GUPnPSimpleIgd: