luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-05 15:38:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Build test subdir after . Remove gdirectorymonitor.[ch]

Browse Source 
2008-01-07  Alexander Larsson  <alexl@redhat.com>

        * Makefile.am:
	Build test subdir after .
	Remove gdirectorymonitor.[ch]
	
        * gdirectorymonitor.[ch]:
        * gfilemonitor.c:
        * gfile.[ch]:
        * gio.h:
	Remove GDirectoryMonitor and make
	GFileMonitor the baseclass for both file and
	directory monitors. Lift the more generic
	rate limiting code from GDirectoryMonitor
	into GFileMonitor.
	
        * fam/fam-helper.c:
        * fam/gfamdirectorymonitor.[ch]:
        * inotify/ginotifydirectorymonitor.[ch]:
        * inotify/inotify-helper.c:
        * glocaldirectorymonitor.[ch]:
        * glocalfile.c:
        * gvolumemonitor.c:
	Update for the removed GDirectoryMonitor.
	
        * gmemoryoutputstream.c:
	Remove ununsed variable


svn path=/trunk/; revision=6262
This commit is contained in:
Alexander Larsson
2008-01-07 13:42:08 +00:00
committed by Alexander Larsson
parent 052c660452
commit e23140cbb4
19 changed files with 312 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gio/fam/fam-helper.c
View File

@@ -25,7 +25,6 @@
#include "config.h"
#include <fam.h>
#include <gio/gfilemonitor.h>
#include <gio/gdirectorymonitor.h>
#include "fam-helper.h"
@@ -92,7 +91,7 @@ fam_do_iter_unlocked (void)
if (sub->directory)
{
GDirectoryMonitor* monitor = G_DIRECTORY_MONITOR (sub->user_data);
GFileMonitor* monitor = G_FILE_MONITOR (sub->user_data);
GFileMonitorEvent eflags = fam_event_to_file_monitor_event (ev.code);
gchar* path = NULL;
GFile *child, *parent;
@@ -108,7 +107,7 @@ fam_do_iter_unlocked (void)
child = g_file_new_for_path (path);
parent = g_file_get_parent (child);
g_directory_monitor_emit_event (monitor, child, NULL, eflags);
g_file_monitor_emit_event (monitor, child, NULL, eflags);
g_free (path);
g_object_unref (child);
g_object_unref (parent);

12
gio/fam/gfamdirectorymonitor.c
View File

@@ -36,7 +36,7 @@ struct _GFamDirectoryMonitor
fam_sub *sub;
};
static gboolean g_fam_directory_monitor_cancel (GDirectoryMonitor* monitor);
static gboolean g_fam_directory_monitor_cancel (GFileMonitor* monitor);
G_DEFINE_DYNAMIC_TYPE (GFamDirectoryMonitor, g_fam_directory_monitor, G_TYPE_LOCAL_DIRECTORY_MONITOR)
@@ -106,12 +106,12 @@ static void
g_fam_directory_monitor_class_init (GFamDirectoryMonitorClass* klass)
{
GObjectClass* gobject_class = G_OBJECT_CLASS (klass);
GDirectoryMonitorClass *directory_monitor_class = G_DIRECTORY_MONITOR_CLASS (klass);
GFileMonitorClass *file_monitor_class = G_FILE_MONITOR_CLASS (klass);
GLocalDirectoryMonitorClass *local_directory_monitor_class = G_LOCAL_DIRECTORY_MONITOR_CLASS (klass);
gobject_class->finalize = g_fam_directory_monitor_finalize;
gobject_class->constructor = g_fam_directory_monitor_constructor;
directory_monitor_class->cancel = g_fam_directory_monitor_cancel;
file_monitor_class->cancel = g_fam_directory_monitor_cancel;
local_directory_monitor_class->prio = 10;
local_directory_monitor_class->mount_notify = FALSE;
@@ -125,7 +125,7 @@ g_fam_directory_monitor_init (GFamDirectoryMonitor* monitor)
}
static gboolean
g_fam_directory_monitor_cancel (GDirectoryMonitor* monitor)
g_fam_directory_monitor_cancel (GFileMonitor* monitor)
{
GFamDirectoryMonitor *fam_monitor = G_FAM_DIRECTORY_MONITOR (monitor);
fam_sub *sub = fam_monitor->sub;
@@ -138,8 +138,8 @@ g_fam_directory_monitor_cancel (GDirectoryMonitor* monitor)
fam_monitor->sub = NULL;
}
if (G_DIRECTORY_MONITOR_CLASS (g_fam_directory_monitor_parent_class)->cancel)
(*G_DIRECTORY_MONITOR_CLASS (g_fam_directory_monitor_parent_class)->cancel) (monitor);
if (G_FILE_MONITOR_CLASS (g_fam_directory_monitor_parent_class)->cancel)
(*G_FILE_MONITOR_CLASS (g_fam_directory_monitor_parent_class)->cancel) (monitor);
return TRUE;
}

1
gio/fam/gfamdirectorymonitor.h
View File

@@ -28,7 +28,6 @@
#include <glib-object.h>
#include <string.h>
#include <gio/gdirectorymonitor.h>
#include "glocaldirectorymonitor.h"
#include "giomodule.h"