From 3869c33a73c89e1f2f916f6bd6dd85a06b34a08d Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 5 Dec 2007 11:10:21 +0000 Subject: [PATCH] Added. 2007-12-05 Alexander Larsson * 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 --- gio/ChangeLog | 10 ++++++++++ gio/Makefile.am | 1 + gio/giomodule-priv.h | 34 ++++++++++++++++++++++++++++++++++ gio/glocaldirectorymonitor.c | 2 +- gio/glocalfilemonitor.c | 2 +- gio/gunionvolumemonitor.c | 2 +- gio/gvfs.c | 2 +- 7 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 gio/giomodule-priv.h diff --git a/gio/ChangeLog b/gio/ChangeLog index 9869395b1..d48773159 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,13 @@ +2007-12-05 Alexander Larsson + + * 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 * gdatainputstream.c: diff --git a/gio/Makefile.am b/gio/Makefile.am index 638470acb..cff20d69c 100644 --- 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 index 000000000..6e40f4e67 --- /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 + */ + +#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 b2c473e97..b93a24230 100644 --- 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 diff --git a/gio/glocalfilemonitor.c b/gio/glocalfilemonitor.c index 1820db948..3547a3e97 100644 --- a/gio/glocalfilemonitor.c +++ b/gio/glocalfilemonitor.c @@ -23,7 +23,7 @@ #include #include "glocalfilemonitor.h" -#include "giomodule.h" +#include "giomodule-priv.h" #include diff --git a/gio/gunionvolumemonitor.c b/gio/gunionvolumemonitor.c index faaa3c10d..63afd0c66 100644 --- a/gio/gunionvolumemonitor.c +++ b/gio/gunionvolumemonitor.c @@ -27,7 +27,7 @@ #include #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 8f6919145..b171d79c8 100644 --- a/gio/gvfs.c +++ b/gio/gvfs.c @@ -24,7 +24,7 @@ #include #include "gvfs.h" #include "glocalvfs.h" -#include "giomodule.h" +#include "giomodule-priv.h" #include "glibintl.h" #include "gioalias.h"