[glib/gsettings: 111/111] Merge commit '2.22.2' into gsettings
- From: Ryan Lortie <ryanl src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glib/gsettings: 111/111] Merge commit '2.22.2' into gsettings
- Date: Sat, 10 Oct 2009 21:15:13 +0000 (UTC)
commit 1003034af5a8b341707af1e9e843ef2f901e3bc9
Merge: 330efe5... f814174...
Author: Ryan Lortie <desrt desrt ca>
Date: Wed Oct 7 20:19:58 2009 -0400
Merge commit '2.22.2' into gsettings
NEWS | 86 ++
README.in | 2 +-
autogen.sh | 22 +-
build/win32/Makefile.am | 10 +-
build/win32/vs9/gio.vcproj | 110 +++-
build/win32/vs9/glib.vcproj | 10 +-
build/win32/vs9/gmodule.vcproj | 2 +-
build/win32/vs9/gobject.vcproj | 2 +-
build/win32/vs9/gspawn-win32-helper.vcproj | 2 +-
build/win32/vs9/gthread.vcproj | 2 +-
build/win32/vs9/install.vcproj | 4 +-
configure.in | 10 +-
docs/reference/glib/glib-sections.txt | 3 +
docs/reference/glib/running.sgml | 34 +
docs/reference/glib/tmpl/arrays_pointer.sgml | 7 +-
docs/reference/glib/tmpl/glib-unused.sgml | 67 --
docs/reference/glib/tmpl/macros_misc.sgml | 5 +-
docs/reference/glib/tmpl/main.sgml | 7 +
docs/reference/glib/tmpl/testing.sgml | 21 +
docs/reference/glib/tmpl/version.sgml | 68 ++
gio/Makefile.am | 4 +-
gio/gappinfo.c | 10 +-
gio/gappinfo.h | 4 +-
gio/gasyncresult.c | 11 +-
gio/gbufferedinputstream.c | 4 +-
gio/gbufferedoutputstream.c | 9 +-
gio/gcancellable.c | 3 +-
gio/gdatainputstream.c | 13 +-
gio/gdesktopappinfo.c | 11 +-
gio/gdummyfile.c | 5 +-
gio/ginputstream.c | 16 +-
gio/giostream.c | 4 -
gio/glocalfile.c | 23 +-
gio/glocalfileinfo.c | 13 +-
gio/glocalfileinputstream.c | 4 -
gio/gmemoryoutputstream.c | 6 +-
gio/gnetworkaddress.c | 5 -
gio/goutputstream.c | 34 +-
gio/gsimpleasyncresult.c | 6 +-
gio/gsimpleasyncresult.h | 2 +-
gio/gsocket.c | 5 +
gio/gthemedicon.c | 2 +-
gio/gunixinputstream.c | 4 -
gio/gunixoutputstream.c | 4 -
gio/gvolumemonitor.c | 4 -
gio/inotify/inotify-kernel.c | 4 +-
gio/win32/Makefile.am | 1 +
gio/xdgmime/Makefile.am | 5 -
gio/xdgmime/test-mime.c | 196 ----
gio/xdgmime/xdgmime.c | 4 +-
gio/xdgmime/xdgmimecache.c | 99 ++-
gio/xdgmime/xdgmimeglob.c | 172 +++-
gio/xdgmime/xdgmimeglob.h | 6 +-
glib/Makefile.am | 22 +-
glib/garray.c | 8 +-
glib/gfileutils.c | 3 +-
glib/gkeyfile.c | 3 +-
glib/glib.py | 252 +++++
glib/glib.symbols | 3 +
glib/gmessages.c | 51 +-
glib/gregex.c | 6 +-
glib/gtestutils.c | 1 +
glib/gtestutils.h | 21 +
glib/gutf8.c | 16 +-
glib/libglib-gdb.py.in | 10 +
glib/tests/array-test.c | 4 +-
glib/tests/testing.c | 27 +
gmodule/Makefile.am | 4 +-
gobject/Makefile.am | 22 +-
gobject/glib-mkenums.in | 2 +-
gobject/gobject.c | 83 ++-
gobject/gobject.h | 4 +-
gobject/gobject.py | 305 ++++++
gobject/gobjectnotifyqueue.c | 9 +-
gobject/gtype.h | 12 +-
gobject/libgobject-gdb.py.in | 10 +
gthread/Makefile.am | 4 +-
po/POTFILES.in | 1 -
po/POTFILES.skip | 1 +
po/am.po | 244 +++---
po/ar.po | 247 +++---
po/as.po | 258 +++---
po/az.po | 244 +++---
po/be.po | 245 +++---
po/be latin po | 247 +++---
po/bg.po | 258 +++---
po/bn.po | 1281 ++++++++++++--------------
po/bn_IN.po | 387 ++++----
po/bs.po | 244 +++---
po/ca.po | 410 ++++-----
po/ca valencia po | 247 +++---
po/cs.po | 253 +++---
po/cy.po | 245 +++---
po/da.po | 252 +++---
po/de.po | 247 +++---
po/dz.po | 245 +++---
po/el.po | 306 +++----
po/en_CA.po | 247 +++---
po/en_GB.po | 440 +++++-----
po/eo.po | 244 +++---
po/es.po | 254 +++---
po/et.po | 247 +++---
po/eu.po | 247 +++---
po/fa.po | 245 +++---
po/fi.po | 252 +++---
po/fr.po | 247 +++---
po/ga.po | 246 +++---
po/gl.po | 273 +++---
po/gu.po | 252 +++---
po/he.po | 252 +++---
po/hi.po | 253 +++---
po/hr.po | 244 +++---
po/hu.po | 247 +++---
po/hy.po | 244 +++---
po/id.po | 245 +++---
po/is.po | 244 +++---
po/it.po | 247 +++---
po/ja.po | 252 +++---
po/ka.po | 245 +++---
po/kn.po | 252 +++---
po/ko.po | 247 +++---
po/ku.po | 244 +++---
po/lt.po | 247 +++---
po/lv.po | 244 +++---
po/mai.po | 247 +++---
po/mg.po | 245 +++---
po/mk.po | 247 +++---
po/ml.po | 332 ++++----
po/mn.po | 245 +++---
po/mr.po | 252 +++---
po/ms.po | 244 +++---
po/nb.po | 254 +++---
po/ne.po | 245 +++---
po/nl.po | 247 +++---
po/nn.po | 247 +++---
po/oc.po | 245 +++---
po/or.po | 261 +++---
po/pa.po | 260 +++---
po/pl.po | 254 +++---
po/ps.po | 247 +++---
po/pt.po | 247 +++---
po/pt_BR.po | 247 +++---
po/ro.po | 411 ++++-----
po/ru.po | 410 ++++-----
po/rw.po | 244 +++---
po/si.po | 245 +++---
po/sk.po | 246 +++---
po/sl.po | 411 ++++-----
po/sq.po | 247 +++---
po/sr.po | 931 +++++++++----------
po/sr ije po | 244 +++---
po/sr latin po | 927 +++++++++----------
po/sv.po | 247 +++---
po/ta.po | 258 +++---
po/te.po | 253 +++---
po/th.po | 252 +++---
po/tl.po | 245 +++---
po/tr.po | 247 +++---
po/tt.po | 245 +++---
po/uk.po | 438 ++++------
po/vi.po | 249 +++---
po/wa.po | 244 +++---
po/xh.po | 245 +++---
po/yi.po | 244 +++---
po/zh_CN.po | 403 ++++-----
po/zh_HK.po | 254 +++---
po/zh_TW.po | 254 +++---
tests/gobject/Makefile.am | 4 +
tests/gobject/performance-threaded.c | 381 ++++++++
tests/gobject/performance.c | 735 +++++++++++++++
tests/gobject/run-performance.sh | 7 +
171 files changed, 15061 insertions(+), 13838 deletions(-)
---
diff --cc gio/Makefile.am
index 6bb2947,6df1c2a..48805a0
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@@ -443,11 -430,7 +443,11 @@@ if HAVE_GLIB_RUNTIME_LIBDI
install-data-hook:
mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
mv $(DESTDIR)$(libdir)/libgio-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
- mv $(DESTDIR)$(libdir)/libgio-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ mv $(DESTDIR)$(libdir)/libgio-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
rm -f $(DESTDIR)$(libdir)/libgio-2.0.so
- ln -s $(GLIB_RUNTIME_LIBDIR)/libgio-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/libgio-2.0.so
+ ln -s $(GLIB_RUNTIME_LIBDIR)/libgio-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/libgio-2.0.so
endif
+
+libexec_PROGRAMS = gsettings-update-schema-cache
+gsettings_update_schema_cache_SOURCES = gsettings-update-schema-cache.c
+gsettings_update_schema_cache_LDADD = ../glib/libglib-2.0.la
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
