Fix minor mem leak in test case

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

diff --git a/gio/gfilemonitor.h b/gio/gfilemonitor.h
index bb96f6c..7b17f9f 100644 (file)
--- a/gio/gfilemonitor.h
+++ b/gio/gfilemonitor.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,9 +13,7 @@
  * 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>
  */
@@ -23,8 +21,11 @@
 #ifndef __G_FILE_MONITOR_H__
 #define __G_FILE_MONITOR_H__
 
-#include <glib-object.h>
-#include <gio/gfile.h>
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
+#include <gio/giotypes.h>
 
 G_BEGIN_DECLS
 
@@ -35,39 +36,17 @@ G_BEGIN_DECLS
 #define G_IS_FILE_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_MONITOR))
 #define G_FILE_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_MONITOR, GFileMonitorClass))
 
-/**
- * GFileMonitorEvent:
- * @G_FILE_MONITOR_EVENT_CHANGED: Monitor file changed events.
- * @G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: Monitor file changed done events.
- * @G_FILE_MONITOR_EVENT_DELETED: Monitors file deleted events.
- * @G_FILE_MONITOR_EVENT_CREATED: Monitors file created events.
- * @G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: Monitors file attribute changed events.
- * @G_FILE_MONITOR_EVENT_PRE_UNMOUNT: Monitors pre-unmount events.
- * @G_FILE_MONITOR_EVENT_UNMOUNTED: Monitors unmount events.
- * 
- * Flags used when creating a #GFileMonitor to define what events to monitor for.
- **/
-typedef enum {
-  G_FILE_MONITOR_EVENT_CHANGED,
-  G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT,
-  G_FILE_MONITOR_EVENT_DELETED,
-  G_FILE_MONITOR_EVENT_CREATED,
-  G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED,
-  G_FILE_MONITOR_EVENT_PRE_UNMOUNT,
-  G_FILE_MONITOR_EVENT_UNMOUNTED
-} GFileMonitorEvent;
-
-typedef struct _GFileMonitorClass      GFileMonitorClass;
+typedef struct _GFileMonitorClass       GFileMonitorClass;
 typedef struct _GFileMonitorPrivate    GFileMonitorPrivate;
 
 /**
  * GFileMonitor:
- * 
- * Watches for changes within a #GFile.
+ *
+ * Watches for changes to a file.
  **/
 struct _GFileMonitor
 {
-  GObject parent;
+  GObject parent_instance;
 
   /*< private >*/
   GFileMonitorPrivate *priv;
@@ -76,15 +55,15 @@ struct _GFileMonitor
 struct _GFileMonitorClass
 {
   GObjectClass parent_class;
-  
+
   /* Signals */
-  void (* changed) (GFileMonitor* monitor,
-                   GFile* file,
-                   GFile* other_file,
-                   GFileMonitorEvent event_type);
-  
+  void     (* changed) (GFileMonitor      *monitor,
+                        GFile             *file,
+                        GFile             *other_file,
+                        GFileMonitorEvent  event_type);
+
   /* Virtual Table */
-  gboolean     (*cancel)(GFileMonitor* monitor);
+  gboolean (* cancel)  (GFileMonitor      *monitor);
 
   /*< private >*/
   /* Padding for future expansion */
@@ -95,19 +74,24 @@ struct _GFileMonitorClass
   void (*_g_reserved5) (void);
 };
 
-GType g_file_monitor_get_type (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
+GType    g_file_monitor_get_type       (void) G_GNUC_CONST;
 
-gboolean g_file_monitor_cancel         (GFileMonitor *monitor);
-gboolean g_file_monitor_is_cancelled   (GFileMonitor *monitor);
-void     g_file_monitor_set_rate_limit (GFileMonitor *monitor,
-                                       int           limit_msecs);
+GLIB_AVAILABLE_IN_ALL
+gboolean g_file_monitor_cancel         (GFileMonitor      *monitor);
+GLIB_AVAILABLE_IN_ALL
+gboolean g_file_monitor_is_cancelled   (GFileMonitor      *monitor);
+GLIB_AVAILABLE_IN_ALL
+void     g_file_monitor_set_rate_limit (GFileMonitor      *monitor,
+                                        gint               limit_msecs);
 
 
 /* For implementations */
-void g_file_monitor_emit_event (GFileMonitor      *monitor,
-                               GFile             *file,
-                               GFile             *other_file,
-                               GFileMonitorEvent  event_type);
+GLIB_AVAILABLE_IN_ALL
+void     g_file_monitor_emit_event     (GFileMonitor      *monitor,
+                                        GFile             *child,
+                                        GFile             *other_file,
+                                        GFileMonitorEvent  event_type);
 
 G_END_DECLS