GTlsCertificate: fix loading of bad certificate chains

[platform/upstream/glib.git] / gio / gunionvolumemonitor.h

diff --git a/gio/gunionvolumemonitor.h b/gio/gunionvolumemonitor.h
index 8cb3ecb..fc1d6fa 100644 (file)
--- a/gio/gunionvolumemonitor.h
+++ b/gio/gunionvolumemonitor.h
@@ -1,5 +1,5 @@
 /* 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
@@ -13,41 +13,34 @@
  * 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.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl@redhat.com>
+ *         David Zeuthen <davidz@redhat.com>
  */
 
 #ifndef __G_UNION_VOLUME_MONITOR_H__
 #define __G_UNION_VOLUME_MONITOR_H__
 
-#include <glib-object.h>
 #include <gio/gvolumemonitor.h>
 
 G_BEGIN_DECLS
 
-#define G_TYPE_UNION_VOLUME_MONITOR        (g_union_volume_monitor_get_type ())
+#define G_TYPE_UNION_VOLUME_MONITOR        (_g_union_volume_monitor_get_type ())
 #define G_UNION_VOLUME_MONITOR(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_UNION_VOLUME_MONITOR, GUnionVolumeMonitor))
 #define G_UNION_VOLUME_MONITOR_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_UNION_VOLUME_MONITOR, GUnionVolumeMonitorClass))
 #define G_IS_UNION_VOLUME_MONITOR(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_UNION_VOLUME_MONITOR))
 #define G_IS_UNION_VOLUME_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_UNION_VOLUME_MONITOR))
 
-typedef struct _GUnionVolumeMonitor GUnionVolumeMonitor;
+typedef struct _GUnionVolumeMonitor      GUnionVolumeMonitor;
 typedef struct _GUnionVolumeMonitorClass GUnionVolumeMonitorClass;
 
-struct _GUnionVolumeMonitorClass {
+struct _GUnionVolumeMonitorClass
+{
   GVolumeMonitorClass parent_class;
-
 };
 
-GType g_union_volume_monitor_get_type (void) G_GNUC_CONST;
-
-GList * g_union_volume_monitor_convert_volumes (GUnionVolumeMonitor *monitor,
-                                               GList               *child_volumes);
-GDrive *g_union_volume_monitor_convert_drive   (GUnionVolumeMonitor *monitor,
-                                               GDrive              *child_drive);
+GType _g_union_volume_monitor_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS