[evolution/express: 68/68] Merge branch 'master' into express
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/express: 68/68] Merge branch 'master' into express
- Date: Fri, 12 Mar 2010 19:35:10 +0000 (UTC)
commit 933a56a012746843c94795438c2d66e8b0d33aef
Merge: 5b41b89 c3cd369
Author: Matthew Barnes <mbarnes redhat com>
Date: Fri Mar 12 13:11:04 2010 -0500
Merge branch 'master' into express
Makefile.am | 1 -
NEWS | 43 +
addressbook/gui/contact-editor/Makefile.am | 5 +-
addressbook/gui/contact-editor/e-contact-editor.c | 10 +-
addressbook/gui/contact-list-editor/Makefile.am | 4 -
addressbook/gui/widgets/Makefile.am | 2 +-
addressbook/gui/widgets/e-minicard-view-widget.c | 4 +
.../gui/widgets/gal-view-factory-minicard.c | 52 +-
.../gui/widgets/gal-view-factory-minicard.h | 52 +-
addressbook/gui/widgets/gal-view-minicard.c | 2 +-
addressbook/printing/Makefile.am | 1 -
calendar/gui/Makefile.am | 2 +-
calendar/gui/alarm-notify/alarm-notify-dialog.c | 6 +-
calendar/gui/calendar-view-factory.c | 2 +-
calendar/gui/calendar-view.c | 2 +-
calendar/gui/dialogs/Makefile.am | 3 +-
calendar/gui/dialogs/cal-prefs-dialog.c | 3 -
calendar/gui/dialogs/event-page.c | 4 +
calendar/gui/dialogs/recurrence-page.c | 4 +
calendar/gui/e-cal-model.c | 7 +
calendar/gui/e-day-view-main-item.c | 8 +
calendar/gui/e-day-view-time-item.c | 4 +
calendar/gui/e-day-view-top-item.c | 4 +
calendar/gui/e-day-view.c | 24 +
calendar/gui/e-meeting-time-sel.c | 16 +
calendar/gui/e-memo-table.c | 5 +
calendar/gui/e-task-table.c | 5 +
calendar/gui/e-timezone-entry.c | 24 +
calendar/gui/e-week-view-event-item.c | 4 +
calendar/gui/e-week-view-main-item.c | 4 +
calendar/gui/e-week-view.c | 12 +
calendar/gui/ea-cal-view.c | 8 +
calendar/gui/ea-day-view.c | 4 +
calendar/gui/ea-week-view.c | 4 +
calendar/gui/gnome-cal.c | 4 +
calendar/gui/tag-calendar.c | 99 +-
calendar/gui/weekday-picker.c | 15 +-
composer/e-composer-private.c | 2 +-
configure.ac | 6 +-
e-util/Makefile.am | 11 +-
e-util/e-file-utils.c | 18 +-
e-util/e-util-private.h | 27 +-
e-util/e-win32-reloc.c | 27 +-
e-util/gconf-bridge.c | 5 +
evolution-shell.pc.in | 3 -
mail/Makefile.am | 4 +-
mail/e-mail-attachment-bar.c | 4 +
mail/e-mail-display.c | 4 +-
mail/e-mail-migrate.c | 16 +
mail/e-mail-reader.c | 211 +-
mail/em-composer-utils.c | 12 +-
mail/em-folder-utils.c | 2 +-
mail/em-format-html-display.c | 4 +
mail/em-format-html.c | 45 +-
mail/importers/Makefile.am | 6 -
mail/mail-send-recv.c | 4 +
mail/message-list.c | 8 +
modules/addressbook/e-book-shell-view-private.c | 2 +
modules/calendar/e-cal-shell-view-actions.c | 17 +-
modules/calendar/e-cal-shell-view-private.c | 6 +
modules/calendar/e-memo-shell-view-actions.c | 17 +-
modules/calendar/e-memo-shell-view-private.c | 2 +
modules/calendar/e-task-shell-view-actions.c | 17 +-
modules/calendar/e-task-shell-view-private.c | 2 +
modules/mail/e-mail-shell-content.c | 1 +
modules/mail/e-mail-shell-view-private.c | 2 +
plugins/backup-restore/backup.c | 1 +
plugins/groupwise-features/proxy-login.c | 3 +-
plugins/itip-formatter/itip-view.c | 4 +
plugins/publish-calendar/url-editor-dialog.c | 4 +
po/bg.po | 1219 +-
po/ca.po |12834 +++++++------
po/de.po | 1226 +-
po/es.po | 1264 +-
po/et.po | 2325 +--
po/eu.po |19604 ++++++++++----------
po/fr.po | 1748 +-
po/gl.po | 3343 +---
po/nb.po | 1100 +-
po/nn.po | 1108 +-
po/sl.po | 1411 +-
shell/e-shell-view.c | 116 +-
shell/e-shell.c | 13 +-
shell/main.c | 8 -
widgets/menus/gal-define-views-dialog.c | 2 +-
widgets/menus/gal-define-views-dialog.h | 54 +-
widgets/menus/gal-view-collection.c | 2 +-
widgets/menus/gal-view-etable.c | 22 +-
widgets/menus/gal-view-etable.h | 81 +-
widgets/menus/gal-view-factory-etable.c | 176 +-
widgets/menus/gal-view-factory-etable.h | 57 +-
widgets/menus/gal-view-factory.c | 88 +-
widgets/menus/gal-view-factory.h | 70 +-
widgets/menus/gal-view-instance-save-as-dialog.c | 2 +-
widgets/menus/gal-view-instance-save-as-dialog.h | 56 +-
widgets/menus/gal-view-instance.c | 13 +-
widgets/menus/gal-view-instance.h | 1 +
widgets/menus/gal-view-new-dialog.c | 2 +-
widgets/menus/gal-view.c | 228 +-
widgets/menus/gal-view.h | 111 +-
widgets/misc/Makefile.am | 9 +-
widgets/misc/e-attachment.c | 4 +-
widgets/misc/e-buffer-tagger.c | 4 +
widgets/misc/e-calendar-item.c | 4 +
widgets/misc/e-calendar-item.h | 118 +-
widgets/misc/e-calendar.c | 17 +
widgets/misc/e-calendar.h | 43 +-
widgets/misc/e-canvas-background.c | 4 +
widgets/misc/e-canvas.c | 4 +
widgets/misc/e-dateedit.c | 4 +
widgets/misc/e-hinted-entry.c | 4 +
widgets/misc/e-map.c | 45 +-
widgets/misc/e-online-button.c | 4 +
widgets/misc/e-search-bar.c | 4 +
widgets/misc/e-spinner.c | 8 +
widgets/table/e-cell-combo.c | 8 +
widgets/table/e-cell-date-edit.c | 16 +
widgets/table/e-cell-text.c | 4 +
widgets/table/e-table-field-chooser-item.c | 7 +-
widgets/table/e-table-header-item.c | 10 +-
widgets/table/e-table-item.c | 12 +
widgets/table/e-table-specification.c | 2 +-
widgets/table/e-table-specification.h | 12 +-
widgets/table/e-table-state.c | 14 +-
widgets/table/e-table.c | 4 +
widgets/table/e-tree.c | 4 +
widgets/table/gal-a11y-e-table.c | 8 +
widgets/text/e-text.c | 12 +
win32/Makefile.am | 66 -
win32/README | 13 -
win32/dummy.la | 32 -
win32/libemiscwidgets.def | 492 -
win32/libetable.def | 509 -
win32/libetext.def | 35 -
win32/libevolution-addressbook.def | 150 -
win32/libevolution-calendar.def | 1109 --
win32/libevolution-mail-shared.def | 531 -
win32/libevolution-mail.def | 174 -
win32/libfilter.def | 102 -
139 files changed, 23434 insertions(+), 29402 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
