[evolution-data-server/openismus-work: 44/44] Merge remote-tracking branch 'origin/gnome-3-6' into openismus-work

[Patrick Ohly <pohly src gnome org>]

commit 4247d751f5f27d3b1a78d50e1ab77c9ef90eba3c
Merge: 4f50d08 7babb93
Author: Patrick Ohly <patrick ohly intel com>
Date:   Thu Mar 21 12:58:44 2013 +0100

    Merge remote-tracking branch 'origin/gnome-3-6' into openismus-work
    
    Conflicts:
        addressbook/backends/file/e-book-backend-file.c
    
    Changes wered made to locking of Berkley DB. All changes
    were also made already for sqlite.
    
        configure.ac
    
    Simple version conflict.
    
        docs/reference/libedataserverui/Makefile.am
        docs/reference/libedataserverui/libedataserverui-sections.txt
        libedataserverui/e-name-selector-entry.c
        libedataserverui/e-name-selector.c
    
    We no longer use these files, so ignore gnome-3-6 changes.

 NEWS                                               |   78 +
 addressbook/backends/ldap/e-book-backend-ldap.c    |   24 +-
 .../backends/webdav/e-book-backend-webdav.c        |   15 +-
 addressbook/libebook-contacts/e-book-query.c       |   21 +
 addressbook/libebook-contacts/e-contact.c          |    4 +-
 addressbook/libedata-book/e-book-backend.c         |   11 +-
 calendar/backends/caldav/e-cal-backend-caldav.c    |  310 ++-
 .../backends/contacts/e-cal-backend-contacts.c     |    2 +-
 calendar/backends/http/e-cal-backend-http.c        |    4 +
 calendar/libecal/e-cal.c                           |    7 +-
 calendar/libedata-cal/e-cal-backend.c              |   14 +-
 calendar/libedata-cal/e-data-cal.c                 |    4 +-
 camel/camel-db.c                                   |    2 +-
 camel/camel-folder-search.c                        |   37 +-
 camel/camel-folder.c                               |   10 +-
 camel/camel-imapx-server.c                         |    7 +-
 camel/camel-imapx-utils.c                          |    1 -
 camel/camel-mime-filter-pgp.c                      |    4 +
 camel/camel-search-sql-sexp.c                      |    2 +-
 camel/camel-service.c                              |    3 +-
 camel/camel-session.c                              |    3 +-
 camel/camel-store.c                                |   59 +-
 camel/camel-subscribable.c                         |   10 +-
 camel/camel-tcp-stream-raw.c                       |    2 +-
 camel/camel-tcp-stream-ssl.c                       |   11 +-
 camel/providers/imap/camel-imap-summary.c          |    2 +-
 camel/providers/local/camel-local-provider.c       |    6 +-
 camel/providers/local/camel-mbox-summary.c         |   12 +-
 camel/providers/nntp/camel-nntp-store.c            |    2 +-
 docs/reference/addressbook/libebook/Makefile.am    |    2 +-
 .../addressbook/libebook/libebook-sections.txt     |    6 +-
 .../addressbook/libedata-book/Makefile.am          |    2 +-
 .../libedata-book/libedata-book-sections.txt       |   33 +-
 docs/reference/calendar/libecal/Makefile.am        |    2 +-
 .../calendar/libecal/libecal-sections.txt          |    8 +-
 docs/reference/calendar/libedata-cal/Makefile.am   |    5 +-
 .../libedata-cal/libedata-cal-sections.txt         |   29 +-
 docs/reference/camel/Makefile.am                   |    3 +-
 docs/reference/camel/camel-sections.txt            |  194 +-
 docs/reference/libebackend/Makefile.am             |    2 +-
 .../reference/libebackend/libebackend-sections.txt |   35 +-
 docs/reference/libedataserver/Makefile.am          |    2 +-
 .../libedataserver/libedataserver-sections.txt     |   65 +-
 docs/reference/private/Makefile.am                 |    6 +-
 docs/reference/private/libedbus-private-docs.sgml  |   16 -
 .../private/libedbus-private-sections.txt          |  371 +--
 libebackend/e-source-registry-server.c             |   38 +-
 libedataserver/e-gdbus-templates.c                 |  108 +-
 libedataserver/e-source-registry.c                 |    2 +-
 libedataserver/e-source.c                          |   40 +-
 po/pt_BR.po                                        |  955 +++---
 po/ug.po                                           | 3974 +++++++++++---------
 private/Makefile.am                                |    8 +-
 .../evolution-source-registry-migrate-sources.c    |    8 +-
 .../evolution-source-registry.c                    |    6 +-
 55 files changed, 3691 insertions(+), 2896 deletions(-)
---
diff --cc addressbook/libebook-contacts/e-book-query.c
index 6c6e53d,aea6709..c26582e
--- a/addressbook/libebook-contacts/e-book-query.c
+++ b/addressbook/libebook-contacts/e-book-query.c
@@@ -644,10 -651,8 +664,11 @@@ static const struct 
        { "is", func_is, 0 },
        { "beginswith", func_beginswith, 0 },
        { "endswith", func_endswith, 0 },
 +      { "eqphone", func_eqphone, 0 },
 +      { "eqphone_national", func_eqphone_national, 0 },
 +      { "eqphone_short", func_eqphone_short, 0 },
        { "exists", func_exists, 0 },
+       { "exists_vcard", func_exists_vcard, 0 }
  };
  
  /**
diff --cc docs/reference/libedataserver/Makefile.am
index 5097c88,05884d6..7396c5b
--- a/docs/reference/libedataserver/Makefile.am
+++ b/docs/reference/libedataserver/Makefile.am
@@@ -2,10 -2,8 +2,10 @@@
  DOC_MODULE = libedataserver
  
  # The top-level SGML file.
- DOC_MAIN_SGML_FILE = libedataserver-docs.sgml
+ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
  
 +MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=e
 +
  # Extra options to supply to gtkdoc-scan
  SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED"