cleanup

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

diff --git a/gio/gunixvolume.h b/gio/gunixvolume.h
index b0cb406..185300a 100644 (file)
--- a/gio/gunixvolume.h
+++ b/gio/gunixvolume.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,24 +13,22 @@
  * 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_UNIX_VOLUME_H__
 #define __G_UNIX_VOLUME_H__
 
-#include <glib-object.h>
-#include <gio/gvolume.h>
-#include <gio/gunixmounts.h>
+#include <gio/giotypes.h>
 #include <gio/gunixvolumemonitor.h>
+#include <gio/gunixmounts.h>
 
 G_BEGIN_DECLS
 
-#define G_TYPE_UNIX_VOLUME        (g_unix_volume_get_type ())
+#define G_TYPE_UNIX_VOLUME        (_g_unix_volume_get_type ())
 #define G_UNIX_VOLUME(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_UNIX_VOLUME, GUnixVolume))
 #define G_UNIX_VOLUME_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_UNIX_VOLUME, GUnixVolumeClass))
 #define G_IS_UNIX_VOLUME(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_UNIX_VOLUME))
@@ -38,19 +36,22 @@ G_BEGIN_DECLS
 
 typedef struct _GUnixVolumeClass GUnixVolumeClass;
 
-struct _GUnixVolumeClass {
-   GObjectClass parent_class;
+struct _GUnixVolumeClass
+{
+  GObjectClass parent_class;
 };
 
-GType g_unix_volume_get_type (void) G_GNUC_CONST;
-
-GUnixVolume *g_unix_volume_new            (GUnixMount     *mount,
-                                          GUnixDrive     *drive);
-gboolean     g_unix_volume_has_mountpoint (GUnixVolume    *volume,
-                                          const char     *mountpoint);
-void         g_unix_volume_unset_drive    (GUnixVolume    *volume,
-                                          GUnixDrive     *drive);
-void         g_unix_volume_unmounted      (GUnixVolume    *volume);
+GType         _g_unix_volume_get_type       (void) G_GNUC_CONST;
+
+GUnixVolume * _g_unix_volume_new            (GVolumeMonitor  *volume_monitor,
+                                             GUnixMountPoint *mountpoint);
+gboolean      _g_unix_volume_has_mount_path (GUnixVolume     *volume,
+                                             const char      *mount_path);
+void          _g_unix_volume_set_mount      (GUnixVolume     *volume,
+                                             GUnixMount      *mount);
+void          _g_unix_volume_unset_mount    (GUnixVolume     *volume,
+                                             GUnixMount      *mount);
+void          _g_unix_volume_disconnected   (GUnixVolume     *volume);
 
 G_END_DECLS