[glib/wip/gsettings-list: 131/131] Merge branch 'master' into wip/gsettings-list
- From: Rodrigo Moya <rodrigo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/gsettings-list: 131/131] Merge branch 'master' into wip/gsettings-list
- Date: Tue, 11 Jan 2011 14:59:49 +0000 (UTC)
commit d75842ff4c8c9d78dbd5462409ab2c93600fa9a6
Merge: 65bd1f5 fabf506
Author: Rodrigo Moya <rodrigo gnome-db org>
Date: Tue Jan 11 15:59:14 2011 +0100
Merge branch 'master' into wip/gsettings-list
Makefile.decl | 18 +-
NEWS | 89 +
build/win32/vs9/glib.vsprops | 9 +-
configure.ac | 11 +-
docs/reference/gio/gio-docs.xml | 4 -
docs/reference/gio/gio-sections.txt | 40 +-
docs/reference/gio/gio.types | 1 -
docs/reference/gio/overview.xml | 9 +-
docs/reference/glib/building.sgml | 25 +-
docs/reference/glib/glib-sections.txt | 3 +
gio/Makefile.am | 4 -
gio/gaction.c | 9 +-
gio/gappinfo.c | 31 +-
gio/gappinfo.h | 9 +-
gio/gapplication.c | 8 +-
gio/gapplicationcommandline.c | 8 +-
gio/gapplicationimpl-dbus.c | 6 +-
gio/gasyncresult.h | 4 +-
gio/gbufferedinputstream.c | 15 +-
gio/gcancellable.c | 6 +-
gio/gcontenttype.c | 4 +-
gio/gconverter.c | 7 +-
gio/gdatainputstream.c | 96 +-
gio/gdataoutputstream.c | 16 +-
gio/gdbusconnection.c | 3 +-
gio/gdbusprivate.c | 14 +-
gio/gdesktopappinfo.c | 520 +++-
gio/gdesktopappinfo.h | 24 +
gio/gdrive.c | 34 +-
gio/gdummytlsbackend.c | 63 +-
gio/gemblem.c | 6 +-
gio/gemblemedicon.c | 137 +-
gio/gemblemedicon.h | 15 +
gio/gfile.c | 183 +-
gio/gfileenumerator.c | 16 +-
gio/gfileenumerator.h | 4 +-
gio/gfileinputstream.c | 8 +-
gio/gfileinputstream.h | 2 +-
gio/gfileiostream.c | 8 +-
gio/gfileiostream.h | 2 +-
gio/gfileoutputstream.h | 2 +-
gio/gicon.c | 4 +-
gio/ginetaddress.c | 2 +-
gio/ginetsocketaddress.c | 2 +-
gio/ginputstream.c | 28 +-
gio/gio.h | 1 -
gio/gio.symbols | 42 +-
gio/gioenums.h | 25 +-
gio/giomodule.c | 3 +-
gio/giostream.c | 260 ++-
gio/giostream.h | 11 +
gio/gloadableicon.c | 12 +-
gio/glocalfile.c | 2 +
gio/gmemoryinputstream.c | 8 +-
gio/gmemoryoutputstream.c | 12 +-
gio/gmemorysettingsbackend.c | 9 +-
gio/gmemorysettingsbackend.h | 30 -
gio/gmount.c | 33 +-
gio/gnetworkaddress.c | 94 +-
gio/gnullsettingsbackend.c | 12 +-
gio/gnullsettingsbackend.h | 30 -
gio/goutputstream.c | 36 +-
gio/goutputstream.h | 2 +-
gio/gperiodic.c | 765 ------
gio/gperiodic.h | 88 -
gio/gpollableinputstream.c | 13 +-
gio/gpollableoutputstream.c | 12 +-
gio/gproxy.c | 11 +-
gio/gproxyaddress.c | 6 +-
gio/gproxyresolver.c | 18 +-
gio/gresolver.c | 24 +-
gio/gschema.dtd | 11 +-
gio/gseekable.c | 4 +-
gio/gsettings-tool.c | 4 +-
gio/gsettings.c | 47 +-
gio/gsettings.h | 5 +-
gio/gsettingsbackend.c | 17 +-
gio/gsettingsbackend.h | 6 +
gio/gsettingsbackendinternal.h | 8 +-
gio/gsimpleactiongroup.c | 4 +-
gio/gsimpleasyncresult.c | 61 +-
gio/gsocket.c | 48 +-
gio/gsocketaddressenumerator.c | 9 +-
gio/gsocketclient.c | 48 +-
gio/gsocketcontrolmessage.c | 2 +-
gio/gsocketlistener.c | 28 +-
gio/gsocks5proxy.c | 2 +-
gio/gthemedicon.c | 2 +-
gio/gtlscertificate.c | 92 +-
gio/gtlscertificate.h | 32 +-
gio/gtlsclientconnection.c | 40 +-
gio/gtlsclientconnection.h | 4 +-
gio/gtlsconnection.c | 391 ++--
gio/gtlsconnection.h | 61 +-
gio/gtlsserverconnection.c | 4 +-
gio/gtlsserverconnection.h | 2 +-
gio/gunixconnection.c | 4 +-
gio/gunixfdlist.c | 14 +-
gio/gunixfdmessage.c | 6 +-
gio/gunixmounts.c | 20 +-
gio/gunixsocketaddress.c | 4 +-
gio/gvolume.c | 13 +-
gio/tests/.gitignore | 1 +
gio/tests/Makefile.am | 4 +
gio/tests/desktop-app-info.c | 56 +-
gio/tests/gdbus-connection.c | 18 +-
gio/tests/io-stream.c | 185 ++
gio/tests/resolver.c | 40 +-
gio/tests/socket-client.c | 2 +-
gio/tests/socket-server.c | 4 +-
glib/gfileutils.c | 19 +
glib/ghostutils.c | 53 +-
glib/giochannel.c | 37 +-
glib/gkeyfile.c | 14 +-
glib/glib.symbols | 3 +
glib/grand.c | 4 +-
glib/grand.h | 2 +-
glib/gsequence.c | 138 +-
glib/gsequence.h | 8 +
glib/gtester-report | 5 +
glib/gutils.c | 93 +-
glib/gutils.h | 2 +
glib/gvariant-parser.c | 83 +-
glib/gvariant.c | 21 +-
glib/gvariant.h | 19 +-
glib/tests/hostutils.c | 61 +
glib/tests/rand.c | 3 +-
glib/tests/regex.c | 2 +
glib/tests/sequence.c | 76 +
glib/tests/utils.c | 15 +
gobject/gboxed.c | 4 +-
gobject/gclosure.c | 29 +-
gobject/gobject.c | 124 +-
gobject/gparam.c | 43 +-
gobject/gparamspecs.c | 46 +-
gobject/gtype.c | 108 +-
gobject/gvalue.c | 13 +-
gobject/gvaluearray.c | 29 +-
gobject/gvaluetypes.c | 2 +-
gobject/tests/Makefile.am | 14 +-
{tests/gobject => gobject/tests}/ifaceproperties.c | 379 ++-
gobject/tests/testcommon.h | 100 +
gthread/tests/1bit-mutex.c | 3 -
m4macros/gsettings.m4 | 2 +-
mkinstalldirs | 93 +-
po/es.po | 355 ++--
po/et.po | 594 +++--
po/gl.po | 386 ++--
po/he.po | 240 +-
po/id.po | 1531 ++++++-----
po/nb.po | 467 ++--
po/sv.po | 1405 ++++++-----
po/ug.po | 547 ++--
po/vi.po | 2876 +++++++++++++-------
po/zh_CN.po | 251 +-
tests/gobject/Makefile.am | 1 -
tests/testglib.c | 6 +-
157 files changed, 8615 insertions(+), 6062 deletions(-)
---
diff --cc gio/gmemorysettingsbackend.c
index 8176b60,5d747b5..eceebc1
--- a/gio/gmemorysettingsbackend.c
+++ b/gio/gmemorysettingsbackend.c
@@@ -363,10 -171,11 +362,16 @@@ g_memory_settings_backend_class_init (G
backend_class->reset = g_memory_settings_backend_reset;
backend_class->get_writable = g_memory_settings_backend_get_writable;
backend_class->get_permission = g_memory_settings_backend_get_permission;
+ backend_class->list = g_memory_settings_backend_list;
+ backend_class->can_insert = g_memory_settings_backend_can_insert;
+ backend_class->can_remove = g_memory_settings_backend_can_remove;
+ backend_class->insert = g_memory_settings_backend_insert;
+ backend_class->remove = g_memory_settings_backend_remove;
object_class->finalize = g_memory_settings_backend_finalize;
}
+
+ GSettingsBackend *
+ g_memory_settings_backend_new (void)
+ {
+ return g_object_new (G_TYPE_MEMORY_SETTINGS_BACKEND, NULL);
+ }
diff --cc gio/gsettingsbackendinternal.h
index 6a4230c,e009b31..8a423e0
--- a/gio/gsettingsbackendinternal.h
+++ b/gio/gsettingsbackendinternal.h
@@@ -103,31 -91,13 +103,35 @@@ void g_settings_back
G_GNUC_INTERNAL
GPermission * g_settings_backend_get_permission (GSettingsBackend *backend,
const gchar *path);
+
+G_GNUC_INTERNAL
+gboolean g_settings_backend_check (GSettingsBackend *backend,
+ const gchar *path);
+G_GNUC_INTERNAL
+gboolean g_settings_backend_insert (GSettingsBackend *backend,
+ const gchar *path,
+ gint index,
+ const gchar *prefix,
+ gchar **name);
+G_GNUC_INTERNAL
+gboolean g_settings_backend_remove (GSettingsBackend *backend,
+ const gchar *path,
+ const gchar *id);
+G_GNUC_INTERNAL
+gboolean g_settings_backend_can_insert (GSettingsBackend *backend,
+ const gchar *path);
+G_GNUC_INTERNAL
+gboolean g_settings_backend_can_remove (GSettingsBackend *backend,
+ const gchar *path,
+ const gchar *id);
+
G_GNUC_INTERNAL
- GSettingsBackend * g_settings_backend_get_default (void);
- G_GNUC_INTERNAL
void g_settings_backend_sync_default (void);
+ G_GNUC_INTERNAL
+ GType g_null_settings_backend_get_type (void);
+
+ G_GNUC_INTERNAL
+ GType g_memory_settings_backend_get_type (void);
+
#endif /* __G_SETTINGS_BACKEND_INTERNAL_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
