projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix minor mem leak in test case
[platform/upstream/glib.git]
/
gio
/
glocaldirectorymonitor.h
diff --git
a/gio/glocaldirectorymonitor.h
b/gio/glocaldirectorymonitor.h
index
418634e
..
b873404
100644
(file)
--- a/
gio/glocaldirectorymonitor.h
+++ b/
gio/glocaldirectorymonitor.h
@@
-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>
*/
@@
-34,8
+32,10
@@
G_BEGIN_DECLS
#define G_LOCAL_DIRECTORY_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), G_TYPE_LOCAL_DIRECTORY_MONITOR, GLocalDirectoryMonitorClass))
#define G_IS_LOCAL_DIRECTORY_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_LOCAL_DIRECTORY_MONITOR))
#define G_IS_LOCAL_DIRECTORY_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_LOCAL_DIRECTORY_MONITOR))
#define G_LOCAL_DIRECTORY_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), G_TYPE_LOCAL_DIRECTORY_MONITOR, GLocalDirectoryMonitorClass))
#define G_IS_LOCAL_DIRECTORY_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_LOCAL_DIRECTORY_MONITOR))
#define G_IS_LOCAL_DIRECTORY_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_LOCAL_DIRECTORY_MONITOR))
+#define G_LOCAL_DIRECTORY_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_LOCAL_DIRECTORY_MONITOR, GLocalDirectoryMonitorClass))
#define G_LOCAL_DIRECTORY_MONITOR_EXTENSION_POINT_NAME "gio-local-directory-monitor"
#define G_LOCAL_DIRECTORY_MONITOR_EXTENSION_POINT_NAME "gio-local-directory-monitor"
+#define G_NFS_DIRECTORY_MONITOR_EXTENSION_POINT_NAME "gio-nfs-directory-monitor"
typedef struct _GLocalDirectoryMonitor GLocalDirectoryMonitor;
typedef struct _GLocalDirectoryMonitorClass GLocalDirectoryMonitorClass;
typedef struct _GLocalDirectoryMonitor GLocalDirectoryMonitor;
typedef struct _GLocalDirectoryMonitorClass GLocalDirectoryMonitorClass;
@@
-47,8
+47,8
@@
struct _GLocalDirectoryMonitor
gchar *dirname;
GFileMonitorFlags flags;
/* For mount emulation */
gchar *dirname;
GFileMonitorFlags flags;
/* For mount emulation */
- GUnixMountMonitor *mount_monitor;
gboolean was_mounted;
gboolean was_mounted;
+ GUnixMountMonitor *mount_monitor;
};
struct _GLocalDirectoryMonitorClass
};
struct _GLocalDirectoryMonitorClass
@@
-58,13
+58,26
@@
struct _GLocalDirectoryMonitorClass
gboolean mount_notify;
gboolean (* is_supported) (void);
gboolean mount_notify;
gboolean (* is_supported) (void);
+ void (* start) (GLocalDirectoryMonitor *local_monitor);
};
};
+#ifdef G_OS_UNIX
+GLIB_AVAILABLE_IN_ALL
+#endif
GType g_local_directory_monitor_get_type (void) G_GNUC_CONST;
GFileMonitor * _g_local_directory_monitor_new (const char *dirname,
GFileMonitorFlags flags,
GType g_local_directory_monitor_get_type (void) G_GNUC_CONST;
GFileMonitor * _g_local_directory_monitor_new (const char *dirname,
GFileMonitorFlags flags,
+ GMainContext *context,
+ gboolean is_remote_fs,
+ gboolean do_start,
GError **error);
GError **error);
+void g_local_directory_monitor_start (GLocalDirectoryMonitor *local_monitor);
+
+/* Actually in glocalfile.c */
+GLocalDirectoryMonitor * g_local_directory_monitor_new_in_worker (const char *pathname,
+ GFileMonitorFlags flags,
+ GError **error);
G_END_DECLS
G_END_DECLS