[evolution/express: 203/203] Merge branch 'master' into express.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/express: 203/203] Merge branch 'master' into express.
- Date: Fri, 2 Apr 2010 00:12:22 +0000 (UTC)
commit 92888be7a71a57649f3afea4d0d6a7f36cbc3641
Merge: 5140910 55d6580
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu Apr 1 19:15:30 2010 -0400
Merge branch 'master' into express.
Makefile.am | 6 +
addressbook/gui/contact-editor/contact-editor.ui | 172 +-
addressbook/gui/contact-editor/e-contact-editor.c | 150 +-
addressbook/gui/contact-editor/e-contact-editor.h | 3 +
.../gui/contact-editor/e-contact-quick-add.c | 2 +
calendar/gui/Makefile.am | 26 +-
calendar/gui/alarm-notify/alarm-queue.c | 2 +-
calendar/gui/dialogs/cal-prefs-dialog.c | 4 +-
calendar/gui/dialogs/cal-prefs-dialog.ui | 365 +-
calendar/gui/dialogs/comp-editor.c | 2 +-
calendar/gui/e-calendar-view.c | 10 +
calendar/gui/e-day-view.c | 3 +
calendar/gui/e-week-view.c | 3 +
calendar/gui/gnome-cal.c | 149 +-
calendar/gui/gnome-cal.h | 5 +-
capplet/Makefile.am | 22 +-
capplet/anjal-settings-main.c | 122 +-
capplet/settings/Makefile.am | 20 +-
capplet/settings/anjal-mail-view.c | 37 +-
capplet/settings/anjal-mail-view.h | 20 +-
capplet/settings/mail-account-view.c | 180 +-
capplet/settings/mail-account-view.h | 13 +-
capplet/settings/mail-capplet-shell.c | 173 +-
capplet/settings/mail-capplet-shell.h | 14 +-
capplet/settings/mail-decoration.c | 101 +-
capplet/settings/mail-decoration.h | 9 +-
capplet/settings/mail-guess-servers.c | 77 +-
capplet/settings/mail-guess-servers.h | 30 +-
capplet/settings/mail-settings-view.c | 34 +-
capplet/settings/mail-settings-view.h | 10 +-
capplet/settings/mail-view.c | 384 +-
capplet/settings/mail-view.h | 15 +-
composer/e-msg-composer.c | 6 +-
composer/mail-composer.error.xml | 4 +-
configure.ac | 76 +-
data/Makefile.am | 49 +-
data/icons/Makefile.am | 83 +
.../gnome_stock_data_16x16_stock_signature-bad.png | Bin 0 -> 839 bytes
.../gnome_stock_data_16x16_stock_signature-ok.png | Bin 0 -> 1110 bytes
.../gnome_stock_data_16x16_stock_signature.png | Bin 0 -> 1108 bytes
.../gnome_stock_data_24x24_stock_signature-bad.png | Bin 0 -> 1618 bytes
.../gnome_stock_data_24x24_stock_signature-ok.png | Bin 0 -> 1659 bytes
.../gnome_stock_data_24x24_stock_signature.png | Bin 0 -> 1548 bytes
.../gnome_stock_data_48x48_stock_signature-bad.png | Bin 0 -> 4764 bytes
.../gnome_stock_data_48x48_stock_signature-ok.png | Bin 0 -> 4273 bytes
.../gnome_stock_data_48x48_stock_signature.png | Bin 0 -> 3730 bytes
...stock_document_16x16_stock_task-assigned-to.png | Bin 0 -> 467 bytes
...me_stock_document_16x16_stock_task-assigned.png | Bin 0 -> 482 bytes
...e_stock_document_16x16_stock_task-recurring.png | Bin 0 -> 475 bytes
.../gnome_stock_document_16x16_stock_task.png | Bin 0 -> 292 bytes
.../gnome_stock_document_16x16_stock_todo.png | Bin 0 -> 560 bytes
...stock_document_24x24_stock_task-assigned-to.png | Bin 0 -> 899 bytes
...me_stock_document_24x24_stock_task-assigned.png | Bin 0 -> 907 bytes
...e_stock_document_24x24_stock_task-recurring.png | Bin 0 -> 814 bytes
.../gnome_stock_document_24x24_stock_task.png | Bin 0 -> 608 bytes
.../gnome_stock_document_24x24_stock_todo.png | Bin 0 -> 853 bytes
.../gnome_stock_document_48x48_stock_todo.png | Bin 0 -> 2936 bytes
.../icons/gnome_stock_generic_16x16_stock_bell.png | Bin 0 -> 491 bytes
...nome_stock_generic_16x16_stock_check-filled.png | Bin 0 -> 270 bytes
...gnome_stock_generic_16x16_stock_new-meeting.png | Bin 0 -> 827 bytes
.../gnome_stock_generic_16x16_stock_score-high.png | Bin 0 -> 383 bytes
...nome_stock_generic_16x16_stock_score-higher.png | Bin 0 -> 381 bytes
...ome_stock_generic_16x16_stock_score-highest.png | Bin 0 -> 376 bytes
.../gnome_stock_generic_16x16_stock_score-low.png | Bin 0 -> 387 bytes
...gnome_stock_generic_16x16_stock_score-lower.png | Bin 0 -> 382 bytes
...nome_stock_generic_16x16_stock_score-lowest.png | Bin 0 -> 378 bytes
...nome_stock_generic_16x16_stock_score-normal.png | Bin 0 -> 343 bytes
.../gnome_stock_generic_16x16_stock_show-all.png | Bin 0 -> 186 bytes
.../gnome_stock_generic_16x16_stock_timezone.png | Bin 0 -> 922 bytes
...nome_stock_generic_16x16_stock_view-details.png | Bin 0 -> 467 bytes
...gnome_stock_generic_24x24_stock_new-meeting.png | Bin 0 -> 1801 bytes
.../gnome_stock_generic_24x24_stock_show-all.png | Bin 0 -> 543 bytes
.../gnome_stock_generic_24x24_stock_timezone.png | Bin 0 -> 1124 bytes
.../gnome_stock_generic_48x48_stock_alarm.png | Bin 0 -> 5022 bytes
...gnome_stock_generic_48x48_stock_new-meeting.png | Bin 0 -> 3766 bytes
.../gnome_stock_generic_48x48_stock_timezone.png | Bin 0 -> 2870 bytes
.../gnome_stock_net_16x16_stock_contact-list.png | Bin 0 -> 450 bytes
...me_stock_net_16x16_stock_mail-filters-apply.png | Bin 0 -> 475 bytes
...net_16x16_stock_mail-flag-for-followup-done.png | Bin 0 -> 515 bytes
...tock_net_16x16_stock_mail-flag-for-followup.png | Bin 0 -> 562 bytes
...me_stock_net_16x16_stock_mail-open-multiple.png | Bin 0 -> 661 bytes
..._stock_net_16x16_stock_mail-unread-multiple.png | Bin 0 -> 553 bytes
.../gnome_stock_net_16x16_stock_shared-by-me.png | Bin 0 -> 777 bytes
.../gnome_stock_net_16x16_stock_shared-to-me.png | Bin 0 -> 825 bytes
...me_stock_net_16x16_stock_video-conferencing.png | Bin 0 -> 1090 bytes
.../gnome_stock_net_24x24_stock_contact-list.png | Bin 0 -> 899 bytes
...me_stock_net_24x24_stock_mail-filters-apply.png | Bin 0 -> 849 bytes
...me_stock_net_24x24_stock_mail-open-multiple.png | Bin 0 -> 1033 bytes
..._stock_net_24x24_stock_mail-unread-multiple.png | Bin 0 -> 813 bytes
.../gnome_stock_net_24x24_stock_shared-by-me.png | Bin 0 -> 1078 bytes
.../gnome_stock_net_24x24_stock_shared-to-me.png | Bin 0 -> 959 bytes
...me_stock_net_24x24_stock_video-conferencing.png | Bin 0 -> 1724 bytes
...net_48x48_stock_mail-flag-for-followup-done.png | Bin 0 -> 3273 bytes
...tock_net_48x48_stock_mail-flag-for-followup.png | Bin 0 -> 3397 bytes
.../gnome_stock_object_16x16_stock_insert-note.png | Bin 0 -> 265 bytes
.../gnome_stock_object_24x24_stock_insert-note.png | Bin 0 -> 1284 bytes
doc/reference/shell/Makefile.am | 4 +-
doc/reference/shell/eshell-docs.sgml | 9 +-
doc/reference/shell/eshell-sections.txt | 62 +-
doc/reference/shell/eshell.types | 2 +
doc/reference/shell/tmpl/Evolution-DataServer.sgml | 1139 -
doc/reference/shell/tmpl/e-account-utils.sgml | 2 +-
doc/reference/shell/tmpl/e-activity-handler.sgml | 19 -
doc/reference/shell/tmpl/e-categories-config.sgml | 2 +-
doc/reference/shell/tmpl/e-config-upgrade.sgml | 32 -
doc/reference/shell/tmpl/e-datetime-format.sgml | 2 +-
doc/reference/shell/tmpl/e-dialog-utils.sgml | 2 +-
.../{e-shell-marshal.sgml => e-extensible.sgml} | 24 +-
.../{e-test-shell-view.sgml => e-extension.sgml} | 16 +-
doc/reference/shell/tmpl/e-icon-factory.sgml | 2 +-
doc/reference/shell/tmpl/e-module.sgml | 2 +-
doc/reference/shell/tmpl/e-print.sgml | 2 +-
doc/reference/shell/tmpl/e-shell-backend.sgml | 5 -
doc/reference/shell/tmpl/e-shell-common.sgml | 21 -
doc/reference/shell/tmpl/e-shell-constants.sgml | 140 -
doc/reference/shell/tmpl/e-shell-content.sgml | 13 +-
doc/reference/shell/tmpl/e-shell-module.sgml | 180 -
doc/reference/shell/tmpl/e-shell-searchbar.sgml | 31 +-
doc/reference/shell/tmpl/e-shell-view.sgml | 20 +
.../shell/tmpl/e-shell-window-actions.sgml | 309 -
.../shell/tmpl/e-shell-window-private.sgml | 25 -
doc/reference/shell/tmpl/e-shell.sgml | 2 +-
doc/reference/shell/tmpl/e-signature-utils.sgml | 2 +-
doc/reference/shell/tmpl/e-util.sgml | 36 +-
doc/reference/shell/tmpl/es-event.sgml | 147 -
doc/reference/shell/tmpl/eshell-unused.sgml | 2885 +---
.../shell/tmpl/evolution-importer-client.sgml | 94 -
.../shell/tmpl/evolution-importer-listener.sgml | 56 -
doc/reference/shell/tmpl/evolution-importer.sgml | 117 -
.../shell/tmpl/evolution-intelligent-importer.sgml | 67 -
doc/reference/shell/tmpl/intelligent.sgml | 26 -
e-util/Makefile.am | 6 +-
e-util/e-account-utils.c | 5 +
e-util/e-account-utils.h | 5 -
e-util/e-bconf-map.c | 537 -
e-util/e-bconf-map.h | 95 -
e-util/e-binding.c | 2 +-
e-util/e-datetime-format.c | 3 +
e-util/e-extensible.c | 93 +
e-util/e-extensible.h | 2 +
e-util/e-extension.c | 31 +
e-util/e-extension.h | 6 +
e-util/e-file-utils.c | 105 -
e-util/e-file-utils.h | 3 -
e-util/e-folder-map.c | 187 -
e-util/e-module.c | 6 +
e-util/e-module.h | 5 -
e-util/e-poolv.c | 146 +
e-util/{e-folder-map.h => e-poolv.h} | 27 +-
e-util/e-selection.c | 6 +
e-util/e-selection.h | 6 -
e-util/e-ui-manager.c | 37 +-
e-util/e-ui-manager.h | 9 -
e-util/e-util.c | 37 +-
e-util/e-util.h | 6 +-
em-format/em-format-quote.c | 6 +-
em-format/em-format.c | 71 +-
em-format/em-format.h | 2 +-
filter/e-filter-datespec.c | 3 +
help/el/el.po |16942 +++++----------
help/fr/fr.po | 5826 +++---
mail/Makefile.am | 27 +-
mail/default/it/Inbox | 1353 +--
mail/e-mail-browser.c | 13 +-
mail/e-mail-display.c | 20 +
mail/e-mail-migrate.c | 2333 +--
mail/e-mail-reader.c | 333 +-
mail/e-mail-reader.h | 1 +
mail/em-account-editor.c | 5 -
mail/em-folder-utils.c | 2 +-
mail/em-format-hook.c | 5 +-
mail/em-format-html-display.c | 6 +-
mail/em-format-html.c | 24 +-
mail/importers/mail-importer.c | 2 +-
mail/mail-config.ui | 2 +-
mail/mail-folder-cache.c | 5 +
mail/mail-folder-cache.h | 5 -
mail/mail-ops.c | 6 +-
mail/mail-tools.c | 6 +-
mail/mail-vfolder.c | 14 +-
mail/message-list.c | 361 +-
mail/message-list.h | 23 -
maint/Makefile.am | 25 +
maint/evolution.xml | 47 +
modules/Makefile.am | 12 +-
modules/addressbook/Makefile.am | 26 +-
modules/addressbook/autocompletion-config.c | 2 +-
modules/addressbook/e-book-shell-content.c | 4 +-
modules/addressbook/e-book-shell-migrate.c | 1011 -
modules/calendar/e-cal-shell-backend.c | 2 +-
modules/calendar/e-cal-shell-content.c | 99 +-
modules/calendar/e-cal-shell-migrate.c | 555 +-
modules/calendar/e-cal-shell-view-actions.c | 54 +-
modules/calendar/e-cal-shell-view-private.c | 56 +-
modules/calendar/e-cal-shell-view.c | 36 +-
modules/calendar/e-memo-shell-backend.c | 2 +-
modules/calendar/e-memo-shell-content.c | 4 +-
modules/calendar/e-task-shell-backend.c | 2 +-
modules/calendar/e-task-shell-content.c | 4 +-
modules/calendar/e-task-shell-migrate.c | 495 +-
modules/connman/Makefile.am | 22 +
modules/connman/evolution-connman.c | 204 +
modules/mail/Makefile.am | 2 +
modules/mail/e-mail-config-web-view.c | 100 +
.../mail/e-mail-config-web-view.h | 21 +-
modules/mail/e-mail-shell-backend.c | 26 +-
modules/mail/e-mail-shell-content.c | 8 +-
modules/mail/e-mail-shell-sidebar.c | 53 +-
modules/mail/e-mail-shell-view-actions.c | 105 +-
modules/mail/e-mail-shell-view-actions.h | 10 +-
modules/mail/em-composer-prefs.c | 21 +-
modules/mail/evolution-module-mail.c | 2 +
modules/network-manager/Makefile.am | 1 +
modules/plugin-mono/Camel.cs | 62 -
modules/windows-sens/Makefile.am | 20 +
modules/windows-sens/evolution-windows-sens.c | 602 +
plugins/attachment-reminder/Makefile.am | 4 +
plugins/bbdb/bbdb.c | 2 +-
plugins/bbdb/gaimbuddies.c | 25 +-
plugins/bogo-junk-plugin/Makefile.am | 25 +-
plugins/default-mailer/Makefile.am | 4 +
plugins/email-custom-header/Makefile.am | 4 +
plugins/external-editor/Makefile.am | 25 +-
plugins/face/Makefile.am | 26 +-
plugins/groupwise-features/share-folder-common.c | 2 +-
plugins/itip-formatter/itip-formatter.c | 2 +-
plugins/mail-notification/Makefile.am | 4 +
.../mail-to-task/org-gnome-mail-to-task.eplug.xml | 9 +-
plugins/prefer-plain/prefer-plain.c | 4 +-
plugins/profiler/profiler.c | 2 +-
plugins/pst-import/pst-importer.c | 4 +-
plugins/startup-wizard/startup-wizard.c | 2 +-
plugins/templates/Makefile.am | 4 +
plugins/tnef-attachments/tnef-plugin.c | 4 +-
po/POTFILES.in | 2 +-
po/bg.po | 1499 +-
po/bn.po | 4911 ++---
po/ca.po | 2198 +-
po/cs.po | 2532 ++-
po/da.po |15525 +++++++-------
po/el.po |20582 ++++++++----------
po/en_GB.po | 2338 ++-
po/es.po | 1593 +-
po/et.po | 2496 ++-
po/eu.po | 1828 +-
po/fr.po | 1510 +-
po/gl.po | 1413 +-
po/hu.po |20162 ++++++++---------
po/it.po |23220 +++++++++++---------
po/ko.po |23229 +++++++++-----------
po/lt.po |18456 ++++++++--------
po/pa.po | 5171 ++---
po/pt.po |15515 +++++++-------
po/pt_BR.po |22146 +++++++++----------
po/ro.po |22567 +++++++++----------
po/sl.po | 1558 +-
po/sr.po |21966 +++++++++----------
po/sr latin po |21966 +++++++++----------
po/sv.po | 5533 +++---
po/ta.po | 2838 ++--
po/te.po |22848 +++++++++++---------
po/uk.po |21842 +++++++++----------
po/zh_HK.po | 2734 ++--
po/zh_TW.po | 2744 ++--
shell/Makefile.am | 8 +-
shell/e-config-upgrade.c | 162 -
shell/e-shell-backend.c | 154 +-
shell/e-shell-backend.h | 11 +-
shell/e-shell-content.c | 162 +-
shell/e-shell-content.h | 14 +-
shell/e-shell-migrate.c | 194 +-
shell/e-shell-searchbar.c | 112 +-
shell/e-shell-searchbar.h | 17 +-
shell/e-shell-settings.c | 6 +
shell/e-shell-settings.h | 6 -
shell/e-shell-sidebar.c | 6 +
shell/e-shell-sidebar.h | 6 -
shell/e-shell-switcher.c | 6 +
shell/e-shell-switcher.h | 6 -
shell/e-shell-taskbar.c | 21 +-
shell/e-shell-taskbar.h | 6 -
shell/e-shell-utils.c | 6 +
shell/e-shell-utils.h | 6 -
shell/e-shell-view.c | 140 +-
shell/e-shell-view.h | 12 +-
shell/e-shell-window-actions.c | 1 +
shell/e-shell-window-private.c | 12 +-
shell/e-shell-window.c | 31 +-
shell/e-shell-window.h | 6 -
shell/e-shell.c | 42 +-
shell/e-shell.h | 6 -
shell/main.c | 85 +-
shell/shell.error.xml | 40 +-
smime/gui/component.c | 2 +-
smime/lib/e-cert-db.c | 2 +-
smime/lib/e-pkcs12.c | 4 +-
ui/evolution-calendars.ui | 32 +
ui/evolution-contacts.ui | 8 +
ui/evolution-mail-reader.ui | 12 +-
ui/evolution-mail.ui | 19 +-
ui/evolution-memos.ui | 18 +-
ui/evolution-shell.ui | 17 +-
ui/evolution-tasks.ui | 4 +
widgets/misc/e-attachment-handler-image.c | 4 +-
widgets/misc/e-attachment-paned.c | 9 +-
widgets/misc/e-web-view.c | 232 +-
widgets/misc/e-web-view.h | 11 +
widgets/table/e-cell-text.c | 2 +-
308 files changed, 167539 insertions(+), 187529 deletions(-)
---
diff --cc mail/e-mail-browser.c
index 425aeb8,96f168f..791e646
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@@ -826,9 -783,15 +832,14 @@@ mail_browser_init (EMailBrowser *browse
browser->priv = E_MAIL_BROWSER_GET_PRIVATE (browser);
reader = E_MAIL_READER (browser);
+ shell_backend = e_mail_reader_get_shell_backend (reader);
+ shell = e_shell_backend_get_shell (shell_backend);
+
+ ui_manager = e_ui_manager_new ();
+ e_shell_configure_ui_manager (shell, E_UI_MANAGER (ui_manager));
- browser->priv->ui_manager = e_ui_manager_new ();
+ browser->priv->ui_manager = ui_manager;
browser->priv->action_group = gtk_action_group_new ("mail-browser");
- browser->priv->html_display = em_format_html_display_new ();
bridge = gconf_bridge_get ();
prefix = "/apps/evolution/mail/mail_browser";
diff --cc mail/e-mail-reader.c
index 0febd90,684b97c..9bc5092
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@@ -2329,8 -2682,20 +2644,16 @@@ e_mail_reader_init (EMailReader *reader
g_signal_connect_swapped (
message_list, "key-press",
G_CALLBACK (mail_reader_key_press_cb), reader);
-
- g_signal_connect_swapped (
- message_list, "selection-change",
- G_CALLBACK (e_mail_reader_changed), reader);
}
+ void
+ e_mail_reader_changed (EMailReader *reader)
+ {
+ g_return_if_fail (E_IS_MAIL_READER (reader));
+
+ g_signal_emit (reader, signals[CHANGED], 0);
+ }
+
guint32
e_mail_reader_check_state (EMailReader *reader)
{
diff --cc plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
index 9cb3909,d904d29..b4f45b9
--- a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
+++ b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
@@@ -61,8 -61,8 +61,9 @@@
<menuitem action="mail-convert-to-memo"/>
</placeholder>
</popup>
+<!-- endif -->
</ui-manager>
+ #endif
</hook>
</e-plugin>
diff --cc po/POTFILES.in
index d165c72,d165c72..91d5448
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -191,6 -191,6 +191,7 @@@ mail/e-mail-label-manager.
mail/e-mail-label-tree-view.c
mail/e-mail-local.c
mail/e-mail-migrate.c
++mail/e-mail-paned.c
mail/e-mail-reader-utils.c
mail/e-mail-reader.c
mail/e-mail-store.c
@@@ -407,7 -407,7 +408,6 @@@ plugins/vcard-inline/vcard-inline.
plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml
plugins/webdav-account-setup/webdav-contacts-source.c
shell/apps_evolution_shell.schemas.in
--shell/e-config-upgrade.c
shell/e-shell-backend.c
shell/e-shell-content.c
shell/e-shell-migrate.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
