projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the new g_strv_contains
[platform/upstream/glib.git]
/
gio
/
glocalfilemonitor.h
diff --git
a/gio/glocalfilemonitor.h
b/gio/glocalfilemonitor.h
index
b11ce85
..
aed2e9c
100644
(file)
--- a/
gio/glocalfilemonitor.h
+++ b/
gio/glocalfilemonitor.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,9
+13,7
@@
* 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>
*/
@@
-23,7
+21,6
@@
#ifndef __G_LOCAL_FILE_MONITOR_H__
#define __G_LOCAL_FILE_MONITOR_H__
#ifndef __G_LOCAL_FILE_MONITOR_H__
#define __G_LOCAL_FILE_MONITOR_H__
-#include <glib-object.h>
#include <gio/gfilemonitor.h>
G_BEGIN_DECLS
#include <gio/gfilemonitor.h>
G_BEGIN_DECLS
@@
-33,6
+30,10
@@
G_BEGIN_DECLS
#define G_LOCAL_FILE_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), G_TYPE_LOCAL_FILE_MONITOR, GLocalFileMonitorClass))
#define G_IS_LOCAL_FILE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_LOCAL_FILE_MONITOR))
#define G_IS_LOCAL_FILE_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_LOCAL_FILE_MONITOR))
#define G_LOCAL_FILE_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), G_TYPE_LOCAL_FILE_MONITOR, GLocalFileMonitorClass))
#define G_IS_LOCAL_FILE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_LOCAL_FILE_MONITOR))
#define G_IS_LOCAL_FILE_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_LOCAL_FILE_MONITOR))
+#define G_LOCAL_FILE_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_LOCAL_FILE_MONITOR, GLocalFileMonitorClass))
+
+#define G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME "gio-local-file-monitor"
+#define G_NFS_FILE_MONITOR_EXTENSION_POINT_NAME "gio-nfs-file-monitor"
typedef struct _GLocalFileMonitor GLocalFileMonitor;
typedef struct _GLocalFileMonitorClass GLocalFileMonitorClass;
typedef struct _GLocalFileMonitor GLocalFileMonitor;
typedef struct _GLocalFileMonitorClass GLocalFileMonitorClass;
@@
-40,19
+41,36
@@
typedef struct _GLocalFileMonitorClass GLocalFileMonitorClass;
struct _GLocalFileMonitor
{
GFileMonitor parent_instance;
struct _GLocalFileMonitor
{
GFileMonitor parent_instance;
+
gchar *filename;
gchar *filename;
+ GFileMonitorFlags flags;
};
};
-struct _GLocalFileMonitorClass {
+struct _GLocalFileMonitorClass
+{
GFileMonitorClass parent_class;
GFileMonitorClass parent_class;
- gint prio;
- gboolean (*is_supported) (void);
+
+ gboolean (* is_supported) (void);
+ void (* start) (GLocalFileMonitor *local_monitor);
};
};
-GType g_local_file_monitor_get_type (void) G_GNUC_CONST;
+#ifdef G_OS_UNIX
+GLIB_AVAILABLE_IN_ALL
+#endif
+GType g_local_file_monitor_get_type (void) G_GNUC_CONST;
+
+GFileMonitor * _g_local_file_monitor_new (const char *pathname,
+ GFileMonitorFlags flags,
+ GMainContext *context,
+ gboolean is_remote_fs,
+ gboolean do_start,
+ GError **error);
+void g_local_file_monitor_start (GLocalFileMonitor *local_monitor);
-GFileMonitor* g_local_file_monitor_new (const char* pathname,
- GFileMonitorFlags flags);
+/* Actually in glocalfile.c */
+GLocalFileMonitor * g_local_file_monitor_new_in_worker (const char *pathname,
+ GFileMonitorFlags flags,
+ GError **error);
G_END_DECLS
G_END_DECLS