projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gdbus-tool: simplify some logic
[platform/upstream/glib.git]
/
gio
/
gunixvolumemonitor.h
diff --git
a/gio/gunixvolumemonitor.h
b/gio/gunixvolumemonitor.h
index
ecaffd5
..
f7dfd0a
100644
(file)
--- a/
gio/gunixvolumemonitor.h
+++ b/
gio/gunixvolumemonitor.h
@@
-1,5
+1,5
@@
/* GIO - GLib Input, Output and Streaming Library
/* 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
* Copyright (C) 2006-2007 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
@@
-13,17
+13,15
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* 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>
*
* Author: Alexander Larsson <alexl@redhat.com>
+ * David Zeuthen <davidz@redhat.com>
*/
#ifndef __G_UNIX_VOLUME_MONITOR_H__
#define __G_UNIX_VOLUME_MONITOR_H__
*/
#ifndef __G_UNIX_VOLUME_MONITOR_H__
#define __G_UNIX_VOLUME_MONITOR_H__
-#include <glib-object.h>
#include <gio/gnativevolumemonitor.h>
G_BEGIN_DECLS
#include <gio/gnativevolumemonitor.h>
G_BEGIN_DECLS
@@
-34,23
+32,29
@@
G_BEGIN_DECLS
#define G_IS_UNIX_VOLUME_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_UNIX_VOLUME_MONITOR))
#define G_IS_UNIX_VOLUME_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_UNIX_VOLUME_MONITOR))
#define G_IS_UNIX_VOLUME_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_UNIX_VOLUME_MONITOR))
#define G_IS_UNIX_VOLUME_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_UNIX_VOLUME_MONITOR))
-typedef struct _GUnixVolumeMonitor GUnixVolumeMonitor;
+typedef struct _GUnixVolumeMonitor
GUnixVolumeMonitor;
typedef struct _GUnixVolumeMonitorClass GUnixVolumeMonitorClass;
/* Forward definitions */
typedef struct _GUnixVolumeMonitorClass GUnixVolumeMonitorClass;
/* Forward definitions */
+
+/**
+ * GUnixMount:
+ *
+ * Implementation of the #GMount interface for Unix systems.
+ */
+typedef struct _GUnixMount GUnixMount;
typedef struct _GUnixVolume GUnixVolume;
typedef struct _GUnixVolume GUnixVolume;
-typedef struct _GUnixDrive GUnixDrive;
-struct _GUnixVolumeMonitorClass {
+struct _GUnixVolumeMonitorClass
+{
GNativeVolumeMonitorClass parent_class;
GNativeVolumeMonitorClass parent_class;
-
};
};
-GType
_g_unix_volume_monitor_get_type
(void) G_GNUC_CONST;
+GType
_g_unix_volume_monitor_get_type
(void) G_GNUC_CONST;
-GVolumeMonitor *
_g_unix_volume_monitor_new
(void);
-GUnix
Drive * _g_unix_volume_monitor_lookup_drive_for_mountpoint
(GUnixVolumeMonitor *monitor,
-
const char *mountpoint
);
+GVolumeMonitor *
_g_unix_volume_monitor_new
(void);
+GUnix
Volume * _g_unix_volume_monitor_lookup_volume_for_mount_path
(GUnixVolumeMonitor *monitor,
+
const char *mount_path
);
G_END_DECLS
G_END_DECLS