[evolution/webkit-composer: 41/41] Merge branch 'master' into webkit-composer
- From: Dan VrÃtil <dvratil src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/webkit-composer: 41/41] Merge branch 'master' into webkit-composer
- Date: Thu, 16 Aug 2012 17:00:45 +0000 (UTC)
commit a6bdf0baaf27235df5c040513378c85339d7da59
Merge: 2c7535d 29ba074
Author: Dan VrÃtil <dvratil redhat com>
Date: Thu Aug 16 19:00:17 2012 +0200
Merge branch 'master' into webkit-composer
Makefile.am | 8 -
calendar/gui/e-calendar-view.c | 11 +-
calendar/gui/e-calendar-view.h | 6 +-
calendar/gui/e-day-view.c | 36 +-
calendar/gui/e-week-view.c | 2 +-
capplet/.gitignore | 24 -
capplet/Makefile.am | 67 -
capplet/anjal-settings-main.c | 196 -
capplet/settings/Makefile.am | 68 -
capplet/settings/anjal-mail-view.c | 80 -
capplet/settings/anjal-mail-view.h | 58 -
capplet/settings/mail-account-view.c | 1177 --
capplet/settings/mail-account-view.h | 93 -
capplet/settings/mail-capplet-shell.c | 302 -
capplet/settings/mail-capplet-shell.h | 59 -
capplet/settings/mail-settings-view.c | 297 -
capplet/settings/mail-settings-view.h | 59 -
capplet/settings/mail-view.c | 656 -
capplet/settings/mail-view.h | 87 -
configure.ac | 45 +-
data/Makefile.am | 30 +-
data/close-on-tab-hover.png | Bin 3269 -> 0 bytes
data/close-on-tab.png | Bin 289 -> 0 bytes
data/default.css | 111 -
data/preview-tab-active-private.png | Bin 1093 -> 0 bytes
data/preview-tab-active.png | Bin 1093 -> 0 bytes
data/preview-tab-hover-private.png | Bin 1080 -> 0 bytes
data/preview-tab-hover.png | Bin 1080 -> 0 bytes
data/preview-tab-inactive-private.png | Bin 1156 -> 0 bytes
data/preview-tab-inactive.png | Bin 1156 -> 0 bytes
data/tab-active-private.png | Bin 1135 -> 0 bytes
data/tab-active.png | Bin 3718 -> 0 bytes
data/tab-add-hover.png | Bin 3280 -> 0 bytes
data/tab-add.png | Bin 3254 -> 0 bytes
data/tab-bar-background.png | Bin 318 -> 0 bytes
data/tab-inactive-hover-private.png | Bin 893 -> 0 bytes
data/tab-inactive-hover.png | Bin 3552 -> 0 bytes
data/tab-inactive-private.png | Bin 895 -> 0 bytes
data/tab-inactive.png | Bin 3557 -> 0 bytes
data/tab-switcher-close-hover.png | Bin 626 -> 0 bytes
data/tab-switcher-close.png | Bin 408 -> 0 bytes
data/tab-switcher-hover.png | Bin 3335 -> 0 bytes
data/tab-switcher.png | Bin 3318 -> 0 bytes
e-util/e-util.c | 2 +-
em-format/e-mail-formatter.c | 14 +-
git.mk | 86 +-
help/C/calendar-searching.page | 5 +-
help/C/default-browser.page | 4 +-
help/C/figures/color-000000.png | Bin 0 -> 205 bytes
help/C/figures/html-composer-insert-image.png | Bin 0 -> 1041 bytes
help/C/figures/html-composer-insert-link.png | Bin 0 -> 1180 bytes
help/C/figures/html-composer-insert-rule.png | Bin 0 -> 199 bytes
help/C/figures/html-composer-insert-table.png | Bin 0 -> 430 bytes
help/C/mail-composer-enable-html-format.page | 29 +
help/C/mail-composer-html-image.page | 6 +-
help/C/mail-composer-html-link.page | 6 +-
help/C/mail-composer-html-rule.page | 6 +-
help/C/mail-composer-html-table.page | 6 +-
help/C/mail-composer-html-text.page | 42 +-
help/C/mail-composer-html.page | 24 +-
help/C/mail-composer-plain-text.page | 43 +
help/C/mail-encryption-gpg-create-key.page | 2 +-
help/C/mail-localized-re-subjects.page | 32 +
help/C/mail-save-as-pdf.page | 5 +-
help/C/offline.page | 5 +-
help/C/problems-getting-help.page | 2 +-
help/Makefile.am | 12 +-
help/es/es.po |20465 ++++++++++----------
libemail-engine/e-mail-folder-utils.c | 23 +-
libemail-engine/e-mail-session-utils.c | 141 +-
libemail-engine/e-mail-session-utils.h | 22 +
libemail-engine/e-mail-session.c | 482 +-
libemail-engine/mail-ops.c | 11 +-
libemail-engine/mail-tools.c | 11 +-
libemail-engine/mail-vfolder.c | 19 +-
mail/Makefile.am | 13 -
mail/e-mail-account-store.c | 6 +-
mail/e-mail-backend.c | 38 +-
mail/e-mail-config-auth-check.c | 3 +-
mail/e-mail-config-defaults-page.c | 28 +-
mail/e-mail-display.c | 54 +-
mail/e-mail-display.h | 3 +
mail/e-mail-migrate.c | 317 -
mail/e-mail-notebook-view.c | 627 -
mail/e-mail-reader.c | 63 +-
mail/e-mail-tab-picker.c | 1347 --
mail/e-mail-tab-picker.h | 105 -
mail/e-mail-tab.c | 1919 --
mail/e-mail-tab.h | 115 -
mail/em-composer-utils.c | 20 +-
mail/em-filter-source-element.c | 4 +-
mail/em-folder-tree.c | 25 +-
mail/em-subscription-editor.c | 5 +-
mail/em-utils.c | 2 +-
mail/mail-send-recv.c | 43 +-
mail/message-list.c | 89 -
modules/backup-restore/evolution-backup-tool.c | 62 +-
modules/cal-config-caldav/e-caldav-chooser.c | 19 +-
modules/calendar/e-cal-shell-view-private.c | 9 +-
modules/itip-formatter/e-mail-part-itip.h | 1 -
modules/itip-formatter/itip-view.c | 54 -
modules/mail/Makefile.am | 5 -
modules/mail/e-mail-shell-backend.c | 32 +-
modules/mail/e-mail-shell-view-actions.c | 2 +-
modules/mail/e-mail-shell-view.c | 14 +-
modules/mdn/evolution-mdn.c | 31 +-
.../e-mail-display-popup-prefer-plain.c | 48 +-
modules/prefer-plain/e-mail-parser-prefer-plain.c | 19 +-
modules/startup-wizard/Makefile.am | 5 -
modules/startup-wizard/evolution-startup-wizard.c | 17 -
.../e-mail-formatter-text-highlight.c | 32 +-
plugins/templates/templates.c | 16 +-
po/POTFILES.in | 6 -
po/cs.po | 2 +-
po/es.po | 1749 +-
po/gl.po | 2769 ++--
po/mr.po | 2813 ++--
shell/Makefile.am | 4 +-
shell/e-convert-local-mail.c | 323 +
shell/main.c | 30 +-
widgets/misc/e-mail-signature-combo-box.c | 51 +
121 files changed, 15237 insertions(+), 22679 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
