Added.

2007-12-05  Alexander Larsson  <alexl@redhat.com>

        * Makefile.am:
        * giomodule-priv.h: Added.
        * glocaldirectorymonitor.c:
        * glocalfilemonitor.c:
        * gunionvolumemonitor.c:
        * gvfs.c:
	Actually add the declaration of _g_io_modules_ensure_loaded

svn path=/trunk/; revision=6051

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 9869395..d487731 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,5 +1,15 @@
 2007-12-05  Alexander Larsson  <alexl@redhat.com>
 
+        * Makefile.am:
+        * giomodule-priv.h: Added.
+        * glocaldirectorymonitor.c:
+        * glocalfilemonitor.c:
+        * gunionvolumemonitor.c:
+        * gvfs.c:
+       Actually add the declaration of _g_io_modules_ensure_loaded
+
+2007-12-05  Alexander Larsson  <alexl@redhat.com>
+
         * gdatainputstream.c:
        Fix warnings
        

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 638470a..cff20d6 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -146,6 +146,7 @@ libgio_2_0_la_SOURCES =             \
        ginputstream.c          \
        gioerror.c              \
        giomodule.c             \
+       giomodule-priv.h        \
        gioscheduler.c          \
        gloadableicon.c         \
        gmemoryinputstream.c    \

diff --git a/gio/giomodule-priv.h b/gio/giomodule-priv.h
new file mode 100644 (file)
index 0000000..6e40f4e
--- /dev/null
+++ b/gio/giomodule-priv.h
@@ -0,0 +1,34 @@
+/* GIO - GLib Input, Output and Streaming Library
+ * 
+ * Copyright (C) 2006-2007 Red Hat, Inc.
+ *
+ * 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 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., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Alexander Larsson <alexl@redhat.com>
+ */
+
+#ifndef __G_IO_MODULE_PRIV_H__
+#define __G_IO_MODULE_PRIV_H__
+
+#include "giomodule.h"
+
+G_BEGIN_DECLS
+
+void       _g_io_modules_ensure_loaded (void);
+
+G_END_DECLS
+
+#endif /* __G_IO_MODULE_H__ */

diff --git a/gio/glocaldirectorymonitor.c b/gio/glocaldirectorymonitor.c
index b2c473e..b93a242 100644 (file)
--- a/gio/glocaldirectorymonitor.c
+++ b/gio/glocaldirectorymonitor.c
@@ -25,7 +25,7 @@
 #include "glocaldirectorymonitor.h"
 #include "gunixmounts.h"
 #include "gdirectorymonitor.h"
-#include "giomodule.h"
+#include "giomodule-priv.h"
 
 #include <string.h>
 

diff --git a/gio/glocalfilemonitor.c b/gio/glocalfilemonitor.c
index 1820db9..3547a3e 100644 (file)
--- a/gio/glocalfilemonitor.c
+++ b/gio/glocalfilemonitor.c
@@ -23,7 +23,7 @@
 #include <config.h>
 
 #include "glocalfilemonitor.h"
-#include "giomodule.h"
+#include "giomodule-priv.h"
 
 #include <string.h>
 

diff --git a/gio/gunionvolumemonitor.c b/gio/gunionvolumemonitor.c
index faaa3c1..63afd0c 100644 (file)
--- a/gio/gunionvolumemonitor.c
+++ b/gio/gunionvolumemonitor.c
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include "gunionvolumemonitor.h"
 #include "gvolumeprivate.h"
-#include "giomodule.h"
+#include "giomodule-priv.h"
 #ifdef G_OS_UNIX
 #include "gunixvolumemonitor.h"
 #endif

diff --git a/gio/gvfs.c b/gio/gvfs.c
index 8f69191..b171d79 100644 (file)
--- a/gio/gvfs.c
+++ b/gio/gvfs.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include "gvfs.h"
 #include "glocalvfs.h"
-#include "giomodule.h"
+#include "giomodule-priv.h"
 #include "glibintl.h"
 
 #include "gioalias.h"