[evolution-data-server/gtk3: 21/21] Synchronize with Evolution-Data-Server 2.91.5.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/gtk3: 21/21] Synchronize with Evolution-Data-Server 2.91.5.
- Date: Sun, 9 Jan 2011 15:09:37 +0000 (UTC)
commit 9d180a40597e0f95fb82449bcd5f2f9a07d47d66
Merge: cba561d 9bdc2cc
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Jan 9 10:03:12 2011 -0500
Synchronize with Evolution-Data-Server 2.91.5.
Conflicts:
configure.ac
NEWS | 76 +
addressbook/backends/file/Makefile.am | 2 +-
addressbook/backends/google/Makefile.am | 4 +-
.../backends/google/e-book-backend-google.c | 1323 ++++++++++-
addressbook/backends/google/util.c | 1183 ---------
addressbook/backends/google/util.h | 42 -
addressbook/backends/groupwise/Makefile.am | 2 +-
addressbook/backends/ldap/Makefile.am | 2 +-
addressbook/backends/vcf/Makefile.am | 2 +-
addressbook/backends/webdav/Makefile.am | 2 +-
addressbook/libebook/e-book-view.c | 3 +
addressbook/libedata-book/Makefile.am | 1 +
addressbook/libedata-book/e-data-book-factory.c | 6 +-
addressbook/libedata-book/libedata-book.pc.in | 1 +
calendar/backends/caldav/Makefile.am | 2 +-
calendar/backends/contacts/Makefile.am | 2 +-
.../backends/contacts/e-cal-backend-contacts.c | 20 +-
calendar/backends/file/Makefile.am | 2 +-
calendar/backends/groupwise/Makefile.am | 2 +-
calendar/backends/http/Makefile.am | 2 +-
calendar/backends/weather/Makefile.am | 2 +-
calendar/libedata-cal/Makefile.am | 1 +
calendar/libedata-cal/e-data-cal-factory.c | 6 +-
calendar/libedata-cal/libedata-cal.pc.in | 1 +
configure.ac | 34 +-
.../addressbook/libebook/libebook-docs.sgml | 3 +
.../libedata-book/libedata-book-docs.sgml | 3 +
docs/reference/calendar/libecal/libecal-docs.sgml | 3 +
.../libecal/tmpl/e-cal-check-timezones.sgml | 3 +
.../calendar/libedata-cal/libedata-cal-docs.sgml | 3 +
docs/reference/camel/camel-docs.sgml | 3 +
.../reference/camel/tmpl/camel-cipher-context.sgml | 6 +
.../libebackend/tmpl/e-data-server-module.sgml | 4 +-
.../libedataserver/libedataserver-docs.sgml | 3 +
.../libedataserverui/libedataserverui-docs.sgml | 3 +
evolution-data-server.pc.in | 1 -
libebackend/Makefile.am | 1 -
libebackend/e-data-server-module.c | 46 +-
libebackend/e-data-server-module.h | 21 +-
libedataserver/e-proxy.c | 3 +
libedataserverui/e-name-selector-entry.c | 38 +-
po/et.po | 3 +-
po/pa.po | 2474 ++++++++++---------
po/sv.po | 2512 ++++++++++----------
po/ug.po | 1081 +++++----
45 files changed, 4669 insertions(+), 4268 deletions(-)
---
diff --cc configure.ac
index dfc3c8b,92af46e..58990d1
--- a/configure.ac
+++ b/configure.ac
@@@ -989,8 -1023,8 +990,8 @@@ f
AC_MSG_RESULT([$use_gweather])
if test "x$use_gweather" = "xyes"; then
- PKG_CHECK_MODULES([LIBGWEATHER], [$GWEATHER_PACKAGE >= $gweather_minimum_version],[],
- [AC_MSG_ERROR([The weather calendar backend requires GWeather >= $gweather_minimum_version. Alternatively, you may specify --disable-weather as a configure option to avoid building the backend.])])
+ PKG_CHECK_MODULES([LIBGWEATHER], [gweather-3.0 >= gweather_minimum_version],[],
- [AC_MSG_ERROR([The weather calendar backend requires GWeather >= gweather_minimum_version. Alternatively, you may specify --without-weather as a configure option to avoid building the backend.])])
++ [AC_MSG_ERROR([The weather calendar backend requires GWeather >= gweather_minimum_version. Alternatively, you may specify --disable-weather as a configure option to avoid building the backend.])])
fi
AM_CONDITIONAL(ENABLE_WEATHER, [test $use_gweather = yes])
diff --cc docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
index 98c382c,98c382c..2bc77e8
--- a/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
+++ b/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
@@@ -37,6 -37,6 +37,9 @@@ e-cal-check-timezone
@const gchar *tzid, gconstpointer custom, GError **error:
@const gchar *tzid, gconstpointer custom, GError **error:
@const gchar *tzid, gconstpointer custom, GError **error:
++ const gchar *tzid, gconstpointer custom, GError **error:
++ const gchar *tzid, gconstpointer custom, GError **error:
++ const gchar *tzid, gconstpointer custom, GError **error:
@const gchar *tzid, gconstpointer custom, GError **error:
@const gchar *tzid, gconstpointer custom, GError **error:
@const gchar *tzid, gconstpointer custom, GError **error:
diff --cc docs/reference/camel/tmpl/camel-cipher-context.sgml
index 1a1848a,1a1848a..0812157
--- a/docs/reference/camel/tmpl/camel-cipher-context.sgml
+++ b/docs/reference/camel/tmpl/camel-cipher-context.sgml
@@@ -461,6 -461,6 +461,12 @@@ CamelCipherContex
@cert_data:
@gpointer cert_data:
@gpointer cert_data:
++ gpointer cert_data:
++ gpointer cert_data:
++ gpointer cert_data:
++ gpointer cert_data:
++ gpointer cert_data:
++ gpointer cert_data:
@gpointer cert_data:
@gpointer cert_data:
@gpointer cert_data:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]