| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| | |
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
a11y/widgets/ea-combo-button.c
a11y/widgets/ea-combo-button.h
addressbook/gui/component/addressbook-component.c
addressbook/gui/component/addressbook-component.h
addressbook/gui/component/addressbook-view.c
addressbook/gui/component/addressbook-view.h
addressbook/gui/component/component-factory.c
addressbook/gui/widgets/e-addressbook-view.c
addressbook/gui/widgets/eab-contact-display.c
addressbook/gui/widgets/eab-gui-util.h
addressbook/gui/widgets/eab-menu.c
addressbook/gui/widgets/eab-menu.h
addressbook/gui/widgets/eab-popup-control.c
addressbook/gui/widgets/eab-popup-control.h
addressbook/gui/widgets/eab-popup.c
addressbook/gui/widgets/eab-popup.h
calendar/gui/cal-search-bar.c
calendar/gui/calendar-commands.c
calendar/gui/calendar-component.c
calendar/gui/comp-editor-factory.c
calendar/gui/comp-editor-factory.h
calendar/gui/control-factory.c
calendar/gui/dialogs/comp-editor.c
calendar/gui/e-cal-component-memo-preview.c
calendar/gui/e-cal-component-memo-preview.h
calendar/gui/e-calendar-table.c
calendar/gui/e-memo-table.c
calendar/gui/e-memos.c
calendar/gui/e-tasks.c
calendar/gui/gnome-cal.c
calendar/gui/gnome-cal.h
calendar/gui/itip-bonobo-control.c
calendar/gui/itip-bonobo-control.h
calendar/gui/main.c
calendar/gui/memos-component.c
calendar/gui/memos-control.c
calendar/gui/memos-control.h
calendar/gui/migration.c
calendar/gui/migration.h
calendar/gui/tasks-component.c
calendar/gui/tasks-control.c
calendar/importers/main.c
composer/Makefile.am
composer/e-composer-header-table.c
composer/e-composer-header.c
composer/e-composer-header.h
composer/e-composer-name-header.c
composer/e-composer-private.c
composer/e-composer-text-header.c
composer/e-msg-composer.c
composer/e-msg-composer.h
e-util/e-corba-utils.h
e-util/e-logger.c
e-util/e-logger.h
e-util/e-util-labels.c
e-util/e-util-labels.h
em-format/em-format.c
mail/Makefile.am
mail/e-mail-shell-migrate.c
mail/em-account-editor.c
mail/em-account-editor.h
mail/em-composer-prefs.c
mail/em-composer-utils.c
mail/em-composer-utils.h
mail/em-folder-browser.c
mail/em-folder-tree-model.c
mail/em-folder-tree.c
mail/em-folder-tree.h
mail/em-folder-utils.c
mail/em-folder-utils.h
mail/em-folder-view.c
mail/em-format-html-display.c
mail/em-format-html.c
mail/em-mailer-prefs.c
mail/em-mailer-prefs.h
mail/em-message-browser.c
mail/em-message-browser.h
mail/em-network-prefs.h
mail/em-popup.c
mail/em-utils.c
mail/importers/Makefile.am
mail/mail-component-factory.c
mail/mail-component.c
mail/mail-config-factory.c
mail/mail-config-factory.h
mail/mail-config.c
mail/mail-dialogs.glade
mail/mail-types.h
plugins/calendar-weather/calendar-weather.c
plugins/mail-account-disable/mail-account-disable.c
plugins/select-one-source/select-one-source.c
po/POTFILES.in
shell/e-component-registry.c
shell/e-component-registry.h
shell/e-component-view.c
shell/e-component-view.h
shell/e-corba-config-page.c
shell/e-corba-config-page.h
shell/e-shell-constants.h
shell/e-shell-settings-dialog.c
shell/e-shell-settings-dialog.h
shell/e-shell-window-commands.c
shell/e-shell-window.c
shell/e-shell.h
shell/e-sidebar.c
shell/e-sidebar.h
shell/e-user-creatable-items-handler.c
shell/e-user-creatable-items-handler.h
shell/es-menu.c
shell/es-menu.h
shell/evolution-component.h
shell/evolution-config-control.c
shell/evolution-config-control.h
shell/evolution-listener.c
shell/evolution-listener.h
shell/evolution-shell-component-utils.c
shell/evolution-shell-component-utils.h
shell/importer/evolution-importer-client.c
shell/importer/evolution-importer-client.h
shell/importer/evolution-importer-listener.c
shell/importer/evolution-importer-listener.h
shell/importer/evolution-importer.c
shell/importer/evolution-importer.h
shell/importer/evolution-intelligent-importer.c
shell/importer/evolution-intelligent-importer.h
shell/importer/intelligent.c
shell/main.c
shell/test/evolution-test-component.c
shell/test/evolution-test-component.h
widgets/menus/gal-view-instance.c
widgets/menus/gal-view-menus.c
widgets/menus/gal-view-menus.h
widgets/misc/Makefile.am
widgets/misc/e-activity-handler.c
widgets/misc/e-activity-handler.h
widgets/misc/e-charset-picker.c
widgets/misc/e-combo-button.c
widgets/misc/e-combo-button.h
widgets/misc/e-config-page.h
widgets/misc/e-dropdown-button.c
widgets/misc/e-dropdown-button.h
widgets/misc/e-filter-bar.c
widgets/misc/e-info-label.c
widgets/misc/e-info-label.h
widgets/misc/e-multi-config-dialog.c
widgets/misc/e-multi-config-dialog.h
widgets/misc/e-search-bar.c
widgets/misc/e-search-bar.h
widgets/misc/e-task-bar.c
widgets/misc/e-task-bar.h
widgets/misc/e-task-widget.c
widgets/misc/e-task-widget.h
widgets/misc/test-dropdown-button.c
widgets/misc/test-error.c
widgets/misc/test-info-label.c
widgets/table/e-table-example-1.c
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This was a particularly messy merge. Watch out for regressions!
Conflicts:
ChangeLog
NEWS
a11y/ChangeLog
a11y/widgets/ea-combo-button.c
a11y/widgets/ea-combo-button.h
a11y/widgets/ea-widgets.c
addressbook/ChangeLog
addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
addressbook/gui/component/addressbook-component.c
addressbook/gui/component/addressbook-component.h
addressbook/gui/component/addressbook-config.c
addressbook/gui/component/addressbook-migrate.h
addressbook/gui/component/addressbook-view.c
addressbook/gui/component/addressbook-view.h
addressbook/gui/component/addressbook.h
addressbook/gui/component/autocompletion-config.c
addressbook/gui/component/autocompletion-config.h
addressbook/gui/component/component-factory.c
addressbook/gui/component/e-book-shell-module-migrate.c
addressbook/gui/component/ldap-config.glade
addressbook/gui/contact-editor/Makefile.am
addressbook/gui/contact-editor/contact-editor.glade
addressbook/gui/contact-editor/e-contact-editor-address.c
addressbook/gui/contact-editor/e-contact-editor-address.h
addressbook/gui/contact-editor/e-contact-editor-im.c
addressbook/gui/contact-editor/e-contact-editor-im.h
addressbook/gui/contact-editor/e-contact-editor.c
addressbook/gui/contact-editor/e-contact-editor.h
addressbook/gui/contact-editor/eab-editor.c
addressbook/gui/contact-editor/eab-editor.h
addressbook/gui/contact-editor/test-editor.c
addressbook/gui/contact-list-editor/Makefile.am
addressbook/gui/widgets/Makefile.am
addressbook/gui/widgets/e-addressbook-model.c
addressbook/gui/widgets/e-addressbook-model.h
addressbook/gui/widgets/e-addressbook-reflow-adapter.c
addressbook/gui/widgets/e-addressbook-view.c
addressbook/gui/widgets/e-addressbook-view.h
addressbook/gui/widgets/e-minicard-view.c
addressbook/gui/widgets/eab-contact-display.c
addressbook/gui/widgets/eab-gui-util.c
addressbook/gui/widgets/eab-menu.c
addressbook/gui/widgets/eab-menu.h
addressbook/gui/widgets/eab-popup-control.c
addressbook/gui/widgets/eab-popup-control.h
addressbook/gui/widgets/eab-popup.c
addressbook/gui/widgets/eab-popup.h
addressbook/gui/widgets/eab-vcard-control.c
addressbook/gui/widgets/eab-vcard-control.h
addressbook/gui/widgets/gal-view-minicard.c
addressbook/gui/widgets/gal-view-minicard.h
addressbook/printing/e-contact-print-style-editor.c
addressbook/printing/e-contact-print-style-editor.h
addressbook/printing/e-contact-print.glade
addressbook/printing/test-contact-print-style-editor.c
addressbook/tools/evolution-addressbook-export.c
addressbook/util/Makefile.am
calendar/ChangeLog
calendar/gui/Makefile.am
calendar/gui/apps_evolution_calendar.schemas.in
calendar/gui/calendar-component.c
calendar/gui/calendar-component.h
calendar/gui/calendar-config.c
calendar/gui/comp-editor-factory.c
calendar/gui/comp-editor-factory.h
calendar/gui/comp-util.c
calendar/gui/comp-util.h
calendar/gui/control-factory.c
calendar/gui/control-factory.h
calendar/gui/dialogs/alarm-dialog.c
calendar/gui/dialogs/cal-prefs-dialog.c
calendar/gui/dialogs/cal-prefs-dialog.glade
calendar/gui/dialogs/cal-prefs-dialog.h
calendar/gui/dialogs/comp-editor.c
calendar/gui/dialogs/comp-editor.h
calendar/gui/dialogs/event-editor.c
calendar/gui/dialogs/event-page.c
calendar/gui/dialogs/memo-editor.c
calendar/gui/dialogs/memo-page.c
calendar/gui/dialogs/recurrence-page.c
calendar/gui/dialogs/task-details-page.c
calendar/gui/dialogs/task-details-page.glade
calendar/gui/dialogs/task-editor.c
calendar/gui/dialogs/task-page.c
calendar/gui/e-cal-component-memo-preview.c
calendar/gui/e-cal-component-memo-preview.h
calendar/gui/e-cal-component-preview.c
calendar/gui/e-cal-component-preview.h
calendar/gui/e-cal-event.h
calendar/gui/e-cal-model.c
calendar/gui/e-cal-popup.c
calendar/gui/e-calendar-table.c
calendar/gui/e-calendar-view.c
calendar/gui/e-day-view.c
calendar/gui/e-itip-control.c
calendar/gui/e-memo-table.c
calendar/gui/e-memos.c
calendar/gui/e-memos.h
calendar/gui/e-tasks.c
calendar/gui/e-tasks.h
calendar/gui/e-week-view.c
calendar/gui/gnome-cal.c
calendar/gui/goto.c
calendar/gui/itip-bonobo-control.c
calendar/gui/itip-bonobo-control.h
calendar/gui/itip-utils.c
calendar/gui/itip-utils.h
calendar/gui/main.c
calendar/gui/memos-component.c
calendar/gui/memos-control.c
calendar/gui/memos-control.h
calendar/gui/migration.c
calendar/gui/migration.h
calendar/gui/tasks-component.c
calendar/gui/tasks-control.c
calendar/importers/main.c
composer/ChangeLog
composer/e-composer-actions.c
composer/e-composer-private.c
composer/e-msg-composer.c
composer/e-msg-composer.h
composer/evolution-composer.ui
configure.in
doc/reference/shell/eshell-overrides.txt
e-util/ChangeLog
e-util/Makefile.am
e-util/e-corba-utils.c
e-util/e-corba-utils.h
e-util/e-gui-utils.c
e-util/e-gui-utils.h
e-util/e-logger.c
e-util/e-non-intrusive-error-dialog.c
e-util/e-non-intrusive-error-dialog.h
e-util/e-plugin-ui.c
e-util/e-util-labels.c
e-util/e-util-labels.h
e-util/e-util.c
e-util/e-util.h
filter/ChangeLog
filter/filter-option.c
help/C/evolution.xml
help/ChangeLog
help/Makefile.am
help/cs/cs.po
help/de/de.po
help/es/es.po
help/eu/figures/Screenshot-Free-Busy.png
help/eu/figures/evo_blink.png
help/eu/figures/evo_dialog-info.png
help/eu/figures/evo_dialog-warning.png
help/eu/figures/evo_email_a.png
help/eu/figures/evo_flag_follow_up_a.png
help/eu/figures/evo_proxyadd_a.png
help/eu/figures/evo_shd_memo_a.png
help/eu/figures/exchange-delegation.png
help/eu/figures/exchange-identity.png
help/eu/figures/exchange-receive-options.png
help/eu/figures/exchange-receive.png
help/eu/figures/exchg-identity.png
help/eu/figures/exchng-identity.png
help/eu/figures/exchng-rec-mail.png
help/eu/figures/exchng-rec-option.png
help/eu/figures/exchng-rec-options.png
help/eu/figures/free_busy.png
help/eu/figures/full-1.png
help/eu/figures/full-2.png
help/eu/figures/full-3.png
help/eu/figures/full-4.png
help/eu/figures/full-5.png
help/eu/figures/full-6.png
help/eu/figures/full-7.png
help/eu/figures/mail-druid-pic.png
help/eu/figures/mail-inbox.png
help/eu/figures/mail-threaded.png
help/eu/figures/mainwindow-pic.png
help/eu/figures/minus.png
help/eu/figures/plus.png
help/eu/figures/proxy-cal.png
help/eu/figures/proxy-login.png
help/eu/figures/schedule.png
help/eu/figures/stock_search.png
help/eu/figures/sub-others-folder.png
help/eu/figures/sub-pub-fold.png
help/eu/figures/vfolder-createrule-fig.png
help/quickref/Makefile.am
mail/ChangeLog
mail/Makefile.am
mail/default/Makefile.am
mail/e-mail-shell-module-migrate.c
mail/e-searching-tokenizer.c
mail/em-account-editor.c
mail/em-account-prefs.h
mail/em-composer-prefs.c
mail/em-composer-prefs.h
mail/em-composer-utils.c
mail/em-filter-folder-element.c
mail/em-folder-browser.c
mail/em-folder-selection-button.h
mail/em-folder-selector.c
mail/em-folder-tree-model.c
mail/em-folder-tree-model.h
mail/em-folder-tree.c
mail/em-folder-tree.h
mail/em-folder-utils.c
mail/em-folder-utils.h
mail/em-folder-view.c
mail/em-format-html-display.c
mail/em-format-html-print.c
mail/em-format-html-print.h
mail/em-format-html.c
mail/em-format-quote.h
mail/em-format.c
mail/em-format.h
mail/em-html-stream.h
mail/em-mailer-prefs.c
mail/em-mailer-prefs.h
mail/em-message-browser.c
mail/em-message-browser.h
mail/em-migrate.h
mail/em-network-prefs.h
mail/em-popup.c
mail/em-search-context.h
mail/em-subscribe-editor.c
mail/em-utils.c
mail/em-utils.h
mail/filtertypes.xml
mail/mail-component-factory.c
mail/mail-component.c
mail/mail-config-factory.c
mail/mail-config-factory.h
mail/mail-config.c
mail/mail-config.glade
mail/mail-crypto.c
mail/mail-crypto.h
mail/mail-dialogs.glade
mail/mail-folder-cache.c
mail/mail-mt.c
mail/mail-send-recv.c
mail/mail-send-recv.h
mail/mail-session.c
mail/mail-session.h
mail/mail-types.h
mail/mail-vfolder.c
mail/message-list.c
mail/message-tag-followup.c
mail/searchtypes.xml
mail/vfoldertypes.xml
plugins/attachment-reminder/Makefile.am
plugins/audio-inline/org-gnome-audio-inline.eplug.xml
plugins/caldav/ChangeLog
plugins/caldav/caldav-source.c
plugins/calendar-http/ChangeLog
plugins/calendar-weather/ChangeLog
plugins/calendar-weather/calendar-weather.c
plugins/email-custom-header/ChangeLog
plugins/email-custom-header/email-custom-header.c
plugins/exchange-operations/ChangeLog
plugins/google-account-setup/ChangeLog
plugins/google-account-setup/Makefile.am
plugins/google-account-setup/google-contacts-source.c
plugins/google-account-setup/google-source.c
plugins/import-ics-attachments/ChangeLog
plugins/import-ics-attachments/Makefile.am
plugins/import-ics-attachments/icsimporter.c
plugins/itip-formatter/ChangeLog
plugins/itip-formatter/itip-view.c
plugins/mail-account-disable/ChangeLog
plugins/mail-account-disable/mail-account-disable.c
plugins/mail-notification/ChangeLog
plugins/mail-notification/mail-notification.c
plugins/mail-to-meeting/ChangeLog
plugins/mail-to-task/ChangeLog
plugins/mark-all-read/mark-all-read.c
plugins/publish-calendar/ChangeLog
plugins/publish-calendar/publish-format-fb.c
plugins/publish-calendar/publish-format-ical.c
plugins/save-attachments/ChangeLog
plugins/save-attachments/Makefile.am
plugins/save-attachments/save-attachments.c
plugins/select-one-source/ChangeLog
plugins/select-one-source/Makefile.am
plugins/select-one-source/select-one-source.c
plugins/startup-wizard/ChangeLog
plugins/startup-wizard/startup-wizard.c
plugins/webdav-account-setup/ChangeLog
plugins/webdav-account-setup/Makefile.am
plugins/webdav-account-setup/webdav-contacts-source.c
po/ChangeLog
po/POTFILES.in
po/ar.po
po/bg.po
po/bn_IN.po
po/ca.po
po/cs.po
po/da.po
po/de.po
po/el.po
po/en_GB.po
po/es.po
po/et.po
po/fr.po
po/gl.po
po/gu.po
po/hi.po
po/hu.po
po/it.po
po/ja.po
po/kn.po
po/ko.po
po/lt.po
po/ml.po
po/mr.po
po/nb.po
po/nl.po
po/pa.po
po/pl.po
po/pt.po
po/ru.po
po/sl.po
po/sr.po
po/sr@latin.po
po/sv.po
po/ta.po
po/te.po
po/th.po
po/tr.po
po/zh_HK.po
po/zh_TW.po
shell/ChangeLog
shell/Evolution-Component.idl
shell/Makefile.am
shell/apps_evolution_shell.schemas.in
shell/e-component-registry.c
shell/e-component-registry.h
shell/e-component-view.c
shell/e-component-view.h
shell/e-corba-config-page.c
shell/e-corba-config-page.h
shell/e-shell-constants.h
shell/e-shell-importer.c
shell/e-shell-importer.h
shell/e-shell-nm.c
shell/e-shell-settings-dialog.c
shell/e-shell-settings-dialog.h
shell/e-shell-view.c
shell/e-shell-view.h
shell/e-shell-window-commands.c
shell/e-shell-window-commands.h
shell/e-shell-window.c
shell/e-shell-window.h
shell/e-shell.c
shell/e-shell.h
shell/e-sidebar.c
shell/e-sidebar.h
shell/e-user-creatable-items-handler.c
shell/e-user-creatable-items-handler.h
shell/es-menu.c
shell/es-menu.h
shell/evolution-component.c
shell/evolution-component.h
shell/evolution-config-control.c
shell/evolution-config-control.h
shell/evolution-listener.c
shell/evolution-listener.h
shell/evolution-shell-component-utils.c
shell/evolution-shell-component-utils.h
shell/importer/evolution-importer-client.c
shell/importer/evolution-importer-client.h
shell/importer/evolution-importer-listener.c
shell/importer/evolution-importer-listener.h
shell/importer/evolution-importer.c
shell/importer/evolution-importer.h
shell/importer/evolution-intelligent-importer.c
shell/importer/evolution-intelligent-importer.h
shell/importer/import.glade
shell/importer/intelligent.c
shell/importer/intelligent.h
shell/main.c
shell/shell.error.xml
shell/test/evolution-test-component.c
shell/test/evolution-test-component.h
smime/ChangeLog
smime/lib/Makefile.am
ui/Makefile.am
ui/evolution-addressbook.xml
ui/evolution-calendar.xml
widgets/ChangeLog
widgets/menus/gal-view-menus.c
widgets/menus/gal-view-menus.h
widgets/misc/ChangeLog
widgets/misc/Makefile.am
widgets/misc/e-activity-handler.c
widgets/misc/e-activity-handler.h
widgets/misc/e-attachment-bar.c
widgets/misc/e-attachment-bar.h
widgets/misc/e-attachment.c
widgets/misc/e-attachment.h
widgets/misc/e-calendar-item.c
widgets/misc/e-charset-picker.c
widgets/misc/e-combo-button.c
widgets/misc/e-combo-button.h
widgets/misc/e-config-page.c
widgets/misc/e-config-page.h
widgets/misc/e-dropdown-button.c
widgets/misc/e-dropdown-button.h
widgets/misc/e-filter-bar.h
widgets/misc/e-info-label.c
widgets/misc/e-info-label.h
widgets/misc/e-multi-config-dialog.c
widgets/misc/e-multi-config-dialog.h
widgets/misc/e-online-button.c
widgets/misc/e-search-bar.c
widgets/misc/e-search-bar.h
widgets/misc/e-signature-combo-box.c
widgets/misc/e-signature-combo-box.h
widgets/misc/e-signature-editor.c
widgets/misc/e-signature-editor.h
widgets/misc/e-task-bar.c
widgets/misc/e-task-bar.h
widgets/misc/e-task-widget.c
widgets/misc/e-task-widget.h
widgets/misc/test-dropdown-button.c
widgets/misc/test-info-label.c
widgets/misc/test-multi-config-dialog.c
widgets/table/ChangeLog
widgets/table/e-cell-date.c
widgets/table/e-table-group-container.c
widgets/table/e-table-group-leaf.c
widgets/table/e-table-group.c
widgets/table/e-table-group.h
widgets/table/e-table.c
widgets/table/e-table.h
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
2009-04-07 Milan Crha <mcrha@redhat.com>
** Fix for bug #539002
* gui/certificate-manager.c: (load_certs):
Show all other certificates in a contact tab.
svn path=/trunk/; revision=37500
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
2009-04-07 Milan Crha <mcrha@redhat.com>
** Fix for bug #529745
* gui/certificate-manager.c: (import_your), (import_contact):
Add more file types in a file filter.
svn path=/trunk/; revision=37499
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
2009-02-25 Milan Crha <mcrha@redhat.com>
** Fix for bug #572975
* gui/smime-ui.glade: Center dialogs.
* gui/certificate-manager.c: (import_your), (import_contact),
(import_ca): Destroy file chooser dialog early enough to not have
hidden any other windows below it.
svn path=/trunk/; revision=37333
|
| | |
| |
| |
| | |
svn path=/trunk/; revision=36116
|
| | |
| |
| |
| | |
svn path=/branches/kill-bonobo/; revision=37295
|
| | |
| |
| |
| |
| |
| | |
Have e_shell_get_preferences_window() take an EShell argument.
svn path=/branches/kill-bonobo/; revision=37294
|
| | |
| |
| |
| | |
svn path=/branches/kill-bonobo/; revision=36307
|
| | |
| |
| |
| | |
svn path=/branches/kill-bonobo/; revision=36260
|
| |/
|
|
|
|
|
|
|
|
|
| |
- Contacts module partially working!
- Implement UI merging. Also merge EInfoLabel into ESidebar.
The shell window now manages the icon and labels and keeps
them up-to-date via EShellView properties.
svn path=/branches/kill-bonobo/; revision=36214
|
| |
|
|
| |
svn path=/trunk/; revision=35665
|
| |
|
|
|
|
|
|
|
| |
2007-11-14 Matthew Barnes <mbarnes@redhat.com>
** Remove trailing whitespace from source code.
svn path=/trunk/; revision=34537
|
| |
|
|
|
|
| |
GtkFileChooser has been around since 2004.
svn path=/trunk/; revision=34257
|
| |
|
|
|
|
|
|
|
|
| |
2007-09-02 Matthew Barnes <mbarnes@redhat.com>
* Update FSF address in header comments (#469886).
Patch from Tobias Mueller.
svn path=/trunk/; revision=34151
|
| |
|
|
| |
svn path=/trunk/; revision=33437
|
| |
|
|
| |
svn path=/trunk/; revision=33432
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2007-03-20 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #419524
* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
* e-util/e-xml-utils.c (e_xml_get_child_by_name_by_lang_list):
* mail/em-migrate.c (emm_setup_initial):
* shell/e-component-registry.c (query_components):
* shell/e-shell-settings-dialog.c (load_pages):
* shell/e-shell-window-commands.c (command_quick_reference):
* tools/killev.c (main):
Use g_get_language_names() instead of gnome_i18n_get_language_list().
* e-util/e-util.c: Remove e_gettext().
* e-util/Makefile.am: Remove e-i18n.h.
svn path=/trunk/; revision=33319
|
| |
|
|
|
|
|
|
|
|
|
| |
2006-01-02 Harish Krishnaswamy <kharish@novell.com>
* gui/certificate-manager.c: (initialize_yourcerts_ui):
Do not set the sort column before the model is initialized.
This is done later by the function unload_certs.
Fixes #325472 (critical warning crasher).
svn path=/trunk/; revision=31015
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
2005-12-18 Tor Lillqvist <tml@novell.com>
* gui/ca-trust-dialog.c (ca_trust_dialog_show)
* gui/cert-trust-dialog.c (cert_trust_dialog_show)
* gui/certificate-manager.c (certificate_manager_config_control_new)
* gui/certificate-viewer.c (certificate_viewer_show)
* gui/e-cert-selector.c (e_cert_selector_new):
Construct glade file pathname at run-time.
svn path=/trunk/; revision=30857
|
| |
|
|
|
|
|
|
|
|
| |
2005-05-06 Sankar P <psankar@novell.com>
*gui/certificate-manager.c
Changed cert to certificates
Fixes #273075
svn path=/trunk/; revision=29290
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
2005-02-21 Not Zed <NotZed@Ximian.com>
** See bug #68592
* gui/certificate-manager.c (yourcerts_selection_changed): dont
pass backup to handle_selection_changed.
(certificate_manager_config_control_new): disable the backup
buttons always.
svn path=/trunk/; revision=28875
|
| |
|
|
|
|
|
|
|
|
|
| |
2004-11-23 Not Zed <NotZed@Ximian.com>
* gui/certificate-manager.c (delete_ca): don't remove the tree
node if deleting the cert failed.
(delete_your): same.
(delete_contact): same. Hoorah for code-reuse.
svn path=/trunk/; revision=28456
|
| |
|
|
|
|
|
|
|
| |
2004-08-12 Carlos Garnacho Parro <carlosg@gnome.org>
* gui/certificate-manager.c: Optionally use GtkFileChooser if
compiled against Gtk+ >= 2.4.0
svn path=/trunk/; revision=26895
|
| |
|
|
|
|
|
|
|
|
| |
2004-05-28 Not Zed <NotZed@Ximian.com>
* gui/certificate-manager.c (initialize_yourcerts_ui): set some
columns resizable.
(initialize_contactcerts_ui): same.
svn path=/trunk/; revision=26120
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-05-28 Not Zed <NotZed@Ximian.com>
** See bugs #52061 & #52669.
* gui/smime-ui.glade: added cert-trust-dialog and tweaked the
ca-trust-dialog.
* gui/ca-trust-dialog.c (ca_trust_dialog_show): Fix the %s in the
label. Slack.
(ca_trust_dialog_show): slight rearrangement.
* gui/certificate-manager.c (add_contact_cert): fill out fields.
* lib/e-cert.c (e_cert_get_usage): helper to get the usage of a
cert.
* gui/certificate-manager.c (edit_ca): use the right certdb, not
the e-one.
(add_user_cert): fill out missing columns.
* lib/e-cert.c (e_cert_get_ca_cert): new method to find the ca
cert of a cert.
* gui/cert-trust-dialog.[ch]: peer cert trust editor.
* gui/certificate-manager.c (edit_contact): implement.
svn path=/trunk/; revision=26119
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-04-30 Chris Toshok <toshok@ximian.com>
[ fixes bug #52724 ]
* gui/ca-trust-dialog.c (ca_trust_dialog_set_trust): new function,
set the toggle buttons' states.
* gui/ca-trust-dialog.h (ca_trust_dialog_set_trust): add
prototype.
* gui/certificate-manager.c (edit_ca): flesh out the rest of the
editing here. set the existing trust levels and get them back
from the dialog when OK is clicked (and store them to the cert
db.)
svn path=/trunk/; revision=25726
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-03-24 Chris Toshok <toshok@ximian.com>
* lib/smime-marshal.list: add BOOL:POINTER,POINTER,POINTER,POINTER
for confirm_ca_cert_import.
* lib/e-cert-db.c (e_cert_db_class_init): initialize the
confirm_ca_cert_import signal.
(confirm_download_ca_cert): emit confirm_ca_cert_import and use
the returned values.
(handle_ca_cert_download): fix the ca trust foo.
(e_cert_db_import_certs): pass the cerdb to
handle_ca_cert_download since we need to emit something on that
object.
* lib/e-cert-db.h (struct _ECertDBClass): add
confirm_ca_cert_import signal.
* gui/smime-ui.glade: give names to the check buttons in the ca
trust dialog.
* gui/component.c (smime_confirm_ca_cert_import): new function,
show the trust dialog.
(smime_component_init): connect to "confirm_ca_cert_import"
signal.
* gui/certificate-viewer.c (fill_in_general): fix lots of
uninitialized variable accesses.
(certificate_viewer_show): don't show the dialog (or connect to
the response signal.) that's the caller's job.
* gui/certificate-manager.c (view_your): do the showing of the
certificate_viewer here.
(view_contact): same.
(view_ca): same.
(edit_ca): new function, pop up the ca trust dialog. we need more
here though, to fill in the toggle buttons when bringing up the
dialog, and also to save out the settings when the user clicks ok.
(initialize_authoritycerts_ui): hook up the edit_ca button.
* gui/Makefile.am (libevolution_smime_la_SOURCES): add
ca-trust-dialog.[ch].
* gui/ca-trust-dialog.[ch]: new file implementing the ca trust
dialog used for importing/editing ca trust levels.
svn path=/trunk/; revision=25177
|
| |
|
|
|
|
|
|
|
|
|
|
| |
2004-03-19 Chris Toshok <toshok@ximian.com>
[ fixes bug #52667 ]
* gui/certificate-manager.c (import_ca): don't expand the CA tree
by default.
(populate_ui): same.
svn path=/trunk/; revision=25133
|
| |
|
|
|
|
|
|
|
|
|
|
| |
2004-02-11 Jeffrey Stedfast <fejj@ximian.com>
* gui/e-cert-selector.c: Same.
* gui/certificate-viewer.c: Same.
* gui/certificate-manager.c: #include <config.h>
svn path=/trunk/; revision=24711
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-01-05 Chris Toshok <toshok@ximian.com>
* gui/component.c (smime_pk11_passwd): new function, implement the
password dialog for PK11 slot authentication.
(smime_component_init): new function, initialize any gui related
signals that the backend exposes.
* gui/certificate-manager.c (import_your): use
e_cert_db_import_pkcs12_file.
(delete_your): new function, implement.
(view_your): same.
(backup_your): new function, stub out.
(backup_all_your): same.
(create_yourcerts_treemodel): new function.
(initialize_yourcerts_ui): do all the sorting foo, and hook up all
the signals.
(ainitialize_contactcerts_ui): same.
(initialize_authoritycerts_ui): same.
(view_contact): treemodel -> streemodel.
(view_ca): same.
(delete_contact): same, and convert from the sort iter to the
child iter before we remove.
(delete_ca): same.
(import_contact): call gtk_tree_view_expand_all.
(import_ca): same.
(add_user_cert): append to the child model, not the sort model.
(add_contact_cert): same.
(add_ca_cert): same.
(unload_certs): implement the E_CERT_USER case, and fix the
USER/CA stuff to use the sorted treemodels.
(load_certs): remove spew.
(populate_ui): expand all the tree views.
* lib/.cvsignore: ignore the generated marshalling files.
* lib/Makefile.am: add the marshalling foo.
* lib/smime-marshal.list (BOOL): new file.
* lib/e-cert-db.c (pk11_password): new function, emit the
pk11_passwd signal.
(initialize_nss): new function, split out all the nss init code
here, and add all the PKCS12 cipers.
(install_loadable_roots): new function, split this code out from
the class_init.
(e_cert_db_class_init): call initialize_nss() and
install_loadable_roots(). also register our pk11_passwd signal.
(e_cert_db_import_pkcs12_file): implement.
(e_cert_db_login_to_slot): new function, implement.
* lib/e-cert-db.h (struct _ECertDBClass): add pk11_passwd signal,
and add prototype for e_cert_db_login_to_slot.
* lib/e-pkcs12.c (input_to_decoder): remove spew.
(prompt_for_password): fix this.
(import_from_file_helper): fix fix fix, and remove spew.
(write_export_file): nuke, we don't need this.
svn path=/trunk/; revision=24058
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-12-03 Chris Toshok <toshok@ximian.com>
* lib/Makefile.am (libessmime_la_SOURCES): add e-asn1-object.[ch]
* gui/smime-ui.glade: rename the ca trust dialog, and give it a
proper id.
* gui/certificate-manager.c (yourcerts_selection_changed): just
use @selection.
(contactcerts_selection_changed): same.
(authoritycerts_selection_changed): same.
* gui/certificate-viewer.c (free_data): free the cert chain.
(fill_in_general): move all the general tab stuff here.
(hierarchy_selection_changed): new function. not finished.
(fields_selection_changed): new function, unimplemented.
(fill_in_details): new function, fill in the heirarchy and hook up
signals and stuff.
(certificate_viewer_show): call fill_in_general/fill_in_details.
* lib/e-cert.c (e_cert_get_chain): new function.
* lib/e-cert.h: add prototype for e_cert_get_chain.
svn path=/trunk/; revision=23622
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-11-26 Chris Toshok <toshok@ximian.com>
* gui/certificate-viewer.[ch]: mostly implement a viewer for
certificates.
* gui/smime-ui.glade: fingerprints-sh1 -> fingerprints-sha1.
* gui/certificate-manager.c (import_your): new function, use
e-pkcs12 to implement it.
(initialize_yourcerts_ui): hook up the import button.
(view_contact): new function, bring up the certificate viewer.
(initialize_contactcerts_ui): hook up the view button.
(view_ca): new function, bring up the certificate viewer.
(initialize_authoritycerts_ui): hook up the view button.
* gui/Makefile.am (libevolution_smime_la_SOURCES): add
certificate-viewer.[ch]
* lib/e-cert.c (e_cert_dispose): free all the new cached foo.
(e_cert_populate): populate all the new cached foo.
(e_cert_get_issuer_cn): new function.
(e_cert_get_issuer_org): same.
(e_cert_get_issuer_org_unit): same.
(e_cert_get_issued_on_time): same.
(e_cert_get_issued_on): same.
(e_cert_get_expires_on_time): same.
(e_cert_get_expires_on): same.
(e_cert_get_serial_number): same.
(e_cert_get_sha1_fingerprint): same.
(e_cert_get_md5_fingerprint): same.
* lib/e-cert.h: add prototypes for lots more accessors.
* lib/e-cert-db.c (e_cert_db_find_cert_by_key): fix typo.
(e_cert_db_find_cert_by_email_address): call
CERT_DestroyCertificate to free the cert.
(default_nickname): new function.
(e_cert_db_import_user_cert): implement.
(e_cert_db_import_server_cert): add blurb.
* lib/e-pkcs12.[ch]: new files.
* lib/Makefile.am (libessmime_la_SOURCES): add e-pkcs12.[ch]
svn path=/trunk/; revision=23486
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-11-12 Chris Toshok <toshok@ximian.com>
* lib/e-cert.c (e_cert_get_cert_type): implement using the
e-cert-trust foo.
(e_cert_get_email): implement.
* lib/e-cert.h: add UNKNOWN cert type.
* gui/smime-ui.glade: fix capitalization of "Import" on the
contact certificate page.
* gui/certificate-manager.c (import_contact): new function.
implement email cert importing.
(delete_contact): new function.
(unload_certs): implement for E_CERT_CONTACT.
(certificate_manager_config_control_new): get the contact cert
action buttons from libglade.
* lib/e-cert-db.c (handle_ca_cert_download): mostly implement the
trust settings correctly. this still needs work pending the CA
trust dialog's completion.
(e_cert_db_delete_cert): fix the ifdef'ed code.
(e_cert_db_import_user_cert): remove the ifdef'ed body of this,
since it was copied from the CA code.
* lib/Makefile.am (libessmime_la_SOURCES): add e-cert-trust.[ch]
* lib/e-cert-trust.[ch]: new files, basically c&p nsNSSCertTrust
from mozilla's PSM.
svn path=/trunk/; revision=23308
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-11-11 Chris Toshok <toshok@ximian.com>
* tests/import-cert.c (main): don't init NSS here. it's done in
e_cert_db_peek.
* lib/Makefile.am (libessmime_la_SOURCES): add e-cert-db.[ch]
* gui/smime-ui.glade: set the initial sensitivity of the buttons
here, and add the beginnings of the CA import dialog (where you
assign trust levels to it.)
* gui/certificate-manager.c (handle_selection_changed):
sensitize/desensitize all the various buttons correctly when the
GtkTreeView's selection changes.
(yourcerts_selection_changed): new, selection change handler for
the Your Certs tab.
(initialize_yourcerts_ui): hook up the tree selection, and add a
model column for the ECert.
(contactcerts_selection_changed): new, selection change handler
for the Contact Certs tab.
(initialize_contactcerts_ui): hook up the tree selection, and add
a model column for the ECert.
(import_ca): new function.
(delete_ca): new function.
(authoritycerts_selection_changed): new, selection change handler
for the Authority Certs tab.
(create_authoritycerts_treemodel): new function for creating the
authority cert tree model. the other tabs will eventually use a
separate function for this too, as unload_certs gets fleshed out.
(initialize_authoritycerts_ui): hook up the tree selection, and
add import/delete buttons.
(destroy_key): dtor for the keys in our hashes.
(destroy_value): dtor for the values in our hashes.
(unload_certs): new function. basically destroy/recreate the
model and hash for the particular cert type/tab.
(load_certs): use e_cert_get_cert_type.
(populate_ui): use unload_certs as well as load_certs.
(certificate_manager_config_control_new): call e_cert_db_peek
,which will initialize all of NSS. hook up all the widgets from
libglade.
* lib/e-cert.h: add prototypes for all the new methods, and add
the ECertType enum.
* lib/e-cert.c (e_cert_dispose): handle deletion from the DB here.
(e_cert_new_from_der): new function.
(e_cert_get_internal_cert): new function.
(e_cert_get_raw_der): new function.
(e_cert_get_issuer_name): new
(e_cert_get_subject_name): new
(e_cert_mark_for_deletion): new
(e_cert_get_cert_type): new.
(e_cert_is_ca_cert): nuke.
* lib/e-cert-db.[ch]: new, partly implemented, derived from
mozilla's nsNSSCertificateDB code.
svn path=/trunk/; revision=23292
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-10-30 Chris Toshok <toshok@ximian.com>
* gui/certificate-manager.h: add boilerplate.
* gui/certificate-manager.c
(certificate_manager_config_control_new): return NULL if the
NSS_InitReadWrite fails - we should probably give better status
though, or return a GtkLabel with an error message....
* gui/Makefile.am (INCLUDES): use CERT_UI_CFLAGS.
(TEST_LIBS): use CERT_UI_LIBS.
svn path=/trunk/; revision=23140
|
|
|
2003-10-23 Chris Toshok <toshok@ximian.com>
* lib/e-cert.[ch], lib/Makefile.am, gui/certificate-manager.[ch],
gui/Makefile.am, gui/smime-ui.glade, Makefile.am: initial addition
of s/mime foo.
svn path=/trunk/; revision=23042
|
