[evolution/webkit-composer: 105/120] Merge branch 'master' into webkit-composer
- From: Dan VrÃtil <dvratil src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/webkit-composer: 105/120] Merge branch 'master' into webkit-composer
- Date: Tue, 9 Oct 2012 21:37:06 +0000 (UTC)
commit 6fe0218201aaf47d7c9edc55b3e7e0f93925f6cb
Merge: 9750a80 1cfe032
Author: Dan VrÃtil <dvratil redhat com>
Date: Mon Oct 8 19:12:06 2012 +0200
Merge branch 'master' into webkit-composer
Conflicts:
shell/Makefile.am
widgets/misc/Makefile.am
NEWS | 88 +
calendar/alarm-notify/alarm-queue.c | 35 +-
calendar/alarm-notify/alarm.c | 12 +
calendar/alarm-notify/alarm.h | 2 +
calendar/gui/e-day-view.c | 30 +-
calendar/gui/e-select-names-editable.c | 12 +-
calendar/gui/gnome-cal.c | 9 +-
calendar/importers/icalendar-importer.c | 4 +-
composer/e-composer-private.c | 2 +-
configure.ac | 140 +-
...org.gnome.evolution.spamassassin.gschema.xml.in | 12 +-
em-format/e-mail-extension-registry.c | 3 +
em-format/e-mail-formatter-attachment-bar.c | 3 +-
em-format/e-mail-formatter-attachment.c | 3 +-
em-format/e-mail-formatter-quote.c | 4 +-
em-format/e-mail-formatter-secure-button.c | 3 +-
em-format/e-mail-inline-filter.c | 7 +-
em-format/e-mail-inline-filter.h | 3 +-
em-format/e-mail-parser-application-mbox.c | 9 +-
em-format/e-mail-parser-message.c | 14 +
em-format/e-mail-parser-multipart-mixed.c | 6 +-
em-format/e-mail-parser-text-plain.c | 15 +-
help/C/calendar-layout-appointment-display.page | 2 +-
help/C/calendar-meetings-delegating.page | 6 +-
help/C/express-mode.page | 4 +-
help/C/intro-application.page | 8 +-
help/C/mail-change-columns-in-message-list.page | 5 +-
help/C/mail-change-time-format.page | 2 +-
help/C/mail-encryption-gpg-create-key.page | 2 +-
help/C/mail-encryption-gpg-set-up.page | 2 +-
help/de/de.po |20697 ++++++------
help/el/el.po | 457 +-
help/fr/figures/new-mail-switcher.png | Bin 7175 -> 16179 bytes
help/fr/figures/window-overview.png | Bin 0 -> 197966 bytes
help/fr/fr.po |20774 ++++++------
help/hu/hu.po |20401 ++++++------
libemail-engine/e-mail-junk-filter.c | 13 -
libemail-engine/e-mail-junk-filter.h | 2 -
libemail-engine/e-mail-session.c | 27 +-
libemail-engine/mail-ops.c | 6 +-
mail/e-http-request.c | 177 +-
mail/e-mail-display.c | 25 +-
mail/e-mail-reader-utils.c | 3 +
mail/e-mail-reader.c | 19 +-
mail/e-mail-request.c | 1 +
mail/em-utils.c | 93 +-
modules/Makefile.am | 12 +-
modules/addressbook/Makefile.am | 4 -
modules/addressbook/ldap-config.ui | 703 -
modules/bogofilter/evolution-bogofilter.c | 17 +-
.../book-config-ldap/evolution-book-config-ldap.c | 33 +-
.../evolution-book-config-webdav.c | 2 +-
modules/calendar/e-cal-shell-view-private.c | 23 +-
modules/itip-formatter/itip-view.c | 60 +-
.../mail-config/e-mail-config-sendmail-backend.c | 110 +-
modules/mail/e-mail-attachment-handler.c | 44 +-
modules/prefer-plain/e-mail-parser-prefer-plain.c | 19 +-
modules/spamassassin/evolution-spamassassin.c | 308 +-
.../e-mail-formatter-text-highlight.c | 8 +-
.../vcard-inline/e-mail-formatter-vcard-inline.c | 2 +-
po/POTFILES.in | 2 +-
po/as.po |19779 +++++------
po/bg.po |16457 +++++-----
po/ca.po |18149 +++++-----
po/ca valencia po |18432 +++++-----
po/cs.po |18712 +++++-----
po/da.po |18378 +++++-----
po/de.po | 730 +-
po/es.po | 1129 +-
po/fi.po |19970 ++++++-----
po/fr.po | 7910 ++---
po/hi.po |21180 ++++++------
po/hu.po |20577 +++++------
po/kn.po |30315 ++++++++--------
po/lt.po | 4296 ++-
po/lv.po |20411 ++++++------
po/ml.po |25463 +++++++-------
po/mr.po | 1967 +-
po/pt.po |18508 +++++-----
po/pt_BR.po |16763 ++++------
po/ru.po | 1691 +-
po/sl.po | 3499 +--
po/ta.po |18399 +++++-----
po/te.po | 7985 +++---
po/th.po |36842 ++++++++++----------
po/uk.po |18747 +++++-----
po/vi.po | 28 +-
shell/Makefile.am | 8 +-
shell/main.c | 13 +
widgets/misc/Makefile.am | 4 +-
widgets/misc/e-calendar-item.c | 7 +
widgets/misc/e-contact-map.c | 168 +-
widgets/misc/e-source-config.c | 1 +
widgets/misc/e-web-view.c | 19 +-
widgets/table/e-tree.c | 6 +-
95 files changed, 222929 insertions(+), 228103 deletions(-)
---
diff --cc shell/Makefile.am
index c45823d,32f33ee..841c97d
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@@ -61,7 -61,8 +61,7 @@@ libeshell_la_CPPFLAGS =
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(EGG_SMCLIENT_CFLAGS) \
- $(CLUTTER_CFLAGS)
- $(GTKHTML_CFLAGS) \
+ $(CLUTTER_GTK_CFLAGS)
libeshell_la_SOURCES = \
$(eshellinclude_HEADERS) \
@@@ -134,8 -134,9 +134,8 @@@ evolution_CPPFLAGS =
-DLIBDIR=\""$(datadir)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
- $(CLUTTER_CFLAGS)
+ $(CLUTTER_GTK_CFLAGS)
evolution_SOURCES = \
main.c \
diff --cc widgets/misc/Makefile.am
index d2a7e2f,4f4a5a1..f402869
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@@ -88,8 -90,9 +88,8 @@@ libemiscwidgets_la_CPPFLAGS =
-DG_LOG_DOMAIN=__FILE__ \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
$(CHAMPLAIN_CFLAGS) \
- $(GEOCLUE_CFLAGS) \
+ $(GEO_CFLAGS) \
$(CLUTTER_CFLAGS)
libemiscwidgets_la_SOURCES = \
@@@ -181,8 -185,9 +181,8 @@@ libemiscwidgets_la_LIBADD =
$(MATH_LIB) \
$(ICONV_LIBS) \
$(CHAMPLAIN_LIBS) \
- $(GEOCLUE_LIBS) \
+ $(GEO_LIBS) \
- $(CLUTTER_LIBS) \
- $(GTKHTML_LIBS)
+ $(CLUTTER_LIBS)
error_DATA = widgets.error
errordir = $(privdatadir)/errors
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
