[evolution/gtk3: 116/116] Merge branch 'master' into gtk3
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/gtk3: 116/116] Merge branch 'master' into gtk3
- Date: Thu, 16 Dec 2010 18:22:08 +0000 (UTC)
commit cc7018280be66500be6a08f7da409d72182b8a7f
Merge: b7edc50 5fd00f9
Author: Milan Crha <mcrha redhat com>
Date: Thu Dec 16 19:21:15 2010 +0100
Merge branch 'master' into gtk3
Conflicts:
e-util/gtk-compat.h
widgets/misc/e-dateedit.c
NEWS | 41 +
addressbook/addressbook.error.xml | 1 +
addressbook/gui/contact-editor/contact-editor.ui | 8 +-
addressbook/gui/contact-editor/e-contact-editor.c | 36 +-
.../contact-list-editor/e-contact-list-editor.c | 8 +-
.../eab-contact-commit-duplicate-detected.ui | 2 +-
addressbook/gui/widgets/e-addressbook-model.c | 29 +-
addressbook/gui/widgets/e-addressbook-selector.c | 3 +
.../gui/widgets/e-addressbook-table-adapter.c | 2 +-
addressbook/gui/widgets/e-addressbook-view.c | 43 +-
addressbook/gui/widgets/eab-gui-util.c | 47 +-
addressbook/gui/widgets/eab-gui-util.h | 9 +-
addressbook/importers/evolution-csv-importer.c | 19 +-
addressbook/importers/evolution-ldif-importer.c | 19 +-
addressbook/importers/evolution-vcard-importer.c | 95 +-
calendar/calendar.error.xml | 8 +
calendar/common/authentication.c | 1 +
calendar/gui/alarm-notify/alarm-notify.c | 27 +-
calendar/gui/alarm-notify/alarm-queue.c | 172 +-
calendar/gui/alarm-notify/alarm.c | 13 +-
calendar/gui/alarm-notify/config-data.c | 33 +-
calendar/gui/alarm-notify/config-data.h | 14 +
calendar/gui/alarm-notify/notify-main.c | 2 +
calendar/gui/dialogs/comp-editor.c | 15 +-
calendar/gui/dialogs/event-editor.c | 3 +
calendar/gui/dialogs/event-page.c | 21 +-
calendar/gui/dialogs/event-page.ui | 2 +-
calendar/gui/dialogs/memo-editor.c | 3 +
calendar/gui/dialogs/send-comp.c | 33 +-
calendar/gui/dialogs/task-editor.c | 3 +
calendar/gui/e-cal-list-view.c | 13 +-
calendar/gui/e-cal-model.c | 21 +-
calendar/gui/e-calendar-view.c | 13 +-
calendar/gui/e-calendar-view.h | 8 +-
calendar/gui/e-day-view.c | 18 +-
calendar/gui/e-meeting-list-view.c | 8 +-
calendar/gui/e-meeting-store.c | 217 +-
calendar/gui/e-memo-table.c | 3 +
calendar/gui/e-task-table.c | 3 +
calendar/gui/e-week-view-event-item.c | 2 +-
calendar/gui/e-week-view.c | 2 +-
calendar/gui/gnome-cal.c | 3 +
capplet/settings/mail-account-view.c | 4 +-
capplet/settings/mail-capplet-shell.c | 24 +-
composer/e-msg-composer.c | 7 +-
configure.ac | 9 +-
e-util/e-alert-dialog.c | 3 +
e-util/e-alert.c | 3 +
e-util/e-datetime-format.c | 6 +-
e-util/e-extension.c | 3 +
e-util/e-selection.c | 2 +
em-format/Makefile.am | 2 +
em-format/em-format-quote.c | 60 +
{mail => em-format}/em-inline-filter.c | 58 +-
{mail => em-format}/em-inline-filter.h | 3 +
filter/e-filter-rule.c | 6 +-
filter/e-rule-context.c | 1 +
filter/filter.ui | 2 +-
help/C/evolution.xml | 631 +-
help/C/figures/evo_backup_prgsbar.png | Bin 19896 -> 0 bytes
help/C/figures/evo_backup_warning.png | Bin 19591 -> 0 bytes
help/Makefile.am | 2 -
mail/Makefile.am | 2 -
mail/e-mail-attachment-bar.c | 3 +
mail/e-mail-backend.c | 13 +-
mail/e-mail-browser.c | 4 +-
mail/e-mail-display.c | 8 +
mail/e-mail-label-dialog.c | 3 +
mail/e-mail-label-list-store.c | 3 +
mail/e-mail-local.c | 12 +-
mail/e-mail-migrate.c | 335 +
mail/e-mail-notebook-view.c | 3 +
mail/e-mail-paned-view.c | 3 +
mail/e-mail-reader.c | 224 +-
mail/e-mail-session-utils.c | 6 +-
mail/e-mail-session.c | 6 +
mail/e-mail-store.c | 5 +-
mail/em-account-editor.c | 225 +-
mail/em-composer-utils.c | 68 +-
mail/em-filter-editor.c | 16 +-
mail/em-filter-rule.c | 6 +-
mail/em-folder-tree-model.c | 4 +-
mail/em-folder-tree.c | 2 +-
mail/em-format-html.c | 10 +-
mail/em-utils.c | 2 +-
mail/evolution-mail.schemas.in | 71 +
mail/mail-config.ui | 101 +-
mail/mail-ops.c | 145 +-
mail/mail-ops.h | 1 +
mail/mail-send-recv.c | 58 +-
mail/mail-send-recv.h | 3 +
mail/mail-tools.c | 2 +-
mail/mail-vfolder.c | 2 +
mail/mail.error.xml | 10 +
modules/addressbook/e-book-shell-backend.c | 3 +
modules/addressbook/e-book-shell-migrate.c | 24 +-
modules/addressbook/e-book-shell-view-private.c | 11 +-
modules/calendar/e-cal-config-calendar-item.c | 7 +
modules/calendar/e-cal-config-comp-editor.c | 7 +
modules/calendar/e-cal-config-date-edit.c | 7 +
modules/calendar/e-cal-config-meeting-store.c | 7 +
.../calendar/e-cal-config-meeting-time-selector.c | 7 +
modules/calendar/e-cal-config-model.c | 7 +
modules/calendar/e-cal-config-view.c | 7 +
modules/calendar/e-cal-shell-backend.c | 3 +
modules/calendar/e-cal-shell-migrate.c | 24 +-
modules/calendar/e-cal-shell-sidebar.c | 40 +-
modules/calendar/e-cal-shell-view-actions.c | 3 +-
modules/calendar/e-memo-shell-backend.c | 3 +
modules/calendar/e-memo-shell-migrate.c | 26 +-
modules/calendar/e-memo-shell-sidebar.c | 62 +-
modules/calendar/e-task-shell-backend.c | 3 +
modules/calendar/e-task-shell-migrate.c | 26 +-
modules/calendar/e-task-shell-sidebar.c | 62 +-
modules/connman/evolution-connman.c | 3 +
modules/mail/e-mail-config-format-html.c | 7 +
modules/mail/e-mail-config-reader.c | 7 +
modules/mail/e-mail-config-web-view.c | 7 +
modules/mail/e-mail-shell-backend.c | 20 -
modules/mail/e-mail-shell-settings.c | 8 +
modules/mail/e-mail-shell-view-actions.c | 202 +-
modules/mail/e-mail-shell-view-actions.h | 10 +-
modules/mail/e-mail-shell-view-private.c | 394 +-
modules/mail/e-mail-shell-view-private.h | 15 +
modules/mail/e-mail-shell-view.c | 4 +
modules/mail/em-mailer-prefs.c | 50 +-
modules/mailto-handler/evolution-mailto-handler.c | 3 +
.../network-manager/evolution-network-manager.c | 3 +
modules/offline-alert/evolution-offline-alert.c | 3 +
modules/plugin-manager/evolution-plugin-manager.c | 3 +
modules/startup-wizard/evolution-startup-wizard.c | 3 +
modules/windows-sens/evolution-windows-sens.c | 3 +
plugins/backup-restore/backup-restore.c | 8 +
plugins/bbdb/gaimbuddies.c | 7 +-
plugins/caldav/caldav-browse-server.c | 207 +-
plugins/caldav/caldav-browse-server.h | 2 +-
plugins/caldav/caldav-source.c | 40 +-
plugins/email-custom-header/email-custom-header.c | 23 +-
plugins/templates/templates.c | 5 +
.../vcard-inline/org-gnome-vcard-inline.eplug.xml | 4 +
plugins/vcard-inline/vcard-inline.c | 15 +-
.../webdav-account-setup/webdav-contacts-source.c | 10 +-
po/LINGUAS | 1 +
po/POTFILES.in | 1 -
po/en_GB.po | 9412 ++++----
po/es.po | 2042 +-
po/et.po | 2945 ++-
po/fi.po |12241 +++++-----
po/gl.po |15391 ++++++------
po/ml.po |27493 ++++++++++----------
po/nb.po | 7556 +++---
po/pa.po | 9863 ++++----
po/ug.po |20552 +++++++++++++++
po/zh_HK.po |11020 ++++-----
po/zh_TW.po |11073 ++++-----
shell/e-shell-content.c | 3 +
shell/e-shell-migrate.c | 28 +-
shell/e-shell-searchbar.c | 3 +
shell/e-shell-sidebar.c | 3 +
shell/e-shell-taskbar.c | 3 +
shell/e-shell-view.c | 4 +-
shell/e-shell-window-actions.c | 27 -
shell/e-shell-window-actions.h | 2 -
shell/e-shell-window-private.c | 11 +-
shell/e-shell-window.c | 3 +
shell/e-shell.c | 39 +-
shell/e-shell.h | 4 -
shell/killev.c | 41 +-
shell/main.c | 47 +-
shell/test/e-test-shell-backend.c | 15 +-
smime/gui/e-cert-selector.c | 13 +-
smime/gui/smime-ui.ui | 2 +-
ui/evolution-calendars.ui | 7 -
ui/evolution-contacts.ui | 7 -
ui/evolution-mail-reader.ui | 2 +
ui/evolution-mail.ui | 5 +-
ui/evolution-memos.ui | 9 -
ui/evolution-tasks.ui | 9 -
widgets/misc/e-alert-bar.c | 32 +
widgets/misc/e-attachment-handler-image.c | 4 +-
widgets/misc/e-attachment-handler-sendto.c | 4 +-
widgets/misc/e-attachment-handler.c | 4 +-
widgets/misc/e-attachment-paned.c | 3 +
widgets/misc/e-attachment-store.c | 3 +
widgets/misc/e-dateedit.c | 8 -
widgets/misc/e-focus-tracker.c | 3 +
widgets/misc/e-preview-pane.c | 3 +
widgets/misc/e-search-bar.c | 3 +
widgets/table/Makefile.am | 2 -
widgets/table/e-cell-text.c | 64 +-
widgets/table/gal-a11y-e-cell-text.c | 726 -
widgets/table/gal-a11y-e-cell-text.h | 63 -
widgets/text/e-text.c | 87 +-
193 files changed, 77140 insertions(+), 58356 deletions(-)
---
diff --cc widgets/misc/e-dateedit.c
index e6cf218,d0b9b7e..b8dce97
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@@ -578,16 -578,12 +578,8 @@@ create_children (EDateEdit *dedit
"has-entry", TRUE,
"entry-text-column", 0,
NULL);
-#else
- priv->time_combo = gtk_combo_box_entry_new_with_model (
- GTK_TREE_MODEL (time_store), 0);
-#endif
g_object_unref (time_store);
- gtk_cell_layout_clear (GTK_CELL_LAYOUT (priv->time_combo));
-
- cell = gtk_cell_renderer_text_new ();
- gtk_cell_layout_pack_start (
- GTK_CELL_LAYOUT (priv->time_combo), cell, TRUE);
- gtk_cell_layout_set_attributes (
- GTK_CELL_LAYOUT (priv->time_combo), cell, "text", 0, NULL);
-
child = gtk_bin_get_child (GTK_BIN (priv->time_combo));
/* We need to make sure labels are right-aligned, since we want
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
