Commit d9594f57 authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson

Removed unnecessary file

2007-11-28  Alexander Larsson  <alexl@redhat.com>

        * Makefile.am:
        * gdriveprivate.h:
	Removed unnecessary file
	
        * gdesktopappinfo.[ch]:
        * gdummyfile.[ch]:
        * gfile.c:
        * glocaldirectorymonitor.[ch]:
        * glocalfile.[ch]:
        * glocalfileenumerator.[ch]:
        * glocalfileinputstream.[ch]:
        * glocalfilemonitor.[ch]:
        * glocalfileoutputstream.[ch]:
        * glocalvfs.[ch]:
        * gnativevolumemonitor.c:
        * gpollfilemonitor.[ch]:
        * gunionvolumemonitor.[ch]:
        * gunixdrive.[ch]:
        * gunixvolume.[ch]:
        * gunixvolumemonitor.[ch]:
        * gvfs.c:
        * gvolumeprivate.h:
        * inotify/ginotifydirectorymonitor.[ch]:
        * inotify/ginotifyfilemonitor.[ch]:
        * inotify/inotify-helper.c:
	Append _ to all internal functions
	
        * gio.symbols:
	Add missing symbols
	Export symbols needed for modules


svn path=/trunk/; revision=5977
parent 3deb5ace
2007-11-28 Alexander Larsson <alexl@redhat.com>
* Makefile.am:
* gdriveprivate.h:
Removed unnecessary file
* gdesktopappinfo.[ch]:
* gdummyfile.[ch]:
* gfile.c:
* glocaldirectorymonitor.[ch]:
* glocalfile.[ch]:
* glocalfileenumerator.[ch]:
* glocalfileinputstream.[ch]:
* glocalfilemonitor.[ch]:
* glocalfileoutputstream.[ch]:
* glocalvfs.[ch]:
* gnativevolumemonitor.c:
* gpollfilemonitor.[ch]:
* gunionvolumemonitor.[ch]:
* gunixdrive.[ch]:
* gunixvolume.[ch]:
* gunixvolumemonitor.[ch]:
* gvfs.c:
* gvolumeprivate.h:
* inotify/ginotifydirectorymonitor.[ch]:
* inotify/ginotifyfilemonitor.[ch]:
* inotify/inotify-helper.c:
Append _ to all internal functions
* gio.symbols:
Add missing symbols
Export symbols needed for modules
2007-11-28 Alexander Larsson <alexl@redhat.com>
* Makefile.am:
......
......@@ -129,7 +129,6 @@ libgio_2_0_la_SOURCES = \
gdataoutputstream.c \
gdirectorymonitor.c \
gdrive.c \
gdriveprivate.h \
gdummyfile.h \
gdummyfile.c \
gfile.c \
......
......@@ -72,6 +72,7 @@ struct _GDesktopAppInfo
/* FIXME: what about StartupWMClass ? */
};
#define g_desktop_app_info_get_type _g_desktop_app_info_get_type
G_DEFINE_TYPE_WITH_CODE (GDesktopAppInfo, g_desktop_app_info, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (G_TYPE_APP_INFO,
g_desktop_app_info_iface_init))
......@@ -151,7 +152,7 @@ g_desktop_app_info_init (GDesktopAppInfo *local)
* Returns: a new #GDesktopAppInfo or %NULL on error.
**/
GDesktopAppInfo *
g_desktop_app_info_new_from_filename (const char *filename)
_g_desktop_app_info_new_from_filename (const char *filename)
{
GDesktopAppInfo *info;
GKeyFile *key_file;
......@@ -257,7 +258,7 @@ g_desktop_app_info_new_from_filename (const char *filename)
* Returns: a new #GDesktopAppInfo.
**/
GDesktopAppInfo *
g_desktop_app_info_new (const char *desktop_id)
_g_desktop_app_info_new (const char *desktop_id)
{
GDesktopAppInfo *appinfo;
const char * const *dirs;
......@@ -272,7 +273,7 @@ g_desktop_app_info_new (const char *desktop_id)
char *p;
filename = g_build_filename (dirs[i], desktop_id, NULL);
appinfo = g_desktop_app_info_new_from_filename (filename);
appinfo = _g_desktop_app_info_new_from_filename (filename);
g_free (filename);
if (appinfo != NULL)
{
......@@ -286,7 +287,7 @@ g_desktop_app_info_new (const char *desktop_id)
*p = '/';
filename = g_build_filename (dirs[i], basename, NULL);
appinfo = g_desktop_app_info_new_from_filename (filename);
appinfo = _g_desktop_app_info_new_from_filename (filename);
g_free (filename);
if (appinfo != NULL)
{
......@@ -303,7 +304,7 @@ g_desktop_app_info_new (const char *desktop_id)
found:
appinfo->desktop_id = g_strdup (desktop_id);
if (g_desktop_app_info_get_is_hidden (appinfo))
if (_g_desktop_app_info_get_is_hidden (appinfo))
{
g_object_unref (appinfo);
appinfo = NULL;
......@@ -380,7 +381,7 @@ g_desktop_app_info_get_name (GAppInfo *appinfo)
* Returns: %TRUE if hidden, %FALSE otherwise.
**/
gboolean
g_desktop_app_info_get_is_hidden (GDesktopAppInfo *info)
_g_desktop_app_info_get_is_hidden (GDesktopAppInfo *info)
{
return info->hidden;
}
......@@ -1437,7 +1438,7 @@ g_app_info_create_from_commandline (const char *commandline,
run_update_command ("update-desktop-database", "applications");
info = g_desktop_app_info_new_from_filename (filename);
info = _g_desktop_app_info_new_from_filename (filename);
g_free (filename);
if (info == NULL)
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
......@@ -1508,7 +1509,7 @@ g_app_info_get_all_for_type (const char *content_type)
{
char *desktop_entry = l->data;
info = g_desktop_app_info_new (desktop_entry);
info = _g_desktop_app_info_new (desktop_entry);
if (info)
{
if (app_info_in_list (G_APP_INFO (info), infos))
......@@ -1549,7 +1550,7 @@ g_app_info_get_default_for_type (const char *content_type,
{
char *desktop_entry = l->data;
info = (GAppInfo *)g_desktop_app_info_new (desktop_entry);
info = (GAppInfo *)_g_desktop_app_info_new (desktop_entry);
if (info)
{
if (must_support_uris && !g_app_info_supports_uris (info))
......@@ -1607,11 +1608,11 @@ get_apps_from_dir (GHashTable *apps, const char *dirname, const char *prefix)
/* Use _extended so we catch NULLs too (hidden) */
if (!g_hash_table_lookup_extended (apps, desktop_id, NULL, NULL))
{
appinfo = g_desktop_app_info_new_from_filename (filename);
appinfo = _g_desktop_app_info_new_from_filename (filename);
/* Don't return apps that don't take arguments */
if (appinfo &&
g_desktop_app_info_get_is_hidden (appinfo) &&
_g_desktop_app_info_get_is_hidden (appinfo) &&
strstr (appinfo->exec,"%U") == NULL &&
strstr (appinfo->exec,"%u") == NULL &&
strstr (appinfo->exec,"%f") == NULL &&
......
......@@ -27,7 +27,7 @@
G_BEGIN_DECLS
#define G_TYPE_DESKTOP_APP_INFO (g_desktop_app_info_get_type ())
#define G_TYPE_DESKTOP_APP_INFO (_g_desktop_app_info_get_type ())
#define G_DESKTOP_APP_INFO(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DESKTOP_APP_INFO, GDesktopAppInfo))
#define G_DESKTOP_APP_INFO_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DESKTOP_APP_INFO, GDesktopAppInfoClass))
#define G_IS_DESKTOP_APP_INFO(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DESKTOP_APP_INFO))
......@@ -42,11 +42,11 @@ struct _GDesktopAppInfoClass
GObjectClass parent_class;
};
GType g_desktop_app_info_get_type (void) G_GNUC_CONST;
GType _g_desktop_app_info_get_type (void) G_GNUC_CONST;
GDesktopAppInfo *g_desktop_app_info_new_from_filename (const char *filename);
GDesktopAppInfo *g_desktop_app_info_new (const char *desktop_id);
gboolean g_desktop_app_info_get_is_hidden (GDesktopAppInfo *info);
GDesktopAppInfo *_g_desktop_app_info_new_from_filename (const char *filename);
GDesktopAppInfo *_g_desktop_app_info_new (const char *desktop_id);
gboolean _g_desktop_app_info_get_is_hidden (GDesktopAppInfo *info);
G_END_DECLS
......
/* 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
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* 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.
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
#ifndef __G_DRIVEPRIV_H__
#define __G_DRIVEPRIV_H__
#include <gio/gdrive.h>
G_BEGIN_DECLS
G_END_DECLS
#endif /* __G_DRIVEPRIV_H__ */
......@@ -54,6 +54,7 @@ struct _GDummyFile
char *text_uri;
};
#define g_dummy_file_get_type _g_dummy_file_get_type
G_DEFINE_TYPE_WITH_CODE (GDummyFile, g_dummy_file, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (G_TYPE_FILE,
g_dummy_file_file_iface_init))
......@@ -108,7 +109,7 @@ g_dummy_file_init (GDummyFile *dummy)
* Returns: a new #GFile.
**/
GFile *
g_dummy_file_new (const char *uri)
_g_dummy_file_new (const char *uri)
{
GDummyFile *dummy;
......@@ -184,7 +185,7 @@ g_dummy_file_get_parent (GFile *file)
uri = _g_encode_uri (&new_decoded_uri);
g_free (dirname);
parent = g_dummy_file_new (uri);
parent = _g_dummy_file_new (uri);
g_free (uri);
return parent;
......@@ -195,7 +196,7 @@ g_dummy_file_dup (GFile *file)
{
GDummyFile *dummy = G_DUMMY_FILE (file);
return g_dummy_file_new (dummy->text_uri);
return _g_dummy_file_new (dummy->text_uri);
}
static guint
......@@ -350,7 +351,7 @@ g_dummy_file_resolve_relative_path (GFile *file,
str = g_string_new (dummy->text_uri);
g_string_append (str, "/");
g_string_append_encoded (str, relative_path, SUB_DELIM_CHARS ":@/");
child = g_dummy_file_new (str->str);
child = _g_dummy_file_new (str->str);
g_string_free (str, TRUE);
}
else
......@@ -365,7 +366,7 @@ g_dummy_file_resolve_relative_path (GFile *file,
uri = _g_encode_uri (&new_decoded_uri);
g_free (new_decoded_uri.path);
child = g_dummy_file_new (uri);
child = _g_dummy_file_new (uri);
g_free (uri);
}
......
......@@ -27,7 +27,7 @@
G_BEGIN_DECLS
#define G_TYPE_DUMMY_FILE (g_dummy_file_get_type ())
#define G_TYPE_DUMMY_FILE (_g_dummy_file_get_type ())
#define G_DUMMY_FILE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DUMMY_FILE, GDummyFile))
#define G_DUMMY_FILE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DUMMY_FILE, GDummyFileClass))
#define G_IS_DUMMY_FILE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DUMMY_FILE))
......@@ -42,9 +42,9 @@ struct _GDummyFileClass
GObjectClass parent_class;
};
GType g_dummy_file_get_type (void) G_GNUC_CONST;
GType _g_dummy_file_get_type (void) G_GNUC_CONST;
GFile * g_dummy_file_new (const char *uri);
GFile * _g_dummy_file_new (const char *uri);
G_END_DECLS
......
......@@ -3076,7 +3076,7 @@ g_file_monitor_file (GFile *file,
/* Fallback to polling */
if (monitor == NULL)
monitor = g_poll_file_monitor_new (file);
monitor = _g_poll_file_monitor_new (file);
return monitor;
}
......
......@@ -347,11 +347,19 @@ g_file_info_get_attribute
g_file_info_get_attribute_string
g_file_info_get_attribute_byte_string
g_file_info_get_attribute_boolean
g_file_info_get_attribute_uint32
g_file_info_get_attribute_int32
g_file_info_get_attribute_uint64
g_file_info_get_attribute_int64
g_file_info_get_attribute_object
g_file_info_set_attribute
g_file_info_set_attribute_string
g_file_info_set_attribute_byte_string
g_file_info_set_attribute_boolean
g_file_info_set_attribute_uint32
g_file_info_set_attribute_int32
g_file_info_set_attribute_uint64
g_file_info_set_attribute_int64
g_file_info_set_attribute_object
g_file_info_clear_status
g_file_info_get_file_type
......@@ -382,6 +390,8 @@ g_file_info_set_size
g_file_info_set_modification_time
g_file_info_set_symlink_target
g_file_info_set_sort_order
g_file_attribute_matcher_new
g_file_attribute_matcher_ref
g_file_attribute_matcher_unref
g_file_attribute_matcher_matches
g_file_attribute_matcher_matches_only
......@@ -686,3 +696,21 @@ g_volume_monitor_get_connected_drives
g_volume_monitor_get
#endif
#endif
#if IN_HEADER(__G_NATIVE_VOLUME_MONITOR_H__)
#if IN_FILE(__G_NATIVE_VOLUME_MONITOR_C__)
g_native_volume_monitor_get_type G_GNUC_CONST
#endif
#endif
#if IN_HEADER(__G_LOCAL_FILE_MONITOR_H__)
#if IN_FILE(__G_LOCAL_FILE_MONITOR_C__)
g_local_file_monitor_get_type G_GNUC_CONST
#endif
#endif
#if IN_HEADER(__G_LOCAL_DIRECTORY_MONITOR_H__)
#if IN_FILE(__G_LOCAL_DIRECTORY_MONITOR_C__)
g_local_directory_monitor_get_type G_GNUC_CONST
#endif
#endif
......@@ -207,7 +207,7 @@ _compare_monitor_class_by_prio (gconstpointer a,
return ret;
}
extern GType g_inotify_directory_monitor_get_type (void);
extern GType _g_inotify_directory_monitor_get_type (void);
static gpointer
get_default_local_directory_monitor (gpointer data)
......@@ -219,7 +219,7 @@ get_default_local_directory_monitor (gpointer data)
#if defined(HAVE_SYS_INOTIFY_H) || defined(HAVE_LINUX_INOTIFY_H)
/* Register Inotify monitor */
g_inotify_directory_monitor_get_type ();
_g_inotify_directory_monitor_get_type ();
#endif
g_io_modules_ensure_loaded (GIO_MODULE_DIR);
......@@ -261,8 +261,8 @@ get_default_local_directory_monitor (gpointer data)
* Returns: new #GDirectoryMonitor for the given @dirname.
**/
GDirectoryMonitor*
g_local_directory_monitor_new (const char* dirname,
GFileMonitorFlags flags)
_g_local_directory_monitor_new (const char* dirname,
GFileMonitorFlags flags)
{
static GOnce once_init = G_ONCE_INIT;
static GType monitor_type = G_TYPE_INVALID;
......@@ -290,3 +290,5 @@ g_local_directory_monitor_cancel (GDirectoryMonitor* monitor)
return TRUE;
}
#define __G_LOCAL_DIRECTORY_MONITOR_C__
#include "gioaliasdef.c"
......@@ -57,8 +57,8 @@ struct _GLocalDirectoryMonitorClass {
GType g_local_directory_monitor_get_type (void) G_GNUC_CONST;
GDirectoryMonitor* g_local_directory_monitor_new (const char* dirname,
GFileMonitorFlags flags);
GDirectoryMonitor* _g_local_directory_monitor_new (const char* dirname,
GFileMonitorFlags flags);
G_END_DECLS
......
......@@ -91,6 +91,7 @@ struct _GLocalFile
char *filename;
};
#define g_local_file_get_type _g_local_file_get_type
G_DEFINE_TYPE_WITH_CODE (GLocalFile, g_local_file, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (G_TYPE_FILE,
g_local_file_file_iface_init))
......@@ -260,13 +261,13 @@ canonicalize_filename (const char *filename)
}
/**
* g_local_file_new:
* _g_local_file_new:
* @filename: filename of the file to create.
*
* Returns: new local #GFile.
**/
GFile *
g_local_file_new (const char *filename)
_g_local_file_new (const char *filename)
{
GLocalFile *local;
......@@ -419,7 +420,7 @@ g_local_file_get_parent (GFile *file)
return NULL;
dirname = g_path_get_dirname (local->filename);
parent = g_local_file_new (dirname);
parent = _g_local_file_new (dirname);
g_free (dirname);
return parent;
}
......@@ -429,7 +430,7 @@ g_local_file_dup (GFile *file)
{
GLocalFile *local = G_LOCAL_FILE (file);
return g_local_file_new (local->filename);
return _g_local_file_new (local->filename);
}
static guint
......@@ -499,10 +500,10 @@ g_local_file_resolve_relative_path (GFile *file,
GFile *child;
if (g_path_is_absolute (relative_path))
return g_local_file_new (relative_path);
return _g_local_file_new (relative_path);
filename = g_build_filename (local->filename, relative_path, NULL);
child = g_local_file_new (filename);
child = _g_local_file_new (filename);
g_free (filename);
return child;
......@@ -516,9 +517,9 @@ g_local_file_enumerate_children (GFile *file,
GError **error)
{
GLocalFile *local = G_LOCAL_FILE (file);
return g_local_file_enumerator_new (local->filename,
attributes, flags,
cancellable, error);
return _g_local_file_enumerator_new (local->filename,
attributes, flags,
cancellable, error);
}
static GFile *
......@@ -845,7 +846,7 @@ g_local_file_find_enclosing_volume (GFile *file,
return NULL;
}
volume = g_volume_get_for_mount_path (mountpoint);
volume = _g_volume_get_for_mount_path (mountpoint);
g_free (mountpoint);
if (volume)
return volume;
......@@ -1036,7 +1037,7 @@ g_local_file_read (GFile *file,
return NULL;
}
return g_local_file_input_stream_new (fd);
return _g_local_file_input_stream_new (fd);
}
static GFileOutputStream *
......@@ -1045,8 +1046,8 @@ g_local_file_append_to (GFile *file,
GCancellable *cancellable,
GError **error)
{
return g_local_file_output_stream_append (G_LOCAL_FILE (file)->filename,
flags, cancellable, error);
return _g_local_file_output_stream_append (G_LOCAL_FILE (file)->filename,
flags, cancellable, error);
}
static GFileOutputStream *
......@@ -1055,8 +1056,8 @@ g_local_file_create (GFile *file,
GCancellable *cancellable,
GError **error)
{
return g_local_file_output_stream_create (G_LOCAL_FILE (file)->filename,
flags, cancellable, error);
return _g_local_file_output_stream_create (G_LOCAL_FILE (file)->filename,
flags, cancellable, error);
}
static GFileOutputStream *
......@@ -1067,9 +1068,9 @@ g_local_file_replace (GFile *file,
GCancellable *cancellable,
GError **error)
{
return g_local_file_output_stream_replace (G_LOCAL_FILE (file)->filename,
etag, make_backup, flags,
cancellable, error);
return _g_local_file_output_stream_replace (G_LOCAL_FILE (file)->filename,
etag, make_backup, flags,
cancellable, error);
}
......@@ -1774,7 +1775,7 @@ g_local_file_monitor_dir (GFile* file,
GCancellable *cancellable)
{
GLocalFile* local_file = G_LOCAL_FILE(file);
return g_local_directory_monitor_new (local_file->filename, flags);
return _g_local_directory_monitor_new (local_file->filename, flags);
}
static GFileMonitor*
......@@ -1783,7 +1784,7 @@ g_local_file_monitor_file (GFile* file,
GCancellable *cancellable)
{
GLocalFile* local_file = G_LOCAL_FILE(file);
return g_local_file_monitor_new (local_file->filename, flags);
return _g_local_file_monitor_new (local_file->filename, flags);
}
static void
......
......@@ -27,7 +27,7 @@
G_BEGIN_DECLS
#define G_TYPE_LOCAL_FILE (g_local_file_get_type ())
#define G_TYPE_LOCAL_FILE (_g_local_file_get_type ())
#define G_LOCAL_FILE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_LOCAL_FILE, GLocalFile))
#define G_LOCAL_FILE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_LOCAL_FILE, GLocalFileClass))
#define G_IS_LOCAL_FILE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_LOCAL_FILE))
......@@ -42,9 +42,9 @@ struct _GLocalFileClass
GObjectClass parent_class;
};
GType g_local_file_get_type (void) G_GNUC_CONST;
GType _g_local_file_get_type (void) G_GNUC_CONST;
GFile * g_local_file_new (const char *filename);
GFile * _g_local_file_new (const char *filename);
G_END_DECLS
......
......@@ -52,6 +52,7 @@ struct _GLocalFileEnumerator
gboolean follow_symlinks;
};
#define g_local_file_enumerator_get_type _g_local_file_enumerator_get_type
G_DEFINE_TYPE (GLocalFileEnumerator, g_local_file_enumerator, G_TYPE_FILE_ENUMERATOR);
static GFileInfo *g_local_file_enumerator_next_file (GFileEnumerator *enumerator,
......@@ -132,16 +133,15 @@ convert_file_to_io_error (GError **error,
}
GFileEnumerator *
g_local_file_enumerator_new (const char *filename,
const char *attributes,
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error)
_g_local_file_enumerator_new (const char *filename,
const char *attributes,
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error)
{
GLocalFileEnumerator *local;
GDir *dir;
GError *dir_error;
int new_code;
dir_error = NULL;
dir = g_dir_open (filename, 0, error != NULL ? &dir_error : NULL);
......
......@@ -29,7 +29,7 @@
G_BEGIN_DECLS
#define G_TYPE_LOCAL_FILE_ENUMERATOR (g_local_file_enumerator_get_type ())
#define G_TYPE_LOCAL_FILE_ENUMERATOR (_g_local_file_enumerator_get_type ())
#define G_LOCAL_FILE_ENUMERATOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_LOCAL_FILE_ENUMERATOR, GLocalFileEnumerator))
#define G_LOCAL_FILE_ENUMERATOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_LOCAL_FILE_ENUMERATOR, GLocalFileEnumeratorClass))
#define G_IS_LOCAL_FILE_ENUMERATOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_LOCAL_FILE_ENUMERATOR))
......@@ -47,13 +47,13 @@ struct _GLocalFileEnumeratorClass
};
GType g_local_file_enumerator_get_type (void) G_GNUC_CONST;
GType _g_local_file_enumerator_get_type (void) G_GNUC_CONST;
GFileEnumerator *g_local_file_enumerator_new (const char *filename,
const char *attributes,
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error);
GFileEnumerator *_g_local_file_enumerator_new (const char *filename,
const char *attributes,
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error);
G_END_DECLS
......
......@@ -37,6 +37,7 @@
#include "gioalias.h"
#define g_local_file_input_stream_get_type _g_local_file_input_stream_get_type
G_DEFINE_TYPE (GLocalFileInputStream, g_local_file_input_stream, G_TYPE_FILE_INPUT_STREAM);
struct _GLocalFileInputStreamPrivate {
......@@ -113,7 +114,7 @@ g_local_file_input_stream_init (GLocalFileInputStream *info)
* Returns: #GFileInputStream for the given file descriptor.
**/
GFileInputStream *
g_local_file_input_stream_new (int fd)
_g_local_file_input_stream_new (int fd)
{
GLocalFileInputStream *stream;
......
......@@ -27,7 +27,7 @@
G_BEGIN_DECLS
#define G_TYPE_LOCAL_FILE_INPUT_STREAM (g_local_file_input_stream_get_type ())
#define G_TYPE_LOCAL_FILE_INPUT_STREAM (_g_local_file_input_stream_get_type ())
#define G_LOCAL_FILE_INPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_LOCAL_FILE_INPUT_STREAM, GLocalFileInputStream))
#define G_LOCAL_FILE_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_LOCAL_FILE_INPUT_STREAM, GLocalFileInputStreamClass))
#define G_IS_LOCAL_FILE_INPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_LOCAL_FILE_INPUT_STREAM))
......@@ -51,9 +51,9 @@ struct _GLocalFileInputStreamClass
GFileInputStreamClass parent_class;
};
GType g_local_file_input_stream_get_type (void) G_GNUC_CONST;
GType _g_local_file_input_stream_get_type (void) G_GNUC_CONST;
GFileInputStream *g_local_file_input_stream_new (int fd);
GFileInputStream *_g_local_file_input_stream_new (int fd);
G_END_DECLS
......
......@@ -143,7 +143,7 @@ _compare_monitor_class_by_prio (gconstpointer a,
return ret;
}
extern GType g_inotify_file_monitor_get_type (void);
extern GType _g_inotify_file_monitor_get_type (void);
static gpointer
get_default_local_file_monitor (gpointer data)
......@@ -155,7 +155,7 @@ get_default_local_file_monitor (gpointer data)
#if defined(HAVE_SYS_INOTIFY_H) || defined(HAVE_LINUX_INOTIFY_H)
/* Register Inotify monitor */
g_inotify_file_monitor_get_type ();
_g_inotify_file_monitor_get_type ();
#endif
g_io_modules_ensure_loaded (GIO_MODULE_DIR);
......@@ -198,8 +198,8 @@ get_default_local_file_monitor (gpointer data)
* Returns: a new #GFileMonitor for the given @pathname.
**/
GFileMonitor*
g_local_file_monitor_new (const char* pathname,
GFileMonitorFlags flags)
_g_local_file_monitor_new (const char* pathname,
GFileMonitorFlags flags)
{
static GOnce once_init = G_ONCE_INIT;
static GType monitor_type = G_TYPE_INVALID;
......@@ -211,3 +211,6 @@ g_local_file_monitor_new (const char* pathname,
return NULL;
}
#define __G_LOCAL_FILE_MONITOR_C__
#include "gioaliasdef.c"
......@@ -51,8 +51,8 @@ struct _GLocalFileMonitorClass {
GType g_local_file_monitor_get_type (void) G_GNUC_CONST;
GFileMonitor* g_local_file_monitor_new (const char* pathname,
GFileMonitorFlags flags);
GFileMonitor* _g_local_file_monitor_new (const char* pathname,
GFileMonitorFlags flags);
G_END_DECLS
......
......@@ -38,6 +38,7 @@
#include "gioalias.h"
#define g_local_file_output_stream_get_type _g_local_file_output_stream_get_type
G_DEFINE_TYPE (GLocalFileOutputStream, g_local_file_output_stream, G_TYPE_FILE_OUTPUT_STREAM);
/* Some of the file replacement code was based on the code from gedit,
......@@ -403,10 +404,10 @@ g_local_file_output_stream_query_info (GFileOutputStream *stream,
}
GFileOutputStream *
g_local_file_output_stream_create (const char *filename,
GFileCreateFlags flags,
GCancellable *cancellable,
GError **error)
_g_local_file_output_stream_create (const char *filename,
GFileCreateFlags flags,
GCancellable *cancellable,
GError **error)
{
GLocalFileOutputStream *stream;
int mode;
......@@ -446,10 +447,10 @@ g_local_file_output_stream_create (const char *filename,
}
GFileOutputStream *
g_local_file_output_stream_append (const char *filename,
GFileCreateFlags flags,
GCancellable *cancellable,
GError **error)
_g_local_file_output_stream_append (const char *filename,
GFileCreateFlags flags,
GCancellable *cancellable,
GError **error)
{
GLocalFileOutputStream *stream;
int mode;
......@@ -819,12 +820,12 @@ handle_overwrite_open (const char *filename,
}
GFileOutputStream *
g_local_file_output_stream_replace (const char *filename,
const char *etag,
gboolean create_backup,
GFileCreateFlags flags,
GCancellable *cancellable,
GError **error)
_g_local_file_output_stream_replace (const char *filename,
const char *etag,
gboolean create_backup,
GFileCreateFlags flags,
GCancellable *cancellable,
GError **error)
{
GLocalFileOutputStream *stream;
int mode;
......
......@@ -28,7 +28,7 @@
G_BEGIN_DECLS
#define G_TYPE_LOCAL_FILE_OUTPUT_STREAM (g_local_file_output_stream_get_type ())
#define G_TYPE_LOCAL_FILE_OUTPUT_STREAM (_g_local_file_output_stream_get_type ())
#define G_LOCAL_FILE_OUTPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_LOCAL_FILE_OUTPUT_STREAM, GLocalFileOutputStream))
#define G_LOCAL_FILE_OUTPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_LOCAL_FILE_OUTPUT_STREAM, GLocalFileOutputStreamClass))
#define G_IS_LOCAL_FILE_OUTPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_LOCAL_FILE_OUTPUT_STREAM))
......@@ -52,21 +52,21 @@ struct _GLocalFileOutputStreamClass
GFileOutputStreamClass parent_class;
};
GType g_local_file_output_stream_get_type (void) G_GNUC_CONST;
GFileOutputStream *g_local_file_output_stream_create (const char *filename,
GFileCreateFlags flags,
GCancellable *cancellable,
GError **error);
GFileOutputStream *