[glib/gsettings: 194/327] Merge branch 'master' into gvariant
- From: Ryan Lortie <ryanl src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glib/gsettings: 194/327] Merge branch 'master' into gvariant
- Date: Thu, 27 Aug 2009 17:48:32 +0000 (UTC)
commit ff99e84644cbc0508408f92917aa8c5ee8be7710
Merge: b2ad0e8... 4dbc207...
Author: Ryan Lortie <desrt desrt ca>
Date: Sun Jun 14 14:01:32 2009 -0400
Merge branch 'master' into gvariant
Conflicts:
docs/reference/gobject/gobject-sections.txt
gobject/gboxed.c
gobject/gboxed.h
.gitignore | 3 +
NEWS | 83 +
README.win32 | 13 +-
autogen.sh | 10 +-
build/win32/make.msc | 120 +-
build/win32/module.defs | 29 +-
config.h.win32.in | 3 +
configure.in | 48 +-
docs/reference/gio/#gio-unused.txt# | 100 +
docs/reference/gio/Makefile.am | 38 +-
docs/reference/gio/aa | 74 +
docs/reference/gio/b | 77 +
docs/reference/gio/bb | 77 +
docs/reference/gio/gio-docs.xml | 46 +-
docs/reference/gio/gio-sections.txt | 374 +++-
docs/reference/gio/gio.types | 27 +-
docs/reference/gio/gvfs-overview.odg | Bin 10542 -> 17772 bytes
docs/reference/gio/gvfs-overview.png | Bin 49138 -> 48474 bytes
docs/reference/gio/overview.xml | 28 +
docs/reference/glib/glib-docs.sgml | 3 +
docs/reference/glib/glib-sections.txt | 21 +
docs/reference/glib/tmpl/arrays.sgml | 41 +-
docs/reference/glib/tmpl/arrays_byte.sgml | 23 +-
docs/reference/glib/tmpl/arrays_pointer.sgml | 64 +-
docs/reference/glib/tmpl/error_reporting.sgml | 12 +
docs/reference/glib/tmpl/hash_tables.sgml | 38 +
docs/reference/glib/tmpl/macros_misc.sgml | 32 +-
docs/reference/glib/tmpl/types.sgml | 33 +-
docs/reference/gobject/gobject-docs.sgml | 3 +
docs/reference/gobject/gobject-sections.txt | 6 +
gio/Makefile.am | 34 +
gio/fen/fen-data.c | 158 +-
gio/fen/fen-data.h | 28 +-
gio/fen/fen-dump.c | 2 +-
gio/fen/fen-helper.c | 76 +-
gio/fen/fen-helper.h | 6 +-
gio/fen/fen-kernel.c | 24 +-
gio/fen/fen-kernel.h | 14 +-
gio/fen/fen-missing.c | 10 +-
gio/fen/fen-missing.h | 4 +-
gio/fen/fen-node.c | 38 +-
gio/fen/fen-node.h | 22 +-
gio/fen/fen-sub.c | 4 +-
gio/fen/fen-sub.h | 4 +-
gio/fen/gfendirectorymonitor.c | 16 +-
gio/fen/gfenfilemonitor.c | 16 +-
gio/fen/libfen_la-fen-dump.loT | 7 +
gio/gasynchelper.c | 38 +-
gio/gasynchelper.h | 14 +-
gio/gasyncinitable.c | 393 ++++
gio/gasyncinitable.h | 119 +
gio/gcancellable.c | 161 +-
gio/gcancellable.h | 2 +-
gio/gdesktopappinfo.c | 231 +--
gio/gfile.c | 703 ++++++-
gio/gfile.h | 92 +
gio/gfileenumerator.c | 2 +-
gio/gfileinputstream.c | 10 +-
gio/gfileiostream.c | 677 ++++++
gio/gfileiostream.h | 118 +
gio/gfilemonitor.c | 3 +
gio/gfileoutputstream.c | 17 +-
gio/ginetaddress.c | 213 ++-
gio/ginetaddress.h | 2 +
gio/ginetsocketaddress.c | 49 +-
gio/ginitable.c | 252 ++
gio/ginitable.h | 96 +
gio/ginputstream.c | 20 +-
gio/gio-marshal.list | 1 +
gio/gio.h | 12 +
gio/gio.rc.in | 30 +
gio/gio.symbols | 216 ++
gio/gioenums.h | 91 +-
gio/gioerror.c | 6 +
gio/giostream.c | 618 +++++
gio/giostream.h | 112 +
gio/giotypes.h | 127 +
gio/glocalfile.c | 67 +
gio/glocalfileinfo.c | 2 +-
gio/glocalfileinputstream.c | 12 +
gio/glocalfileinputstream.h | 5 +-
gio/glocalfileiostream.c | 114 +
gio/glocalfileiostream.h | 60 +
gio/glocalfileoutputstream.c | 128 +-
gio/glocalfileoutputstream.h | 14 +
gio/gmount.c | 16 +
gio/gmount.h | 4 +
gio/gnetworkaddress.c | 185 ++-
gio/gnetworkaddress.h | 14 +-
gio/gnetworkingprivate.h | 14 +-
gio/gnetworkservice.c | 37 +-
gio/goutputstream.c | 19 +-
gio/gresolver.c | 51 +-
gio/gresolver.h | 7 +-
gio/gsimpleasyncresult.c | 34 +-
gio/gsocket.c | 3111 +++++++++++++++++++++++++
gio/gsocket.h | 168 ++
gio/gsocketaddress.c | 29 +-
gio/gsocketaddress.h | 6 +-
gio/gsocketaddressenumerator.c | 34 +-
gio/gsocketaddressenumerator.h | 2 +-
gio/gsocketclient.c | 1010 ++++++++
gio/gsocketclient.h | 130 +
gio/gsocketconnectable.c | 6 +-
gio/gsocketconnectable.h | 4 +-
gio/gsocketconnection.c | 499 ++++
gio/gsocketconnection.h | 91 +
gio/gsocketcontrolmessage.c | 216 ++
gio/gsocketcontrolmessage.h | 105 +
gio/gsocketinputstream.c | 264 +++
gio/gsocketinputstream.h | 58 +
gio/gsocketlistener.c | 903 +++++++
gio/gsocketlistener.h | 134 ++
gio/gsocketoutputstream.c | 266 +++
gio/gsocketoutputstream.h | 58 +
gio/gsocketservice.c | 332 +++
gio/gsocketservice.h | 88 +
gio/gsrvtarget.c | 110 +-
gio/gtcpconnection.c | 400 ++++
gio/gtcpconnection.h | 68 +
gio/gthemedicon.c | 6 +-
gio/gthemedicon.h | 2 +-
gio/gthreadedresolver.c | 11 +-
gio/gthreadedsocketservice.c | 278 +++
gio/gthreadedsocketservice.h | 81 +
gio/gunixconnection.c | 293 +++
gio/gunixconnection.h | 77 +
gio/gunixfdmessage.c | 269 +++
gio/gunixfdmessage.h | 73 +
gio/gunixmount.c | 2 +
gio/gunixresolver.c | 3 +-
gio/gunixsocketaddress.c | 312 ++-
gio/gunixsocketaddress.h | 9 +-
gio/gunixvolume.c | 3 +-
gio/inotify/inotify-helper.c | 4 +-
gio/libasyncns/g-asyncns.h | 11 +
gio/makefile.msc | 82 +-
gio/pltcheck.sh | 2 +-
gio/tests/.gitignore | 7 +
gio/tests/Makefile.am | 32 +-
gio/tests/echo-server.c | 73 +
gio/tests/httpd.c | 183 ++
gio/tests/live-g-file.c | 4 +-
gio/tests/readwrite.c | 293 +++
gio/tests/send-data.c | 163 ++
gio/tests/socket-client.c | 294 +++
gio/tests/socket-server.c | 305 +++
gio/tests/srvtarget.c | 157 ++
gio/win32/gwinhttpfile.c | 15 +-
gio/win32/gwinhttpfileinputstream.c | 23 +-
gio/win32/makefile.msc | 35 +
gio/xdgmime/xdgmimeglob.c | 1 -
glib/garray.c | 255 ++-
glib/garray.h | 10 +
glib/gbase64.c | 2 +-
glib/gerror.c | 16 +-
glib/gerror.h | 6 +
glib/ghash.c | 13 +-
glib/ghash.h | 8 +
glib/giowin32.c | 4 +
glib/gkeyfile.c | 12 +-
glib/glib.symbols | 14 +
glib/gmain.c | 15 +-
glib/gmappedfile.c | 5 +
glib/gmarkup.c | 1167 ++++------
glib/gsequence.c | 2 +-
glib/gspawn.c | 3 +-
glib/gstring.c | 54 +-
glib/gutf8.c | 12 +-
glib/gutils.c | 78 +
glib/makefile.msc.in | 114 +-
glib/pcre/pcre_ucp_searchfuncs.c | 4 +
glib/pcre/pcre_valid_utf8.c | 1 +
glib/tests/array-test.c | 172 ++
glib/tests/keyfile.c | 1 +
glib/tests/string.c | 23 +
glib/update-pcre/pcre_ucp_searchfuncs.c | 4 +
glib/update-pcre/pcre_valid_utf8.c | 1 +
glibconfig.h.win32.in | 10 +
gobject/gboxed.c | 32 +
gobject/gboxed.h | 27 +
gobject/gobject.symbols | 3 +
po/LINGUAS | 1 +
po/am.po | 421 ++--
po/ar.po | 481 ++--
po/as.po | 495 ++--
po/az.po | 471 ++--
po/be.po | 501 ++---
po/be latin po | 504 ++---
po/bg.po | 504 ++--
po/bn.po | 466 ++--
po/bn_IN.po | 1024 ++++-----
po/bs.po | 471 ++--
po/ca.po | 521 +++--
po/ca valencia po | 1940 +++++++++++++++
po/cs.po | 508 ++--
po/cy.po | 470 ++--
po/da.po | 500 ++--
po/de.po | 509 ++--
po/dz.po | 467 ++--
po/el.po | 502 ++--
po/en_CA.po | 484 ++--
po/en_GB.po | 495 ++--
po/eo.po | 465 ++--
po/es.po | 512 ++--
po/et.po | 443 ++--
po/eu.po | 507 ++--
po/fa.po | 471 ++--
po/fi.po | 499 ++--
po/fr.po | 509 ++--
po/ga.po | 439 ++--
po/gl.po | 503 ++--
po/gu.po | 491 ++--
po/he.po | 495 ++--
po/hi.po | 491 ++--
po/hr.po | 468 ++--
po/hu.po | 502 ++--
po/hy.po | 423 ++--
po/id.po | 477 ++--
po/is.po | 468 ++--
po/it.po | 506 ++--
po/ja.po | 500 ++--
po/ka.po | 467 ++--
po/kn.po | 497 ++--
po/ko.po | 503 ++--
po/ku.po | 405 ++--
po/lt.po | 500 ++--
po/lv.po | 471 ++--
po/mai.po | 481 ++--
po/mg.po | 473 ++--
po/mk.po | 478 ++--
po/ml.po | 495 ++--
po/mn.po | 471 ++--
po/mr.po | 494 ++--
po/ms.po | 471 ++--
po/nb.po | 949 ++++----
po/ne.po | 469 ++--
po/nl.po | 516 ++--
po/nn.po | 473 ++--
po/oc.po | 404 ++--
po/or.po | 425 ++--
po/pa.po | 491 ++--
po/pl.po | 501 ++--
po/ps.po | 932 ++++----
po/pt.po | 500 ++--
po/pt_BR.po | 501 ++--
po/ro.po | 502 ++--
po/ru.po | 508 ++--
po/rw.po | 471 ++--
po/si.po | 448 ++--
po/sk.po | 476 ++--
po/sl.po | 497 ++--
po/sq.po | 524 ++---
po/sr.po | 466 ++--
po/sr ije po | 477 ++--
po/sr latin po | 466 ++--
po/sv.po | 500 ++--
po/ta.po | 493 ++--
po/te.po | 491 ++--
po/th.po | 491 ++--
po/tl.po | 480 ++--
po/tr.po | 499 ++--
po/tt.po | 433 ++--
po/uk.po | 496 ++--
po/vi.po | 498 ++--
po/wa.po | 450 ++--
po/xh.po | 474 ++--
po/yi.po | 468 ++--
po/zh_CN.po | 491 ++--
po/zh_HK.po | 491 ++--
po/zh_TW.po | 491 ++--
tests/Makefile.am | 9 +-
tests/makefile.msc.in | 39 +-
tests/markups/fail-36.gmarkup | Bin 13 -> 42 bytes
tests/regex-test.c | 2 +
275 files changed, 41433 insertions(+), 24329 deletions(-)
---
diff --cc docs/reference/gobject/gobject-sections.txt
index c4cc2b1,b970c28..8cea880
--- a/docs/reference/gobject/gobject-sections.txt
+++ b/docs/reference/gobject/gobject-sections.txt
@@@ -341,7 -341,9 +341,10 @@@ G_TYPE_DAT
G_TYPE_GSTRING
G_TYPE_STRV
G_TYPE_REGEX
+G_TYPE_VARIANT
+ G_TYPE_ARRAY
+ G_TYPE_BYTE_ARRAY
+ G_TYPE_PTR_ARRAY
GStrv
<SUBSECTION Standard>
@@@ -353,7 -355,9 +356,10 @@@ g_strv_get_typ
g_date_get_type
g_hash_table_get_type
g_regex_get_type
+g_variant_get_gtype
+ g_array_get_type
+ g_byte_array_get_type
+ g_ptr_array_get_type
</SECTION>
<SECTION>
diff --cc gobject/gboxed.c
index f2ba73c,e3a6170..75677a3
--- a/gobject/gboxed.c
+++ b/gobject/gboxed.c
@@@ -275,15 -275,35 +275,47 @@@ g_regex_get_type (void
}
GType
+g_variant_get_gtype (void)
+{
+ static GType type_id = 0;
+
+ if (!type_id)
+ type_id = g_boxed_type_register_static (g_intern_static_string ("GVariant"),
+ (GBoxedCopyFunc) g_variant_ref,
+ (GBoxedFreeFunc) g_variant_unref);
++ return type_id;
++}
++
++GType
+ g_array_get_type (void)
+ {
+ static GType type_id = 0;
+ if (!type_id)
+ type_id = g_boxed_type_register_static (g_intern_static_string ("GArray"),
+ (GBoxedCopyFunc) g_array_ref,
+ (GBoxedFreeFunc) g_array_unref);
+ return type_id;
+ }
+
+ GType
+ g_ptr_array_get_type (void)
+ {
+ static GType type_id = 0;
+ if (!type_id)
+ type_id = g_boxed_type_register_static (g_intern_static_string ("GPtrArray"),
+ (GBoxedCopyFunc) g_ptr_array_ref,
+ (GBoxedFreeFunc) g_ptr_array_unref);
+ return type_id;
+ }
+ GType
+ g_byte_array_get_type (void)
+ {
+ static GType type_id = 0;
+ if (!type_id)
+ type_id = g_boxed_type_register_static (g_intern_static_string ("GByteArray"),
+ (GBoxedCopyFunc) g_byte_array_ref,
+ (GBoxedFreeFunc) g_byte_array_unref);
return type_id;
}
diff --cc gobject/gboxed.h
index 3c9a23f,82e2722..ecc1326
--- a/gobject/gboxed.h
+++ b/gobject/gboxed.h
@@@ -163,13 -163,29 +163,37 @@@ GType g_boxed_type_register_static (co
*/
#define G_TYPE_REGEX (g_regex_get_type ())
/**
+ * G_TYPE_VARIANT:
+ *
+ * The #GType for a boxed type holding a #GVariant reference.
+ *
+ * Since: 2.14
+ */
+#define G_TYPE_VARIANT (g_variant_get_gtype ())
++/**
+ * G_TYPE_ARRAY:
+ *
+ * The #GType for a boxed type holding a #GArray reference.
+ *
+ * Since: 2.22
+ */
+ #define G_TYPE_ARRAY (g_array_get_type ())
+ /**
+ * G_TYPE_BYTE_ARRAY:
+ *
+ * The #GType for a boxed type holding a #GByteArray reference.
+ *
+ * Since: 2.22
+ */
+ #define G_TYPE_BYTE_ARRAY (g_byte_array_get_type ())
+ /**
+ * G_TYPE_PTR_ARRAY:
+ *
+ * The #GType for a boxed type holding a #GPtrArray reference.
+ *
+ * Since: 2.22
+ */
+ #define G_TYPE_PTR_ARRAY (g_ptr_array_get_type ())
void g_value_take_boxed (GValue *value,
@@@ -185,7 -201,9 +209,10 @@@ GType g_date_get_type (void) G_
GType g_strv_get_type (void) G_GNUC_CONST;
GType g_gstring_get_type (void) G_GNUC_CONST;
GType g_hash_table_get_type (void) G_GNUC_CONST;
+GType g_variant_get_gtype (void) G_GNUC_CONST;
+ GType g_array_get_type (void) G_GNUC_CONST;
+ GType g_byte_array_get_type (void) G_GNUC_CONST;
+ GType g_ptr_array_get_type (void) G_GNUC_CONST;
GType g_regex_get_type (void) G_GNUC_CONST;
/**
diff --cc gobject/gobject.symbols
index 4a2aa99,a43dd08..3e0e162
--- a/gobject/gobject.symbols
+++ b/gobject/gobject.symbols
@@@ -20,8 -20,10 +20,11 @@@ g_date_get_type G_GNUC_CONS
g_gstring_get_type G_GNUC_CONST
g_strv_get_type G_GNUC_CONST
g_hash_table_get_type G_GNUC_CONST
+ g_array_get_type G_GNUC_CONST
+ g_byte_array_get_type G_GNUC_CONST
+ g_ptr_array_get_type G_GNUC_CONST
g_regex_get_type G_GNUC_CONST
+g_variant_get_gtype G_GNUC_CONST
g_closure_get_type G_GNUC_CONST
g_value_get_type G_GNUC_CONST
g_value_array_get_type G_GNUC_CONST
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
