evolution r37050 - in branches/kill-bonobo: . addressbook addressbook/conduit addressbook/gui/component addressbook/gui/contact-editor addressbook/gui/contact-list-editor addressbook/gui/merging addressbook/gui/widgets addressbook/printing addressbook/util calendar calendar/conduits/todo calendar/gui calendar/gui/alarm-notify calendar/gui/dialogs composer e-util filter help help/C help/cs help/de help/de/figures help/es help/es/figures help/no/figures help/quickref help/quickref/C help/quickref/cs help/quickref/de help/quickref/es help/quickref/fr help/quickref/hu help/quickref/it help/quickref/oc help/quickref/pl help/quickref/pt help/quickref/sq help/quickref/sv mail mail/importers plugins/bogo-junk-plugin plugins/email-custom-header plugins/groupwise-features plugins/mailing-list-actions plugins/publish-calendar po shell shell/importer ui widgets widgets/menus widgets/misc widgets/table
- From: mbarnes svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution r37050 - in branches/kill-bonobo: . addressbook addressbook/conduit addressbook/gui/component addressbook/gui/contact-editor addressbook/gui/contact-list-editor addressbook/gui/merging addressbook/gui/widgets addressbook/printing addressbook/util calendar calendar/conduits/todo calendar/gui calendar/gui/alarm-notify calendar/gui/dialogs composer e-util filter help help/C help/cs help/de help/de/figures help/es help/es/figures help/no/figures help/quickref help/quickref/C help/quickref/cs help/quickref/de help/quickref/es help/quickref/fr help/quickref/hu help/quickref/it help/quickref/oc help/quickref/pl help/quickref/pt help/quickref/sq help/quickref/sv mail mail/importers plugins/bogo-junk-plugin plugins/email-custom-header plugins/groupwise-features plugins/mailing-list-actions plugins/publish-calendar po shell shell/importer ui widgets widgets/menus widgets/misc widgets/table
- Date: Mon, 12 Jan 2009 04:12:01 +0000 (UTC)
Author: mbarnes
Date: Mon Jan 12 04:12:01 2009
New Revision: 37050
URL: http://svn.gnome.org/viewvc/evolution?rev=37050&view=rev
Log:
Merge revisions 36866:37046 from trunk.
Added:
branches/kill-bonobo/help/de/figures/attach_reminder_a.png
- copied unchanged from r37046, /trunk/help/de/figures/attach_reminder_a.png
branches/kill-bonobo/help/de/figures/evo-newmail.png
- copied unchanged from r37046, /trunk/help/de/figures/evo-newmail.png
branches/kill-bonobo/help/de/figures/evo_account_editor_a.png
- copied unchanged from r37046, /trunk/help/de/figures/evo_account_editor_a.png
branches/kill-bonobo/help/de/figures/evo_adv_search_a.png
- copied unchanged from r37046, /trunk/help/de/figures/evo_adv_search_a.png
branches/kill-bonobo/help/de/figures/evo_attachreminder_plugin.png
- copied unchanged from r37046, /trunk/help/de/figures/evo_attachreminder_plugin.png
branches/kill-bonobo/help/de/figures/evo_backup.png
- copied unchanged from r37046, /trunk/help/de/figures/evo_backup.png
branches/kill-bonobo/help/de/figures/evo_backup_prgsbar.png
- copied unchanged from r37046, /trunk/help/de/figures/evo_backup_prgsbar.png
branches/kill-bonobo/help/de/figures/evo_backup_warning.png
- copied unchanged from r37046, /trunk/help/de/figures/evo_backup_warning.png
branches/kill-bonobo/help/de/figures/evo_calender_appointmnt.png
- copied unchanged from r37046, /trunk/help/de/figures/evo_calender_appointmnt.png
branches/kill-bonobo/help/de/figures/evo_contacteditor_a.png
- copied unchanged from r37046, /trunk/help/de/figures/evo_contacteditor_a.png
branches/kill-bonobo/help/de/figures/evo_import_asst_a.png
- copied unchanged from r37046, /trunk/help/de/figures/evo_import_asst_a.png
branches/kill-bonobo/help/de/figures/evo_mailnotification.png
- copied unchanged from r37046, /trunk/help/de/figures/evo_mailnotification.png
branches/kill-bonobo/help/de/figures/evo_message_filters_a.png
- copied unchanged from r37046, /trunk/help/de/figures/evo_message_filters_a.png
branches/kill-bonobo/help/de/figures/evo_newmess_a.png
- copied unchanged from r37046, /trunk/help/de/figures/evo_newmess_a.png
branches/kill-bonobo/help/de/figures/google_cal_view.png
- copied unchanged from r37046, /trunk/help/de/figures/google_cal_view.png
branches/kill-bonobo/help/de/figures/network_pref.png
- copied unchanged from r37046, /trunk/help/de/figures/network_pref.png
branches/kill-bonobo/help/de/figures/quick_add_a.png
- copied unchanged from r37046, /trunk/help/de/figures/quick_add_a.png
branches/kill-bonobo/help/es/figures/evo_customheader.png
- copied unchanged from r37046, /trunk/help/es/figures/evo_customheader.png
branches/kill-bonobo/help/es/figures/evo_googlecontacts.png
- copied unchanged from r37046, /trunk/help/es/figures/evo_googlecontacts.png
branches/kill-bonobo/help/es/figures/evo_shd_memo_a.png
- copied unchanged from r37046, /trunk/help/es/figures/evo_shd_memo_a.png
branches/kill-bonobo/help/es/figures/mail-threaded.png
- copied unchanged from r37046, /trunk/help/es/figures/mail-threaded.png
branches/kill-bonobo/help/es/figures/network_pref.png
- copied unchanged from r37046, /trunk/help/es/figures/network_pref.png
branches/kill-bonobo/help/es/figures/ver_view_a.png
- copied unchanged from r37046, /trunk/help/es/figures/ver_view_a.png
branches/kill-bonobo/help/quickref/cs/
- copied from r37046, /trunk/help/quickref/cs/
Removed:
branches/kill-bonobo/help/de/figures/Screenshot-Evolution-mailer-Preferences.png
branches/kill-bonobo/help/de/figures/Screenshot-Free-Busy.png
branches/kill-bonobo/help/de/figures/account_editor_a.png
branches/kill-bonobo/help/de/figures/calendar.png
branches/kill-bonobo/help/de/figures/categories_a.png
branches/kill-bonobo/help/de/figures/collap_head_a.png
branches/kill-bonobo/help/de/figures/config-cal.png
branches/kill-bonobo/help/de/figures/config-mail.png
branches/kill-bonobo/help/de/figures/contact-editor.png
branches/kill-bonobo/help/de/figures/contact.png
branches/kill-bonobo/help/de/figures/contacts_mainwindow_a.png
branches/kill-bonobo/help/de/figures/evo_account_info_a.png
branches/kill-bonobo/help/de/figures/evo_add_rule_a.png
branches/kill-bonobo/help/de/figures/evo_allday_a.png
branches/kill-bonobo/help/de/figures/evo_cal_ prop_a.png
branches/kill-bonobo/help/de/figures/evo_cal_a.png
branches/kill-bonobo/help/de/figures/evo_cal_callout_a.png
branches/kill-bonobo/help/de/figures/evo_edit_rule_a.png
branches/kill-bonobo/help/de/figures/evo_edit_search.png
branches/kill-bonobo/help/de/figures/evo_email_a.png
branches/kill-bonobo/help/de/figures/evo_flag_follow_up_a.png
branches/kill-bonobo/help/de/figures/evo_gwreceiveedit_a.png
branches/kill-bonobo/help/de/figures/evo_gwreceiveoptedit_a.png
branches/kill-bonobo/help/de/figures/evo_identityedit_a.png
branches/kill-bonobo/help/de/figures/evo_imapheader_a.png
branches/kill-bonobo/help/de/figures/evo_mail_a.png
branches/kill-bonobo/help/de/figures/evo_mail_callout_a.png
branches/kill-bonobo/help/de/figures/evo_mereceive_a.png
branches/kill-bonobo/help/de/figures/evo_proxyadd_a.png
branches/kill-bonobo/help/de/figures/evo_receive_setup2_a.png
branches/kill-bonobo/help/de/figures/evo_rmdrnotes_a.png
branches/kill-bonobo/help/de/figures/evo_rule_a.png
branches/kill-bonobo/help/de/figures/evo_select_add_folder.png
branches/kill-bonobo/help/de/figures/evo_select_folder.png
branches/kill-bonobo/help/de/figures/evo_shd_memo_a.png
branches/kill-bonobo/help/de/figures/exchange-delegation.png
branches/kill-bonobo/help/de/figures/exchange-identity.png
branches/kill-bonobo/help/de/figures/exchange-receive-options.png
branches/kill-bonobo/help/de/figures/exchange-receive.png
branches/kill-bonobo/help/de/figures/exchg-identity.png
branches/kill-bonobo/help/de/figures/exchng-identity.png
branches/kill-bonobo/help/de/figures/exchng-rec-mail.png
branches/kill-bonobo/help/de/figures/exchng-rec-mails.png
branches/kill-bonobo/help/de/figures/exchng-rec-option.png
branches/kill-bonobo/help/de/figures/exchng-rec-options.png
branches/kill-bonobo/help/de/figures/filter-new-fig.png
branches/kill-bonobo/help/de/figures/free_busy.png
branches/kill-bonobo/help/de/figures/full-1.png
branches/kill-bonobo/help/de/figures/full-2.png
branches/kill-bonobo/help/de/figures/full-3.png
branches/kill-bonobo/help/de/figures/full-4.png
branches/kill-bonobo/help/de/figures/full-5.png
branches/kill-bonobo/help/de/figures/full-6.png
branches/kill-bonobo/help/de/figures/full-7.png
branches/kill-bonobo/help/de/figures/mail-druid-pic.png
branches/kill-bonobo/help/de/figures/mail-inbox.png
branches/kill-bonobo/help/de/figures/mail-threaded.png
branches/kill-bonobo/help/de/figures/mail_mainwindow_a.png
branches/kill-bonobo/help/de/figures/mainwindow-pic.png
branches/kill-bonobo/help/de/figures/minus.png
branches/kill-bonobo/help/de/figures/newmsg.png
branches/kill-bonobo/help/de/figures/plus.png
branches/kill-bonobo/help/de/figures/proxy-cal.png
branches/kill-bonobo/help/de/figures/proxy-login.png
branches/kill-bonobo/help/de/figures/replymsg.png
branches/kill-bonobo/help/de/figures/schedule.png
branches/kill-bonobo/help/de/figures/stock_search.png
branches/kill-bonobo/help/de/figures/sub-others-folder.png
branches/kill-bonobo/help/de/figures/sub-pub-fold.png
branches/kill-bonobo/help/de/figures/ver_view_a.png
branches/kill-bonobo/help/de/figures/vfolder-createrule-fig.png
branches/kill-bonobo/help/es/figures/evo_blink.png
branches/kill-bonobo/help/es/figures/evo_dialog-info.png
branches/kill-bonobo/help/es/figures/evo_dialog-warning.png
branches/kill-bonobo/help/es/figures/full-1.png
branches/kill-bonobo/help/es/figures/full-2.png
branches/kill-bonobo/help/es/figures/full-3.png
branches/kill-bonobo/help/es/figures/full-4.png
branches/kill-bonobo/help/es/figures/full-5.png
branches/kill-bonobo/help/es/figures/full-6.png
branches/kill-bonobo/help/es/figures/full-7.png
branches/kill-bonobo/help/es/figures/minus.png
branches/kill-bonobo/help/es/figures/plus.png
branches/kill-bonobo/help/es/figures/stock_search.png
branches/kill-bonobo/help/no/figures/full-1.png
branches/kill-bonobo/help/no/figures/full-2.png
branches/kill-bonobo/help/no/figures/full-3.png
branches/kill-bonobo/help/no/figures/full-4.png
branches/kill-bonobo/help/no/figures/full-5.png
branches/kill-bonobo/help/no/figures/full-6.png
branches/kill-bonobo/help/no/figures/full-7.png
branches/kill-bonobo/widgets/misc/test-color.c
Modified:
branches/kill-bonobo/ (props changed)
branches/kill-bonobo/ChangeLog
branches/kill-bonobo/NEWS
branches/kill-bonobo/addressbook/ChangeLog
branches/kill-bonobo/addressbook/conduit/address-conduit.c
branches/kill-bonobo/addressbook/gui/component/Makefile.am
branches/kill-bonobo/addressbook/gui/component/addressbook-component.c
branches/kill-bonobo/addressbook/gui/component/addressbook-config.c
branches/kill-bonobo/addressbook/gui/component/addressbook-view.c
branches/kill-bonobo/addressbook/gui/component/eab-composer-util.c (props changed)
branches/kill-bonobo/addressbook/gui/component/eab-composer-util.h (props changed)
branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-address.c
branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-fullname.c
branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-im.c
branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.h
branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-quick-add.c
branches/kill-bonobo/addressbook/gui/contact-editor/eab-editor.h
branches/kill-bonobo/addressbook/gui/contact-editor/test-editor.c
branches/kill-bonobo/addressbook/gui/contact-list-editor/e-contact-list-editor.h
branches/kill-bonobo/addressbook/gui/merging/eab-contact-merging.c
branches/kill-bonobo/addressbook/gui/widgets/addresstypes.xml
branches/kill-bonobo/addressbook/printing/e-contact-print.c
branches/kill-bonobo/addressbook/printing/test-contact-print-style-editor.c
branches/kill-bonobo/addressbook/printing/test-print.c
branches/kill-bonobo/addressbook/util/addressbook.c (props changed)
branches/kill-bonobo/addressbook/util/addressbook.h (props changed)
branches/kill-bonobo/calendar/ChangeLog
branches/kill-bonobo/calendar/conduits/todo/todo-conduit.c
branches/kill-bonobo/calendar/gui/Makefile.am
branches/kill-bonobo/calendar/gui/alarm-notify/alarm-queue.c
branches/kill-bonobo/calendar/gui/calendar-commands.c
branches/kill-bonobo/calendar/gui/calendar-component.c
branches/kill-bonobo/calendar/gui/calendar-config.c
branches/kill-bonobo/calendar/gui/calendar-config.h
branches/kill-bonobo/calendar/gui/dialogs/alarm-dialog.c
branches/kill-bonobo/calendar/gui/dialogs/cal-attachment-select-file.c
branches/kill-bonobo/calendar/gui/dialogs/cancel-comp.c
branches/kill-bonobo/calendar/gui/dialogs/changed-comp.c
branches/kill-bonobo/calendar/gui/dialogs/comp-editor.c
branches/kill-bonobo/calendar/gui/dialogs/delete-error.c
branches/kill-bonobo/calendar/gui/dialogs/event-editor.c
branches/kill-bonobo/calendar/gui/dialogs/memo-editor.c
branches/kill-bonobo/calendar/gui/dialogs/recur-comp.c
branches/kill-bonobo/calendar/gui/dialogs/recurrence-page.c
branches/kill-bonobo/calendar/gui/dialogs/schedule-page.c
branches/kill-bonobo/calendar/gui/e-cal-list-view.c
branches/kill-bonobo/calendar/gui/e-cal-model.c
branches/kill-bonobo/calendar/gui/e-cal-popup.c
branches/kill-bonobo/calendar/gui/e-calendar-table.c
branches/kill-bonobo/calendar/gui/e-calendar-view.c
branches/kill-bonobo/calendar/gui/e-calendar-view.h
branches/kill-bonobo/calendar/gui/e-cell-date-edit-text.c
branches/kill-bonobo/calendar/gui/e-day-view.c
branches/kill-bonobo/calendar/gui/e-itip-control.c
branches/kill-bonobo/calendar/gui/e-meeting-attendee.c
branches/kill-bonobo/calendar/gui/e-meeting-list-view.c
branches/kill-bonobo/calendar/gui/e-meeting-store.c
branches/kill-bonobo/calendar/gui/e-meeting-time-sel.c
branches/kill-bonobo/calendar/gui/e-meeting-types.h
branches/kill-bonobo/calendar/gui/e-select-names-editable.c
branches/kill-bonobo/calendar/gui/e-week-view.c
branches/kill-bonobo/calendar/gui/gnome-cal.c
branches/kill-bonobo/calendar/gui/goto.c
branches/kill-bonobo/calendar/gui/itip-utils.c
branches/kill-bonobo/calendar/gui/memos-component.c
branches/kill-bonobo/calendar/gui/print.c
branches/kill-bonobo/calendar/gui/tasks-component.c
branches/kill-bonobo/calendar/gui/tasks-control.c
branches/kill-bonobo/composer/ChangeLog
branches/kill-bonobo/composer/e-composer-actions.c
branches/kill-bonobo/composer/e-composer-header-table.c
branches/kill-bonobo/composer/e-composer-private.h
branches/kill-bonobo/composer/e-msg-composer.c
branches/kill-bonobo/configure.in
branches/kill-bonobo/e-util/ChangeLog
branches/kill-bonobo/e-util/e-config.c
branches/kill-bonobo/e-util/e-dialog-utils.c
branches/kill-bonobo/e-util/e-util-labels.c
branches/kill-bonobo/filter/ChangeLog
branches/kill-bonobo/filter/filter-code.c
branches/kill-bonobo/filter/filter-code.h
branches/kill-bonobo/filter/filter-int.c
branches/kill-bonobo/filter/filter-option.c
branches/kill-bonobo/filter/rule-context.c
branches/kill-bonobo/filter/rule-editor.c
branches/kill-bonobo/help/C/evolution.xml
branches/kill-bonobo/help/ChangeLog
branches/kill-bonobo/help/cs/cs.po
branches/kill-bonobo/help/de/de.po
branches/kill-bonobo/help/es/es.po
branches/kill-bonobo/help/quickref/C/quickref.pdf
branches/kill-bonobo/help/quickref/Makefile.am
branches/kill-bonobo/help/quickref/de/quickref.pdf
branches/kill-bonobo/help/quickref/es/quickref.pdf
branches/kill-bonobo/help/quickref/es/quickref.tex
branches/kill-bonobo/help/quickref/evolution-logo.eps
branches/kill-bonobo/help/quickref/fr/quickref.pdf
branches/kill-bonobo/help/quickref/hu/quickref.pdf
branches/kill-bonobo/help/quickref/it/quickref.pdf
branches/kill-bonobo/help/quickref/it/quickref.tex
branches/kill-bonobo/help/quickref/oc/quickref.pdf
branches/kill-bonobo/help/quickref/pl/quickref.pdf
branches/kill-bonobo/help/quickref/pl/quickref.tex
branches/kill-bonobo/help/quickref/pt/quickref.pdf
branches/kill-bonobo/help/quickref/sq/quickref.pdf
branches/kill-bonobo/help/quickref/sq/quickref.tex
branches/kill-bonobo/help/quickref/sv/quickref.pdf
branches/kill-bonobo/mail/ChangeLog
branches/kill-bonobo/mail/e-searching-tokenizer.c
branches/kill-bonobo/mail/em-account-editor.c
branches/kill-bonobo/mail/em-filter-folder-element.c
branches/kill-bonobo/mail/em-filter-folder-element.h
branches/kill-bonobo/mail/em-folder-view.c
branches/kill-bonobo/mail/em-format-html-display.c
branches/kill-bonobo/mail/em-format.c
branches/kill-bonobo/mail/em-icon-stream.c
branches/kill-bonobo/mail/em-subscribe-editor.c
branches/kill-bonobo/mail/em-vfolder-context.c
branches/kill-bonobo/mail/importers/mail-importer.c
branches/kill-bonobo/mail/mail-autofilter.c
branches/kill-bonobo/mail/mail-component.c
branches/kill-bonobo/mail/mail-config.c
branches/kill-bonobo/mail/mail-send-recv.c
branches/kill-bonobo/mail/message-list.c
branches/kill-bonobo/mail/message-tag-followup.c
branches/kill-bonobo/mail/searchtypes.xml
branches/kill-bonobo/mail/vfoldertypes.xml
branches/kill-bonobo/plugins/bogo-junk-plugin/ChangeLog
branches/kill-bonobo/plugins/bogo-junk-plugin/Makefile.am
branches/kill-bonobo/plugins/bogo-junk-plugin/bf-junk-filter.c
branches/kill-bonobo/plugins/email-custom-header/ChangeLog
branches/kill-bonobo/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
branches/kill-bonobo/plugins/email-custom-header/email-custom-header.c
branches/kill-bonobo/plugins/groupwise-features/ChangeLog
branches/kill-bonobo/plugins/groupwise-features/mail-retract.c
branches/kill-bonobo/plugins/mailing-list-actions/ChangeLog
branches/kill-bonobo/plugins/mailing-list-actions/mailing-list-actions.c
branches/kill-bonobo/plugins/publish-calendar/ChangeLog
branches/kill-bonobo/plugins/publish-calendar/url-editor-dialog.c
branches/kill-bonobo/po/ChangeLog
branches/kill-bonobo/po/POTFILES.in
branches/kill-bonobo/po/de.po
branches/kill-bonobo/po/es.po
branches/kill-bonobo/po/fi.po
branches/kill-bonobo/po/lv.po
branches/kill-bonobo/po/nb.po
branches/kill-bonobo/po/oc.po
branches/kill-bonobo/po/pt_BR.po
branches/kill-bonobo/po/sk.po
branches/kill-bonobo/po/sl.po
branches/kill-bonobo/shell/ChangeLog
branches/kill-bonobo/shell/importer/intelligent.c
branches/kill-bonobo/shell/main.c
branches/kill-bonobo/ui/evolution-mail-reader.ui (props changed)
branches/kill-bonobo/widgets/ChangeLog
branches/kill-bonobo/widgets/menus/gal-view-collection.c
branches/kill-bonobo/widgets/menus/gal-view-instance.c
branches/kill-bonobo/widgets/misc/ChangeLog
branches/kill-bonobo/widgets/misc/e-cell-date-edit.c
branches/kill-bonobo/widgets/misc/e-cell-percent.c
branches/kill-bonobo/widgets/misc/e-charset-picker.c
branches/kill-bonobo/widgets/misc/e-dropdown-button.c
branches/kill-bonobo/widgets/misc/e-signature-combo-box.c
branches/kill-bonobo/widgets/misc/test-dropdown-button.c
branches/kill-bonobo/widgets/table/ChangeLog
branches/kill-bonobo/widgets/table/e-table-state.c
Modified: branches/kill-bonobo/NEWS
==============================================================================
--- branches/kill-bonobo/NEWS (original)
+++ branches/kill-bonobo/NEWS Mon Jan 12 04:12:01 2009
@@ -1,3 +1,64 @@
+Evolution 2.25.4 2009-01-05
+---------------------------
+
+Bug Fixes:
+ #435694: (Novell Bugzilla) Since we now add a bar, lets set the popup items right (Bharath Acharya)
+ #439998: (Novell Bugzilla) Ask the user if he wants to remove the delegated events or keep a copy (Bharath Acharya)
+ #446285: (Novell Bugzilla) Traverse all the entries in the added list (Bharath Acharya)
+ #546437: Fix various typos and poor wording in chapters 1-4 (Matthew Barnes)
+ #546860: Don't craash on malformed label strings (Matthew Barnes)
+ #558337: Fix a crash while managing IMAP folder subscriptions (Norman Wang)
+ #559153: Migration improvements (Sankar P)
+ #559604: Show additional status information for the meeting only when user is an organizer (Milan Crha)
+ #562091: Fix the problem of normal memo window popup when trying to create a shared memo (Matthew Barnes)
+ #562155: Fix a warning shown in the terminal output (Matthew Barnes)
+ #564248: Bump minimum version required for gtkhtml because of new html editor functions (Milan Crha)
+ #565628: Fix memory leak (Ignacio Casal Quinteiro)
+ #565857: Fixes a memory leak (Matthew Barnes)
+ #566206: Remove unlocalized screenshots (Andre Klapper)
+
+Updated Translations:
+ Jorge Gonzalez (es)
+ Yannig Marchegay (oc)
+ Marcel Telka (sk)
+ Leonardo Ferreira Fontenelle (pt_BR)
+ Andre Klapper (de)
+
+Evolution 2.25.3 2008-12-15
+---------------------------
+
+Bug Fixes:
+ #332629: New helper function to be used in FilterOption (Milan Crha)
+ #332629: Use dynamically created list of categories in the option's widget (Milan Crha)
+ #333224: Fix a crash when changing the time of an exchange appointment (Milan Crha)
+ #337082: Do not set we finished with loading until we are really done with it. The previous behavior can cause duplicate nodes in tree for subscribed folders (Milan Crha)
+ #348299: Use category completion in the Categories field. Fix some reference count leaks (Matthew Barnes)
+ #350725: Copy/Paste support in day/week views (Hiroyuki Ikezoe)
+ #352287: Draw top icons in full detail/color depth (Milan Crha)
+ #549964: Fix for an errorneous string (Jennifer Newman)
+ #551599: Do not fallback to default 15 minutes alarm offset if alarm is triggered at start (or end) of appointment (Paul Bolle)
+ #552357: Function prototype (Milan Crha)
+ #552583: Extending Sankar's fix of account checking logic a bit, to be more consistent (Milan Crha)
+ #552583: For the purpose of matching a URL to an EAccount, only compare the protocol, user, host and port and disregard the rest. Fix the errors in the account checking logic (Matthew Barnes,Sankar P)
+ #555371: Added print menu option to task, memo and event editors (Jennifer Newman)
+ #555663: Do not overwrite signal id (Milan Crha)
+ #556303: Check whether attachment has a body already before accessing it (Milan Crha)
+ #558498: Check for the offline status before setting up the Exchange settings (Bharath Acharya)
+ #560420: spamc and spamassassin use error codes >= 64 to denote execution errors. Positive error codes < 64 means the message was identified as Spam (hp syntomax com)
+ #562228: Make it clearer then mailbox entry is optional (Milan Crha)
+ #562990: Use 'username' property to read/write user name, not the url (Milan Crha)
+ #563077: Fixes a crash if the gnome-settings-daemon is not running. Observed on SUN Solaris (Jeff Cai)
+ #563250: Load on startup and save on shutdown, custom keyboard accelerators (Matthew Barnes)
+ #563369: Translate "Templates" folder name (Milan Crha)
+ #563633: SUN compiler doesn't understand an empty structure (Jeff Cai)
+ #563669: Use zero GtkSpinButton's Pagesize, as Gtk+ requires (Milan Crha)
+ #563870: Drop unused header include (Milan Crha)
+ #564351: Fix single header include issue for GdkPixbuf (Tal Benavidor)
+
+Updated Translations:
+ Ilkka Tuohela (fi)
+ Leonardo Ferreira Fontenelle (pt_BR)
+
Evolution 2.25.2 2008-12-01
---------------------------
Modified: branches/kill-bonobo/addressbook/conduit/address-conduit.c
==============================================================================
--- branches/kill-bonobo/addressbook/conduit/address-conduit.c (original)
+++ branches/kill-bonobo/addressbook/conduit/address-conduit.c Mon Jan 12 04:12:01 2009
@@ -35,6 +35,8 @@
#include <pi-socket.h>
#include <pi-dlp.h>
#include <pi-address.h>
+#include <pi-appinfo.h>
+#include <libedataserver/e-categories.h>
#include <libedataserver/e-url.h>
#include <libedataserverui/e-passwords.h>
#include <libebook/e-book.h>
@@ -64,6 +66,7 @@
#define WARN g_warning
#define INFO g_message
+#define PILOT_MAX_CATEGORIES 16
enum {
LABEL_WORK,
@@ -155,6 +158,194 @@
gchar *last_uri;
};
+/* NOTE: copied from calendar/conduit/common/libecalendar-common-conduit.c
+ * Adds a category to the category app info structure (name and ID),
+ * sets category->renamed[i] to true if possible to rename.
+ *
+ * This will be packed and written to the app info block during post_sync.
+ *
+ * NOTE: cat_to_add MUST be in PCHAR format. Evolution stores categories
+ * in UTF-8 format. A conversion must take place before calling
+ * this function (see e_pilot_utf8_to_pchar() in e-pilot-util.c)
+ */
+static int
+e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *category)
+{
+ int i, j;
+ int retval = 0; /* 0 is the Unfiled category */
+ LOG(g_message("e_pilot_add_category_if_possible\n"));
+
+ for(i=0; i<PILOT_MAX_CATEGORIES; i++){
+ /* if strlen is 0, then the category is empty
+ the PalmOS doesn't let 0-length strings for
+ categories */
+ if(strlen(category->name[i]) == 0){
+ int cat_to_add_len;
+ int desktopUniqueID;
+
+ cat_to_add_len = strlen(cat_to_add);
+ retval = i;
+
+ if(cat_to_add_len > 15){
+ char tmpstr[16];
+ strncpy(tmpstr, cat_to_add,16);
+ tmpstr[16] = '\0';
+ /* Have to truncate the category name */
+ LOG (g_warning ("*** Desktop category '%s' too long for PDA."
+ "Truncating to '%s' ***",cat_to_add, tmpstr));
+ cat_to_add_len = 15;
+ }
+
+ /* only 15 characters for category, 16th is
+ * '\0' can't do direct mem transfer due to
+ * declaration type
+ */
+ for(j=0; j<cat_to_add_len; j++){
+ category->name[i][j] = cat_to_add[j];
+ }
+
+ for(j=cat_to_add_len; j<16; j++) {
+ category->name[i][j] = '\0';
+ }
+
+ //find a desktop id that is not in use between 128 and 255
+ /* XXX desktopUniqueID should really be used for tracking
+ * categories across renaming operations, but as Evo
+ * doesn't have a concept of category UIDs or renaming,
+ * we don't have much use for it at present.
+ */
+ for (desktopUniqueID = 128; desktopUniqueID <= 255; desktopUniqueID++) {
+ int found = 0;
+ for(j=0; j<PILOT_MAX_CATEGORIES; j++){
+ if (category->ID[j] == desktopUniqueID) {
+ found = 1;
+ }
+ }
+ if (found == 0) {
+ break;
+ }
+ if (desktopUniqueID == 255) {
+ LOG (g_warning ("*** no more categories available on PC ***"));
+ }
+ }
+ category->ID[i] = desktopUniqueID;
+
+ category->renamed[i] = TRUE;
+
+ break;
+ }
+ }
+
+ if(retval == 0){
+ LOG (g_warning ("*** not adding category - category list already full ***"));
+ }
+
+ return retval;
+}
+
+/*
+ * conversion from an evolution category to a palm category.
+ * we iterate over the list of desktop categories to see if
+ * there is matching palm category. If not, we create
+ * a new palm category from the first evo category.
+ * If a category was not found and could not be created,
+ * or if there are no desktop categories, then *pilotCategory
+ * is set to zero ("Unfiled").
+ */
+static
+void e_pilot_local_category_to_remote(int * pilotCategory,
+ EContact *contact, struct CategoryAppInfo *category)
+{
+ GList *c_list = NULL, *l;
+ char * category_string, *first_category = NULL;
+ int i;
+ *pilotCategory = 0; /* default to "Unfiled" */
+ c_list = e_contact_get (contact, E_CONTACT_CATEGORY_LIST);
+ if (c_list) {
+ /* remember the first category */
+ first_category = e_pilot_utf8_to_pchar((const char *)c_list->data);
+ }
+ l = c_list;
+ while(l && *pilotCategory == 0) {
+ //list != 0, so at least 1 category is assigned
+ category_string = e_pilot_utf8_to_pchar((const char *)l->data);
+ for (i=0; i < PILOT_MAX_CATEGORIES; i++) {
+ /* only 15 chars + nul in palm category name */
+ if (strncmp(category_string,category->name[i], 15) == 0) {
+ *pilotCategory = i;
+ break;
+ }
+ }
+ g_free(category_string);
+ l = l->next;
+ }
+ if (*pilotCategory == 0 && first_category && *first_category) {
+ /* category not available on palm, try to create it */
+ /* XXX e_pilot_add_category_if_possible can be called
+ * when we're doing a 'copy from pilot'. This should
+ * really be avoided.
+ */
+ *pilotCategory = e_pilot_add_category_if_possible(
+ first_category,category);
+ g_free(first_category);
+ }
+ g_list_foreach (c_list, (GFunc)g_free, NULL);
+ g_list_free(c_list);
+ /*end category*/
+}
+
+/*
+ * conversion from a palm category to an evolution category
+ */
+static
+void e_pilot_remote_category_to_local(int pilotCategory,
+ EContact *contact, struct CategoryAppInfo *category)
+{
+ char *category_string = NULL;
+
+ if (pilotCategory != 0) {
+ /* pda has category assigned */
+ category_string = e_pilot_utf8_from_pchar(
+ category->name[pilotCategory]);
+
+ LOG(g_message("PDA Category: %s\n", category_string));
+
+ if(e_categories_exist(category_string) == FALSE){
+ /* add if it doesn't exist */
+ LOG(g_message("Category created on pc\n"));
+ e_categories_add(category_string, NULL, NULL, TRUE);
+ }
+ }
+
+ /* store the data in EContact */
+ if (category_string == NULL) {
+ /* remove categories from desktop. */
+ e_contact_set (contact, E_CONTACT_CATEGORY_LIST, NULL);
+ }
+ else {
+
+ /* Since the first first category is synced with the PDA, add the PDA's
+ * category to the beginning of the category list */
+ GList *c_list = NULL;
+ GList *newcat_in_list;
+ c_list = e_contact_get (contact, E_CONTACT_CATEGORY_LIST);
+
+ /* remove old item from list so we don't have duplicate entries */
+ newcat_in_list = g_list_find_custom(c_list, category_string, (GCompareFunc)strcmp);
+ if(newcat_in_list != NULL)
+ {
+ g_free(newcat_in_list->data);
+ c_list = g_list_remove(c_list, newcat_in_list->data);
+ }
+
+ c_list = g_list_prepend(c_list, category_string);
+ e_contact_set (contact, E_CONTACT_CATEGORY_LIST, c_list);
+
+ g_list_foreach (c_list, (GFunc)g_free, NULL);
+ g_list_free(c_list);
+ }
+}
+
static EAddrConduitCfg *
addrconduit_load_configuration (guint32 pilot_id)
{
@@ -920,6 +1111,9 @@
#endif
}
+ /*Category support*/
+ e_pilot_local_category_to_remote(&(local->local.category), contact, &(ctxt->ai.category));
+
local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME));
local->addr->entry[entryLastname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_FAMILY_NAME));
local->addr->entry[entryCompany] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_ORG));
@@ -1105,11 +1299,17 @@
else
contact = e_contact_duplicate (in_contact);
+ /*Category support*/
+ e_pilot_remote_category_to_local(remote->category, contact, &(ctxt->ai.category));
+
/* Name */
name = e_contact_name_new ();
name->given = get_entry_text (address, entryFirstname);
name->family = get_entry_text (address, entryLastname);
+ /* set the name, respecting the pilot's given/family names */
+ e_contact_set (contact, E_CONTACT_NAME, name);
+ /* now set the full_name */
full_name = e_contact_name_to_string (name);
e_contact_set (contact, E_CONTACT_FULL_NAME, full_name);
e_contact_name_free (name);
@@ -1424,9 +1624,29 @@
{
GList *changed;
gchar *filename, *change_id;
+ unsigned char *buf;
+ int dlpRetVal, len;
LOG (g_message ( "post_sync: Address Conduit v.%s", CONDUIT_VERSION ));
+ /* Write AppBlock to PDA - updates categories */
+ buf = (unsigned char*)g_malloc (0xffff);
+
+ len = pack_AddressAppInfo (&(ctxt->ai), buf, 0xffff);
+
+ dlpRetVal = dlp_WriteAppBlock (dbi->pilot_socket, dbi->db_handle,
+ (unsigned char *)buf, len);
+
+ g_free (buf);
+
+ if (dlpRetVal < 0) {
+ WARN ( ("Could not write pilot's Address application block"));
+ WARN ("dlp_WriteAppBlock(...) = %d", dlpRetVal);
+ /*gnome_pilot_conduit_error (conduit,
+ _("Could not write pilot's Address application block"));*/
+ return -1;
+ }
+
g_free (ctxt->cfg->last_uri);
ctxt->cfg->last_uri = g_strdup (e_book_get_uri (ctxt->ebook));
addrconduit_save_configuration (ctxt->cfg);
Modified: branches/kill-bonobo/addressbook/gui/component/Makefile.am
==============================================================================
--- branches/kill-bonobo/addressbook/gui/component/Makefile.am (original)
+++ branches/kill-bonobo/addressbook/gui/component/Makefile.am Mon Jan 12 04:12:01 2009
@@ -18,6 +18,7 @@
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
-DPREFIX=\""$(prefix)"\" \
$(LDAP_CFLAGS) \
Modified: branches/kill-bonobo/addressbook/gui/component/addressbook-component.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/component/addressbook-component.c (original)
+++ branches/kill-bonobo/addressbook/gui/component/addressbook-component.c Mon Jan 12 04:12:01 2009
@@ -44,7 +44,7 @@
#include <string.h>
#include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gconf/gconf-client.h>
#include <e-util/e-util.h>
#include <libedataserver/e-url.h>
Modified: branches/kill-bonobo/addressbook/gui/component/addressbook-config.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/component/addressbook-config.c (original)
+++ branches/kill-bonobo/addressbook/gui/component/addressbook-config.c Mon Jan 12 04:12:01 2009
@@ -627,7 +627,7 @@
if (old)
return old;
else {
- offline_setting = gtk_check_button_new_with_mnemonic (N_("Copy _book content locally for offline operation"));
+ offline_setting = gtk_check_button_new_with_mnemonic (_("Copy _book content locally for offline operation"));
gtk_widget_show (offline_setting);
gtk_container_add (GTK_CONTAINER (parent), offline_setting);
g_signal_connect (offline_setting, "toggled", G_CALLBACK (offline_status_changed_cb), sdialog);
Modified: branches/kill-bonobo/addressbook/gui/component/addressbook-view.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/component/addressbook-view.c (original)
+++ branches/kill-bonobo/addressbook/gui/component/addressbook-view.c Mon Jan 12 04:12:01 2009
@@ -28,9 +28,7 @@
#include <string.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-href.h>
-#include <libgnomeui/gnome-uidefs.h>
+#include <gdk/gdkkeysyms.h>
#include <bonobo/bonobo-generic-factory.h>
#include <bonobo/bonobo-ui-util.h>
#include <bonobo/bonobo-exception.h>
Modified: branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-address.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-address.c (original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-address.c Mon Jan 12 04:12:01 2009
@@ -26,7 +26,6 @@
#include <e-util/e-util-private.h>
#include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
#include <misc/e-gui-utils.h>
#include <string.h>
#include <stdlib.h>
Modified: branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-fullname.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-fullname.c (original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-fullname.c Mon Jan 12 04:12:01 2009
@@ -23,7 +23,6 @@
#include <config.h>
#include "e-contact-editor-fullname.h"
#include <e-util/e-util-private.h>
-#include <libgnome/gnome-util.h>
#include <glib/gi18n.h>
static void e_contact_editor_fullname_init (EContactEditorFullname *card);
Modified: branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-im.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-im.c (original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-im.c Mon Jan 12 04:12:01 2009
@@ -22,7 +22,6 @@
#include <config.h>
#include "e-contact-editor-im.h"
-#include <libgnome/gnome-util.h>
#include <glib/gi18n.h>
#include <string.h>
#include <e-util/e-util-private.h>
Modified: branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.h
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.h (original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.h Mon Jan 12 04:12:01 2009
@@ -23,8 +23,6 @@
#ifndef __E_CONTACT_EDITOR_H__
#define __E_CONTACT_EDITOR_H__
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-app-helper.h>
#include <glade/glade.h>
#include "addressbook/gui/contact-editor/eab-editor.h"
Modified: branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-quick-add.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-quick-add.c (original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-quick-add.c Mon Jan 12 04:12:01 2009
@@ -25,7 +25,6 @@
#include <string.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <libgnomeui/gnome-app.h>
#include <libebook/e-book.h>
#include <libebook/e-contact.h>
#include <libedataserverui/e-source-combo-box.h>
Modified: branches/kill-bonobo/addressbook/gui/contact-editor/eab-editor.h
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/eab-editor.h (original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/eab-editor.h Mon Jan 12 04:12:01 2009
@@ -24,8 +24,6 @@
#ifndef __EAB_EDITOR_H__
#define __EAB_EDITOR_H__
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-app-helper.h>
#include <glade/glade.h>
#include <libebook/e-book.h>
Modified: branches/kill-bonobo/addressbook/gui/contact-editor/test-editor.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/test-editor.c (original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/test-editor.c Mon Jan 12 04:12:01 2009
@@ -92,26 +92,6 @@
exit (0);
}
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-
- const gchar *authors[] =
- {
- "Christopher James Lahey <clahey umich edu>",
- NULL
- };
-
- GtkWidget *about =
- gnome_about_new ( _( "Contact Editor Test" ), VERSION,
- _( "Copyright (C) 2000, Ximian, Inc." ),
- authors,
- _( "This should test the contact editor canvas item" ),
- NULL);
- gtk_widget_show (about);
-}
-#endif
-
int main( int argc, char *argv[] )
{
char *cardstr;
Modified: branches/kill-bonobo/addressbook/gui/contact-list-editor/e-contact-list-editor.h
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-list-editor/e-contact-list-editor.h (original)
+++ branches/kill-bonobo/addressbook/gui/contact-list-editor/e-contact-list-editor.h Mon Jan 12 04:12:01 2009
@@ -23,8 +23,6 @@
#ifndef __E_CONTACT_LIST_EDITOR_H__
#define __E_CONTACT_LIST_EDITOR_H__
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-app-helper.h>
#include <glade/glade.h>
#include <libedataserverui/e-name-selector.h>
Modified: branches/kill-bonobo/addressbook/gui/merging/eab-contact-merging.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/merging/eab-contact-merging.c (original)
+++ branches/kill-bonobo/addressbook/gui/merging/eab-contact-merging.c Mon Jan 12 04:12:01 2009
@@ -32,7 +32,7 @@
#include <string.h>
#include "addressbook/gui/widgets/eab-contact-display.h"
#include "e-util/e-util-private.h"
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
typedef struct dropdown_data dropdown_data;
typedef enum {
Modified: branches/kill-bonobo/addressbook/gui/widgets/addresstypes.xml
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/addresstypes.xml (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/addresstypes.xml Mon Jan 12 04:12:01 2009
@@ -79,7 +79,7 @@
</part>
<part name="sexp">
<title>Expression</title>
- <input type="code" name="code"/>
+ <input type="rawcode" name="rawcode"/>
</part>
</partset>
Modified: branches/kill-bonobo/addressbook/printing/e-contact-print.c
==============================================================================
--- branches/kill-bonobo/addressbook/printing/e-contact-print.c (original)
+++ branches/kill-bonobo/addressbook/printing/e-contact-print.c Mon Jan 12 04:12:01 2009
@@ -29,7 +29,6 @@
#include <libxml/tree.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
-#include <libgnome/gnome-util.h>
#include <glib/gi18n.h>
#include <libebook/e-book.h>
#include <libebook/e-contact.h>
Modified: branches/kill-bonobo/addressbook/printing/test-contact-print-style-editor.c
==============================================================================
--- branches/kill-bonobo/addressbook/printing/test-contact-print-style-editor.c (original)
+++ branches/kill-bonobo/addressbook/printing/test-contact-print-style-editor.c Mon Jan 12 04:12:01 2009
@@ -40,26 +40,6 @@
exit(0);
}
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-
- const gchar *authors[] =
- {
- "Christopher James Lahey <clahey umich edu>",
- NULL
- };
-
- GtkWidget *about =
- gnome_about_new ( _( "Contact Print Style Editor Test" ), VERSION,
- _( "Copyright (C) 2000, Ximian, Inc." ),
- authors,
- _( "This should test the contact print style editor widget" ),
- NULL);
- gtk_widget_show (about);
-}
-#endif
-
int main( int argc, char *argv[] )
{
GtkWidget *app;
Modified: branches/kill-bonobo/addressbook/printing/test-print.c
==============================================================================
--- branches/kill-bonobo/addressbook/printing/test-print.c (original)
+++ branches/kill-bonobo/addressbook/printing/test-print.c Mon Jan 12 04:12:01 2009
@@ -24,32 +24,11 @@
#include <stdlib.h>
#include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-ui-init.h>
#include <glade/glade.h>
#include <bonobo/bonobo-main.h>
#include "e-contact-print.h"
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-
- const gchar *authors[] =
- {
- "Christopher James Lahey <clahey umich edu>",
- NULL
- };
-
- GtkWidget *about =
- gnome_about_new ( _( "Contact Print Test" ), VERSION,
- _( "Copyright (C) 2000, Ximian, Inc." ),
- authors,
- _( "This should test the contact print code" ),
- NULL);
- gtk_widget_show (about);
-}
-#endif
-
int main( int argc, char *argv[] )
{
GList *shown_fields = NULL;
Modified: branches/kill-bonobo/calendar/conduits/todo/todo-conduit.c
==============================================================================
--- branches/kill-bonobo/calendar/conduits/todo/todo-conduit.c (original)
+++ branches/kill-bonobo/calendar/conduits/todo/todo-conduit.c Mon Jan 12 04:12:01 2009
@@ -240,7 +240,7 @@
rows = E_PILOT_SETTINGS_TABLE_ROWS;
lbl = gtk_label_new (_("Default Priority:"));
gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
- adj = gtk_adjustment_new (1, 1, 5, 1, 5, 5);
+ adj = gtk_adjustment_new (1, 1, 5, 1, 5, 0);
gui->priority = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (gui->priority), TRUE);
gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, rows, rows + 1);
Modified: branches/kill-bonobo/calendar/gui/Makefile.am
==============================================================================
--- branches/kill-bonobo/calendar/gui/Makefile.am (original)
+++ branches/kill-bonobo/calendar/gui/Makefile.am Mon Jan 12 04:12:01 2009
@@ -29,6 +29,7 @@
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
+ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
-DPREFIX=\""$(prefix)"\" \
$(LIBSOUP_CFLAGS) \
Modified: branches/kill-bonobo/calendar/gui/alarm-notify/alarm-queue.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/alarm-notify/alarm-queue.c (original)
+++ branches/kill-bonobo/calendar/gui/alarm-notify/alarm-queue.c Mon Jan 12 04:12:01 2009
@@ -36,8 +36,6 @@
#include <glib/gi18n.h>
#include <libgnome/gnome-exec.h>
#include <libgnome/gnome-sound.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-uidefs.h>
#include <libecal/e-cal-time-util.h>
#include <libecal/e-cal-component.h>
@@ -991,7 +989,7 @@
}
if (tray_data->location){
- g_free (tray_data->description);
+ g_free (tray_data->location);
tray_data->location = NULL;
}
Modified: branches/kill-bonobo/calendar/gui/calendar-commands.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/calendar-commands.c (original)
+++ branches/kill-bonobo/calendar/gui/calendar-commands.c Mon Jan 12 04:12:01 2009
@@ -37,10 +37,6 @@
#include <errno.h>
#include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock-icons.h>
-#include <libgnome/gnome-util.h>
#include <glib/gi18n.h>
#include <bonobo/bonobo-ui-util.h>
#include <bonobo/bonobo-exception.h>
Modified: branches/kill-bonobo/calendar/gui/calendar-component.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/calendar-component.c (original)
+++ branches/kill-bonobo/calendar/gui/calendar-component.c Mon Jan 12 04:12:01 2009
@@ -27,7 +27,7 @@
#include <string.h>
#include <errno.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-exception.h>
#include <libical/icalvcal.h>
@@ -609,6 +609,9 @@
POA_GNOME_Evolution_Component__epv *epv = &class->epv;
GObjectClass *object_class = G_OBJECT_CLASS (class);
+ bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
parent_class = g_type_class_peek_parent (class);
epv->handleURI = impl_handleURI;
Modified: branches/kill-bonobo/calendar/gui/calendar-config.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/calendar-config.c (original)
+++ branches/kill-bonobo/calendar/gui/calendar-config.c Mon Jan 12 04:12:01 2009
@@ -32,7 +32,6 @@
#include <time.h>
#include <string.h>
#include <e-util/e-util.h>
-#include <libgnomeui/gnome-dialog.h>
#include <libecal/e-cal-time-util.h>
#include <libedataserver/e-data-server-util.h>
#include <widgets/e-timezone-dialog/e-timezone-dialog.h>
@@ -47,13 +46,6 @@
/* Store the zones here, this is not destroyed as the ical timezones */
static GHashTable *custom_zones = NULL;
-static void on_timezone_set (GnomeDialog *dialog,
- int button,
- ETimezoneDialog *etd);
-static gboolean on_timezone_dialog_delete_event (GnomeDialog *dialog,
- GdkEvent *event,
- ETimezoneDialog *etd);
-
static void
do_cleanup (void)
{
@@ -1240,59 +1232,6 @@
gconf_client_set_bool (config, CALENDAR_CONFIG_PROMPT_PURGE, confirm, NULL);
}
-void
-calendar_config_check_timezone_set (void)
-{
- ETimezoneDialog *timezone_dialog;
- GtkWidget *dialog;
- GList *elem;
- char *zone;
-
- zone = calendar_config_get_timezone ();
- if (zone && zone[0])
- return;
-
- /* Show timezone dialog. */
- timezone_dialog = e_timezone_dialog_new ();
- dialog = e_timezone_dialog_get_toplevel (timezone_dialog);
-
- /* Hide the cancel button, which is the 2nd button. */
- elem = g_list_nth (GNOME_DIALOG (dialog)->buttons, 1);
- gtk_widget_hide (elem->data);
-
- g_signal_connect (dialog, "clicked",
- G_CALLBACK (on_timezone_set), timezone_dialog);
- g_signal_connect (dialog, "delete-event",
- G_CALLBACK (on_timezone_dialog_delete_event), timezone_dialog);
-
- gtk_widget_show (dialog);
-}
-
-
-static void
-on_timezone_set (GnomeDialog *dialog,
- int button,
- ETimezoneDialog *etd)
-{
- icaltimezone *zone;
-
- zone = e_timezone_dialog_get_timezone (etd);
- if (zone)
- calendar_config_set_timezone (icaltimezone_get_location (zone));
-
- g_object_unref (etd);
-}
-
-
-static gboolean
-on_timezone_dialog_delete_event (GnomeDialog *dialog,
- GdkEvent *event,
- ETimezoneDialog *etd)
-{
- g_object_unref (etd);
- return TRUE;
-}
-
/**
* calendar_config_get_tasks_due_today_color:
Modified: branches/kill-bonobo/calendar/gui/calendar-config.h
==============================================================================
--- branches/kill-bonobo/calendar/gui/calendar-config.h (original)
+++ branches/kill-bonobo/calendar/gui/calendar-config.h Mon Jan 12 04:12:01 2009
@@ -247,9 +247,6 @@
guint calendar_config_add_notification_free_busy_template (GConfClientNotifyFunc func,
gpointer data);
-/* Shows the timezone dialog if the user hasn't set a default timezone. */
-void calendar_config_check_timezone_set (void);
-
/* Returns TRUE if the locale has 'am' and 'pm' strings defined, i.e. it
supports 12-hour time format. */
gboolean calendar_config_locale_supports_12_hour_format(void);
Modified: branches/kill-bonobo/calendar/gui/dialogs/alarm-dialog.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/alarm-dialog.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/alarm-dialog.c Mon Jan 12 04:12:01 2009
@@ -642,7 +642,7 @@
/* Alarm options */
e_dialog_option_menu_set (dialog->action, *action, action_map);
- action_selection_done_cb (GTK_MENU_SHELL (dialog->action), dialog);
+ action_selection_done_cb (GTK_MENU_SHELL (gtk_option_menu_get_menu (GTK_OPTION_MENU (dialog->action))), dialog);
switch (*action) {
case E_CAL_COMPONENT_ALARM_AUDIO:
Modified: branches/kill-bonobo/calendar/gui/dialogs/cal-attachment-select-file.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/cal-attachment-select-file.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/cal-attachment-select-file.c Mon Jan 12 04:12:01 2009
@@ -32,7 +32,6 @@
#include <gtk/gtk.h>
-#include <libgnomeui/gnome-uidefs.h>
#include <glib/gi18n.h>
#include "cal-attachment-select-file.h"
Modified: branches/kill-bonobo/calendar/gui/dialogs/cancel-comp.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/cancel-comp.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/cancel-comp.c Mon Jan 12 04:12:01 2009
@@ -28,7 +28,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <libgnomeui/gnome-uidefs.h>
#include "e-util/e-error.h"
#include "cancel-comp.h"
Modified: branches/kill-bonobo/calendar/gui/dialogs/changed-comp.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/changed-comp.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/changed-comp.c Mon Jan 12 04:12:01 2009
@@ -27,7 +27,6 @@
#endif
#include <glib/gi18n.h>
-#include <libgnomeui/gnome-uidefs.h>
#include "changed-comp.h"
Modified: branches/kill-bonobo/calendar/gui/dialogs/comp-editor.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/comp-editor.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/comp-editor.c Mon Jan 12 04:12:01 2009
@@ -26,15 +26,15 @@
#include <config.h>
#endif
+#include <errno.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
#include <gdk/gdkkeysyms.h>
-#include <libgnome/libgnome.h>
#include <e-util/e-util.h>
#include <e-util/e-dialog-utils.h>
#include <e-util/e-util-private.h>
@@ -163,6 +163,7 @@
" <toolitem action='close'/>"
" <separator/>"
" <toolitem action='attach'/>"
+" <separator/>"
" </toolbar>"
"</ui>";
@@ -1111,6 +1112,24 @@
g_object_unref (comp);
}
+static gboolean
+remove_event_dialog (ECal *client,
+ ECalComponent *comp,
+ GtkWindow *parent)
+{
+ GtkWidget *dialog;
+ gboolean ret;
+
+ g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), TRUE);
+
+ dialog = gtk_message_dialog_new (parent, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _("Keep original item?"));
+ gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
+ ret = gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES;
+ gtk_widget_destroy (dialog);
+
+ return ret;
+}
+
static void
action_save_cb (GtkAction *action,
CompEditor *editor)
@@ -1162,9 +1181,33 @@
if (!text.value)
if (!send_component_prompt_subject ((GtkWindow *) editor, priv->client, priv->comp))
return;
- if (save_comp_with_send (editor))
- close_dialog (editor);
+ if (save_comp_with_send (editor)) {
+ CompEditorFlags flags;
+ gboolean delegate;
+
+ flags = comp_editor_get_flags (editor);
+ delegate = flags & COMP_EDITOR_DELEGATE;
+
+ if (delegate && !remove_event_dialog (priv->client, priv->comp, GTK_WINDOW (editor))) {
+ const char *uid = NULL;
+ GError *error = NULL;
+
+ e_cal_component_get_uid (priv->comp, &uid);
+
+ if (e_cal_component_is_instance (priv->comp) || e_cal_component_has_recurrences (priv->comp)) {
+ gchar *rid;
+ rid = e_cal_component_get_recurid_as_string (priv->comp);
+ e_cal_remove_object_with_mod (priv->client, uid, rid, priv->mod, &error);
+ g_free (rid);
+ } else
+ e_cal_remove_object (priv->client, uid, &error);
+
+ g_clear_error (&error);
+ }
+ }
+
+ close_dialog (editor);
}
static void
@@ -2410,6 +2453,7 @@
show_warning =
!editor->priv->warned &&
+ !(editor->priv->flags & COMP_EDITOR_DELEGATE) &&
editor->priv->existing_org &&
!editor->priv->user_org;
@@ -2458,6 +2502,7 @@
show_warning =
changed && !editor->priv->warned &&
+ !(editor->priv->flags & COMP_EDITOR_DELEGATE) &&
editor->priv->existing_org && !editor->priv->user_org;
if (show_warning) {
Modified: branches/kill-bonobo/calendar/gui/dialogs/delete-error.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/delete-error.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/delete-error.c Mon Jan 12 04:12:01 2009
@@ -28,7 +28,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <libgnomeui/gnome-uidefs.h>
#include "delete-error.h"
Modified: branches/kill-bonobo/calendar/gui/dialogs/event-editor.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/event-editor.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/event-editor.c Mon Jan 12 04:12:01 2009
@@ -78,20 +78,21 @@
" <menu action='options-menu'>"
" <menuitem action='alarms'/>"
" <menuitem action='show-time-busy'/>"
+" <menuitem action='recurrence'/>"
" <menuitem action='all-day-event'/>"
+" <menuitem action='free-busy'/>"
" <menu action='classification-menu'>"
" <menuitem action='classify-public'/>"
" <menuitem action='classify-private'/>"
" <menuitem action='classify-confidential'/>"
" </menu>"
-" <menuitem action='recurrence'/>"
-" <menuitem action='free-busy'/>"
" </menu>"
" </menubar>"
" <toolbar name='main-toolbar'>"
" <toolitem action='alarms'/>"
-" <toolitem action='all-day-event'/>"
+" <toolitem action='show-time-busy'/>"
" <toolitem action='recurrence'/>"
+" <toolitem action='all-day-event'/>"
" <toolitem action='free-busy'/>"
" </toolbar>"
"</ui>";
@@ -148,9 +149,15 @@
EventEditor *editor)
{
gboolean active;
+ GtkAction *action_show_busy;
+ CompEditor *comp_editor = COMP_EDITOR (editor);
active = gtk_toggle_action_get_active (action);
event_page_set_all_day_event (editor->priv->event_page, active);
+
+ action_show_busy = comp_editor_get_action (comp_editor, "show-time-busy");
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action_show_busy), !active);
+ event_page_set_show_time_busy (editor->priv->event_page, !active);
}
static void
@@ -222,7 +229,7 @@
FALSE },
{ "show-time-busy",
- NULL,
+ GTK_STOCK_DIALOG_ERROR,
N_("Show Time as _Busy"),
NULL,
N_("Toggles whether to show time as busy"),
Modified: branches/kill-bonobo/calendar/gui/dialogs/memo-editor.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/memo-editor.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/memo-editor.c Mon Jan 12 04:12:01 2009
@@ -96,6 +96,21 @@
}
static void
+memo_editor_constructed (GObject *object)
+{
+ MemoEditorPrivate *priv;
+ CompEditor *editor;
+
+ priv = MEMO_EDITOR_GET_PRIVATE (object);
+ editor = COMP_EDITOR (object);
+
+ priv->memo_page = memo_page_new (editor);
+ comp_editor_append_page (
+ editor, COMP_EDITOR_PAGE (priv->memo_page),
+ _("Memo"), TRUE);
+}
+
+static void
memo_editor_class_init (MemoEditorClass *class)
{
GObjectClass *object_class;
@@ -105,6 +120,7 @@
object_class = G_OBJECT_CLASS (class);
object_class->dispose = memo_editor_dispose;
+ object_class->constructed = memo_editor_constructed;
/* TODO Add a help section for memos. */
editor_class = COMP_EDITOR_CLASS (class);
@@ -131,12 +147,6 @@
g_critical ("%s: %s", G_STRFUNC, error->message);
g_error_free (error);
}
-
- me->priv->memo_page = memo_page_new (editor);
- comp_editor_append_page (
- COMP_EDITOR (me),
- COMP_EDITOR_PAGE (me->priv->memo_page),
- _("Memo"), TRUE);
}
/**
Modified: branches/kill-bonobo/calendar/gui/dialogs/recur-comp.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/recur-comp.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/recur-comp.c Mon Jan 12 04:12:01 2009
@@ -27,7 +27,6 @@
#endif
#include <glib/gi18n.h>
-#include <libgnomeui/gnome-uidefs.h>
#include "recur-comp.h"
Modified: branches/kill-bonobo/calendar/gui/dialogs/recurrence-page.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/recurrence-page.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/recurrence-page.c Mon Jan 12 04:12:01 2009
@@ -1377,7 +1377,7 @@
hbox = gtk_hbox_new (FALSE, 2);
gtk_container_add (GTK_CONTAINER (priv->ending_special), hbox);
- adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 10000, 1, 10, 10));
+ adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 10000, 1, 10, 0));
priv->ending_count_spin = gtk_spin_button_new (adj, 1, 0);
gtk_spin_button_set_numeric ((GtkSpinButton *)priv->ending_count_spin, TRUE);
gtk_box_pack_start (GTK_BOX (hbox), priv->ending_count_spin,
Modified: branches/kill-bonobo/calendar/gui/dialogs/schedule-page.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/schedule-page.c (original)
+++ branches/kill-bonobo/calendar/gui/dialogs/schedule-page.c Mon Jan 12 04:12:01 2009
@@ -31,7 +31,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <libgnomeui/gnome-dialog-util.h>
#include <glade/glade.h>
#include <e-util/e-dialog-widgets.h>
#include <e-util/e-util-private.h>
Modified: branches/kill-bonobo/calendar/gui/e-cal-list-view.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-cal-list-view.c (original)
+++ branches/kill-bonobo/calendar/gui/e-cal-list-view.c Mon Jan 12 04:12:01 2009
@@ -43,7 +43,6 @@
#include <misc/e-popup-menu.h>
#include <misc/e-cell-date-edit.h>
#include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-util.h>
#include <e-util/e-categories-config.h>
#include <e-util/e-dialog-utils.h>
#include <e-util/e-util-private.h>
Modified: branches/kill-bonobo/calendar/gui/e-cal-model.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-cal-model.c (original)
+++ branches/kill-bonobo/calendar/gui/e-cal-model.c Mon Jan 12 04:12:01 2009
@@ -1655,7 +1655,7 @@
goto try_again;
}
- g_warning (G_STRLOC ": Unable to get query");
+ g_warning (G_STRLOC ": Unable to get query, %s", error->message);
return;
}
Modified: branches/kill-bonobo/calendar/gui/e-cal-popup.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-cal-popup.c (original)
+++ branches/kill-bonobo/calendar/gui/e-cal-popup.c Mon Jan 12 04:12:01 2009
@@ -139,7 +139,7 @@
usepath = g_strjoin (NULL, "file://", path, NULL);
wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
- stream = camel_stream_vfs_new_with_uri (path, CAMEL_STREAM_VFS_CREATE);
+ stream = camel_stream_vfs_new_with_uri (usepath, CAMEL_STREAM_VFS_CREATE);
if (usepath != path)
g_free (usepath);
Modified: branches/kill-bonobo/calendar/gui/e-calendar-table.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-calendar-table.c (original)
+++ branches/kill-bonobo/calendar/gui/e-calendar-table.c Mon Jan 12 04:12:01 2009
@@ -440,7 +440,8 @@
e_cal_component_free_datetime (&dtstart);
e_cal_component_free_datetime (&dtdue);
- tmp = e_calendar_view_get_attendees_status_info (new_comp);
+ tmp = e_calendar_view_get_attendees_status_info (
+ new_comp, comp_data->client);
if (tmp) {
l = gtk_label_new (tmp);
gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
Modified: branches/kill-bonobo/calendar/gui/e-calendar-view.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-calendar-view.c (original)
+++ branches/kill-bonobo/calendar/gui/e-calendar-view.c Mon Jan 12 04:12:01 2009
@@ -2116,7 +2116,7 @@
* Free returned pointer with g_free.
**/
char *
-e_calendar_view_get_attendees_status_info (ECalComponent *comp)
+e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client)
{
struct _values {
icalparameter_partstat status;
@@ -2137,7 +2137,7 @@
char *res = NULL;
int i;
- if (!comp || !e_cal_component_has_attendees (comp))
+ if (!comp || !e_cal_component_has_attendees (comp) || !itip_organizer_is_user (comp, client))
return NULL;
e_cal_component_get_attendee_list (comp, &attendees);
@@ -2333,7 +2333,7 @@
g_free (tmp2);
g_free (tmp1);
- tmp = e_calendar_view_get_attendees_status_info (newcomp);
+ tmp = e_calendar_view_get_attendees_status_info (newcomp, pevent->comp_data->client);
if (tmp) {
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start ((GtkBox *)hbox, gtk_label_new (tmp), FALSE, FALSE, 0);
Modified: branches/kill-bonobo/calendar/gui/e-calendar-view.h
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-calendar-view.h (original)
+++ branches/kill-bonobo/calendar/gui/e-calendar-view.h Mon Jan 12 04:12:01 2009
@@ -172,7 +172,7 @@
void e_calendar_view_move_tip (GtkWidget *widget, int x, int y);
const gchar *e_calendar_view_get_icalcomponent_summary (ECal *ecal, icalcomponent *icalcomp, gboolean *free_text);
-char *e_calendar_view_get_attendees_status_info (ECalComponent *comp);
+char *e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client);
void draw_curved_rectangle (cairo_t *cr,
double x0,
Modified: branches/kill-bonobo/calendar/gui/e-cell-date-edit-text.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-cell-date-edit-text.c (original)
+++ branches/kill-bonobo/calendar/gui/e-cell-date-edit-text.c Mon Jan 12 04:12:01 2009
@@ -29,8 +29,6 @@
#include <time.h>
#include <unistd.h>
#include <string.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock-icons.h>
#include <glib/gi18n.h>
#include <libedataserver/e-time-utils.h>
#include <libedataserver/e-data-server-util.h>
Modified: branches/kill-bonobo/calendar/gui/e-day-view.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-day-view.c (original)
+++ branches/kill-bonobo/calendar/gui/e-day-view.c Mon Jan 12 04:12:01 2009
@@ -39,7 +39,6 @@
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-util.h>
#include <e-util/e-categories-config.h>
#include <e-util/e-dialog-utils.h>
Modified: branches/kill-bonobo/calendar/gui/e-itip-control.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-itip-control.c (original)
+++ branches/kill-bonobo/calendar/gui/e-itip-control.c Mon Jan 12 04:12:01 2009
@@ -31,11 +31,6 @@
#include <unistd.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-stock-icons.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
#include <bonobo/bonobo-object.h>
#include <bonobo/bonobo-exception.h>
#include <gtkhtml/gtkhtml.h>
@@ -2282,7 +2277,7 @@
priv = itip->priv;
/* To translators: RSVP means "please reply" */
- btn = gtk_check_button_new_with_label ("RSVP");
+ btn = gtk_check_button_new_with_label (_("RSVP"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (btn), TRUE);
priv->rsvp = TRUE;
Modified: branches/kill-bonobo/calendar/gui/e-meeting-attendee.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-meeting-attendee.c (original)
+++ branches/kill-bonobo/calendar/gui/e-meeting-attendee.c Mon Jan 12 04:12:01 2009
@@ -845,6 +845,10 @@
if (compare_times (&period.start, &period.end) > 0)
return FALSE;
+ /* If the busy_type is FREE, then there is no need to render it in UI */
+ if (busy_type == E_MEETING_FREE_BUSY_FREE)
+ goto done;
+
/* If the busy range is not set elsewhere, track it as best we can */
if (!priv->start_busy_range_set) {
if (!g_date_valid (&priv->busy_periods_start.date)) {
@@ -871,6 +875,7 @@
}
}
}
+
if (!priv->end_busy_range_set) {
if (!g_date_valid (&priv->busy_periods_end.date)) {
priv->busy_periods_end.date = period.end.date;
@@ -898,12 +903,14 @@
}
g_array_append_val (priv->busy_periods, period);
- priv->has_calendar_info = TRUE;
- priv->busy_periods_sorted = FALSE;
period_in_days = g_date_get_julian (&period.end.date) - g_date_get_julian (&period.start.date) + 1;
priv->longest_period_in_days = MAX (priv->longest_period_in_days, period_in_days);
+done:
+ priv->has_calendar_info = TRUE;
+ priv->busy_periods_sorted = FALSE;
+
return TRUE;
}
Modified: branches/kill-bonobo/calendar/gui/e-meeting-list-view.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-meeting-list-view.c (original)
+++ branches/kill-bonobo/calendar/gui/e-meeting-list-view.c Mon Jan 12 04:12:01 2009
@@ -31,7 +31,6 @@
#include <bonobo/bonobo-widget.h>
#include <bonobo/bonobo-exception.h>
#include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
#include <libebook/e-book.h>
#include <libebook/e-vcard.h>
#include <libecal/e-cal-component.h>
@@ -471,6 +470,21 @@
}
static void
+ense_update (GtkWidget *w, gpointer data1, gpointer user_data)
+{
+ gtk_cell_editable_editing_done ((GtkCellEditable *)w);
+}
+
+static void
+editing_started_cb (GtkCellRenderer *renderer,
+ GtkCellEditable *editable,
+ gchar *path,
+ gpointer user_data)
+{
+ g_signal_connect (editable, "updated", G_CALLBACK(ense_update), NULL);
+}
+
+static void
build_table (EMeetingListView *lview)
{
GtkCellRenderer *renderer;
@@ -501,6 +515,8 @@
g_object_set_data (G_OBJECT (col), "mtg-store-col", GINT_TO_POINTER (E_MEETING_STORE_ATTENDEE_COL));
g_signal_connect (renderer, "cell_edited", G_CALLBACK (attendee_edited_cb), view);
g_signal_connect (renderer, "editing-canceled", G_CALLBACK (attendee_editing_canceled_cb), view);
+ g_signal_connect (renderer, "editing-started", G_CALLBACK (editing_started_cb), view);
+
g_hash_table_insert (edit_table, GINT_TO_POINTER (E_MEETING_STORE_ATTENDEE_COL), renderer);
renderer = e_cell_renderer_combo_new ();
Modified: branches/kill-bonobo/calendar/gui/e-meeting-store.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-meeting-store.c (original)
+++ branches/kill-bonobo/calendar/gui/e-meeting-store.c Mon Jan 12 04:12:01 2009
@@ -27,7 +27,6 @@
#include <gio/gio.h>
#include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
#include <libecal/e-cal-component.h>
#include <libecal/e-cal-util.h>
#include <libecal/e-cal-time-util.h>
@@ -1017,6 +1016,10 @@
busy_type = E_MEETING_FREE_BUSY_TENTATIVE;
break;
+ case ICAL_FBTYPE_FREE:
+ busy_type = E_MEETING_FREE_BUSY_FREE;
+ break;
+
default:
break;
}
Modified: branches/kill-bonobo/calendar/gui/e-meeting-time-sel.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-meeting-time-sel.c (original)
+++ branches/kill-bonobo/calendar/gui/e-meeting-time-sel.c Mon Jan 12 04:12:01 2009
@@ -648,6 +648,7 @@
e_meeting_time_selector_alloc_named_color (mts, "white", &mts->attendee_list_bg_color);
e_meeting_time_selector_alloc_named_color (mts, "snow4", &mts->meeting_time_bg_color);
+ e_meeting_time_selector_alloc_named_color (mts, "snow", &mts->busy_colors[E_MEETING_FREE_BUSY_FREE]);
e_meeting_time_selector_alloc_named_color (mts, "yellow", &mts->busy_colors[E_MEETING_FREE_BUSY_TENTATIVE]);
e_meeting_time_selector_alloc_named_color (mts, "blue", &mts->busy_colors[E_MEETING_FREE_BUSY_BUSY]);
e_meeting_time_selector_alloc_named_color (mts, "orange4", &mts->busy_colors[E_MEETING_FREE_BUSY_OUT_OF_OFFICE]);
Modified: branches/kill-bonobo/calendar/gui/e-meeting-types.h
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-meeting-types.h (original)
+++ branches/kill-bonobo/calendar/gui/e-meeting-types.h Mon Jan 12 04:12:01 2009
@@ -48,11 +48,12 @@
used as for loop counters, so they should start at 0 and be ordered. */
typedef enum
{
- E_MEETING_FREE_BUSY_TENTATIVE = 0,
+ E_MEETING_FREE_BUSY_TENTATIVE = 0,
E_MEETING_FREE_BUSY_OUT_OF_OFFICE = 1,
E_MEETING_FREE_BUSY_BUSY = 2,
+ E_MEETING_FREE_BUSY_FREE = 3,
- E_MEETING_FREE_BUSY_LAST = 3
+ E_MEETING_FREE_BUSY_LAST = 4
} EMeetingFreeBusyType;
/* This is our representation of a time. We use a GDate to store the day,
Modified: branches/kill-bonobo/calendar/gui/e-select-names-editable.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-select-names-editable.c (original)
+++ branches/kill-bonobo/calendar/gui/e-select-names-editable.c Mon Jan 12 04:12:01 2009
@@ -129,7 +129,7 @@
e_select_names_editable_get_emails (ESelectNamesEditable *esne)
{
EDestinationStore *destination_store;
- GList *destinations;
+ GList *destinations, *l;
EDestination *destination;
GList *result = NULL;
@@ -140,25 +140,27 @@
if (!destinations)
return NULL;
- destination = destinations->data;
- if (e_destination_is_evolution_list (destination)) {
- const GList *list_dests, *l;
-
- list_dests = e_destination_list_get_dests (destination);
- for (l = list_dests; l != NULL; l = g_list_next (l)) {
- result = g_list_append (result, g_strdup (e_destination_get_email (l->data)));
+ for (l = destinations; l != NULL; l = l->next) {
+ destination = l->data;
+ if (e_destination_is_evolution_list (destination)) {
+ const GList *list_dests, *l;
+
+ list_dests = e_destination_list_get_dests (destination);
+ for (l = list_dests; l != NULL; l = g_list_next (l)) {
+ result = g_list_append (result, g_strdup (e_destination_get_email (l->data)));
+ }
+ } else {
+ /* check if the contact is contact list, it does not contain all the email ids */
+ /* we dont expand it currently, TODO do we need to expand it by getting it from addressbook*/
+ if (e_destination_get_contact (destination) &&
+ e_contact_get (e_destination_get_contact (destination), E_CONTACT_IS_LIST)) {
+ /* If its a contact_list which is not expanded, it wont have a email id,
+ so we can use the name as the email id */
+
+ result = g_list_append (result, g_strdup (e_destination_get_name (destination)));
+ } else
+ result = g_list_append (result, g_strdup (e_destination_get_email (destination)));
}
- } else {
- /* check if the contact is contact list, it does not contain all the email ids */
- /* we dont expand it currently, TODO do we need to expand it by getting it from addressbook*/
- if (e_destination_get_contact (destination) &&
- e_contact_get (e_destination_get_contact (destination), E_CONTACT_IS_LIST)) {
- /* If its a contact_list which is not expanded, it wont have a email id,
- so we can use the name as the email id */
-
- result = g_list_append (result, g_strdup (e_destination_get_name (destination)));
- } else
- result = g_list_append (result, g_strdup (e_destination_get_email (destination)));
}
g_list_free (destinations);
@@ -191,7 +193,7 @@
e_select_names_editable_get_names (ESelectNamesEditable *esne)
{
EDestinationStore *destination_store;
- GList *destinations;
+ GList *destinations, *l;
EDestination *destination;
GList *result = NULL;
@@ -202,18 +204,20 @@
if (!destinations)
return NULL;
- destination = destinations->data;
- if (e_destination_is_evolution_list (destination)) {
- const GList *list_dests, *l;
-
- list_dests = e_destination_list_get_dests (destination);
- for (l = list_dests; l != NULL; l = g_list_next (l)) {
- result = g_list_append (result, g_strdup (e_destination_get_name (l->data)));
+ for (l = destinations; l != NULL; l = l->next) {
+ destination = l->data;
+ if (e_destination_is_evolution_list (destination)) {
+ const GList *list_dests, *l;
+
+ list_dests = e_destination_list_get_dests (destination);
+ for (l = list_dests; l != NULL; l = g_list_next (l)) {
+ result = g_list_append (result, g_strdup (e_destination_get_name (l->data)));
+ }
+ } else {
+ result = g_list_append (result, g_strdup (e_destination_get_name (destination)));
}
- } else {
- result = g_list_append (result, g_strdup (e_destination_get_name (destination)));
}
-
+
g_list_free (destinations);
return result;
Modified: branches/kill-bonobo/calendar/gui/e-week-view.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-week-view.c (original)
+++ branches/kill-bonobo/calendar/gui/e-week-view.c Mon Jan 12 04:12:01 2009
@@ -36,7 +36,6 @@
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-util.h>
#include <libgnomecanvas/gnome-canvas-pixbuf.h>
#include <text/e-text.h>
#include <misc/e-canvas-utils.h>
Modified: branches/kill-bonobo/calendar/gui/gnome-cal.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/gnome-cal.c (original)
+++ branches/kill-bonobo/calendar/gui/gnome-cal.c Mon Jan 12 04:12:01 2009
@@ -36,9 +36,6 @@
#include <glib.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
#include <bonobo/bonobo-exception.h>
#include <libedataserver/e-categories.h>
#include <libedataserver/e-url.h>
Modified: branches/kill-bonobo/calendar/gui/goto.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/goto.c (original)
+++ branches/kill-bonobo/calendar/gui/goto.c Mon Jan 12 04:12:01 2009
@@ -26,7 +26,6 @@
#include <config.h>
#include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog.h>
#include <glade/glade.h>
#include "e-util/e-util-private.h"
#include "calendar-config.h"
@@ -112,7 +111,6 @@
gnome_calendar_goto (dlg->gcal, et);
gtk_dialog_response (GTK_DIALOG (dlg->dialog), GTK_RESPONSE_NONE);
- /* gnome_dialog_close (GNOME_DIALOG (dlg->dialog)); */
#endif
}
Modified: branches/kill-bonobo/calendar/gui/itip-utils.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/itip-utils.c (original)
+++ branches/kill-bonobo/calendar/gui/itip-utils.c Mon Jan 12 04:12:01 2009
@@ -661,16 +661,32 @@
switch (a->status) {
case ICAL_PARTSTAT_ACCEPTED:
- prefix = _("Accepted");
+ /* Translators: This is part of the subject
+ * line of a meeting request or update email.
+ * The full subject line would be:
+ * "Accepted: Meeting Name". */
+ prefix = C_("Meeting", "Accepted");
break;
case ICAL_PARTSTAT_TENTATIVE:
- prefix = _("Tentatively Accepted");
+ /* Translators: This is part of the subject
+ * line of a meeting request or update email.
+ * The full subject line would be:
+ * "Tentatively Accepted: Meeting Name". */
+ prefix = C_("Meeting", "Tentatively Accepted");
break;
case ICAL_PARTSTAT_DECLINED:
- prefix = _("Declined");
+ /* Translators: This is part of the subject
+ * line of a meeting request or update email.
+ * The full subject line would be:
+ * "Declined: Meeting Name". */
+ prefix = C_("Meeting", "Declined");
break;
case ICAL_PARTSTAT_DELEGATED:
- prefix = _("Delegated");
+ /* Translators: This is part of the subject
+ * line of a meeting request or update email.
+ * The full subject line would be:
+ * "Delegated: Meeting Name". */
+ prefix = C_("Meeting", "Delegated");
break;
default:
break;
@@ -680,23 +696,38 @@
break;
case E_CAL_COMPONENT_METHOD_ADD:
- prefix = _("Updated");
+ /* Translators: This is part of the subject line of a
+ * meeting request or update email. The full subject
+ * line would be: "Updated: Meeting Name". */
+ prefix = C_("Meeting", "Updated");
break;
case E_CAL_COMPONENT_METHOD_CANCEL:
- prefix = _("Cancel");
+ /* Translators: This is part of the subject line of a
+ * meeting request or update email. The full subject
+ * line would be: "Cancel: Meeting Name". */
+ prefix = C_("Meeting", "Cancel");
break;
case E_CAL_COMPONENT_METHOD_REFRESH:
- prefix = _("Refresh");
+ /* Translators: This is part of the subject line of a
+ * meeting request or update email. The full subject
+ * line would be: "Refresh: Meeting Name". */
+ prefix = C_("Meeting", "Refresh");
break;
case E_CAL_COMPONENT_METHOD_COUNTER:
- prefix = _("Counter-proposal");
+ /* Translators: This is part of the subject line of a
+ * meeting request or update email. The full subject
+ * line would be: "Counter-proposal: Meeting Name". */
+ prefix = C_("Meeting", "Counter-proposal");
break;
case E_CAL_COMPONENT_METHOD_DECLINECOUNTER:
- prefix = _("Declined");
+ /* Translators: This is part of the subject line of a
+ * meeting request or update email. The full subject
+ * line would be: "Declined: Meeting Name". */
+ prefix = C_("Meeting", "Declined");
break;
default:
Modified: branches/kill-bonobo/calendar/gui/memos-component.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/memos-component.c (original)
+++ branches/kill-bonobo/calendar/gui/memos-component.c Mon Jan 12 04:12:01 2009
@@ -27,7 +27,7 @@
#include <errno.h>
#include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-exception.h>
#include <gconf/gconf-client.h>
Modified: branches/kill-bonobo/calendar/gui/print.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/print.c (original)
+++ branches/kill-bonobo/calendar/gui/print.c Mon Jan 12 04:12:01 2009
@@ -36,9 +36,6 @@
#include <glib.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <libgnomeui/gnome-stock-icons.h>
#include <libedataserver/e-time-utils.h>
#include <libedataserver/e-data-server-util.h>
#include <e-util/e-util.h>
Modified: branches/kill-bonobo/calendar/gui/tasks-component.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/tasks-component.c (original)
+++ branches/kill-bonobo/calendar/gui/tasks-component.c Mon Jan 12 04:12:01 2009
@@ -26,7 +26,7 @@
#include <errno.h>
#include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-exception.h>
#include <gconf/gconf-client.h>
@@ -691,7 +691,6 @@
{
GList *l;
- g_signal_handlers_disconnect_by_func (component_view->table, G_CALLBACK (table_selection_change_cb), component_view);
g_signal_handlers_disconnect_matched (component_view->model, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, component_view);
if (component_view->source_list)
@@ -885,6 +884,9 @@
POA_GNOME_Evolution_Component__epv *epv = &klass->epv;
GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
parent_class = g_type_class_peek_parent (klass);
epv->requestCreateItem = impl_requestCreateItem;
Modified: branches/kill-bonobo/calendar/gui/tasks-control.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/tasks-control.c (original)
+++ branches/kill-bonobo/calendar/gui/tasks-control.c Mon Jan 12 04:12:01 2009
@@ -27,10 +27,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-stock-icons.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-ui-util.h>
#include <e-util/e-dialog-utils.h>
@@ -228,12 +224,6 @@
bonobo_ui_component_add_listener(uic, "ViewPreview", tasks_control_view_preview, tasks);
bonobo_ui_component_set_prop(uic, "/commands/ViewPreview", "state", state?"1":"0", NULL);
- /* Show the dialog for setting the timezone if the user hasn't chosen
- a default timezone already. This is done in the startup wizard now,
- so we don't do it here. */
-#if 0
- calendar_config_check_timezone_set ();
-#endif
}
Modified: branches/kill-bonobo/composer/e-composer-actions.c
==============================================================================
--- branches/kill-bonobo/composer/e-composer-actions.c (original)
+++ branches/kill-bonobo/composer/e-composer-actions.c Mon Jan 12 04:12:01 2009
@@ -508,7 +508,7 @@
{ "save-draft",
GTK_STOCK_SAVE,
- N_("Save _Draft"),
+ N_("Save as _Draft"),
"<Shift><Control>s",
N_("Save as draft"),
G_CALLBACK (action_save_draft_cb) },
@@ -693,8 +693,10 @@
/* Fine Tuning */
g_object_set (
- G_OBJECT (ACTION (ATTACH)),
- "short-label", _("Attach"), NULL);
+ ACTION (ATTACH), "short-label", _("Attach"), NULL);
+
+ g_object_set (
+ ACTION (SAVE_DRAFT), "short-label", _("Save Draft"), NULL);
#if defined (HAVE_NSS)
visible = TRUE;
Modified: branches/kill-bonobo/composer/e-composer-header-table.c
==============================================================================
--- branches/kill-bonobo/composer/e-composer-header-table.c (original)
+++ branches/kill-bonobo/composer/e-composer-header-table.c Mon Jan 12 04:12:01 2009
@@ -18,7 +18,7 @@
#include "e-composer-header-table.h"
#include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <libedataserverui/e-name-selector.h>
#include "e-signature-combo-box.h"
Modified: branches/kill-bonobo/composer/e-composer-private.h
==============================================================================
--- branches/kill-bonobo/composer/e-composer-private.h (original)
+++ branches/kill-bonobo/composer/e-composer-private.h Mon Jan 12 04:12:01 2009
@@ -20,7 +20,7 @@
#include "e-msg-composer.h"
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
#include <camel/camel-iconv.h>
Modified: branches/kill-bonobo/composer/e-msg-composer.c
==============================================================================
--- branches/kill-bonobo/composer/e-msg-composer.c (original)
+++ branches/kill-bonobo/composer/e-msg-composer.c Mon Jan 12 04:12:01 2009
@@ -62,6 +62,7 @@
#include "misc/e-charset-picker.h"
#include "misc/e-expander.h"
#include "e-util/e-error.h"
+#include "e-util/e-mktemp.h"
#include "e-util/e-plugin-ui.h"
#include "e-util/e-util-private.h"
#include "e-signature-combo-box.h"
@@ -2407,6 +2408,7 @@
EMsgComposer *composer;
GtkWidget *parent;
GtkWidget *widget;
+ GtkClipboard *clipboard;
composer = E_MSG_COMPOSER (editor);
widget = gtk_window_get_focus (GTK_WINDOW (editor));
@@ -2417,8 +2419,37 @@
return;
}
- /* Chain up to parent's paste_clipboard() method. */
- GTKHTML_EDITOR_CLASS (parent_class)->paste_clipboard (editor);
+ clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_CLIPBOARD);
+ if (clipboard && gtk_clipboard_wait_is_image_available (clipboard)) {
+ GdkPixbuf *pixbuf;
+
+ pixbuf = gtk_clipboard_wait_for_image (clipboard);
+ if (pixbuf) {
+ char *tmpl = g_strconcat (_("Image"), "-XXXXXX", NULL);
+ char *filename = e_mktemp (tmpl);
+
+ g_free (tmpl);
+
+ if (filename && gdk_pixbuf_save (pixbuf, filename, "png", NULL, NULL)) {
+ if (gtkhtml_editor_get_html_mode (editor)) {
+ char *uri = g_strconcat ("file://", filename, NULL);
+ /* this loads image async, thus cannot remove file from this */
+ gtkhtml_editor_insert_image (editor, uri);
+ g_free (uri);
+ } else {
+ /* this loads image immediately, remove file from cache to free up disk space */
+ e_attachment_bar_attach (E_ATTACHMENT_BAR (composer->priv->attachment_bar), filename, "image/png");
+ g_remove (filename);
+ }
+ }
+
+ g_free (filename);
+ g_object_unref (pixbuf);
+ }
+ } else {
+ /* Chain up to parent's paste_clipboard() method. */
+ GTKHTML_EDITOR_CLASS (parent_class)->paste_clipboard (editor);
+ }
}
static void
@@ -3096,7 +3127,7 @@
mime_part = camel_multipart_get_part (
multipart, CAMEL_MULTIPART_SIGNED_CONTENT);
- if (mime_part != NULL)
+ if (mime_part == NULL)
return;
content_type = camel_mime_part_get_content_type (mime_part);
Modified: branches/kill-bonobo/configure.in
==============================================================================
--- branches/kill-bonobo/configure.in (original)
+++ branches/kill-bonobo/configure.in Mon Jan 12 04:12:01 2009
@@ -3,7 +3,7 @@
m4_define([evo_major_version], [2])
m4_define([evo_minor_version], [25])
-m4_define([evo_micro_version], [3])
+m4_define([evo_micro_version], [5])
m4_define([evo_version],
[evo_major_version.evo_minor_version.evo_micro_version])
m4_define([evo_stable_version],
@@ -23,11 +23,11 @@
# Required Packages
m4_define([glib_minimum_version], [2.18.0])
m4_define([gtk_minimum_version], [2.14.0])
-m4_define([eds_minimum_version], [2.25.3])
+m4_define([eds_minimum_version], [2.25.5])
m4_define([gnome_icon_theme_minimum_version], [2.19.91])
m4_define([libbonobo_minimum_version], [2.20.3])
m4_define([libbonoboui_minimum_version], [2.4.2])
-m4_define([libgtkhtml_minimum_version], [3.23.5])
+m4_define([libgtkhtml_minimum_version], [3.25.4])
m4_define([gconf_minimum_version], [2.0.0]) # XXX Just a Guess
m4_define([libglade_minimum_version], [2.0.0]) # XXX Just a Guess
m4_define([libgnomecanvas_minimum_version], [2.0.0]) # XXX Just a Guess
@@ -2004,6 +2004,7 @@
help/Makefile
help/quickref/Makefile
help/quickref/C/Makefile
+help/quickref/cs/Makefile
help/quickref/de/Makefile
help/quickref/es/Makefile
help/quickref/hu/Makefile
Modified: branches/kill-bonobo/e-util/e-config.c
==============================================================================
--- branches/kill-bonobo/e-util/e-config.c (original)
+++ branches/kill-bonobo/e-util/e-config.c Mon Jan 12 04:12:01 2009
@@ -28,6 +28,7 @@
#include <stdlib.h>
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include <libgnomeui/gnome-druid.h>
#include <libgnomeui/gnome-druid-page-standard.h>
@@ -422,10 +423,14 @@
for (wn = (struct _widget_node *)p->widgets.head;wn->next;wn=wn->next) {
struct _EConfigItem *item = wn->item;
+ const gchar *translated_label = NULL;
GtkWidget *w;
d(printf(" '%s'\n", item->path));
+ if (item->label != NULL)
+ translated_label = gettext (item->label);
+
/* If the last section doesn't contain anything, hide it */
if (sectionnode != NULL
&& sectionnode->frame != NULL
@@ -524,7 +529,7 @@
} else {
page = gnome_druid_page_edge_new(item->type == E_CONFIG_PAGE_START?GNOME_EDGE_START:GNOME_EDGE_FINISH);
gtk_widget_show(page);
- gnome_druid_page_edge_set_title((GnomeDruidPageEdge *)page, item->label);
+ gnome_druid_page_edge_set_title((GnomeDruidPageEdge *)page, translated_label);
gnome_druid_insert_page((GnomeDruid *)druid, pagenode?(GnomeDruidPage *)pagenode->frame:NULL, (GnomeDruidPage *)page);
}
if (item->type == E_CONFIG_PAGE_FINISH) {
@@ -579,13 +584,13 @@
if (emp->type == E_CONFIG_DRUID) {
w = gnome_druid_page_standard_new();
gtk_widget_show(w);
- gnome_druid_page_standard_set_title((GnomeDruidPageStandard *)w, item->label);
+ gnome_druid_page_standard_set_title((GnomeDruidPageStandard *)w, translated_label);
gnome_druid_insert_page((GnomeDruid *)druid, pagenode?(GnomeDruidPage *)pagenode->frame:NULL, (GnomeDruidPage *)w);
wn->frame = w;
page = ((GnomeDruidPageStandard *)w)->vbox;
connect = TRUE;
} else {
- w = gtk_label_new_with_mnemonic (item->label);
+ w = gtk_label_new_with_mnemonic (translated_label);
gtk_widget_show(w);
page = gtk_vbox_new(FALSE, 12);
gtk_container_set_border_width((GtkContainer *)page, 12);
@@ -653,8 +658,8 @@
wn->frame = NULL;
}
- if (item->label) {
- char *txt = g_strdup_printf("<span weight=\"bold\">%s</span>", item->label);
+ if (translated_label != NULL) {
+ char *txt = g_strdup_printf("<span weight=\"bold\">%s</span>", translated_label);
label = g_object_new(gtk_label_get_type(),
"label", txt,
Modified: branches/kill-bonobo/e-util/e-dialog-utils.c
==============================================================================
--- branches/kill-bonobo/e-util/e-dialog-utils.c (original)
+++ branches/kill-bonobo/e-util/e-dialog-utils.c Mon Jan 12 04:12:01 2009
@@ -27,6 +27,7 @@
#include "e-dialog-utils.h"
+#include <errno.h>
#include <unistd.h>
#include <glib/gstdio.h>
@@ -36,7 +37,6 @@
#include <gconf/gconf-client.h>
#include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
#include "e-util/e-util.h"
#include "e-util/e-error.h"
Modified: branches/kill-bonobo/e-util/e-util-labels.c
==============================================================================
--- branches/kill-bonobo/e-util/e-util-labels.c (original)
+++ branches/kill-bonobo/e-util/e-util-labels.c Mon Jan 12 04:12:01 2009
@@ -71,6 +71,10 @@
char *color, *name, *tag;
name = buf = list->data;
color = strrchr (buf, ':');
+ if (color == NULL) {
+ g_free (buf);
+ continue;
+ }
*color++ = '\0';
tag = strchr (color, '|');
Modified: branches/kill-bonobo/filter/filter-code.c
==============================================================================
--- branches/kill-bonobo/filter/filter-code.c (original)
+++ branches/kill-bonobo/filter/filter-code.c Mon Jan 12 04:12:01 2009
@@ -98,9 +98,16 @@
* Return value: A new #FilterCode object.
**/
FilterCode *
-filter_code_new (void)
+filter_code_new (gboolean raw_code)
{
- return (FilterCode *) g_object_new (FILTER_TYPE_CODE, NULL, NULL);
+ FilterCode *fc = (FilterCode *) g_object_new (FILTER_TYPE_CODE, NULL, NULL);
+
+ if (fc && raw_code) {
+ xmlFree (((FilterInput *) fc)->type);
+ ((FilterInput *) fc)->type = (char *)xmlStrdup ((const unsigned char *)"rawcode");
+ }
+
+ return fc;
}
/* here, the string IS the code */
@@ -109,14 +116,19 @@
{
GList *l;
FilterInput *fi = (FilterInput *)fe;
+ gboolean is_rawcode = fi && fi->type && g_str_equal (fi->type, "rawcode");
+
+ if (!is_rawcode)
+ g_string_append(out, "(match-all ");
- g_string_append(out, "(match-all ");
l = fi->values;
while (l) {
g_string_append(out, (char *)l->data);
l = g_list_next(l);
}
- g_string_append(out, ")");
+
+ if (!is_rawcode)
+ g_string_append (out, ")");
}
/* and we have no value */
Modified: branches/kill-bonobo/filter/filter-code.h
==============================================================================
--- branches/kill-bonobo/filter/filter-code.h (original)
+++ branches/kill-bonobo/filter/filter-code.h Mon Jan 12 04:12:01 2009
@@ -49,7 +49,7 @@
};
GType filter_code_get_type (void);
-FilterCode *filter_code_new (void);
+FilterCode *filter_code_new (gboolean raw_code);
/* methods */
Modified: branches/kill-bonobo/filter/filter-int.c
==============================================================================
--- branches/kill-bonobo/filter/filter-int.c (original)
+++ branches/kill-bonobo/filter/filter-int.c Mon Jan 12 04:12:01 2009
@@ -241,7 +241,7 @@
GtkObject *adjustment;
FilterInt *fs = (FilterInt *)fe;
- adjustment = gtk_adjustment_new (0.0, (gfloat)fs->min, (gfloat)fs->max, 1.0, 1.0, 1.0);
+ adjustment = gtk_adjustment_new (0.0, (gfloat)fs->min, (gfloat)fs->max, 1.0, 1.0, 0);
spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), fs->max>fs->min+1000?5.0:1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE);
Modified: branches/kill-bonobo/filter/filter-option.c
==============================================================================
--- branches/kill-bonobo/filter/filter-option.c (original)
+++ branches/kill-bonobo/filter/filter-option.c Mon Jan 12 04:12:01 2009
@@ -29,7 +29,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <dlfcn.h>
+#include <gmodule.h>
#include "filter-option.h"
#include "filter-part.h"
@@ -352,23 +352,22 @@
static GSList *
get_dynamic_options (FilterOption *fo)
{
- void *module;
+ GModule *module;
GSList *(*get_func)(void);
GSList *res = NULL;
if (!fo || !fo->dynamic_func)
return res;
- module = dlopen (NULL, RTLD_LAZY);
+ module = g_module_open (NULL, G_MODULE_BIND_LAZY);
- get_func = dlsym (module, fo->dynamic_func);
- if (get_func) {
+ if (g_module_symbol (module, fo->dynamic_func, (gpointer) &get_func)) {
res = get_func ();
} else {
g_warning ("optionlist dynamic fill function '%s' not found", fo->dynamic_func);
}
- dlclose (module);
+ g_module_close (module);
return res;
}
Modified: branches/kill-bonobo/filter/rule-context.c
==============================================================================
--- branches/kill-bonobo/filter/rule-context.c (original)
+++ branches/kill-bonobo/filter/rule-context.c Mon Jan 12 04:12:01 2009
@@ -905,7 +905,9 @@
/* FIXME: temporary ... need real address type */
return (FilterElement *) filter_input_new_type_name (type);
} else if (!strcmp (type, "code")) {
- return (FilterElement *) filter_code_new ();
+ return (FilterElement *) filter_code_new (FALSE);
+ } else if (!strcmp (type, "rawcode")) {
+ return (FilterElement *) filter_code_new (TRUE);
} else if (!strcmp (type, "colour")) {
return (FilterElement *) filter_colour_new ();
} else if (!strcmp (type, "optionlist")) {
Modified: branches/kill-bonobo/filter/rule-editor.c
==============================================================================
--- branches/kill-bonobo/filter/rule-editor.c (original)
+++ branches/kill-bonobo/filter/rule-editor.c Mon Jan 12 04:12:01 2009
@@ -175,7 +175,8 @@
gui = glade_xml_new (filter_glade, "rule_editor", NULL);
g_free (filter_glade);
rule_editor_construct (re, rc, gui, source, label);
- gtk_widget_hide(glade_xml_get_widget (gui, "filter_source"));
+ gtk_widget_hide(glade_xml_get_widget (gui, "label17"));
+ gtk_widget_hide(glade_xml_get_widget (gui, "filter_source"));
g_object_unref (gui);
return re;
Modified: branches/kill-bonobo/help/C/evolution.xml
==============================================================================
--- branches/kill-bonobo/help/C/evolution.xml (original)
+++ branches/kill-bonobo/help/C/evolution.xml Mon Jan 12 04:12:01 2009
@@ -12,7 +12,6 @@
<?yelp:chunk-depth 3?>
<book lang="en" id="index">
-<title>&appname; &appversion; User Guide</title>
<bookinfo id="Front">
<!-- Novell staff change this as you wish -->
<authorgroup>
@@ -23,9 +22,6 @@
Novell, Inc
</corpauthor>
</authorgroup>
- <title>
- User's Guide to the Evolution Groupware Suite and Email Client
- </title>
<date>
2002-2008
</date>
@@ -70,13 +66,13 @@
<abstract role="description">
<para>
A user's guide to Evolution which explains how to use
- its mail, calendar, addressbook, and task list features.
+ its mail, calendar, address book, and task list features.
</para>
</abstract>
- <productname class="trade">&appname;</productname>
- <productnumber>&appversion;</productnumber>
- <invpartnumber>February 2008</invpartnumber>
- <title>User guide</title>
+ <productname class="trade">&appname;</productname>
+ <productnumber>&appversion;</productnumber>
+ <invpartnumber>February 2008</invpartnumber>
+ <title>&appname; &appversion; User Guide</title>
</bookinfo>
@@ -147,7 +143,7 @@
<chapter id="usage-mainwindow">
<title>Getting Started</title>
- <para><trademark>Evolution</trademark> is a <link linkend="groupware">groupware</link> application that helps you work in a group by handling email, address, memos, tasks, and one or more calendars. This makes the tasks of storing, organizing, and retrieving your personal information easy, so you can work and communicate more effectively with others.</para>
+ <para><trademark>Evolution</trademark> is a <link linkend="groupware">groupware</link> application that helps you work in a group by handling email, address, memos, tasks, and one or more calendars. This makes the tasks of storing, organizing, and retrieving your personal information easy, so you can work and communicate effectively with others.</para>
<itemizedlist>
<listitem>
<para><link linkend="usage-mainwindow-starting">Starting Evolution for the First Time</link></para>
@@ -199,7 +195,7 @@
<section id="bse54o0">
<title>Using the First-Run Assistant</title>
- <para>The first time you run Evolution, it creates a directory <emphasis>.evolution</emphasis> in your home directory, where it stores all of its local data. Then, it opens a First-Run Assistant to help you set up email accounts and import data from other applications.</para>
+ <para>The first time you run Evolution, it creates a directory named <emphasis>.evolution</emphasis> in your home directory, where it stores all of its local data. Then, it opens a First-Run Assistant to help you set up email accounts and import data from other applications.</para>
<para>Using the first-run assistant takes two to five minutes.</para>
<para>Later on, if you want to change this account, or if you want to create a new one, click Edit > Preferences, then click Mail Accounts. Select the account you want to change, then click Edit. Alternately, add a new account by clicking Add. See <link linkend="config-prefs-mail">Mail Preferences</link> for details.</para>
<para>The First-Run Assistant helps you provide the information Evolution needs to get started.</para>
@@ -265,43 +261,57 @@
<para>The following is a list of server types that are available:</para>
<formalpara id="bsj74dr">
<title>Novell GroupWise:</title>
- <para>Select this option if you connect to Novell <trademark class="registered">GroupWise</trademark>. Novell GroupWise keeps email, calendar, and contact information on the server. For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
+ <para>Select this option if you connect to a Novell <trademark class="registered">GroupWise</trademark> server.</para>
+ <para>Email, calendar, and contact information are stored on the server.</para>
+ <para>For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
</formalpara>
<formalpara id="bsj74ds">
<title>Microsoft Exchange:</title>
- <para>Available only if you have installed the Connector for Microsoft&z-3rdParty; Exchange. It allows you to connect to a Microsoft Exchange 2000 or 2003 server, which stores email, calendar, and contact information on the server. For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
+ <para>Available only if you have installed the Connector for Microsoft&z-3rdParty; Exchange. Select this option if you connect to a Microsoft Exchange 2000 or 2003 server.</para>
+ <para>Email, calendar, and contact information are stored on the server.</para>
+ <para>For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
</formalpara>
<formalpara id="bsj74dt">
<title>IMAP:</title>
- <para>Keeps the email on your server so you can access your email from multiple systems. For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
+ <para>Keeps the email on your server so you can access your email from multiple systems.</para>
+ <para>For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
</formalpara>
<formalpara id="bsj74du">
<title>POP:</title>
- <para>Downloads your email to your hard disk for permanent storage, freeing up space on the email server. For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
+ <para>Downloads your email to your hard disk for permanent storage, freeing up space on the email server.</para>
+ <para>For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
</formalpara>
<formalpara id="bstgdhu">
<title>USENET News:</title>
- <para>Connects to the news server and downloads a list of available news digests. For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
+ <para>Connects to a news server and downloads a list of available news digests.</para>
+ <para>For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
</formalpara>
<formalpara id="bsj74dv">
<title>Local Delivery:</title>
- <para>Choose this option if you want to move email from the spool (the location where mail waits for delivery) and store it in your home directory. You need to provide the path to the mail spool you want to use. If you want to leave email in your system's spool files, choose the Standard Unix Mbox Spool option instead. For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
+ <para>Choose this option if you want to move email from the spool (the location where mail waits for delivery) and store it in your home directory. You need to provide the path to the mail spool you want to use. If you want to leave email in your system's spool files, choose the Standard Unix Mbox Spool option instead.</para>
+ <para>For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
</formalpara>
<formalpara id="bsj74dw">
<title>MH Format Mail Directories:</title>
- <para>If you download your email using mh or another MH-style program, you should use this option. You need to provide the path to the mail directory you want to use. For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
+ <para>If you download your email using MH or another MH-style program, you should use this option.</para>
+ <para>You need to provide the path to the mail directory you want to use.</para>
+ <para>For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
</formalpara>
<formalpara id="bsj74dx">
<title>Maildir Format Mail Directories:</title>
- <para>If you download your email using Qmail or another maildir-style program, you should use this option. You need to provide the path to the mail directory you want to use. For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
+ <para>If you download your email using Qmail or another Maildir-style program, you should use this option.</para>
+ <para>You need to provide the path to the mail directory you want to use.</para>
+ <para>For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
</formalpara>
<formalpara id="bsj74dy">
- <title>Standard Unix mbox spool file:</title>
- <para>If you want to read and store email in the mail spool file on your local system, choose this option. You need to provide the path to the mail spool file you want to use. For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
+ <title>Standard Unix mbox Spool File:</title>
+ <para>If you want to read and store email in the mail spool file on your local system, choose this option. You need to provide the path to the mail spool file you want to use.</para>
+ <para>For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
</formalpara>
<formalpara id="b185ajx5">
- <title>Standard Unix mbox spool directory:</title>
- <para>If you want to read and store email in the mail spool directory on your local system, choose this option. You need to provide the path to the mail spool directory you want to use. For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
+ <title>Standard Unix mbox Spool Directory:</title>
+ <para>If you want to read and store email in the mail spool directory on your local system, choose this option. You need to provide the path to the mail spool directory you want to use.</para>
+ <para>For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
</formalpara>
<formalpara id="bsj74dz">
<title>None:</title>
@@ -316,7 +326,7 @@
<orderedlist>
<listitem id="bstg8f2">
<para>Type the server name of your email server in the Server field.</para>
- <para>If you are unsure what your Server address is, contact your system administrator.</para>
+ <para>If you are unsure what your server address is, contact your system administrator.</para>
</listitem>
<listitem id="bstg8sr">
<para>Type your username in the Username field.</para>
@@ -329,7 +339,7 @@
<listitem id="bstg9rc">
<para>Select your authentication type in the Authentication list.</para>
<para>or</para>
- <para>Click Check for Supported Types to have Evolution check for supported types. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</para>
+ <para>Click Check for Supported Types to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</para>
<para>Free webmail providers usually supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information.</para>
</listitem>
<listitem id="bstgaxb">
@@ -345,7 +355,7 @@
<section id="bstgbqn">
<title>Local Configuration Options</title>
- <para>If you selected Local Delivery, MH-Format Mail Directories, Maildir-Format Mail Directories, Standard Unix mbox spool file or Standard Unix mbox spool directory, you must specify the path to the local files in the path field. Continue with<link linkend="more-mail-options">Receiving Mail Options</link>.</para>
+ <para>If you selected Local Delivery, MH-Format Mail Directories, Maildir-Format Mail Directories, Standard Unix mbox spool file or Standard Unix mbox spool directory, you must specify the path to the local files in the path field. Continue with <link linkend="more-mail-options">Receiving Mail Options</link>.</para>
</section>
</section>
@@ -384,7 +394,7 @@
<section id="bsthktw">
<title>Novell GroupWise Receiving Options</title>
- <para>If you select Novell GroupWise as your receiving server type, you need to specify the following options:</para>
+ <para>You need to specify the following options for this server type:</para>
<orderedlist>
<listitem id="bv7wblf">
<para>Select if you want Evolution to automatically check for new mail.</para>
@@ -406,8 +416,8 @@
</listitem>
<listitem id="bsthmhx">
<para>Select Automatically synchronize remote mail locally to download the messages to your local system.</para>
- <para>Evolution, by default downloads only the header information such as From, Subject, and Date. The body of the message and the attachments are downloaded only when you click the message. Thus you can save time and network usage. This is useful when you don't read all the messages you receive.</para>
- <para>If you check this option, evolution fetches the headers as well as the body of the message simultaneously. In this case, the time taken to open a message is comparatively less. In addition to that, you can download the mail for reading them offline, when you have checked this option.</para>
+ <para>Evolution, by default, downloads only the header information such as From, Subject, and Date. The body of the message and the attachments are downloaded only when you click the message. Thus you can save time and network usage. This is useful when you don't read all the messages you receive.</para>
+ <para>If you check this option, Evolution fetches the headers as well as the body of the message simultaneously. In this case, the time taken to open a message is comparatively less. In addition, you can download the mail for reading them offline, when you have checked this option.</para>
</listitem>
<listitem id="bsthnab">
<para>Type your Post Office Agent SOAP port in the Post Office Agent SOAP Port field.</para>
@@ -424,7 +434,7 @@
<section id="bstgjve">
<title>Microsoft Exchange Receiving Options</title>
- <para>If you select Microsoft Exchange as your receiving server type, you need to specify the following options:</para>
+ <para>You need to specify the following options for this server type:</para>
<mediaobject id="bsu2c0q"><imageobject><imagedata format="PNG" fileref="figures/evo_mereceive_a.png"/></imageobject></mediaobject>
<orderedlist>
<listitem id="bstgk36">
@@ -439,11 +449,11 @@
<para>The Global Catalog Server contains the user information for users. If you are unsure what your Global Catalog server name is, contact your system administrator.</para>
</listitem>
<listitem id="bstglhn">
- <para>Select if you want to limit the number of Global Address Lists (GAL).</para>
+ <para>Select if you want to limit the number of Global Address List (GAL) responses.</para>
<para>The GAL contains a list of all email addresses. If you select this option, you need to specify the maximum number of responses.</para>
</listitem>
<listitem id="bstgsrp">
- <para>Select if you want to use a password expire warning time period.</para>
+ <para>Select if you want to use a password expiry warning time period.</para>
<para>If you select this option, you need to specify how often Evolution should send the password expire message.</para>
</listitem>
<listitem id="bv6uqm7">
@@ -465,7 +475,7 @@
<section id="bstggh0">
<title>IMAP Receiving Options</title>
- <para>If you select IMAP as your receiving server type, you need to specify the following options:</para>
+ <para>You need to specify the following options for this server type:</para>
<mediaobject id="bsu2dp4"><imageobject><imagedata format="PNG" fileref="figures/evo_imapreceive_a.png"/></imageobject></mediaobject>
<orderedlist>
<listitem id="bstggly">
@@ -497,8 +507,8 @@
</listitem>
<listitem id="bstgje2">
<para>Select Automatically synchronize remote mail locally to download the messages to your local system.</para>
- <para>Evolution, by default downloads only the header information such as From, Subject, and Date. The body of the message and the attachments are downloaded only when you click the message. Thus you can save time and network usage. This is useful when you don't read all the messages you receive.</para>
- <para>If you check this option, evolution fetches the headers as well as the body of the message simultaneously. In this case, the time taken to open a message is comparatively less. In addition to that, you can download the mail for reading them offline, when you have checked this option.</para>
+ <para>Evolution, by default, downloads only the header information such as From, Subject, and Date. The body of the message and the attachments are downloaded only when you click the message. Thus you can save time and network usage. This is useful when you don't read all the messages you receive.</para>
+ <para>If you check this option, Evolution fetches the headers as well as the body of the message simultaneously. In this case, the time taken to open a message is comparatively less. In addition, you can download the mail for reading them offline, when you have checked this option.</para>
</listitem>
<listitem id="bstgjlq">
<para>Click Forward.</para>
@@ -510,7 +520,7 @@
<section id="bspcfg3">
<title>POP Receiving Options</title>
<mediaobject id="bsu2e8x"><imageobject><imagedata format="PNG" fileref="figures/evo_popreceive_a.png"/></imageobject></mediaobject>
- <para>If you select POP as your receiving server type, you need to specify the following options:</para>
+ <para>You need to specify the following options for this server type:</para>
<orderedlist>
<listitem id="bsthozk">
<para>Select if you want Evolution to automatically check for new mail.</para>
@@ -532,7 +542,7 @@
<section id="bsthqql">
<title>USENET News Receiving Options</title>
<mediaobject id="bsu2evz"><imageobject><imagedata format="PNG" fileref="figures/evo_usereceive_a.png"/></imageobject></mediaobject>
- <para>If you select USENET News as your receiving server type, you need to specify the following options:</para>
+ <para>You need to specify the following options for this server type:</para>
<orderedlist>
<listitem id="bsthqws">
<para>Select if you want Evolution to automatically check for new mail.</para>
@@ -555,7 +565,7 @@
<section id="bsthseo">
<title>Local Delivery Receiving Options</title>
- <para>If you select Local Delivery as your receiving server type, you need to specify the following options:</para>
+ <para>You need to specify the following options for this server type:</para>
<orderedlist>
<listitem id="bsthsnr">
<para>Select if you want Evolution to automatically check for new mail.</para>
@@ -570,7 +580,7 @@
<section id="bsthszn">
<title>MH-Format Mail Directories Receiving Options</title>
- <para>If you select MH-Format Mail Directories as your receiving server type, you need to specify the following options:</para>
+ <para>You need to specify the following options for this server type:</para>
<orderedlist>
<listitem id="bsthtg0">
<para>Select if you want Evolution to automatically check for new mail.</para>
@@ -590,7 +600,7 @@
<section id="bsthu34">
<title>Maildir-Format Mail Directories Receiving Options</title>
- <para>If you select Maildir-Format Mail Directories as your receiving server type, you need to specify the following options:</para>
+ <para>You need to specify the following options for this server type:</para>
<orderedlist>
<listitem id="bsthu9o">
<para>Select if you want Evolution to automatically check for new mail.</para>
@@ -610,7 +620,7 @@
</section>
<section id="bsthukq">
- <title>Standard Unix mbox spool file Receiving Options</title>
+ <title>Standard Unix mbox Spool File Receiving Options</title>
<orderedlist>
<listitem id="bsthuto">
<para>Select if you want Evolution to automatically check for new mail.</para>
@@ -632,8 +642,8 @@
</section>
<section id="b185akx6">
- <title>Standard Unix mbox spool directory Receiving Options</title>
- <para>If you select Standard Unix mbox Spool directory as your receiving server type, you need to specify the following options:</para>
+ <title>Standard Unix mbox Spool Directory Receiving Options</title>
+ <para>You need to specify the following options for this server type:</para>
<orderedlist>
<listitem id="b185aln9">
<para>Select if you want Evolution to automatically check for new mail.</para>
@@ -679,7 +689,7 @@
<orderedlist>
<listitem id="bsthxta">
<para>Type the server name of your email server in the Server field.</para>
- <para>If you are unsure what your Server address is, contact your system administrator.</para>
+ <para>If you are unsure what your server address is, contact your system administrator.</para>
</listitem>
<listitem id="bsthy6f">
<para>Select if your server requires authentication.</para>
@@ -688,7 +698,7 @@
<listitem id="bsw0acl">
<para>Select your authentication type in the Authentication list.</para>
<para>or</para>
- <para>Click Check for Supported Types to have Evolution check for supported types. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</para>
+ <para>Click Check for Supported Types to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</para>
</listitem>
<listitem id="bsw0aqr">
<para>Type your username in the Username field.</para>
@@ -740,8 +750,8 @@
<para>To import information, you might want to use the Export tool under Windows&z-3rdParty;. See the instructions in <link linkend="outlook-migration-mail">Migrating Local Outlook Mail Folders</link>.</para>
<para>Before importing email from Netscape&z-3rdParty;, Mozilla and Netscape users need to click File > Compact > All Folders from within the Netscape or Mozilla mail tool. Otherwise, Evolution imports and undeletes the messages in your Trash folders.</para>
<tip>
- <para>Evolution uses standard file types for email and calendar information, so you can copy those files from your <command>~/.evolution</command> directory. The file formats used are <command>mbox</command> for email and iCal for calendar information.</para>
- <para>Contacts files are stored in a database, but can be saved as a standard vCard&z-3rdParty;. To export an addressbook, click File > Save Address Book As VCard". If you want to export only one contact, click File > Save Contact as VCard.</para>
+ <para>Evolution uses standard file types for email and calendar information, so you can copy those files from your <command>~/.evolution</command> directory. The file formats used are <emphasis>mbox</emphasis> for email and <emphasis>iCal</emphasis> for calendar information.</para>
+ <para>Contacts files are stored in a database, but can be saved as a standard vCard&z-3rdParty;. To export an address book, click File > Save Address Book As VCard". If you want to export only one contact, click File > Save Contact as VCard.</para>
</tip>
</section>
</section>
@@ -772,8 +782,8 @@
<para>The message list displays a list of email that you have received. To view an email in the preview pane, click the email in the message list.</para>
</formalpara>
<formalpara id="b17s9of0">
- <title>Side bar:</title>
- <para>The side bar lets you switch between folders and between Evolution tools. At the bottom of the side bar is the switcher that let you switch Evolution tools, and above that is a list of all the available folders for the current tool. For additional information, see <link linkend="usage-mainwindow-shortcutbar">The Side Bar</link>.</para>
+ <title>Side Bar:</title>
+ <para>The side bar lets you switch between folders and between Evolution tools. At the bottom of the side bar is the switcher that lets you switch Evolution tools, and above that is a list of all the available folders for the current tool. For additional information, see <link linkend="usage-mainwindow-shortcutbar">The Side Bar</link>.</para>
</formalpara>
<formalpara id="b17xycio">
<title>Switcher:</title>
@@ -797,7 +807,7 @@
</formalpara>
<formalpara id="bs7g25f">
<title>Edit:</title>
- <para>Holds useful tools that help you edit text and move it around. Lets you access the settings and configuration options in the Edit menu.</para>
+ <para>Holds useful tools that help you edit text and move it around. Also lets you access the settings and configuration options.</para>
</formalpara>
<formalpara id="bs7g2ew">
<title>View:</title>
@@ -817,15 +827,15 @@
</formalpara>
<formalpara id="bs7g3gq">
<title>Help:</title>
- <para>Opens the Evolution Help files.</para>
+ <para>Opens the Evolution help files.</para>
</formalpara>
</section>
<section id="usage-mainwindow-shortcutbar">
<title>The Sidebar</title>
- <para>Sidebar is the vertical panel on the left side of the Evolution main window. At the bottom of the sidebar is the Switcher, that lets you switch between the Evolution tools like Mail, Memo,Tasks and Contacts. Above the Switcher you can see a list of folders for the current Evolution tool.</para>
+ <para>The Sidebar is the vertical panel on the left side of the Evolution main window. At the bottom of the Sidebar is the Switcher. This lets you switch between different Evolution tools like Mail, Memo, Tasks, and Contacts. Above the Switcher is a list of folders related to the current Evolution tool.</para>
<para>The folder list organizes your email, calendars, address books, task lists and memo lists in a tree, similar to a <link linkend="filetree">file tree</link>. Most people find one to four folders at the base of the tree, depending on the tool and their system configuration. Each Evolution tool has at least one folder, called On This Computer, for local information. For example, the folder list for the email tool shows any remote email storage you have set up, plus local folders and search folders, which are discussed in <link linkend="usage-mail-organize-vfolders">Using Search Folders</link>.</para>
- <para>If you get large amounts of email, you might want more folders than just your Inbox. You can create multiple calendar, task, or contacts folders.</para>
+ <para>If you get large amounts of email, you might want more folders than just your Inbox. You can also create multiple calendar, task, or contacts folders.</para>
<para>To create a new folder:</para>
<orderedlist>
<listitem id="bs7fael">
@@ -844,7 +854,7 @@
<section id="b17s9pb0">
<title>Changing Switcher Appearance:</title>
- <para>To change the appearance of your switcher click <emphasis>View > Switcher Appearance</emphasis> from the Menu bar. Under Switcher Appearance you can select:</para>
+ <para>To change the appearance of your switcher click <emphasis>View > Switcher Appearance</emphasis> from the Menu Bar. Under Switcher Appearance you can select:</para>
<formalpara id="b13cep2o">
<title>Icons and Text:</title>
<para>Displays buttons with the label and the icon corresponding to it.</para>
@@ -876,7 +886,7 @@
</formalpara>
<formalpara id="bs7fc7y">
<title>Move:</title>
- <para>Moves the folder to another location.</para>
+ <para>Moves the folder to another location. When you select this item, Evolution offers a choice of locations to move the folder to.</para>
</formalpara>
<formalpara id="bxmemdh">
<title>Mark Messages As Read:</title>
@@ -915,7 +925,7 @@
<para>It can send and receive email in HTML or as plain text, and makes it easy to send and receive multiple file attachments.</para>
</listitem>
<listitem>
- <para>It supports multiple email sources, including <link linkend="imap">IMAP</link>, <link linkend="pop">POP3</link>, and local mbox or mh spools and files created by other email programs.</para>
+ <para>It supports multiple email sources, including <link linkend="imap">IMAP</link>, <link linkend="pop">POP3</link>, and local mbox or MH spools and files created by other email programs.</para>
</listitem>
<listitem>
<para>It can sort and organize your email in a wide variety of ways with folders, searches, and filters.</para>
@@ -924,7 +934,7 @@
<para>It lets you guard your privacy with encryption.</para>
</listitem>
</itemizedlist>
- <para>However, Evolution has some important differences from other email programs. First, It is built to handle very large amounts of email. The <link linkend="usage-mail-organize-spam">junk email</link>, message <link linkend="usage-mail-organize-filters">filtering</link> and <link linkend="usage-mail-organize-search">searching</link> functions were built for speed and efficiency. There's also the <link linkend="usage-mail-organize-vfolders">search folder</link>, an advanced organizational feature not found in some email clients. If you get a lot of email, or if you keep every message you get in case you need to refer to it later, you will find this feature especially useful. Here's a quick explanation of what's happening in your main Evolution email window.</para>
+ <para>However, Evolution has some important differences from other email programs. First, it is built to handle very large amounts of email. The <link linkend="usage-mail-organize-spam">junk email</link>, message <link linkend="usage-mail-organize-filters">filtering</link> and <link linkend="usage-mail-organize-search">searching</link> functions were built for speed and efficiency. There's also the <link linkend="usage-mail-organize-vfolders">search folder</link>, an advanced organizational feature not found in some email clients. If you get a lot of email, or if you keep every message you get in case you need to refer to it later, you will find this feature especially useful. Here's a quick explanation of what's happening in your main Evolution email window.</para>
<mediaobject id="b159qi3q"><imageobject><imagedata format="PNG" fileref="figures/evo_mail_a.png"/></imageobject></mediaobject>
<formalpara id="b17sa4um">
<title>Message List:</title>
@@ -936,13 +946,13 @@
</formalpara>
<para>If you find the preview pane too small, you can resize the pane, enlarge the whole window, or double-click the message in the message list to have it open in a new window. To change the size of a pane, drag the divider between the two panes.</para>
<para>As with folders, you can right-click messages in the message list and get a menu of possible actions, including moving or deleting them, creating filters or search folders based on them, and marking them as junk mail.</para>
- <para>Most of the email-related actions you want to perform are listed in the Message Menu and Folder Menu in the menu bar. The most frequently used ones, like Reply and Forward, also appear as buttons in the toolbar. Most of them are also located in the right-click menu and as keyboard shortcuts.</para>
+ <para>Most of the email-related actions you want to perform are listed in the Message menu and Folder menu in the menu bar. The most frequently used ones, like Reply and Forward, also appear as buttons in the toolbar. Most of them are also located in the right-click menu and as keyboard shortcuts.</para>
<para>For an in-depth guide to the email capabilities of Evolution, read <link linkend="usage-mail">Sending and Receiving Email</link>.</para>
</section>
<section id="basics-calendar">
<title>The Calendar</title>
- <para>To begin using the calendar, click Calendar in the switcher. By default, the calendar shows today's schedule on a ruled background. At the left bottom, there is a monthly calendar you can use to switch days. At the upper right, there is a Task list, where you can keep a list of tasks separate from your calendar appointments. Below that, there is a Memo list.</para>
+ <para>To begin using the calendar, click Calendar in the Switcher. By default, the calendar shows today's schedule on a ruled background. At the left bottom, there is a monthly calendar you can use to switch days. At the upper right, there is a task list, where you can keep a list of tasks separate from your calendar appointments. Below that, there is a memo list.</para>
<mediaobject id="usage-calendar-fig"><imageobject><imagedata format="PNG" fileref="figures/evo_cal_callout_a.png"/></imageobject></mediaobject>
<formalpara id="b17sa5gu">
<title>Appointment List:</title>
@@ -962,7 +972,7 @@
<section id="basics-contacts">
<title>The Contacts</title>
<para>The Evolution contacts can handle all of the functions of an address book or phone book. However, it is easier to update Evolution than it is to change an actual paper book, in part because Evolution can synchronize with Palm OS&z-3rdParty; devices and use <link linkend="ldap">LDAP</link> directories on a network.</para>
- <para>To use the contacts tool, click Contacts in the switcher. By default, the display shows all your contacts in alphabetical order, in a minicard view. You can select other views from the View menu, and adjust the width of the columns by clicking and dragging the gray column dividers.</para>
+ <para>To use the contacts tool, click Contacts in the Switcher. By default, the display shows all your contacts in alphabetical order, in a minicard view. You can select other views from the View menu, and adjust the width of the columns by clicking and dragging the gray column dividers.</para>
<mediaobject id="usage-contact-fig"><imageobject><imagedata format="PNG" fileref="figures/contacts_mainwindow_a.png"/></imageobject></mediaobject>
<para>Another advantage of the Evolution contacts is its integration with the rest of the application. For example, you can right-click an email address in Evolution mail to instantly create a contact entry.</para>
<para><emphasis>Contact List</emphasis></para>
@@ -972,8 +982,8 @@
</section>
<section id="b17qy921">
- <title>Backing Up And Restoring Evolution</title>
- <para>With the Backup and Restore plug-in enabled, you can successfully back up Evolution to your machine and restore it whenever it is required. The backup saves your Evolution gconf settings, mail, contacts, tasks, memos, and calendars and creates an archive.</para>
+ <title>Backing Up and Restoring Evolution</title>
+ <para>With the Backup and Restore plugin enabled, you can successfully back up Evolution to your machine and restore it whenever it is required. The backup saves your Evolution settings, mail, contacts, tasks, memos, and calendars and creates an archive.</para>
<orderedlist>
<listitem id="b17qydgx">
<para>Select File > Backup Settings to select the folder where you want to save the backup.</para>
@@ -998,10 +1008,10 @@
<para>This feature restores your settings from the archive.</para>
<orderedlist>
<listitem id="b17rbrfm">
- <para>Select File > Restore Settings to open the available evolution.tar.gz files.</para>
+ <para>Select File > Restore Settings to open the available evolution-backup.tar.gz files.</para>
</listitem>
<listitem id="b17rbry6">
- <para>Select the evolution.tar.gz and click Save.</para>
+ <para>Select the evolution-backup.tar.gz and click Save.</para>
<para>Before the process starts, a pop-up window appears and asks you to close Evolution. Close all the windows and then click Restore in the pop-up window.</para>
<tip>
<para> If you are creating your first account via the Startup Wizard, you can use the option to restore from the archive if it is available locally.</para>
@@ -1046,7 +1056,7 @@
</entry>
<entry colname="2">
<para>Disables all the preview panes when you launch Evolution.</para>
- <para>It lets Evolution not to open the last crashed message, task or contact when you restart Evolution. Thus, it provides a way to avoid system crash caused by previewing message, task or contact.</para>
+ <para>This prevents Evolution from opening the most recently selected message, task or contact, thus providing a way to avoid an application crash caused by previewing the message, task or contact.</para>
</entry>
</row>
<row id="bsl8i03">
@@ -1136,7 +1146,7 @@
</tip>
<section id="b17rgdac">
- <title>Magic Spacebar For Reading Mail</title>
+ <title>Magic Spacebar for Reading Mail</title>
<para>With Magic Spacebar, you can easily read the unread messages in all the mail folders. You can read mail, scroll through mail and switch folders by using the Spacebar on your keyboard.</para>
<para>To enable Magic Spacebar:</para>
<orderedlist>
@@ -1177,7 +1187,7 @@
<section id="b17qh4uo">
<title>New Mail Notification</title>
<para>Evolution can notify you of new messages. When you receive a new message in your inbox, a blinking icon appears on the Switcher.</para>
- <para>You can also view a blinking icon<inlinegraphic format="PNG" fileref="figures/evo_blink.png"/> in the notification area that disappears when you open the new message. Mouse over the icon to view the notification message.</para>
+ <para>You can also view a blinking icon (<inlinegraphic format="PNG" fileref="figures/evo_blink.png"/>) in the notification area that disappears when you open the new message. Mouse over the icon to view the notification message.</para>
<mediaobject id="b1a5asi6"><imageobject><imagedata format="PNG" fileref="figures/evo_newmail.png"/></imageobject></mediaobject>
<para>To enable this feature, select Edit > Plugins, then select the Mail Notification check box. You can configure the plugin by specifing the following in the Plugin Manager.</para>
<mediaobject id="b1dl90p1"><imageobject><imagedata format="PNG" fileref="figures/evo_mailnotification.png"/></imageobject></mediaobject>
@@ -1237,39 +1247,29 @@
<para>Click Open to select the sound file.</para>
</listitem>
<listitem id="b1dl9qrp">
- <para>Click Play to confirm the selection.</para>
+ <para>Click Play to listen to the file.</para>
</listitem>
</orderedlist>
</section>
<section id="b131ni8g">
<title>Vertical View Versus Classical View</title>
- <para>Evolution provides you vertical view in addition to the classical view. In the vertical view, message preview pane is located at the right side of the message list when compared to the Classical view where the message preview pane is placed below the message list. Vertical View enables you to use the extra width of the wide screen monitors.</para>
+ <para>Evolution provides a vertical view in addition to the classical view. In the vertical view, the message preview pane is located at the right side of the message list when compared to the classical view where the message preview pane is placed below the message list. Vertical view enables you to use the extra width of wide screen monitors.</para>
<formalpara id="b131nl11">
<title>Vertical View:</title>
- <para>To switch to vertical view</para>
+ <para>To switch to vertical view, click View > Preview > Vertical View.</para>
</formalpara>
- <orderedlist>
- <listitem id="b131nk3o">
- <para>Click View > Preview > Vertical View</para>
- </listitem>
- </orderedlist>
- <para>In Vertical view, default message list contains a double line compressed headers, which enables you to consume the extra width in the preview column. The compressed columns have Sender Name and Email, Attachment Icon, Date and Subject in the second line.</para>
+ <para>In vertical view, the message list contains double lines of compressed headers, which enables you to consume the extra width in the preview column. The compressed columns have Sender Name and Email, Attachment Icon, Date and Subject in the second line.</para>
<mediaobject id="b159qju3"><imageobject><imagedata format="PNG" fileref="figures/ver_view_a.png"/></imageobject></mediaobject>
<formalpara id="b131nkqr">
<title>Classical View:</title>
- <para>To switch to classical view,</para>
+ <para>To switch to classical view, click View > Preview > Classical View.</para>
</formalpara>
- <orderedlist>
- <listitem id="b131nkhr">
- <para>Click View > Preview > Classical View</para>
- </listitem>
- </orderedlist>
</section>
<section id="b131oj36">
<title>Collapsible Message Headers</title>
- <para>Evolution compresses the TO, CC, BCC headers of received mail and shows only limited addresses. You can set the limit of the number of addresses to be displayed in the preview pane.</para>
+ <para>Evolution compresses the TO, CC and BCC headers of received mail and shows only limited addresses. You can set the limit of the number of addresses to be displayed in the preview pane.</para>
<mediaobject id="b159qo4q"><imageobject><imagedata format="PNG" fileref="figures/collap_head_a.png"/></imageobject></mediaobject>
<para>Use the following procedure to set the limit of addresses to be displayed:</para>
<orderedlist>
@@ -1286,7 +1286,7 @@
<para>Enter the limit in the field.</para>
</listitem>
</orderedlist>
- <para>You can expand the message headers by clicking the <inlinegraphic format="PNG" fileref="figures/plus.png"/> icon or the <guilabel>...</guilabel> in the message preview pane. To collapse click <inlinegraphic format="PNG" fileref="figures/minus.png"/> icon in the preview pane.</para>
+ <para>You can expand the message headers by clicking the <inlinegraphic format="PNG" fileref="figures/plus.png"/> icon or the ellipsis (<guilabel>...</guilabel>) in the message preview pane. To collapse the message headers, click the <inlinegraphic format="PNG" fileref="figures/minus.png"/> icon in the preview pane.</para>
</section>
<section id="bsempjs">
@@ -1313,7 +1313,7 @@
<section id="usage-mail-getnsend-get-attach">
<title>Working with Attachments and HTML Mail</title>
- <para>If someone sends you an <link linkend="attachment">attachment</link>, Evolution displays a file icon at the end of the message to which it is attached. Text, including HTML formatting and embedded images appears as part of the message, rather than as a separate attachment. Attachments are also listed under the address list. To view the attachments, click the arrow to expand the attachment window. To open an attachment, double-click it. Click the Save All button to save all the attachments.</para>
+ <para>If someone sends you an <link linkend="attachment">attachment</link>, Evolution displays a file icon at the end of the message to which it is attached. Text, including HTML formatting, and embedded images appears as part of the message, rather than as a separate attachment. Attachments are also listed under the address list. To view the attachments, click the arrow to expand the attachment window. To open an attachment, double-click it. Click the Save All button to save all the attachments.</para>
<section id="usage-mail-getnsend-get-attach-actions">
<title>Saving or Opening Attachments</title>
@@ -1352,13 +1352,8 @@
<section id="usage-mail-getnsend-get-attach-html">
<title>Inline Images in HTML Mail</title>
<para>When someone sends you HTML mail that includes an image in the body of the message (for example, the welcome message in your Inbox), Evolution displays the image inside the message. You can create messages like this by using the Insert Image tool in the message composer. Alternately, just drag an image into the message composition area.</para>
- <para>Some images are links in a message, rather than being part of the message. Evolution can download those images from the Internet, but does not do so unless you request it. This is because remotely servered images can be slow to load and display, and can even be used by spammers to track who reads the email. Not automatically loading images helps protect your privacy.</para>
- <para>To load the images for one message:</para>
- <orderedlist>
- <listitem id="bsen9jh">
- <para>Click View > Load Images.</para>
- </listitem>
- </orderedlist>
+ <para>Some images are links in a message, rather than being part of the message. Evolution can download those images from the Internet, but does not do so unless you request it. This is because remotely hosted images can be slow to load and display, and can even be used by spammers to track who reads the email. Not automatically loading images helps protect your privacy.</para>
+ <para>To load the images for one message, click View > Load Images.</para>
<para>To set the default action for loading images:</para>
<orderedlist>
<listitem id="bsenabn">
@@ -1409,7 +1404,7 @@
<section id="usage-mail-getnsend-get-news">
<title>Using Evolution for News</title>
- <para>USENET newsgroups are similar to mail, so it is often convenient to read news and mail side by side. You can add a news source, called an NNTP server, the same way you would add <link linkend="bse54o0">new email account</link>, selecting USENET News as the Server type. The news server appear as a remote mail server, and each newsgroup works like an IMAP folder. When you click Send/Receive, Evolution also checks for news messages.</para>
+ <para>USENET newsgroups are similar to mail, so it is often convenient to read news and mail side by side. You can add a news source, called an NNTP server, the same way you would add <link linkend="bse54o0">new email account</link>, selecting USENET News as the server type. The news server appear as a remote mail server, and each newsgroup works like an IMAP folder. When you click Send/Receive, Evolution also checks for news messages.</para>
<para>When you create a newsgroup account, you are not subscribed to any groups. To subscribe to a newsgroup:</para>
<orderedlist>
<listitem id="bsx1euy">
@@ -1426,8 +1421,8 @@
<section id="usage-mail-getnsend-delete">
<title>Deleting Mail</title>
- <para>Evolution allows you to delete unwanted messages. To delete a message, select it and press the Delete key, or click the delete tool in the toolbar, press Ctrl+D, or right-click the message, then click Delete.</para>
- <para>When you press Delete or click the Trash folder, your mail is not actually deleted, but is marked for deletion. Your email is recoverable until you have expunged your mail. When you expunge a folder, you remove all the mail that you have marked for deletion.To show deleted messages, uncheck Hide Deleted Messages option from the View menu. You can view the messages striken off for later deletion. You can also find deleted messages in your Trash folder.</para>
+ <para>Evolution allows you to delete unwanted messages. To delete a message, select it and press the Delete key, or click the Delete button in the toolbar, or press Ctrl+D, or right-click the message, then click Delete.</para>
+ <para>When you press Delete or click the Trash folder, your mail is not actually deleted, but is marked for deletion. Your email is recoverable until you have expunged your mail. When you expunge a folder, you remove all the mail that you have marked for deletion. To show deleted messages, uncheck Hide Deleted Messages option from the View menu. You can view the messages striken off for later deletion. You can also find deleted messages in your Trash folder.</para>
<para>To permanently erase all the deleted messages in a folder, click Folder > Expunge or press Ctrl+E.</para>
<para>Trash folders in GroupWise, local and IMAP accounts are actually virtual search folders that display all messages you have marked for later deletion. Hence, emptying Trash is nothing but expunging deleted mail from all your folders in the account.</para>
<para>However, this is not true for the Trash folder on Exchange servers, which behaves just the same as it does in Outlook. It is a normal folder with actual messages in it. For more information about search folders, see <link linkend="usage-mail-organize-vfolders">Using Search Folders</link>.</para>
@@ -1442,7 +1437,7 @@
<section id="usage-mail-getnsend-send">
<title>Composing New Email Messages</title>
- <para>You can start writing a new email message by clicking File > New > Mail Message, by pressing Ctrl+N when in the mailing tool, or by clicking New in the toolbar.</para>
+ <para>You can start writing a new email message by clicking File > New > Mail Message, by pressing Ctrl+N when in the mail tool, or by clicking New in the toolbar.</para>
<para>Enter an address in the To field. If you want to enter multiple email addresses, type in the addresses separated by comma. You can also use a contact list to send messages to multiple recipients. Enter a subject in the Subject field, and a message in the box at the bottom of the window. After you have written your message, click Send.</para>
<para>New mail message window look like this:</para>
<mediaobject id="usage-mail-newmsg-fig"><imageobject><imagedata format="PNG" fileref="figures/evo_newmess_a.png"/></imageobject></mediaobject>
@@ -1530,7 +1525,7 @@
<para>If you are offline when you click Send, Evolution adds your message to the Outbox queue. The next time you connect to the Internet and send or receive mail, that message is sent.</para>
</listitem>
<listitem>
- <para>Click File > Save Draft to store your messages in the drafts folder for later revision.</para>
+ <para>Click File > Save Draft to store your messages in the Drafts folder for later revision.</para>
</listitem>
<listitem>
<para>If you prefer to save your message as a text file, click File > Save As, then specify a filename.</para>
@@ -1551,12 +1546,12 @@
<para>Click Copy Folder Content Locally for Offline Operation.</para>
</listitem>
</orderedlist>
- <para>Your connection status is shown by the small icon in the lower left border of the Evolution main window. When you are online, it displays two connected cables. When you go offline, the cables separate.</para>
+ <para>Your connection status is shown by the small icon in the lower left corner of the Evolution main window. When you are online, it displays two connected cables. When you go offline, the cables separate.</para>
<para>To cache your selected folders and disconnect from the network,</para>
<orderedlist>
<listitem id="b17rcz0t">
<para>Click File > Work Offline, or click the connection status icon in the lower left of the screen.</para>
- <para>A message pop-ups and asks you whether you want to go offline immediately or cache before you go offline.</para>
+ <para>A message pops up and asks you whether you want to go offline immediately or synchronize folders locally before you go offline.</para>
<mediaobject id="b17rd4gb"><imageobject><imagedata format="PNG" fileref="figures/evo_offline.png"/></imageobject></mediaobject>
</listitem>
@@ -1567,22 +1562,12 @@
<para>Select Do not show this message again to switch off this popup. The default is to not synchronize while going offline.</para>
</listitem>
</orderedlist>
- <para>When you want to reconnect,</para>
- <orderedlist>
- <listitem id="b17rcz7v">
- <para>Click File > Work Online, or click the connection status icon again.</para>
- </listitem>
- </orderedlist>
+ <para>When you want to reconnect, click File > Work Online, or click the connection status icon again.</para>
<section id="b17rczm1">
<title>Download Messages for Offline Operations</title>
<para>This features prepares you for going offline and for offline operations. It helps you download all the messages locally before you go offline. If otherwise, by default, it goes offline when you click the offline button without downloading the message.</para>
- <para>To download messages for offline operations,</para>
- <orderedlist>
- <listitem id="b17rd6dc">
- <para>Select File > Download messages for offline.</para>
- </listitem>
- </orderedlist>
+ <para>To download messages for offline operations, select File > Download messages for offline.</para>
</section>
<section id="b101llnc">
@@ -1596,7 +1581,7 @@
<para>To attach a file to your email:</para>
<orderedlist>
<listitem id="bsfnwxr">
- <para>Click the Attach icon in the composer toolbar.</para>
+ <para>Click the Attach button in the composer toolbar.</para>
</listitem>
<listitem id="bsfnx41">
<para>Select the file you want to attach.</para>
@@ -1609,7 +1594,7 @@
<para>When you send the message, a copy of the attached file goes with it. Be aware that large attachments can take a long time to send and receive.</para>
</section>
<section id="b17rcxmf">
- <title>Attachment Reminder:</title>
+ <title>Attachment Reminder</title>
<para>Evolution has an Attachment Reminder plugin you can use to remind yourself to attach a file to an email. If it determines that you have not attached the file, it displays the following message:</para>
<mediaobject id="b17rcrvr"><imageobject><imagedata format="PNG" fileref="figures/attach_reminder_a.png"/></imageobject></mediaobject>
<orderedlist>
@@ -1627,7 +1612,7 @@
<mediaobject id="b17rcni6"><imageobject><imagedata format="PNG" fileref="figures/evo_attachreminder_plugin.png"/></imageobject></mediaobject>
</listitem>
<listitem id="b17rcq0r">
- <para>Select keywords such as <quote>Attach</quote> or <quote>Attachment</quote> and click Add.</para>
+ <para>Click Add, then enter keywords such as <quote>Attach</quote> or <quote>Attachment</quote>.</para>
<para>Based on the keywords you have added here, it searches every mail you are sending. If it finds the keywords such as <quote>attach</quote> in your mail and there is no actual attached file, you are reminded of missing attachments.</para>
</listitem>
<listitem id="b1a57zh3">
@@ -1643,7 +1628,7 @@
<para><trademark>Evolution</trademark>, like most email programs, recognizes three types of addresses: primary recipients, secondary recipients, and hidden (blind) recipients. The simplest way to direct a message is to put the email address or addresses in the To: field, which denotes primary recipients. Use the Cc: field to send a message to secondary recipients.</para>
<para>Addresses on the Bcc: list are hidden from the other recipients of the message. You can use it to send mail to large groups of people, especially if they don't know each other or if privacy is a concern. If your Bcc: field is absent, click View > Bcc Field.</para>
<para>If you frequently write email to the same groups of people, you can create address lists in the contacts tool, and then send them mail as though they have a single address. To learn how to do that, see <link linkend="usage-contact-organize-group-list">Creating a List of Contacts</link>.</para>
- <para>Evolution has the ability to let you specify the Reply-To in an email. Using this, you can set up a special Reply-To for an email. To do this:</para>
+ <para>Evolution allows you to specify the Reply-To header in an email. To do this:</para>
<orderedlist>
<listitem id="bsfnz55">
<para>Open a compose window.</para>
@@ -1665,21 +1650,21 @@
<section id="usage-mail-getnsend-send-to">
<title>Choosing Recipients Quickly</title>
- <para>Address auto completion is by default enabled in Evolution when you create contacts. Evolution makes it easy for you to quickly fill in the address field without having to remember the email address of recipients. You can type nicknames or other portions of address data in the address field and Evolution will display a drop-down list of possible address completions from your contacts. If you type a name or nickname that can go with more than one card, Evolution opens a dialog box to ask you which person you meant.</para>
- <para>If Evolution does not complete addresses automatically, click Edit > Preferences, then click Autocompletion. There, select the address book you want to use for address autocompletion in the mailer.</para>
+ <para>Address auto-completion is enabled in Evolution by default when you create contacts. Evolution makes it easy for you to quickly fill in the address field without having to remember the email address of recipients. You can type nicknames or other portions of address data in the address field and Evolution will display a drop-down list of possible address completions from your contacts. If you type a name or nickname that can go with more than one card, Evolution opens a dialog box to ask you which person you meant.</para>
+ <para>If Evolution does not complete addresses automatically, click Edit > Preferences, then click Autocompletion. Then, select the address book you want to use for address autocompletion in the mailer.</para>
<para>Alternately, you can click the To:, Cc:, or Bcc: buttons to get a list of the email addresses in your contacts. Select addresses and click the arrows to move them into the appropriate address columns.</para>
<para>For more information about using email with the contact manager and the calendar, see <link linkend="contact-automation-basic">Send Me a Card: Adding New Cards Quickly</link> and <link linkend="usage-calendar-apts">Scheduling With the Evolution Calendar</link>.</para>
</section>
<section id="usage-mail-getnsend-send-reply">
<title>Replying to Email Messages</title>
- <para>To reply to a message, click the message to reply to in the message list and click the Reply button in the toolbar, or right-click within the message and select Reply to Sender. This opens the message composer. The To: and Subject: fields are already filled, although you can alter them if you prefer. In addition, the full text of the old message is inserted into the new message, either in grey with a blue line on one side (for HTML display) or with the > character before each line (in plain text mode), to indicate that it is part of the previous message.</para>
+ <para>To reply to a message, select the message to reply to in the message list and click the Reply button in the toolbar, or right-click within the message and select Reply to Sender. This opens the message composer. The To: and Subject: fields are already filled, although you can alter them if you prefer. In addition, the full text of the old message is inserted into the new message, either in grey with a blue line on one side (for HTML display) or with the > character before each line (in plain text mode), to indicate that it is part of the previous message.</para>
<para>If you're reading a message with several recipients, you can use Reply to All instead of Reply. If there are large numbers of people in the Cc: or To: fields, this can save substantial amounts of time.</para>
<section id="bsfo4jl">
<title>Using the Reply To All Feature</title>
<para>Susan sends an email to a client and sends copies to Tim and to an internal company mailing list of co-workers. If Tim wants to make a comment for all of them to read, he uses Reply to All, but if he just wants to tell Susan that he agrees with her, he uses Reply. His reply does not reach anyone that Susan put on her Bcc list, because that list is not shared with anyone.</para>
- <para>If you subscribe to a mailing list, and want your reply to go just to the list, rather than to the sender, select Reply to List instead of Reply or Reply to All.</para>
+ <para>If you subscribe to a mailing list, and want your reply to go just to the list rather than to the sender, select Reply to List instead of Reply or Reply to All.</para>
</section>
<section id="b13e1i15">
@@ -1701,7 +1686,7 @@
<tbody valign="top">
<row id="b13e1iws">
<entry colname="1">
- <para>Reply to sender</para>
+ <para>Reply to Sender</para>
</entry>
<entry colname="2">
<para>Ctrl+R</para>
@@ -1839,7 +1824,7 @@
</informaltable>
<formalpara id="bsaia7u">
<title>Alignment:</title>
- <para>Located next to the text style buttons, the three paragraph icons should be familiar to users of most word processing software. The left most button aligns your text to the left, the center button centers text, and the right button aligns the text to the right.</para>
+ <para>Located next to the text style buttons, the three paragraph icons should be familiar to users of most word processing software. The left-most button aligns your text to the left, the center button centers text, and the right button aligns the text to the right.</para>
</formalpara>
<formalpara id="bsaiagc">
<title>Indentation Rules:</title>
@@ -1951,7 +1936,7 @@
<section id="b13uhy6r">
<title>Default Settings</title>
- <para>Evolution allows you to change the default settings. You can organize your draft folder and sent folder, set the addresses to which you want to sent carbon copies and blind carbon copies to. You can also change the settings for message receipts from Default setting window.</para>
+ <para>Evolution allows you to change the default settings. You can organize your Draft folder and Sent folder, set the addresses to which you want to sent carbon copies and blind carbon copies to. You can also change the settings for message receipts.</para>
<mediaobject id="b13uuaeb"><imageobject><imagedata format="PNG" fileref="figures/evo_account_editor_a.png"/></imageobject></mediaobject>
<para>To change your default settings,</para>
<orderedlist>
@@ -1959,16 +1944,16 @@
<para>Select Edit > Preferences.</para>
</listitem>
<listitem id="b13uu2g0">
- <para>Select the mail account whose default settings you want to change.</para>
+ <para>Select the mail account whose settings you want to change.</para>
</listitem>
<listitem id="b13uu7dv">
- <para>Click Edit to open Account Editor window.</para>
+ <para>Click Edit to open the Account Editor.</para>
</listitem>
<listitem id="b13uu7rw">
- <para>Click Default tab.</para>
+ <para>Click the Default tab.</para>
</listitem>
<listitem id="b13uuba1">
- <para>Click the respective check boxes and enter the email addresses you want CC and BCC to.</para>
+ <para>Click the respective check boxes and enter the email addresses you want to always CC and BCC.</para>
</listitem>
<listitem id="b13uuhrf">
<para>Select the desired option for send message receipts from the drop-down list.</para>
@@ -1977,26 +1962,26 @@
<section id="b17s9qmz">
<title>Changing Default Folder for Sent and Draft Items</title>
- <para>By default, all the sent messages directly goes to Sent folder and those messages marked as drafts are saved in Draft folder. To change the default setting for draft items,</para>
+ <para>By default, all the sent messages directly go to the Sent folder and those messages marked as drafts are saved in the Drafts folder. To change the default setting for draft items,</para>
<orderedlist>
<listitem id="b13uuu4v">
- <para>Click Drafts button to open Folder view.</para>
+ <para>Click the Drafts button to open the folder selection window.</para>
</listitem>
<listitem id="b13uuutt">
- <para>Select the folder you want to save the drafts to.</para>
+ <para>Select the folder you want to save drafts to.</para>
</listitem>
<listitem id="b13uuvee">
<para>Click OK.</para>
</listitem>
<listitem id="b13uuvlq">
- <para>Click Revert button to revert back to previous settings.</para>
+ <para>Click the Revert button to revert back to previous settings.</para>
</listitem>
</orderedlist>
<mediaobject id="b13uuw3i"><imageobject><imagedata format="PNG" fileref="figures/account_editor_a.png"/></imageobject></mediaobject>
<para>To change the default folder for sent items,</para>
<orderedlist>
<listitem id="b13uuylj">
- <para>Click Sent button to open the Folder view.</para>
+ <para>Click the Sent button to open the folder selection window.</para>
</listitem>
<listitem id="b13uuylk">
<para>Select the desired folder for sent items.</para>
@@ -2005,7 +1990,7 @@
<para>Click OK.</para>
</listitem>
<listitem id="b13uuylm">
- <para>Click Revert button to revert back to previous settings.</para>
+ <para>Click the Revert button to revert back to previous settings.</para>
</listitem>
</orderedlist>
</section>
@@ -2036,7 +2021,7 @@
<title>Tips for Email Courtesy</title>
<itemizedlist>
<listitem>
- <para>Don't forward chain letters. If you must, watch out for hoaxes and urban legends, and make sure the message doesn't have multiple layers of greater-than signs, (>) indicating multiple layers of careless in-line forwarding.</para>
+ <para>Don't forward chain letters. If you must, watch out for hoaxes and urban legends, and make sure the message doesn't have multiple layers of greater-than signs (>), indicating multiple layers of careless in-line forwarding.</para>
</listitem>
<listitem>
<para>Always begin and close with a salutation. Say <quote>please</quote> and <quote>thank you,</quote> just like you do in real life. You can keep your pleasantries short, but be polite.</para>
@@ -2278,10 +2263,10 @@
<para>If you want, you can upload your keys to a key server.</para>
<orderedlist>
<listitem id="bsg3379">
- <para>Check your public key ID with gpg--list-keys. It is the string after 1024D on the line beginning with pub. In the example above, it is 32j38dk2.</para>
+ <para>Check your public key ID with gpg--list-keys. It is the string after <quote>1024D</quote> on the line beginning with <quote>pub</quote>. In the example above, it is <quote>32j38dk2</quote>.</para>
</listitem>
<listitem id="bsg347p">
- <para>Enter the command <command>gpg --send-keys --keyserver wwwkeys.pgp.net <varname>32j38dk2</varname></command>. Substitute your key ID for <varname>32j38dk2</varname>. You need your password to do this.</para>
+ <para>Enter the command <command>gpg --send-keys --keyserver wwwkeys.pgp.net <varname>32j38dk2</varname></command>. Substitute your key ID for <quote>32j38dk2</quote>. You need your password to do this.</para>
</listitem>
</orderedlist>
<para>Key servers store your public keys for you so that your friends can decrypt your messages. If you choose not to use a key server, you can manually send your public key, include it in your signature file, or put it on your own Web page. However, it is easier to publish a key once, and then let people download it from a central place when they want.</para>
@@ -2334,7 +2319,7 @@
<para>To encrypt a single message:</para>
<orderedlist>
<listitem id="bsg2p0a">
- <para>Open a Compose a Message window.</para>
+ <para>Open a Compose Message window.</para>
</listitem>
<listitem id="bsg2p9i">
<para>Click Security > PGP Encrypt.</para>
@@ -2344,6 +2329,9 @@
<para>Click Send.</para>
</listitem>
</orderedlist>
+ <note>
+ <para>The Subject line of the message will not be encrypted and should not be used for sensitive information.</para>
+ </note>
<para>You can set Evolution to always sign your email messages:</para>
<orderedlist>
<listitem id="bsaj12e">
@@ -2377,7 +2365,7 @@
<title>S/MIME Encryption</title>
<para>S/MIME encryption also uses a key-based approach, but it has some significant advantages in convenience and security. S/MIME uses certificates, which are similar to keys. The public portion of each certificate is held by the sender of a message and by one of several certificate authorities, who are paid to guarantee the identity of the sender and the security of the message. Evolution already recognizes a large number of certificate authorities, so when you get a message with an S/MIME certificate, your system automatically receives the public portion of the certificate and decrypts or verifies the message.</para>
<para>S/MIME is used most often in corporate settings. In these cases, administrators supply certificates that they have purchased from a certificate authority. In some cases, an organization can act as its own certificate authority, with or without a guarantee from a dedicated authority such as VeriSign&z-3rdParty; or Thawte&z-3rdParty;. In either case, the system administrator provides you with a certificate file.</para>
- <para>If you want to use S/MIME independently, you can extract an identification certificate from your Mozilla&z-3rdParty; or Netscape&z-3rdParty; Web browser. See the <ulink url="http://www.mozilla.org/projects/security/pki/psm/help_21/using_certs_help.html";>Mozilla Help</ulink>for more information on security certificates.</para>
+ <para>If you want to use S/MIME independently, you can extract an identification certificate from your Mozilla&z-3rdParty; or Netscape&z-3rdParty; Web browser. See the <ulink url="http://www.mozilla.org/projects/security/pki/psm/help_21/using_certs_help.html";>Mozilla Help</ulink> for more information on security certificates.</para>
<para>The certificate file is a password-protected file on your computer.</para>
<section id="bspyee8">
@@ -2399,7 +2387,7 @@
<para>Click Close.</para>
</listitem>
</orderedlist>
- <para>Similarly, you can add certificates that are sent to you independently of any authority by clicking the Contact Certificates tab and using the same Import tool. You can also add new certificate authorities, which have their own certificate files, in the same way.</para>
+ <para>Similarly, you can add certificates that are sent to you independently of any authority by clicking the Contact Certificates tab and using the same import tool. You can also add new certificate authorities, which have their own certificate files, in the same way.</para>
</section>
<section id="bsqbdkv">
@@ -2564,7 +2552,7 @@
<mediaobject id="b1448dzl"><imageobject><imagedata format="PNG" fileref="figures/mail-threaded.png"/></imageobject></mediaobject>
<para>In a thread of conversation view, each new message is stacked below of the ones that arrived before it, so that the newest message is always the one you see first. Whenever a new message arrives to an old thread as a reply, you will see it below the parent message. You always see the thread based on the date of the recent message received. The threads are sorted by the date of most recent message in the threads.</para>
<tip>
- <para>There is a gconf key to toggle between the collapsed or expanded state of mail thread. By default, it is collapsed and you can change this at /apps/evolution/mail/display/thread_expand. If the value is set to false, expanded state is remembered. When you restart Evolution, all the threads are arranged to this state. This is a highly advanced option only for the advanced users.</para>
+ <para>There is a GConf key to toggle between the collapsed or expanded state of mail thread. By default, it is collapsed and you can change this at /apps/evolution/mail/display/thread_expand. If the value is set to false, expanded state is remembered. When you restart Evolution, all the threads are arranged to this state. This is a highly advanced option only for the advanced users.</para>
</tip>
</section>
@@ -2644,7 +2632,7 @@
</listitem>
</itemizedlist>
<note>
- <para>Clicking each sort criteria cycles take you through three possibilities. Sort by criteria in ascending or descending order or unsort the message. When you click any of the sort criteria reiteratively, Evolution sort the messages in a sequential order - ascending, descending and unsort. For example, when you click Recepients for the first time, Evolution sort the messages by recipients in ascending order and for the second time, sort in the reverse order. For the next click, messages will be displayed unsorted.</para>
+ <para>Clicking each sort criteria cycles take you through three possibilities. Sort by criteria in ascending or descending order or unsort the message. When you click any of the sort criteria reiteratively, Evolution sorts the messages in a sequential order - ascending, descending and unsort. For example, when you click Recepients for the first time, Evolution sorts the messages by recipients in ascending order and for the second time, sorts in the reverse order. For the next click, messages will be displayed unsorted.</para>
</note>
<formalpara id="bsawhu7">
<title>Sort Ascending:</title>
@@ -2652,7 +2640,7 @@
</formalpara>
<formalpara id="b1449089">
<title>Sort Descending:</title>
- <para>Sort descending revers the order and returns you the sorted message list in the order of newest to oldest.</para>
+ <para>Sort descending reverts the order and returns you the sorted message list in the order of newest to oldest.</para>
</formalpara>
<formalpara id="b144939d">
<title>Unsort:</title>
@@ -2683,8 +2671,8 @@
</section>
<section id="usage-mail-organize-columns-followup">
- <title>Using the Follow up Feature</title>
- <para>To make sure you don't forget about a message, you can use the Follow up feature.</para>
+ <title>Using the Follow-Up Feature</title>
+ <para>To make sure you don't forget about a message, you can use the follow-up feature.</para>
<orderedlist>
<listitem id="bsqbrxl">
<para>Select one or more messages.</para>
@@ -2699,27 +2687,27 @@
<para>You can also open the Flag to Follow Up window by</para>
<orderedlist>
<listitem id="b13tawzg">
- <para>Select the messages.</para>
+ <para>Selecting the messages.</para>
</listitem>
<listitem id="b13tax4b">
- <para>Select Message menu.</para>
+ <para>Selecting the Message menu.</para>
</listitem>
<listitem id="b13taxf6">
- <para>Click Mark as.</para>
+ <para>Clicking Mark as.</para>
</listitem>
<listitem id="b13taxls">
- <para>Select Follow Up or press Shift+Ctrl+G.</para>
- <para>A dialog box opens to allow you to set the type of flag and the due date.</para>
+ <para>Selecting Follow Up or pressing Shift+Ctrl+G.</para>
+ <para>A window opens to allow you to set the type of flag and the due date.</para>
</listitem>
</orderedlist>
<mediaobject id="b13tarj6"><imageobject><imagedata format="PNG" fileref="figures/evo_flag_follow_up_a.png"/></imageobject></mediaobject>
- <para>The flag itself is the action you want to remind yourself about. Several are provided for you, such as Call, Forward, and Reply, but you can enter your own note or action if you want.</para>
+ <para>The flag itself is the action you want to remind yourself about. Several are provided for you, such as Call, Forward and Reply, but you can enter your own note or action if you want.</para>
<para>After you have added a flag, you can mark it as complete or remove it entirely by right-clicking the message, then click either Flag Completed or Clear Flag.</para>
<para>When you read a flagged message, its flag status is displayed at the top, before the message headers. An overdue message might tell you <quote>Overdue: Call by April 07, 2003, 5:00 PM.</quote></para>
<para>Flags can help you organize your work in a number of ways. For example, you might add a Flag Status column to your message list and sort that way. Alternately, you could create a search folder that displays all your flagged messages, then clear the flags when you're done, so the search folder contains only messages with upcoming deadlines.</para>
<formalpara id="b17s9rir">
<title>Mark as Important Feature:</title>
- <para>If you prefer a simpler way to remind yourself about messages, you can mark them as important by right-clicking the message, then click Mark as Important or Select Message > Mark as > Important from the menubar.</para>
+ <para>If you prefer a simpler way to remind yourself about messages, you can mark them as important by right-clicking the message, then click Mark as Important or select Message > Mark as > Important from the menubar.</para>
</formalpara>
</section>
</section>
@@ -2730,7 +2718,7 @@
<para>When you click OK, your new folder appears in the folder view. You can then move the messages to it by dragging and dropping them, or right click on the message and choose Move to folder, or press Shift+Ctrl+V.</para>
<para>You can also drop the messages to a particular folder by selecting Message > Move to folder. This will open the Select folder window, where you can drop your message to any of the folders listed.</para>
<mediaobject id="b13td8j9"><imageobject><imagedata format="PNG" fileref="figures/evo_select_folder.png"/></imageobject></mediaobject>
- <para>If you want to create a new folder click New at the bottom left of the window. Specify the location and enter the label of the folder at the entry box appeared at the top. You can also move the messages from one folder to another by selecting the message and then press Move tab at the bottom right.</para>
+ <para>If you want to create a new folder click New at the bottom left of the window. Specify the location and enter the label of the folder in the entry box appeared at the top. You can also move the messages from one folder to another by selecting the message and then press the Move button at the bottom right.</para>
<para>If you create a filter with the filter assistant, you can have mail filed automatically. Select Edit > Message Filters to bring up the Message Filters window.</para>
<mediaobject id="b13tf6pl"><imageobject><imagedata format="PNG" fileref="figures/evo_message_filters_a.png"/></imageobject></mediaobject>
<para>Click on the Add button to bring up the Add Rule window from where you can set different criteria for filtering messages. For additional information on filtering, see <link linkend="usage-mail-org-filters-new">Creating New Filter Rules</link>.</para>
@@ -2741,12 +2729,12 @@
<section id="usage-mail-organize-search">
<title>Searching for Messages</title>
- <para>Most email clients can search the message for you, but Evolution does it differently and efficiently giving you faster search result with Quick search, Customized Search and Advanced Search.</para>
+ <para>Most email clients can search for messages for you, but Evolution does it differently and efficiently giving you faster search results with quick search, customized search and advanced search.</para>
<formalpara id="b131j1jn">
<title>Quick Search:</title>
- <para>Quick Search displays all the messages that match the in-built criteria you selected from the drop-down list at the top left side, just above the message list.</para>
+ <para>Quick Search displays all the messages that match the built-in criteria you selected from the drop-down list at the top left side, just above the message list.</para>
</formalpara>
- <para>To perform a quick search, perform the following procedure:</para>
+ <para>To perform a quick search:</para>
<orderedlist>
<listitem id="b131j296">
<para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list.</para>
@@ -2824,7 +2812,7 @@
</tip>
<formalpara id="b131jgie">
<title>Customized Search:</title>
- <para>Evolution allows you to perform customized search. To search for a message use the following procedure:</para>
+ <para>Evolution allows you to perform customized search. To search for a message:</para>
</formalpara>
<orderedlist>
<listitem id="b131jhwt">
@@ -2894,7 +2882,7 @@
<para>Select the Search menu.</para>
</listitem>
<listitem id="b13tvb7l">
- <para>Click Advanced Search to open Advanced Search dialog box.</para>
+ <para>Click Advanced Search to open the Advanced Search window.</para>
<mediaobject id="b13tvd61"><imageobject><imagedata format="PNG" fileref="figures/evo_adv_search_a.png"/></imageobject></mediaobject>
</listitem>
@@ -2908,7 +2896,7 @@
<para>Click OK.</para>
</listitem>
<listitem id="b13tviwm">
- <para>Press Save to save your search results.</para>
+ <para>Click Save to save your search results.</para>
</listitem>
</orderedlist>
<formalpara id="b13tvk69">
@@ -2924,13 +2912,13 @@
<para>Select Search from the menu bar.</para>
</listitem>
<listitem id="b13tw2vp">
- <para>Click Edit Saved Searches to open the Searches dialog box.</para>
+ <para>Click Edit Saved Searches to open the Searches window.</para>
<mediaobject id="b13tw8de"><imageobject><imagedata format="PNG" fileref="figures/evo_edit_search.png"/></imageobject></mediaobject>
</listitem>
<listitem id="b13tw8px">
- <para>Click the Edit button to open the Edit Rule dialog box.</para>
- <para>You can also add or remove Searches from the list by using the respective buttons available at the right.</para>
+ <para>Click the Edit button to open the Edit Rule window.</para>
+ <para>You can also add or remove searches from the list by using the respective buttons available at the right.</para>
<mediaobject id="b13twan3"><imageobject><imagedata format="PNG" fileref="figures/evo_edit_rule_a.png"/></imageobject></mediaobject>
</listitem>
@@ -3148,7 +3136,7 @@
</listitem>
</orderedlist>
<para>If you have several filters that match a single message, they are all applied to the message in order, unless one of the filters has the Stop Processing action. If you use that action in a filter, the messages that it affects are not touched by other filters.</para>
- <para>When you first open the Filters dialog box, you are shown the list of filters sorted in the order in which they will be applied. You can move them up and down in the priority list by clicking the Up and Down buttons.</para>
+ <para>When you first open the Filters window, you are shown the list of filters sorted in the order in which they will be applied. You can move them up and down in the priority list by clicking the Up and Down buttons.</para>
</section>
<section id="filters-edit">
@@ -3197,7 +3185,7 @@
<listitem id="bsazs7h">
<para>Click Message > Create Rule, then select a search folder based on Subject, Sender, Recipient, or Mailing List.</para>
<para>or</para>
- <para>Select Search menu > Create Search Folder From Search.</para>
+ <para>Select Search > Create Search Folder From Search.</para>
<note>
<para>Perform this operation from the search results. Create a search folder from search is enabled only when you already have performed a search.</para>
</note>
@@ -3231,7 +3219,7 @@
<para>Searches in the actual text of the message.</para>
</formalpara>
<formalpara id="bshkzum">
- <title>Expression (For programmers only):</title>
+ <title>Expression (for programmers only):</title>
<para>Match a message according to an expression you write in the Scheme language used to define filters in Evolution.</para>
</formalpara>
<formalpara id="bshkzun">
@@ -3298,10 +3286,7 @@
<listitem id="b13txae8">
<para>click Add button to open the Select folder window.</para>
<mediaobject id="b13txc09"><imageobject><imagedata format="PNG" fileref="figures/evo_select_add_folder.png"/></imageobject></mediaobject>
-
</listitem>
- </orderedlist>
- <orderedlist>
<listitem id="b13txawl">
<para>Select the folder and press Add button.</para>
</listitem>
@@ -3318,13 +3303,13 @@
<section id="usage-mail-organize-spam">
<title>Stopping Junk Mail (Spam)</title>
<para>Evolution can check for junk mail for you. Evolution uses SpamAssassin and/or Bogofilter with trainable Bayesian filters to perform the spam check. When the software detects mail that appears to be junk mail, it will flag it and hide it from your view. Messages that are flagged as junk mail are displayed only in the Junk folder.</para>
- <para>The junk mail filter can learn which kinds of mail are legitimate and which are not if you train it. When you first start using junk mail blocking, check the Junk folder to be sure that legitimate mail doesn't get flagged as junk mail. If good mail is incorrectly flagged, remove it from the Junk folder by right-clicking it and selecting Mark as Not Junk or press Shift+Ctrl+J. If Evolution misses junk mail, right-click the message, then click Mark as Junk or press Ctrl+J. When you correct it, the filter can recognize similar messages in the future, and becomes more accurate as time goes on.</para>
+ <para>The junk mail filter can learn which kinds of mail are legitimate and which are not if you train it. When you first start using junk mail blocking, check the Junk folder to be sure that legitimate mail doesn't get flagged as junk mail. If legitimate mail is incorrectly flagged, remove it from the Junk folder by right-clicking it and selecting Mark as Not Junk or pressing Shift+Ctrl+J. If Evolution misses junk mail, right-click the message, then click Mark as Junk or press Ctrl+J. When you correct it, the filter can recognize similar messages in the future, and becomes more accurate as time goes on.</para>
<para>Every filter needs to learn at the least 100 spam and 100 ham to start working. For that, you must mark each message manually by clicking the <emphasis>Not junk</emphasis> button in the toolbar to learn that it is ham. The <emphasis>Junk</emphasis> button learns a message as spam.</para>
<para>To change your junk mail filtering preferences, click Edit > Preferences, then click Mail Preferences.</para>
<para>For additional information on junk content, see <link linkend="mail-prefs-junk">Junk Mail Preferences</link>.</para>
<para>For additional junk mail settings, see <link linkend="more-mail-options">Receiving Mail Options</link>.</para>
<note>
- <para>SpamAssassin is an application that scan through the mail box to find junk mail. Evolution uses SpamAssassin as the default spam-filtering application. For more information, see<ulink url="http://spamassassin.apache.org/";> The Apache SpamAssassin Project</ulink>.</para>
+ <para>SpamAssassin is an application that scans through the mail box to find junk mail. Evolution uses SpamAssassin as the default spam-filtering application. For more information, see<ulink url="http://spamassassin.apache.org/";> The Apache SpamAssassin Project</ulink>.</para>
<para>Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) by a statistical analysis of the message's header and content (body). It is able to learn from the user's classifications and corrections. For more information on Bogofilter, see <ulink url="http://bogofilter.sourceforge.net/";>The Bogofilter site</ulink>.</para>
</note>
</section>
@@ -3353,11 +3338,11 @@
<section id="usage-contact-cards">
<title>Contacts and Cards</title>
- <para>Contacts are the individuals you have chosen to add to your address book so you can keep track of information about them and send email to them. In Evolution, an individual contact is called a card. For more information on organizing your contacts see <link linkend="usage-contact-organize">Organizing your Contacts</link>. To learn about configuring the contacts tool, refer <link linkend="config-prefs-contact">Contact Management</link>.</para>
+ <para>Contacts are the individuals you have chosen to add to your address book so you can keep track of information about them and send email to them. In Evolution, an individual contact is called a card. For more information on organizing your contacts see <link linkend="usage-contact-organize">Organizing your Contacts</link>. To learn about configuring the contacts tool, see <link linkend="config-prefs-contact">Contact Management</link>.</para>
<section id="bsqchx3">
<title>The Contact Editor</title>
- <para>If you want to add or change cards, use the contact editor. You can edit email address, telephone numbers, mailer addresses and all other contact information you have entered for a particular contact.</para>
+ <para>If you want to add or change cards, use the contact editor. You can edit email addresses, telephone numbers, mailing addresses and all other contact information you have entered for a particular contact.</para>
<para>The contact editor window has three tabs:</para>
<formalpara id="b13psru7">
<title>Contact:</title>
@@ -3371,12 +3356,12 @@
<title>Mailing Address:</title>
<para>Contains the individual's mailing address.</para>
</formalpara>
- <para>You can also the Forward Contact menu item in the Action menu, which opens a new message with the card already attached, and Send Message to Contact, which opens a new message to the contact's email address.</para>
+ <para>You can also use the Forward Contact menu item in the Action menu, which opens a new message with the card already attached, or Send Message to Contact, which opens a new message to the contact's email address.</para>
<para>You can add a card from within an email message or calendar appointment. In an open email, right-click any email address or message, and click Add to Address Book or select Add Sender to Address Book from the Message menu.</para>
<para>Most of the items in the contact editor simply display the information you enter, but some of them have additional features:</para>
<formalpara id="b13psuii">
<title>Full Name:</title>
- <para>Specify the name of your contact here. You can type a name into the Full Name field, but you can also click the Full Name button to bring up a small dialog box with text boxes for first and last names, titles like <quote>Mr.</quote> or <quote>Her Excellency,</quote> and suffixes like <quote>Jr.</quote> The Full Name field also interacts with the File Under box to help you organize your contacts and to handle multi-word surnames. To see how it works, type a name in the Full Name field. As an example, we will use Miguel de Icaza. You will notice that the File Under field also fills in, but in reverse: Icaza, Miguel de. If you had entered John Q. Doe, the contacts editor would have correctly guessed that the entry should be filed under <quote>Doe, John Q.</quote> However, Miguel's surname, <quote>de Icaza,</quote> has two words, and to sort it correctly you must enter de Icaza, Miguel in the File As entry.</para>
+ <para>Specify the name of your contact here. You can type a name into the Full Name field, but you can also click the Full Name button to bring up a small dialog box with text boxes for first and last names, titles like <quote>Mr.</quote> or <quote>Her Excellency,</quote> and suffixes like <quote>Jr.</quote> The Full Name field also interacts with the File Under box to help you organize your contacts and to handle multi-word surnames. To see how it works, type a name in the Full Name field. As an example, we will use Miguel de Icaza. You will notice that the File Under field also fills in, but in reverse: Icaza, Miguel de. If you had entered John Q. Doe, the contacts editor would have correctly guessed that the entry should be filed under <quote>Doe, John Q.</quote> However, Miguel's surname, <quote>de Icaza,</quote> has two words, and to sort it correctly you must enter de Icaza, Miguel in the File Under entry.</para>
</formalpara>
<formalpara id="b13psvf3">
<title>Where:</title>
@@ -3388,7 +3373,7 @@
</formalpara>
<formalpara id="b13psweg">
<title>Free/Busy and Calendar URLs:</title>
- <para>Click the Personal Information tab to enter Web addresses for the contact. If the contact publishes Free/Busy or calendar data online, using a server other than Exchange or GroupWise, you can specify the addresses for those servers here. After you do so, you can check their schedules when creating appointments in the calendar.</para>
+ <para>Click the Personal Information tab to enter Web addresses for the contact. If the contact publishes free/busy or calendar data online, using a server other than Exchange or GroupWise, you can specify the addresses for those servers here. After you do so, you can check their schedules when creating appointments in the calendar.</para>
</formalpara>
<mediaobject id="usage-contact-editor-fig"><imageobject><imagedata format="PNG" fileref="figures/evo_contacteditor_a.png"/></imageobject></mediaobject>
@@ -3448,7 +3433,7 @@
<para>To configure your Google Address Book in Evolution contacts:</para>
<orderedlist>
<listitem id="b1dl9x1r">
- <para>Select File > New > Address book to open the New Address Book window.</para>
+ <para>Click File > New > Address Book.</para>
<mediaobject id="b1dl9yef"><imageobject><imagedata format="PNG" fileref="figures/evo_googlecontacts.png"/></imageobject></mediaobject>
</listitem>
@@ -3476,13 +3461,13 @@
<listitem>
<formalpara id="b1dla28w">
<title>Username:</title>
- <para>Specify the username of your Google account.</para>
+ <para>Specify your username for your Google account.</para>
</formalpara>
</listitem>
<listitem>
<formalpara id="b1dla46h">
<title>Use SSL:</title>
- <para> Select Use SSL to enable a secure connection between Evolution and the server</para>
+ <para> Select Use SSL to enable a secure connection between Evolution and the server.</para>
</formalpara>
</listitem>
<listitem>
@@ -3504,7 +3489,7 @@
<title>Searching for Contacts</title>
<formalpara id="b131mz65">
<title>Customized Search:</title>
- <para>Evolution enables you to find the contact address quickly by using Customized Search. To find the contact address you are looking for, use the following procedure:</para>
+ <para>Evolution enables you to find the contact address quickly by using customized search. To find the contact address you are looking for, use the following procedure:</para>
</formalpara>
<orderedlist>
<listitem id="b131m9n2">
@@ -3525,7 +3510,7 @@
</itemizedlist>
</listitem>
<listitem id="b131mgp9">
- <para>Press Enter to begin the search</para>
+ <para>Press Enter to begin the search.</para>
</listitem>
</orderedlist>
<para>For a more complex search, select Search Advanced and select criteria that describe your desired contact:</para>
@@ -3546,7 +3531,7 @@
<para>To clear your search you can click the Clear icon in the search string field, or choose Search > Clear from the menubar, or enter a blank search. You can also press Shift+Ctrl+Q to clear the search.</para>
<formalpara id="b131mh80">
<title>Quick Search:</title>
- <para>Displays all the contacts that match the built-in criteria you have selected from the drop-down list at the top left side, just above the Display pane.</para>
+ <para>Displays all the contacts that match the built-in criteria you have selected from the drop-down list at the top left side, just above the display pane.</para>
</formalpara>
<para>To perform quick search, use the following procedure:</para>
<orderedlist>
@@ -3656,7 +3641,7 @@
<para>Evolution allows you to organize your contacts. You can create several individual address books, or contact lists. Within a given address book, you can have several categories of contacts.</para>
<itemizedlist>
<listitem>
- <para><link linkend="usage-contact-organize-group">Contacts Groups</link></para>
+ <para><link linkend="usage-contact-organize-group">Contact Groups</link></para>
</listitem>
<listitem>
<para><link linkend="usage-contact-organize-group-list">Creating a List of Contacts</link></para>
@@ -3670,8 +3655,8 @@
</itemizedlist>
<section id="usage-contact-organize-group">
- <title>Contacts Groups</title>
- <para>Contacts Groups are nothing but Address Books. The simplest way to organize contacts is to create additional address books. You can create a new one by clicking File > New > Address Book. For contacts groups on your computer, you only need to provide a name. For contacts on the network, you need to provide more information about the contacts server you are trying to access.</para>
+ <title>Contact Groups</title>
+ <para>Contact groups are nothing but address books. The simplest way to organize contacts is to create additional address books. You can create a new one by clicking File > New > Address Book. For contacts groups on your computer, you only need to provide a name. For contacts on the network, you need to provide more information about the contacts server you are trying to access.</para>
<para>To move a card from one group to another, just drag it from the main display of contacts and drop it to a different group. You cannot change the contents of most network contact groups.</para>
<note>
<para>Contacts groups are not the same as contact lists. A contact group is like a folder or address book full of contacts. A contact list is a single contact that contains other contacts, and is most often used to email several people at once.</para>
@@ -3685,7 +3670,7 @@
<listitem id="bsqciqk">
<para>Click File > Import.</para>
<para>or</para>
- <para>Mail yourself a contact as vCard attachment.</para>
+ <para>Mail yourself a contact as a vCard attachment.</para>
<para>Currently VCF and LDIF are supported. CSV and TAB format files are supported from Microsoft Outlook, Thunderbird, Mozilla, and Evolution.</para>
</listitem>
</orderedlist>
@@ -3698,7 +3683,7 @@
<para> To create a list of contacts:</para>
<orderedlist>
<listitem id="bshlf6r">
- <para>Open the list creation dialog box by clicking the New List button.</para>
+ <para>Open the list creation window by clicking the New List button.</para>
<para>or</para>
<para>Click File > New > Contact List.</para>
</listitem>
@@ -3729,18 +3714,11 @@
<para>To mark a card as belonging to a category,</para>
<orderedlist>
<listitem id="b13ptaog">
- <para>Double click the card to appear the Contact Editor window</para>
+ <para>Double click the card to bring up the Contact Editor window</para>
</listitem>
<listitem id="b13ptb98">
<para>Click the Categories button at the left.</para>
- <para>You can view the Categories dialog box as given below.</para>
- <para></para>
- <para></para>
- <para></para>
- <para></para>
- <para></para>
- <para></para>
- <para></para>
+ <para>The Categories window is shown below.</para>
<mediaobject id="b13pr0v9"><imageobject><imagedata format="PNG" fileref="figures/categories_a.png"/></imageobject></mediaobject>
</listitem>
@@ -3755,14 +3733,14 @@
</listitem>
<listitem id="b13ptef4">
<para>Click OK.</para>
- <para>You can view the category name appeared in the field next to Categories button in the Contact Editor.</para>
+ <para>You can view the category name in the field next to Categories button in the Contact Editor window.</para>
</listitem>
<listitem id="b13ptgw7">
<para>Click OK.</para>
</listitem>
</orderedlist>
<tip>
- <para>You can edit or set the color and icon for each categories available under categories list. To achieve that click Edit button at the bottom of the Categories window. Press the Delete button to delete the items from the list.</para>
+ <para>You can edit or set the color and icon for each categories available under categories list. To achieve that click the Edit button at the bottom of the Categories window. Press the Delete button to delete the items from the list.</para>
</tip>
</section>
</section>
@@ -3770,11 +3748,11 @@
<section id="usage-contact-sharing">
<title>LDAP: Shared Address Books on a Network</title>
<para>The <link linkend="ldap">LDAP</link> protocol was created to let users share contact information over a network by sharing access to a central directory. LDAP allows a company to maintain a shared set of contact information. Many companies keep a common LDAP address book for all their employees or for client contacts.</para>
- <para>To learn how to add a remote LDAP directory to your available address books, see <link linkend="config-prefs-contact">Contact Management</link>. Remote groups of contacts appear under the On LDAP Servers item in the switcher. They work like a local folder of contact cards, with the following exceptions:</para>
+ <para>To learn how to add a remote LDAP directory to your available address books, see <link linkend="config-prefs-contact">Contact Management</link>. Remote groups of contacts appear under the On LDAP Servers item in the side bar. They work like a local folder of contact cards, with the following exceptions:</para>
<itemizedlist>
<listitem>
<para>Network folders are only available when you are connected to the network. If you use a laptop or have a modem connection, you might want to copy or cache some of the network directory. You do this by dragging and dropping your desired contacts into the local address books.</para>
- <para>You can also mark the network folder for offline usage. To mark the folder, right-click the folder, then click Properties. Select Copy Folder Content Locally for Offline Operation.</para>
+ <para>You can also mark the network folder for offline usage. To mark the folder, right-click the folder, click Properties and select Copy Folder Content Locally for Offline Operation.</para>
</listitem>
<listitem>
<para>To prevent excess network traffic, Evolution does not normally load data from the LDAP server upon opening.</para>
@@ -3792,7 +3770,7 @@
<section id="contact-automation-basic">
<title>Send Me a Card: Adding New Cards Quickly</title>
- <para>When you get information about a person in the mail or in a calendar entry, you can add it to an address card. To do so, right-click any email address or email message, and click Add to Address Book on the menu that appears. If the sender already exists, the Editor tab opens and you can edit the detail. Evolution can also add cards from a hand-held device during HotSync&z-3rdParty; operation. For more information, see <link linkend="config-sync">Synchronizing Your Handheld Device</link>.</para>
+ <para>When you get information about a person in the mail or in a calendar entry, you can add it to an address card. To do so, right-click any email address or email message, and click Add to Address Book on the menu that appears. If the sender already exists, the Editor button opens and you can edit the address card details. Evolution can also add cards from a hand-held device during a HotSync&z-3rdParty; operation. For more information, see <link linkend="config-sync">Synchronizing Your Handheld Device</link>.</para>
</section>
</chapter>
@@ -3960,13 +3938,13 @@
<listitem>
<formalpara id="b1a4aey4">
<title>Name:</title>
- <para> Specify a name for the Google calendar</para>
+ <para>Specify a name for the Google calendar.</para>
</formalpara>
</listitem>
<listitem>
<formalpara id="b1a4af9o">
<title>Username:</title>
- <para> Specify your username for your Google account</para>
+ <para>Specify your username for your Google account.</para>
</formalpara>
</listitem>
</itemizedlist>
@@ -3975,7 +3953,7 @@
<para>Set the time to automatically refresh the calendar.</para>
</listitem>
<listitem id="b1a4ak4r">
- <para>Select Use SSL to enable a secure connection between Evolution and the Google server.</para>
+ <para>Select Use SSL to enable a secure connection between Evolution and the server.</para>
</listitem>
<listitem id="b1a4amec">
<para>If you want to set a color label for the calendar, click the Color tab, select the desired color, then click OK.</para>
@@ -4105,7 +4083,7 @@
<para>Click the Attach button on the toolbar, or click Insert > Attachment and then browse to the attachment.</para>
</listitem>
<listitem id="b10fo4ao">
- <para>(Optional) Select a classification (Public, Private, or Confidential) by clicking > Options > Classifications.</para>
+ <para>(Optional) Click Options > Classifications, then select a classification (as Public, Private or Confidential).</para>
</listitem>
<listitem id="b10fo4rj">
<para>(Optional) Click the Recurrence button on the toolbar.</para>
@@ -4256,7 +4234,7 @@
<para>Click the Attach button on the toolbar, or click Insert > Attachment and then browse to the attachment.</para>
</listitem>
<listitem id="b10fof8f">
- <para>(Optional) Select a classification (Public, Private, or Confidential) by clicking > Options > Classifications.</para>
+ <para>(Optional) Click Options > Classifications, then select a classification (as Public, Private or Confidential).</para>
</listitem>
<listitem id="b10fof8g">
<para>(Optional) Click the Recurrence button on the toolbar.</para>
@@ -5164,7 +5142,7 @@
<listitem>
<formalpara id="b15fkslg">
<title>Send Options:</title>
- <para>You can set the priority and sensitivity of the sent message so that the recipients will know how important the message is.The priority can have one of the three values - High, Normal or Low and sensitivity can have one of the four values-Normal, Personal, Private and Confidential respectively. You can also enable delivery receipt request and read receipt request for the messages sent.</para>
+ <para>You can set the priority and sensitivity of the sent message so that the recipients will know how important the message is. You can also enable delivery receipt request and read receipt request for the messages sent.</para>
</formalpara>
</listitem>
</itemizedlist>
@@ -5198,7 +5176,7 @@
<listitem>
<formalpara id="b10fqk4l">
<title>Adding vCards to the Address Book:</title>
- <para>Allows you to save the vCards you receive in attachment to your Exchange address book.New Address Book entries can also be created on Exchange from received email messages with a single click.</para>
+ <para>Allows you to save the vCards you receive in attachment to your Exchange address book. New Address Book entries can also be created on Exchange from received email messages with a single click.</para>
</formalpara>
</listitem>
</itemizedlist>
@@ -5293,10 +5271,9 @@
<para>Select Edit > Preferences, then select Mail Accounts.</para>
</listitem>
<listitem id="bsqdqvl">
- <para>Select the account you want to convert, then click Edit to appear the Account Editor.</para>
- <para>You can view Identity tab enabled.</para>
+ <para>Select the account you want to convert, then click Edit.</para>
+ <para>Click the Identity tab.</para>
<mediaobject id="b13p90wc"><imageobject><imagedata format="PNG" fileref="figures/exchg-identity.png"/></imageobject></mediaobject>
-
</listitem>
<listitem id="bshngg7">
<para>Change your email address as needed.</para>
@@ -5304,7 +5281,6 @@
<listitem id="bshngsm">
<para>Click the Receiving Mail tab, then select Microsoft Exchange as your server type.</para>
<mediaobject id="b13pb2z0"><imageobject><imagedata format="PNG" fileref="figures/exchng-rec-mail.png"/></imageobject></mediaobject>
-
</listitem>
<listitem id="bshnh8h">
<para>Type your user name, and the Outlook Web Access (OWA) URL. Click Authenticate, then enter the password at the prompt. The Exchange server authenticates your account.</para>
@@ -5319,10 +5295,10 @@
<para>Specify how often to check for new mail, your Global Catalog server name and whether to apply filters to messages in your Inbox, check for junk, set a password expiry period, and any other settings you want to include.</para>
</listitem>
<listitem id="bshnjw0">
- <para>Use the Defaults tab to define folders, send cc: or bcc: messages to certain IDs, and set options for message receipts.</para>
+ <para>Use the Defaults tab to define folders, send CC or BCC messages to certain email addresses, and set options for message receipts.</para>
</listitem>
<listitem id="bshnkmu">
- <para>Use the Security tab to set PGP and s/MIME options.</para>
+ <para>Use the Security tab to set PGP and S/MIME options.</para>
</listitem>
<listitem id="bxn65fw">
<para>Quit Evolution and restart it.</para>
@@ -5336,7 +5312,7 @@
<section id="access">
<title>Accessing the Exchange Server</title>
<para>When you have installed Evolution Exchange, you can access public folders and perform certain Exchange actions like delegation and password management, and subscribing to other user's calendars, tasks, and contact folders. You can also carry out any folder-related operations like adding, deleting, and renaming folders, and selecting folder permissions on calendars, tasks, and contact folders. Use the regular Mail tool for mail, the Contacts tool for contacts, and the Calendar tool for setting schedules.</para>
- <para>If you are using both an Exchange account and a local mail account, you should be aware that whenever you save an email address or appointment from an email message, it is saved in your Exchange contacts list or calendar, rather than in your local account. The same is true for synchronization with Palm OS devices; tasks, and appointments.Addresses from your Palm OS device are synchronized in the Exchange folders rather than in local folders.</para>
+ <para>If you are using both an Exchange account and a local mail account, you should be aware that whenever you save an email address or appointment from an email message, it is saved in your Exchange contacts list or calendar, rather than in your local account. The same is true for synchronization with Palm OS devices; tasks, and appointments. Addresses from your Palm OS device are synchronized in the Exchange folders rather than in local folders.</para>
<para>To avoid unnecessary strain on the server, the Global Address List (GAL) appears empty until you search for something in it.</para>
<para></para>
</section>
@@ -5371,7 +5347,7 @@
<section id="b15flgn7">
<title>Send Options</title>
- <para> You can set the priority and sensitivity of the sent message from an exchange account so that the recipients will know how important the message is.The priority can have one of the three options - High, Normal or Low and sensitivity can have one of the four options-Normal, Personal, Private and Confidential respectively. You can also enable delivery receipt request and read receipt request for the messages sent.</para>
+ <para>You can set the priority and sensitivity of the sent message from an exchange account so that the recipients will know how important the message is. The priority can have one of the three options: High, Normal or Low; and sensitivity can have one of the four options: Normal, Personal, Private and Confidential. You can also enable delivery receipt request and read receipt request for the messages sent.</para>
<section id="b17reifv">
<title>Tracking Options</title>
@@ -5385,12 +5361,12 @@
<para>Select the exchange account from the From field.</para>
</listitem>
<listitem id="b15flmjn">
- <para>Click Insert > Send Options to open the Send Option dialog box</para>
+ <para>Click Insert > Send Options.</para>
<mediaobject id="b15fliu0"><imageobject><imagedata format="PNG" fileref="figures/evo_send_option_a.png"/></imageobject></mediaobject>
</listitem>
<listitem id="b15flnox">
- <para>Select the priority for your sent message from the given three options (Normal, High, Low)</para>
+ <para>Select the priority for your sent message from the given three options (Normal, High, Low).</para>
</listitem>
<listitem id="b15flo2b">
<para>Select the sensitivity for your sent message from the given four options (Normal, Personal, Private, Confidential).</para>
@@ -5588,14 +5564,14 @@
<section id="full-advantage">
<title>Scheduling Meetings with Free/Busy</title>
- <para>Evolution helps you fix a convenient time for a meeting according to the availability of the attendees.It's Free/Busy feature allows you to perform a check on other user's Exchange calendar to find whether they are busy according to their Exchange calendars, if so, you can reschedule the meeting altogether.</para>
+ <para>Evolution helps you fix a convenient time for a meeting according to the availability of the attendees. Its Free/Busy feature allows you to perform a check on other user's Exchange calendar to find whether they are busy according to their Exchange calendars, if so, you can reschedule the meeting altogether.</para>
<mediaobject id="bs4aw7n"><imageobject><imagedata format="PNG" fileref="figures/free_busy.png"/></imageobject></mediaobject>
<orderedlist>
<listitem id="bsbgc5a">
<para>Create a new appointment in the calendar.</para>
</listitem>
<listitem id="bsbgc8b">
- <para>Right-click the appointment, then select Schedule Meeting to appear Evolution Meeting editor.</para>
+ <para>Right-click the appointment, then select Schedule Meeting.</para>
</listitem>
<listitem id="b13pcsbd">
<para>Click the Add tab to enter the email addresses into the list.</para>
@@ -5646,7 +5622,7 @@
<chapter id="usage-groupwise">
<title>Connecting to GroupWise</title>
- <para><trademark>Evolution</trademark> can access accounts on <trademark class="registered">Novell</trademark> <trademark class="registered">GroupWise</trademark> 7 system.</para>
+ <para><trademark>Evolution</trademark> can access accounts on <trademark class="registered">Novell</trademark> <trademark class="registered">GroupWise</trademark> 7 systems.</para>
<itemizedlist>
<listitem>
<para><link linkend="bv7wchf">GroupWise Features</link></para>
@@ -5719,7 +5695,7 @@
<para>If you receive a card attachment and click Save in Address Book, it is saved to your Personal address book. New Address Book entries can also be added to your personal address book from received Email messages.</para>
</listitem>
<listitem>
- <para>To create your GroupWise Frequent contacts and Personal address books, you need to access your GroupWise account once through GroupWise Java client because Evolution currently does not support creating them. The GroupWise system address book is marked for offline use by default.This boosts performance.</para>
+ <para>To create your GroupWise Frequent contacts and Personal address books, you need to access your GroupWise account once through GroupWise Java client because Evolution currently does not support creating them. The GroupWise system address book is marked for offline use by default. This boosts performance.</para>
</listitem>
</itemizedlist>
</listitem>
@@ -5931,7 +5907,7 @@
<section id="b15iirao">
<title>Reminder Notes</title>
- <para>GroupWise Reminder notes are like mail messages except they are scheduled for a particular day and appear on the Calendar for that date. You can use reminder notes to show vacations, holidays, pay days, birthdays, and so forth.Posted reminder notes are placed in your Calendar on the date you specify. They are not placed in your Mailbox or in any other user's Mailbox.</para>
+ <para>GroupWise Reminder notes are like mail messages except they are scheduled for a particular day and appear on the Calendar for that date. You can use reminder notes to show vacations, holidays, pay days, birthdays, and so on. Posted reminder notes are placed in your Calendar on the date you specify. They are not placed in your Mailbox or in any other user's Mailbox.</para>
<para>Evolution integrates this feature into its Memo component so that you can view the Reminder notes listed under Memo at the right bottom side of the calender view.</para>
<note>
<para>Select the memo or the Reminder notes under the Memo component to display it on the Calendar view.</para>
@@ -6040,18 +6016,17 @@
<para>In the Compose Message window, click Insert > Send Options.</para>
<para>Select Status Tracking.</para>
<mediaobject id="b17qsuu3"><imageobject><imagedata format="PNG" fileref="figures/evo_gwstatustrack.png"/></imageobject></mediaobject>
-
</listitem>
<listitem id="b17qt9nx">
<para>Select the check box next to Create a sent item to track information.</para>
</listitem>
<listitem id="b17qt9yd">
- <para>Select any of the options given (Delivered, Delivered and opened, All information)</para>
+ <para>Select any of the options given (Delivered, Delivered and opened, All information).</para>
<para>Based on this selection, you can view the status of the send message in the Sent Items folder.</para>
<para>For more information, see <link linkend="Aal54a9">Checking the Status of an Item You Have Sent</link>.</para>
</listitem>
<listitem id="b17qtcil">
- <para>(Optional)Select the check box next to Auto-delete sent item to automatically delete the sent item from the Sent folder.</para>
+ <para>(Optional) Select the check box next to Auto-delete sent item to automatically delete the sent item from the Sent folder.</para>
</listitem>
<listitem id="b17qte6b">
<para>Under Return Notification, specify the type of return receipt you want.</para>
@@ -6080,7 +6055,7 @@
<para>In the Compose Message window, click Insert > Send Options.</para>
</listitem>
<listitem id="bv7vmrw">
- <para>Select High Priority, Standard Priority, Low Priority, or Undefined.</para>
+ <para>Select the priority for your sent message from the given three options (Normal, High, Low).</para>
<para>The small icon next to an item in the Mailbox is red when the priority is high.</para>
</listitem>
<listitem id="bv7vmrx">
@@ -6151,7 +6126,8 @@
<title>Enabling Status Tracking</title>
<orderedlist>
<listitem id="b17rearj">
- <para>In the Compose Meeting window, click Insert > Send Options > Status Tracking</para>
+ <para>In the Compose Meeting window, click Insert > Send Options.</para>
+ <para>Select Status Tracking.</para>
<mediaobject id="b17reckf"><imageobject><imagedata format="PNG" fileref="figures/evo_calstatus_a.png"/></imageobject></mediaobject>
</listitem>
<listitem id="b17recrx">
@@ -6162,7 +6138,7 @@
<para>Based on this selection, you can view the status of the send message in the Sent Items folder.</para>
</listitem>
<listitem id="b17red21">
- <para>(Optional)Select the check box next to Auto-delete sent item to automatically delete the sent item from the Sent folder.</para>
+ <para>(Optional) Select the check box next to Auto-delete sent item to automatically delete the sent item from the Sent folder.</para>
</listitem>
<listitem id="b17red4i">
<para>Under Return Notification, specify the type of return receipt you want.</para>
@@ -6215,10 +6191,10 @@
<thead valign="top">
<row id="b10fqugl">
<entry colname="1">
- <para>This Right</para>
+ <para>Permission:</para>
</entry>
<entry colname="2">
- <para>Lets your proxy do this</para>
+ <para>Allows your proxy to do:</para>
</entry>
</row>
</thead>
@@ -6500,7 +6476,9 @@
<title>Working with Mail Accounts</title>
<para>Evolution allows you to maintain multiple accounts, or identities. When you are writing an email message, you can choose which account to use by selecting from the drop-down list next to the From field in the message composer.</para>
<para>Click Send/Receive to update all mail sources that are not disabled. If you don't want to check mail for a given account, select the account in Edit > Preferences > Mail Accounts page and click the Disable button.</para>
- <para>To add a new account, click Add to open the Evolution configuration assistant. To alter an existing account, select it in the Preferences window, then click Edit to open the account editor dialog box.</para>
+ <para>To add a new account, click Add to open the Evolution configuration assistant.</para>
+ <para>To alter an existing account, select it in the Preferences window.</para>
+ <para>Click Edit to open the Account Editor.</para>
<para>The account editor dialog box has seven sections:</para>
<formalpara id="bsbhdwn">
<title>Identity:</title>
@@ -6508,7 +6486,7 @@
</formalpara>
<formalpara id="bsbhe10">
<title>Receiving Email:</title>
- <para>Select the way you receive email. You can download email from a <link linkend="pop">POP server</link>, read and keep it on the server (Microsoft Exchange, <trademark class="registered">Novell</trademark> <trademark class="registered">GroupWise</trademark>, or IMAP<link linkend="imap">IMAP</link>), or read it from files that already exist on your desktop computer. If your server requires you to use a secure connection, you can select from the given three options: No encryption, TLS encryption or SSL encryption.</para>
+ <para>Select the way you receive email. You can download email from a <link linkend="pop">POP server</link>, read and keep it on the server (Microsoft Exchange, <trademark class="registered">Novell</trademark> <trademark class="registered">GroupWise</trademark>, or <link linkend="imap">IMAP</link>), or read it from files that already exist on your desktop computer. If your server requires you to use a secure connection, you can select from the given three options: No encryption, TLS encryption or SSL encryption.</para>
</formalpara>
<para>Your system administrator might ask you to connect to a specific port on a mail server. To specify which port you use, just type a colon and the port number after the server name. For example, to connect to port 143 on the server smtp.example.com, specify smtp.example.com:143 as the server name.</para>
<para>For additional information, see <link linkend="second-step">Receiving Mail</link>.</para>
@@ -6546,10 +6524,10 @@
<section id="b15fx7uz">
<title>IMAP Mail Headers</title>
- <para>Evolution allows you to choose the headers that you want to download so that you can reduce the download time and filter or move your mail around the way you like it. Evolution help you customize your IMAP Mail header preferences and thus save the download time. The IMAP Mail header options are as follows:</para>
+ <para>Evolution allows you to choose the headers that you want to download so that you can reduce the download time and filter or move your mail around the way you like it. Evolution helps you to customize your IMAP Mail header preferences and thus save the download time. The IMAP Mail header options are as follows:</para>
<formalpara id="b15fzvdp">
<title>All Headers:</title>
- <para>This includes all the available IMAP Mail headers. By choosing this option, Evolution will download all the headers for all the messages.</para>
+ <para>All available IMAP mail headers for all the messages will be downloaded.</para>
</formalpara>
<formalpara id="b15fzvjw">
<title>Basic Headers:</title>
@@ -6566,7 +6544,8 @@
<para>Select Edit > Preferences.</para>
</listitem>
<listitem id="b15fy3hq">
- <para>Select the IMAP account and click Edit to open the Account Editor.</para>
+ <para>Select the IMAP account.</para>
+ <para>Click Edit to open the Account Editor.</para>
</listitem>
<listitem id="b15fy4cs">
<para>On the Account Editor, click IMAP Headers tab to open IMAP Headers to the Account Editor.</para>
@@ -6624,14 +6603,14 @@
<section id="config-prefs-mail-general">
<title>General Mail Settings</title>
- <para>The General page has the following options:</para>
+ <para>The following options are available:</para>
<formalpara id="bsbhnw0">
<title>Message Fonts:</title>
<para>Normally, Evolution uses the same fonts as other GNOME applications. To choose different fonts, deselect Use the same fonts as other applications and select one font for standard typefaces and a second for monospace.</para>
</formalpara>
<formalpara id="bsbho3f">
<title>Message Display:</title>
- <para>Choose how long you want to wait before marking a message read, how to highlight quotations, and the default encoding. Enable <guilabel>Fall back to threading message by subject</guilabel> to group the messages as message threads. You can also set the limit to the number of addresses displayed in the message header by enabling <guilabel>Shrink To/CC/BCC header to</guilabel> option.You can also set the limit for rendering text content in the message you receive. By default, when you receive a message with text content more than 4096 Kilo Bytes, Evolution will not render the message in the preview pane. You can view unformatted text either inline or using an external application. You can also enable Magic spacebar and search folders.</para>
+ <para>Choose how long you want to wait before marking a message read, how to highlight quotations, and the default encoding. Enable <guilabel>Fall back to threading message by subject</guilabel> to group the messages as message threads. You can also set the limit to the number of addresses displayed in the message header by enabling <guilabel>Shrink To/CC/BCC header to</guilabel> option. You can also set the limit for rendering text content in the message you receive. By default, when you receive a message with text content more than 4096 Kilo Bytes, Evolution will not render the message in the preview pane. You can view unformatted text either inline or using an external application. You can also enable the <link linkend="b17rgdac">Magic spacebar</link> and <link linkend="usage-mail-organize-vfolders">search folders</link>.</para>
</formalpara>
<para>To group the messages as threads select View > Group By threads or press Ctrl+T.</para>
<formalpara id="bsbhq3y">
@@ -6646,7 +6625,7 @@
<section id="mail-prefs-html">
<title>HTML Mail Preferences</title>
- <para>The HTML Mail page has the following options:</para>
+ <para>The following options are available:</para>
<formalpara id="bsbhqot">
<title>Show Image Animations:</title>
<para>Turns image animation (e.g. GIF files) on or off.</para>
@@ -6704,7 +6683,7 @@
<para>This feature adds support for viewing the photograph of the sender at the right side of the preview pane.</para>
</formalpara>
<para>To enable this feature, select Edit > Preferences > Mail Preferences > Headers > Show the photograph of sender in the email preview. Deselect this option to disable this feature.</para>
- <para>By default it searches only in the local addressbooks enabled for autocompletion. If you deselect the option <guilabel>Search for sender photograph only in the local addressbook</guilabel>, it searches in all the addressbooks enabled for autocompletion. If there are multiple matches for the same contact, it always takes the first one. Consider a contact that has multiple matches - the first one with a photograph and the second without a photo. Here, Evolution takes the first contact regardless of it not having a photograph.</para>
+ <para>By default it searches only in the local address books enabled for autocompletion. If you deselect the option <guilabel>Search for sender photograph only in the local address book</guilabel>, it searches in all the address books enabled for autocompletion. If there are multiple matches for the same contact, it always takes the first one. Consider a contact that has multiple matches - the first one with a photograph and the second without a photo. Here, Evolution takes the first contact regardless of it not having a photograph.</para>
<para>This feature is disabled by default as it causes delay in fetching the messages.</para>
</section>
@@ -6780,7 +6759,7 @@
<section id="bshpixy">
<title>General</title>
- <para>The General page has the following options:</para>
+ <para>The following options are available:</para>
<formalpara id="bsbhs8n">
<title>Default Behavior:</title>
<para>Choose how to normally forward and reply to messages, what character set they will use, whether they are in HTML, and whether that HTML can contain graphic emoticons.</para>
@@ -6842,7 +6821,7 @@
<section id="bshpskx">
<title>General</title>
- <para>The General page lets you set the following options:</para>
+ <para>The following options are available:</para>
<formalpara id="bsbhukf">
<title>Time Zone:</title>
<para>The city you're located in, to specify your time zone.</para>
@@ -6928,7 +6907,7 @@
<title>Network Preferences</title>
<para>This interface lets you configure your network proxy settings.</para>
<mediaobject id="b15m5vi1"><imageobject><imagedata format="PNG" fileref="figures/network_pref.png"/></imageobject></mediaobject>
- <para>Use the following four options to configure the proxy settings:</para>
+ <para>The following options are available:</para>
<formalpara id="b15m5zr2">
<title>Use system defaults:</title>
<para>Select this option to use the system wide proxy settings configured through Control Center > Network Proxies in GNOME. When this option is selected, Evolution uses the proxy settings in the /system/http_proxy and /system/proxy/gconf keys.</para>
@@ -7207,8 +7186,7 @@
<mediaobject id="b1a4or91"><imageobject><imagedata format="PNG" fileref="figures/evo_debuglogs_a.png"/></imageobject></mediaobject>
</listitem>
<listitem id="b1a4orv0">
- <para>Specify the display duration for the error messages.</para>
- <para>The messages remain in the statusbar for this specified time.</para>
+ <para>Specify for how long error messages will be displayed in the statusbar.</para>
</listitem>
</orderedlist>
<note>
@@ -7498,21 +7476,6 @@
</listitem>
</itemizedlist>
<para>Please file comments and suggestions for this manual as bugs in the GNOME bug tracking system. If you contributed to this project but do not see your name here, please contact Radhika PC (pradhika novell com) or Srinivasa Ragavan (sragavan novell com) and either of them will list you.</para>
- <para>Partial list of Documentation Translators (application translated to numerous additional languages):</para>
- <itemizedlist>
- <listitem>
- <para>Daniel Persson for Swedish (.se)</para>
- </listitem>
- <listitem>
- <para>Hector Garcia Alvarez and Francisco Javier F. Serrador for Spanish (.es)</para>
- </listitem>
- <listitem>
- <para>Kjartan Maraas for Norwegian (.no)</para>
- </listitem>
- <listitem>
- <para>Sergey V. Mironov for Russian (.ru)</para>
- </listitem>
- </itemizedlist>
</appendix>
<glossary id="apx-gloss">
Modified: branches/kill-bonobo/help/quickref/C/quickref.pdf
==============================================================================
Binary files. No diff available.
Modified: branches/kill-bonobo/help/quickref/Makefile.am
==============================================================================
--- branches/kill-bonobo/help/quickref/Makefile.am (original)
+++ branches/kill-bonobo/help/quickref/Makefile.am Mon Jan 12 04:12:01 2009
@@ -1,3 +1,3 @@
-SUBDIRS = C de es fr hu it oc pl pt sv sq
+SUBDIRS = C cs de es fr hu it oc pl pt sv sq
EXTRA_DIST = evolution-logo.eps
Modified: branches/kill-bonobo/help/quickref/de/quickref.pdf
==============================================================================
Binary files. No diff available.
Modified: branches/kill-bonobo/help/quickref/es/quickref.pdf
==============================================================================
Binary files. No diff available.
Modified: branches/kill-bonobo/help/quickref/es/quickref.tex
==============================================================================
--- branches/kill-bonobo/help/quickref/es/quickref.tex (original)
+++ branches/kill-bonobo/help/quickref/es/quickref.tex Mon Jan 12 04:12:01 2009
@@ -3,7 +3,7 @@
% dvips -t letter -f -Pcmz < quickref.dvi >| quickref.ps
% ps2pdf -sPAPERSIZE=letter quickref.ps
\documentclass[12pt]{article}
-\usepackage[utf-8]{inputenc}
+\usepackage[utf8]{inputenc}
\usepackage{lscape}
\usepackage{setspace}
\usepackage{graphicx}
Modified: branches/kill-bonobo/help/quickref/evolution-logo.eps
==============================================================================
Binary files. No diff available.
Modified: branches/kill-bonobo/help/quickref/fr/quickref.pdf
==============================================================================
Binary files. No diff available.
Modified: branches/kill-bonobo/help/quickref/hu/quickref.pdf
==============================================================================
Binary files. No diff available.
Modified: branches/kill-bonobo/help/quickref/it/quickref.pdf
==============================================================================
Binary files. No diff available.
Modified: branches/kill-bonobo/help/quickref/it/quickref.tex
==============================================================================
--- branches/kill-bonobo/help/quickref/it/quickref.tex (original)
+++ branches/kill-bonobo/help/quickref/it/quickref.tex Mon Jan 12 04:12:01 2009
@@ -3,7 +3,7 @@
% dvips -t letter -f -Pcmz < quickref.dvi >| quickref.ps
% ps2pdf -sPAPERSIZE=letter quickref.ps
\documentclass[12pt]{article}
-\usepackage[utf-8]{inputenc}
+\usepackage[utf8]{inputenc}
\usepackage{lscape}
\usepackage{setspace}
\usepackage{graphicx}
Modified: branches/kill-bonobo/help/quickref/oc/quickref.pdf
==============================================================================
Binary files. No diff available.
Modified: branches/kill-bonobo/help/quickref/pl/quickref.pdf
==============================================================================
Binary files. No diff available.
Modified: branches/kill-bonobo/help/quickref/pl/quickref.tex
==============================================================================
--- branches/kill-bonobo/help/quickref/pl/quickref.tex (original)
+++ branches/kill-bonobo/help/quickref/pl/quickref.tex Mon Jan 12 04:12:01 2009
@@ -4,7 +4,7 @@
% ps2pdf -sPAPERSIZE=letter quickref.ps
\documentclass[12pt]{article}
\usepackage[OT4]{fontenc}
-\usepackage[utf-8]{inputenc}
+\usepackage[utf8]{inputenc}
\usepackage{lscape}
\usepackage{setspace}
\usepackage{graphicx}
Modified: branches/kill-bonobo/help/quickref/pt/quickref.pdf
==============================================================================
Binary files. No diff available.
Modified: branches/kill-bonobo/help/quickref/sq/quickref.pdf
==============================================================================
Binary files. No diff available.
Modified: branches/kill-bonobo/help/quickref/sq/quickref.tex
==============================================================================
--- branches/kill-bonobo/help/quickref/sq/quickref.tex (original)
+++ branches/kill-bonobo/help/quickref/sq/quickref.tex Mon Jan 12 04:12:01 2009
@@ -3,7 +3,7 @@
% dvips -t letter -f -Pcmz < quickref.dvi >| quickref.ps
% ps2pdf -sPAPERSIZE=letter quickref.ps
\documentclass[12pt]{article}
-\usepackage[utf-8]{inputenc}
+\usepackage[utf8]{inputenc}
\usepackage{lscape}
\usepackage{setspace}
\usepackage{graphicx}
Modified: branches/kill-bonobo/help/quickref/sv/quickref.pdf
==============================================================================
Binary files branches/kill-bonobo/help/quickref/sv/quickref.pdf (original) and branches/kill-bonobo/help/quickref/sv/quickref.pdf Mon Jan 12 04:12:01 2009 differ
Modified: branches/kill-bonobo/mail/e-searching-tokenizer.c
==============================================================================
--- branches/kill-bonobo/mail/e-searching-tokenizer.c (original)
+++ branches/kill-bonobo/mail/e-searching-tokenizer.c Mon Jan 12 04:12:01 2009
@@ -45,7 +45,7 @@
static guint signals[LAST_SIGNAL] = { 0, };
-static void e_searching_tokenizer_begin (HTMLTokenizer *, char *);
+static void e_searching_tokenizer_begin (HTMLTokenizer *, const char *);
static void e_searching_tokenizer_end (HTMLTokenizer *);
static char *e_searching_tokenizer_peek_token (HTMLTokenizer *);
static char *e_searching_tokenizer_next_token (HTMLTokenizer *);
@@ -811,7 +811,7 @@
s->current = token = (struct _token *)e_dlist_remhead(&s->output);
- return token?token->tok:NULL;
+ return token ? g_strdup (token->tok) : NULL;
}
static char *
@@ -1070,7 +1070,7 @@
}
static void
-e_searching_tokenizer_begin (HTMLTokenizer *t, char *content_type)
+e_searching_tokenizer_begin (HTMLTokenizer *t, const char *content_type)
{
ESearchingTokenizer *st = E_SEARCHING_TOKENIZER (t);
struct _ESearchingTokenizerPrivate *p = st->priv;
Modified: branches/kill-bonobo/mail/em-account-editor.c
==============================================================================
--- branches/kill-bonobo/mail/em-account-editor.c (original)
+++ branches/kill-bonobo/mail/em-account-editor.c Mon Jan 12 04:12:01 2009
@@ -2018,9 +2018,9 @@
hbox = gtk_hbox_new(FALSE, 0);
check = g_object_new(gtk_check_button_get_type(), "label", pre, "use_underline", TRUE, "active", enable, NULL);
- spin = gtk_spin_button_new((GtkAdjustment *)gtk_adjustment_new(def, min, max, 1, 1, 1), 1, 0);
+ spin = gtk_spin_button_new((GtkAdjustment *)gtk_adjustment_new(def, min, max, 1, 1, 0), 1, 0);
if (post)
- label = gtk_label_new(post);
+ label = gtk_label_new_with_mnemonic(post);
gtk_box_pack_start((GtkBox *)hbox, check, FALSE, TRUE, 0);
gtk_box_pack_start((GtkBox *)hbox, spin, FALSE, TRUE, 0);
if (label)
Modified: branches/kill-bonobo/mail/em-filter-folder-element.c
==============================================================================
--- branches/kill-bonobo/mail/em-filter-folder-element.c (original)
+++ branches/kill-bonobo/mail/em-filter-folder-element.c Mon Jan 12 04:12:01 2009
@@ -181,7 +181,10 @@
value = xmlNewNode(NULL, (unsigned const char *)"value");
xmlSetProp(value, (unsigned const char *)"name", (unsigned char *)fe->name);
- xmlSetProp(value, (unsigned const char *)"type", (unsigned const char *)"folder");
+ if (ff->store_camel_uri)
+ xmlSetProp(value, (unsigned const char *)"type", (unsigned const char *)"folder-curi");
+ else
+ xmlSetProp(value, (unsigned const char *)"type", (unsigned const char *)"folder");
work = xmlNewChild(value, NULL, (unsigned const char *)"folder", NULL);
xmlSetProp(work, (unsigned const char *)"uri", (unsigned const char *)ff->uri);
@@ -194,12 +197,21 @@
{
EMFilterFolderElement *ff = (EMFilterFolderElement *)fe;
xmlNodePtr n;
+ xmlChar *type;
d(printf("Decoding folder from xml %p\n", fe));
xmlFree(fe->name);
fe->name = (char *)xmlGetProp(node, (unsigned const char *)"name");
+ type = xmlGetProp (node, (unsigned const char *)"type");
+ if (type) {
+ ff->store_camel_uri = g_str_equal ((const char *)type, "folder-curi");
+ xmlFree (type);
+ } else {
+ ff->store_camel_uri = FALSE;
+ }
+
n = node->children;
while(n) {
if (!strcmp((char *)n->name, "folder")) {
@@ -224,7 +236,11 @@
uri = em_folder_selection_button_get_selection(button);
g_free(ff->uri);
- ff->uri = uri!=NULL?em_uri_from_camel(uri):NULL;
+
+ if (ff->store_camel_uri)
+ ff->uri = g_strdup (uri);
+ else
+ ff->uri = uri != NULL ? em_uri_from_camel (uri) : NULL;
gdk_window_raise(GTK_WIDGET(gtk_widget_get_ancestor(GTK_WIDGET(button), GTK_TYPE_WINDOW))->window);
}
@@ -237,11 +253,16 @@
GtkWidget *button;
char *uri;
- uri = em_uri_to_camel(ff->uri);
+ if (ff->store_camel_uri)
+ uri = ff->uri;
+ else
+ uri = em_uri_to_camel (ff->uri);
model = e_mail_shell_module_get_folder_tree_model (mail_shell_module);
button = em_folder_selection_button_new (model, _("Select Folder"), NULL);
em_folder_selection_button_set_selection(EM_FOLDER_SELECTION_BUTTON(button), uri);
- g_free(uri);
+
+ if (!ff->store_camel_uri)
+ g_free(uri);
gtk_widget_show(button);
g_signal_connect(button, "selected", G_CALLBACK(folder_selected), ff);
@@ -266,8 +287,9 @@
static void
emff_copy_value(FilterElement *de, FilterElement *se)
{
- if (EM_IS_FILTER_FOLDER_ELEMENT(se))
+ if (EM_IS_FILTER_FOLDER_ELEMENT(se)) {
+ ((EMFilterFolderElement *)de)->store_camel_uri = ((EMFilterFolderElement *)se)->store_camel_uri;
em_filter_folder_element_set_value((EMFilterFolderElement *)de, ((EMFilterFolderElement *)se)->uri);
- else
+ } else
parent_class->copy_value(de, se);
}
Modified: branches/kill-bonobo/mail/em-filter-folder-element.h
==============================================================================
--- branches/kill-bonobo/mail/em-filter-folder-element.h (original)
+++ branches/kill-bonobo/mail/em-filter-folder-element.h Mon Jan 12 04:12:01 2009
@@ -40,6 +40,7 @@
FilterElement parent_object;
char *uri;
+ gboolean store_camel_uri; /* true if uri should contain camel uri, otherwise contains evolution's uri with an Account ID */
};
struct _EMFilterFolderElementClass {
Modified: branches/kill-bonobo/mail/em-folder-view.c
==============================================================================
--- branches/kill-bonobo/mail/em-folder-view.c (original)
+++ branches/kill-bonobo/mail/em-folder-view.c Mon Jan 12 04:12:01 2009
@@ -30,7 +30,6 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-util.h>
#ifdef G_OS_WIN32
/* Work around 'DATADIR' and 'interface' lossage in <windows.h> */
Modified: branches/kill-bonobo/mail/em-format-html-display.c
==============================================================================
--- branches/kill-bonobo/mail/em-format-html-display.c (original)
+++ branches/kill-bonobo/mail/em-format-html-display.c Mon Jan 12 04:12:01 2009
@@ -49,6 +49,7 @@
#include <bonobo/bonobo-control-frame.h>
#include <bonobo/bonobo-stream-memory.h>
#include <bonobo/bonobo-widget.h>
+#include <bonobo-activation/bonobo-activation-mime.h>
#include <camel/camel-stream.h>
#include <camel/camel-stream-filter.h>
@@ -187,6 +188,8 @@
static void efhd_complete(EMFormat *);
gboolean efhd_mnemonic_show_bar (GtkWidget *widget, gboolean focus, GtkWidget *efhd);
+static gboolean efhd_bonobo_object(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject);
+static gboolean efhd_use_component(const char *mime_type);
static void efhd_builtin_init(EMFormatHTMLDisplayClass *efhc);
enum {
@@ -1304,10 +1307,37 @@
}
/* ********************************************************************** */
-
+static void
+efhd_bonobo_unknown(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
+{
+ char *classid;
+
+ classid = g_strdup_printf("bonobo-unknown:///em-format-html-display/%s", emf->part_id->str);
+ em_format_html_add_pobject((EMFormatHTML *)emf, sizeof(EMFormatHTMLPObject), classid, part, efhd_bonobo_object);
+ camel_stream_printf(stream, "<object classid=\"%s\" type=\"%s\"></object><br>\n", classid, info->mime_type);
+ g_free(classid);
+}
+
+ /* ********************************************************************** */
static const EMFormatHandler *efhd_find_handler(EMFormat *emf, const char *mime_type)
{
- return ((EMFormatClass *)efhd_parent)->find_handler(emf, mime_type);
+ const EMFormatHandler *handle;
+
+ if ( (handle = ((EMFormatClass *)efhd_parent)->find_handler(emf, mime_type)) == NULL
+ && efhd_use_component(mime_type)
+ && (handle = g_hash_table_lookup(efhd_bonobo_handlers, mime_type)) == NULL) {
+
+ EMFormatHandler *h = g_malloc0(sizeof(*h));
+
+ h->mime_type = g_strdup(mime_type);
+ h->handler = efhd_bonobo_unknown;
+ h->flags = EM_FORMAT_HANDLER_INLINE_DISPOSITION;
+ g_hash_table_insert(efhd_bonobo_handlers, h->mime_type, h);
+
+ handle = h;
+ }
+
+ return handle;
}
static void efhd_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMimeMessage *msg, EMFormat *src)
@@ -1957,6 +1987,155 @@
}
}
+static gboolean
+efhd_bonobo_object(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject)
+{
+ CamelDataWrapper *wrapper;
+ Bonobo_ServerInfo *component;
+ GtkWidget *embedded;
+ Bonobo_PersistStream persist;
+ CORBA_Environment ev;
+ CamelStreamMem *cstream;
+ BonoboStream *bstream;
+ BonoboControlFrame *control_frame;
+ Bonobo_PropertyBag prop_bag;
+
+ component = bonobo_activation_get_default_component_for_mime_type (eb->type);
+ if (component == NULL)
+ return FALSE;
+
+ embedded = bonobo_widget_new_control(component->iid, NULL);
+ CORBA_free(component);
+ if (embedded == NULL)
+ return FALSE;
+
+ CORBA_exception_init(&ev);
+
+ control_frame = bonobo_widget_get_control_frame((BonoboWidget *)embedded);
+ prop_bag = bonobo_control_frame_get_control_property_bag(control_frame, NULL);
+ if (prop_bag != CORBA_OBJECT_NIL) {
+ /*
+ * Now we can take care of business. Currently, the only control
+ * that needs something passed to it through a property bag is
+ * the iTip control, and it needs only the From email address,
+ * but perhaps in the future we can generalize this section of code
+ * to pass a bunch of useful things to all embedded controls.
+ */
+ const CamelInternetAddress *from;
+ char *from_address;
+
+ from = camel_mime_message_get_from((CamelMimeMessage *)((EMFormat *)efh)->message);
+ from_address = camel_address_encode((CamelAddress *)from);
+ bonobo_property_bag_client_set_value_string(prop_bag, "from_address", from_address, &ev);
+ g_free(from_address);
+
+ Bonobo_Unknown_unref(prop_bag, &ev);
+ }
+
+ persist = (Bonobo_PersistStream)Bonobo_Unknown_queryInterface(bonobo_widget_get_objref((BonoboWidget *)embedded),
+ "IDL:Bonobo/PersistStream:1.0", &ev);
+ if (persist == CORBA_OBJECT_NIL) {
+ g_object_ref_sink(embedded);
+ CORBA_exception_free(&ev);
+ return FALSE;
+ }
+
+ /* Write the data to a CamelStreamMem... */
+ cstream = (CamelStreamMem *)camel_stream_mem_new();
+ wrapper = camel_medium_get_content_object((CamelMedium *)pobject->part);
+ if (FALSE && !g_ascii_strncasecmp (eb->type, "text/", 5)) {
+ /* do charset conversion, etc */
+ d(printf("performing charset conversion for %s component\n", eb->type));
+ em_format_format_text((EMFormat *)efh, (CamelStream *)cstream, wrapper);
+ } else {
+ camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) cstream);
+ }
+
+ /* ...convert the CamelStreamMem to a BonoboStreamMem... */
+ bstream = bonobo_stream_mem_create((char *)cstream->buffer->data, cstream->buffer->len, TRUE, FALSE);
+ camel_object_unref(cstream);
+
+ /* ...and hydrate the PersistStream from the BonoboStream. */
+ Bonobo_PersistStream_load(persist,
+ bonobo_object_corba_objref(BONOBO_OBJECT (bstream)),
+ eb->type, &ev);
+ bonobo_object_unref(BONOBO_OBJECT (bstream));
+ Bonobo_Unknown_unref(persist, &ev);
+ CORBA_Object_release(persist, &ev);
+
+ if (ev._major != CORBA_NO_EXCEPTION) {
+ g_object_ref_sink(embedded);
+ CORBA_exception_free(&ev);
+ return FALSE;
+ }
+ CORBA_exception_free(&ev);
+
+ gtk_widget_show(embedded);
+ gtk_container_add(GTK_CONTAINER (eb), embedded);
+
+ return TRUE;
+}
+
+static gboolean
+efhd_check_server_prop(Bonobo_ServerInfo *component, const char *propname, const char *value)
+{
+ CORBA_sequence_CORBA_string stringv;
+ Bonobo_ActivationProperty *prop;
+ int i;
+
+ prop = bonobo_server_info_prop_find(component, propname);
+ if (!prop || prop->v._d != Bonobo_ACTIVATION_P_STRINGV)
+ return FALSE;
+
+ stringv = prop->v._u.value_stringv;
+ for (i = 0; i < stringv._length; i++) {
+ if (!g_ascii_strcasecmp(value, stringv._buffer[i]))
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static gboolean
+efhd_use_component(const char *mime_type)
+{
+ GList *components, *iter;
+ Bonobo_ServerInfo *component = NULL;
+
+ /* should this cache it? */
+
+ if (g_ascii_strcasecmp(mime_type, "text/x-vcard") != 0
+ && g_ascii_strcasecmp(mime_type, "text/calendar") != 0) {
+ const char **mime_types;
+ int i;
+
+ mime_types = mail_config_get_allowable_mime_types();
+ for (i = 0; mime_types[i]; i++) {
+ if (!g_ascii_strcasecmp(mime_types[i], mime_type))
+ goto type_ok;
+ }
+ return FALSE;
+ }
+type_ok:
+ components = bonobo_activation_get_all_components_for_mime_type (mime_type);
+ for (iter = components; iter; iter = iter->next) {
+ Bonobo_ServerInfo *comp = iter->data;
+
+ comp = iter->data;
+ if (efhd_check_server_prop(comp, "repo_ids", "IDL:Bonobo/PersistStream:1.0")
+ && efhd_check_server_prop(comp, "bonobo:supported_mime_types", mime_type)) {
+ component = comp;
+ break;
+ }
+ }
+
+ /* FIXME: How should I free the Bonobo_ServerInfo's ? */
+ g_list_foreach (components, (GFunc)CORBA_free, NULL);
+ g_list_free (components);
+
+ return component != NULL;
+}
+
static void
attachment_bar_arrow_clicked(GtkWidget *w, EMFormatHTMLDisplay *efhd)
{
@@ -2330,6 +2509,12 @@
if (handle) {
if (info->shown)
handle->handler(emf, stream, part, handle);
+ } else if (efhd_use_component(mime_type)) {
+ g_free(classid); /* messy */
+
+ classid = g_strdup_printf("bonobo-unknown:///em-format-html-display/%s", emf->part_id->str);
+ em_format_html_add_pobject((EMFormatHTML *)emf, sizeof(EMFormatHTMLPObject), classid, part, efhd_bonobo_object);
+ camel_stream_printf(stream, "<object classid=\"%s\" type=\"%s\"></object><br>>\n", classid, mime_type);
}
g_free(classid);
Modified: branches/kill-bonobo/mail/em-format.c
==============================================================================
--- branches/kill-bonobo/mail/em-format.c (original)
+++ branches/kill-bonobo/mail/em-format.c Mon Jan 12 04:12:01 2009
@@ -1653,6 +1653,8 @@
CamelCipherValidity *valid;
CamelException *ex;
CamelMimePart *opart;
+ CamelDataWrapper *dw;
+ char *mime_type;
cipher = camel_gpg_context_new(emf->session);
ex = camel_exception_new();
@@ -1671,6 +1673,19 @@
return;
}
+ dw = camel_medium_get_content_object ((CamelMedium *)opart);
+ mime_type = camel_data_wrapper_get_mime_type (dw);
+
+ /* this ensures to show the 'opart' as inlined, if possible */
+ if (mime_type && g_ascii_strcasecmp (mime_type, "application/octet-stream") == 0) {
+ const char *snoop = em_utils_snoop_type (opart);
+
+ if (snoop)
+ camel_data_wrapper_set_mime_type (dw, snoop);
+ }
+
+ g_free (mime_type);
+
/* Pass it off to the real formatter */
em_format_format_secure(emf, stream, opart, valid);
Modified: branches/kill-bonobo/mail/em-icon-stream.c
==============================================================================
--- branches/kill-bonobo/mail/em-icon-stream.c (original)
+++ branches/kill-bonobo/mail/em-icon-stream.c Mon Jan 12 04:12:01 2009
@@ -29,7 +29,6 @@
#include <string.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixbuf-loader.h>
#include <gtk/gtk.h>
#include "em-icon-stream.h"
#include "e-util/e-icon-factory.h"
Modified: branches/kill-bonobo/mail/em-subscribe-editor.c
==============================================================================
--- branches/kill-bonobo/mail/em-subscribe-editor.c (original)
+++ branches/kill-bonobo/mail/em-subscribe-editor.c Mon Jan 12 04:12:01 2009
@@ -111,6 +111,12 @@
GtkTreePath *path;
};
+typedef struct _MailMsgListNode MailMsgListNode;
+struct _MailMsgListNode {
+ EDListNode node;
+ MailMsg *msg;
+};
+
static void sub_editor_busy(EMSubscribeEditor *se, int dir);
static int sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node);
static void sub_selection_changed(GtkTreeSelection *selection, EMSubscribe *sub);
@@ -185,6 +191,7 @@
GtkTreeModel *model;
EMSubscribeNode *node;
gboolean subscribed, issub;
+ MailMsgListNode *msgListNode;
m->sub->subscribe_id = -1;
if (m->sub->cancel)
@@ -209,10 +216,13 @@
}
/* queue any further ones, or if out, update the ui */
- next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe);
- if (next) {
+ msgListNode = (MailMsgListNode *) e_dlist_remhead(&m->sub->subscribe);
+ if (msgListNode) {
+ next = (struct _zsubscribe_msg *) msgListNode->msg;
+ /* Free the memory of the MailMsgListNode which won't be used anymore. */
+ g_free(msgListNode);
next->sub->subscribe_id = next->base.seq;
- mail_msg_unordered_push (next);
+ mail_msg_unordered_push (next);
} else {
/* should it go off the model instead? */
sub_selection_changed(gtk_tree_view_get_selection(m->sub->tree), m->sub);
@@ -239,6 +249,7 @@
sub_subscribe_folder (EMSubscribe *sub, EMSubscribeNode *node, int state, const char *spath)
{
struct _zsubscribe_msg *m;
+ MailMsgListNode *msgListNode;
int id;
m = mail_msg_new (&sub_subscribe_folder_info);
@@ -254,8 +265,10 @@
d(printf("running subscribe folder '%s'\n", spath));
mail_msg_unordered_push (m);
} else {
+ msgListNode = g_malloc0(sizeof(MailMsgListNode));
+ msgListNode->msg = (MailMsg *) m;
d(printf("queueing subscribe folder '%s'\n", spath));
- e_dlist_addtail(&sub->subscribe, (EDListNode *)m);
+ e_dlist_addtail(&sub->subscribe, (EDListNode *)msgListNode);
}
return id;
@@ -541,6 +554,7 @@
sub_destroy(GtkWidget *w, EMSubscribe *sub)
{
struct _zsubscribe_msg *m;
+ MailMsgListNode *msgListNode;
d(printf("subscribe closed\n"));
sub->cancel = TRUE;
@@ -551,8 +565,12 @@
if (sub->subscribe_id != -1)
mail_msg_cancel(sub->subscribe_id);
- while ( (m = (struct _zsubscribe_msg *)e_dlist_remhead(&sub->subscribe)) )
+ while ( (msgListNode = (MailMsgListNode *)e_dlist_remhead(&sub->subscribe))) {
+ m = (struct _zsubscribe_msg *) msgListNode->msg;
+ /* Free the memory of MailMsgListNode which won't be used anymore. */
+ g_free(msgListNode);
mail_msg_unref(m);
+ }
sub_unref(sub);
}
Modified: branches/kill-bonobo/mail/em-vfolder-context.c
==============================================================================
--- branches/kill-bonobo/mail/em-vfolder-context.c (original)
+++ branches/kill-bonobo/mail/em-vfolder-context.c Mon Jan 12 04:12:01 2009
@@ -33,6 +33,8 @@
#include "filter/filter-option.h"
#include "filter/filter-int.h"
+#include "em-filter-folder-element.h"
+
static FilterElement *vfolder_new_element(RuleContext *rc, const char *type);
static RuleContextClass *parent_class = NULL;
@@ -108,6 +110,13 @@
return (FilterElement *) filter_option_new();
} else if (!strcmp(type, "score")) {
return (FilterElement *) filter_int_new_type("score", -3, 3);
+ } else if (!strcmp(type, "folder-curi")) {
+ EMFilterFolderElement *ff = em_filter_folder_element_new ();
+ if (ff)
+ ff->store_camel_uri = TRUE;
+ return (FilterElement *) ff;
+ } else if (!strcmp(type, "folder")) {
+ return (FilterElement *) em_filter_folder_element_new();
} else {
return parent_class->new_element(rc, type);
}
Modified: branches/kill-bonobo/mail/importers/mail-importer.c
==============================================================================
--- branches/kill-bonobo/mail/importers/mail-importer.c (original)
+++ branches/kill-bonobo/mail/importers/mail-importer.c Mon Jan 12 04:12:01 2009
@@ -25,6 +25,7 @@
#include <config.h>
#endif
+#include <errno.h>
#include <string.h>
#include <sys/types.h>
#include <sys/types.h>
@@ -36,7 +37,6 @@
#include <glib/gstdio.h>
#include <gmodule.h>
-#include <libgnome/gnome-util.h>
#include <glib/gi18n.h>
#include <camel/camel-folder.h>
#include <camel/camel-store.h>
Modified: branches/kill-bonobo/mail/mail-autofilter.c
==============================================================================
--- branches/kill-bonobo/mail/mail-autofilter.c (original)
+++ branches/kill-bonobo/mail/mail-autofilter.c Mon Jan 12 04:12:01 2009
@@ -29,9 +29,6 @@
#include <glib.h>
#include <glib/gi18n.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-app-helper.h>
-#include <libgnomeui/gnome-popup-menu.h>
#include "mail-vfolder.h"
#include "mail-autofilter.h"
Modified: branches/kill-bonobo/mail/mail-component.c
==============================================================================
--- branches/kill-bonobo/mail/mail-component.c (original)
+++ branches/kill-bonobo/mail/mail-component.c Mon Jan 12 04:12:01 2009
@@ -80,7 +80,7 @@
#include <table/e-tree.h>
#include <table/e-tree-memory.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <camel/camel-file-utils.h>
#include <camel/camel-vtrash-folder.h>
@@ -1239,6 +1239,9 @@
POA_GNOME_Evolution_MailComponent__epv *mepv = &class->epv;
GObjectClass *object_class = G_OBJECT_CLASS (class);
+ bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
parent_class = g_type_class_peek_parent (class);
object_class->dispose = impl_dispose;
Modified: branches/kill-bonobo/mail/mail-config.c
==============================================================================
--- branches/kill-bonobo/mail/mail-config.c (original)
+++ branches/kill-bonobo/mail/mail-config.c Mon Jan 12 04:12:01 2009
@@ -859,6 +859,7 @@
}
g_object_unref (iter);
+ camel_url_free (url);
return account;
}
@@ -898,10 +899,11 @@
if (!mail_config_account_url_equal (url, account_url))
account = NULL; /* not a match */
- camel_url_free (url);
+ camel_url_free (account_url);
}
g_object_unref (iter);
+ camel_url_free (url);
return account;
}
Modified: branches/kill-bonobo/mail/mail-send-recv.c
==============================================================================
--- branches/kill-bonobo/mail/mail-send-recv.c (original)
+++ branches/kill-bonobo/mail/mail-send-recv.c Mon Jan 12 04:12:01 2009
@@ -424,7 +424,8 @@
g_object_unref (iter);
/* Check to see if we have to send any mails --- if we don't, don't display the SMTP row in the table */
- if (outbox && destination && camel_folder_get_message_count (outbox) == 0)
+ if (outbox && destination
+ && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) == 0)
num_sources--;
table = gtk_table_new (num_sources, 4, FALSE);
@@ -552,7 +553,8 @@
e_event_emit ((EEvent *)em_event_peek (), "mail.sendreceive", (EEventTarget *) target);
/* Skip displaying the SMTP row if we've got no outbox, destination or unsent mails */
- if (outbox && destination && camel_folder_get_message_count (outbox) != 0) {
+ if (outbox && destination
+ && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) != 0) {
info = g_hash_table_lookup (data->active, SEND_URI_KEY);
if (info == NULL) {
info = g_malloc0 (sizeof (*info));
Modified: branches/kill-bonobo/mail/message-list.c
==============================================================================
--- branches/kill-bonobo/mail/message-list.c (original)
+++ branches/kill-bonobo/mail/message-list.c Mon Jan 12 04:12:01 2009
@@ -2358,6 +2358,11 @@
g_hash_table_destroy (message_list->normalised_hash);
+ if (message_list->ensure_uid) {
+ g_free (message_list->ensure_uid);
+ message_list->ensure_uid = NULL;
+ }
+
if (message_list->thread_tree)
camel_folder_thread_messages_unref(message_list->thread_tree);
@@ -4030,13 +4035,11 @@
uids = camel_folder_get_uids (m->folder);
} else {
searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex);
-
/* If m->changes is not NULL, then it means we are called from folder_changed event,
thus we will keep the selected message to be sure it doesn't disappear because
it no longer belong to our search filter. */
- if (uids && m->ml->search && ((m->changes && m->ml->cursor_uid) || m->ml->ensure_uid)) {
+ if (uids && ((m->changes && m->ml->cursor_uid) || m->ml->ensure_uid)) {
const char *looking_for = m->ml->cursor_uid;
-
/* ensure_uid has precedence of cursor_uid */
if (m->ml->ensure_uid)
looking_for = m->ml->ensure_uid;
@@ -4190,10 +4193,6 @@
if (m->ml->priv->destroyed)
return;
- if (m->ml->ensure_uid) {
- g_free (m->ml->ensure_uid);
- m->ml->ensure_uid = NULL;
- }
if (!m->complete)
return;
Modified: branches/kill-bonobo/mail/message-tag-followup.c
==============================================================================
--- branches/kill-bonobo/mail/message-tag-followup.c (original)
+++ branches/kill-bonobo/mail/message-tag-followup.c Mon Jan 12 04:12:01 2009
@@ -33,7 +33,6 @@
#include <gconf/gconf.h>
#include <gconf/gconf-client.h>
-#include <libgnomeui/gnome-pixmap.h>
#include <glib/gi18n.h>
#include "e-util/e-util-private.h"
Modified: branches/kill-bonobo/mail/searchtypes.xml
==============================================================================
--- branches/kill-bonobo/mail/searchtypes.xml (original)
+++ branches/kill-bonobo/mail/searchtypes.xml Mon Jan 12 04:12:01 2009
@@ -115,6 +115,223 @@
<input type="address" name="recipient"/>
</part>
+ <part name="cc">
+ <title>CC</title>
+ <input type="optionlist" name="recipient-type">
+ <option value="contains">
+ <title>contains</title>
+ <code>
+ (match-all (header-contains "Cc" ${recipient}))
+ </code>
+ </option>
+ <option value="not contains">
+ <title>does not contain</title>
+ <code>
+ (match-all (not (header-contains "Cc" ${recipient})))
+ </code>
+ </option>
+ <option value="is">
+ <title>is</title>
+ <code>
+ (match-all (header-matches "Cc" ${recipient}))
+ </code>
+ </option>
+ <option value="is not">
+ <title>is not</title>
+ <code>
+ (match-all (not (header-matches "Cc" ${recipient})))
+ </code>
+ </option>
+ <option value="starts with">
+ <title>starts with</title>
+ <code>
+ (match-all (header-starts-with "Cc" ${recipient}))
+ </code>
+ </option>
+ <option value="not starts with">
+ <title>does not start with</title>
+ <code>
+ (match-all (not (header-starts-with "Cc" ${recipient})))
+ </code>
+ </option>
+ <option value="ends with">
+ <title>ends with</title>
+ <code>
+ (match-all (header-ends-with "Cc" ${recipient}))
+ </code>
+ </option>
+ <option value="not ends with">
+ <title>does not end with</title>
+ <code>
+ (match-all (not (header-ends-with "Cc" ${recipient})))
+ </code>
+ </option>
+ <option value="matches soundex">
+ <title>sounds like</title>
+ <code>
+ (match-all (header-soundex "Cc" ${recipient}))
+ </code>
+ </option>
+ <option value="not match soundex">
+ <title>does not sound like</title>
+ <code>
+ (match-all (not (header-soundex "Cc" ${recipient})))
+ </code>
+ </option>
+ </input>
+ <input type="address" name="recipient"/>
+ </part>
+
+ <part name="bcc">
+ <title>BCC</title>
+ <input type="optionlist" name="recipient-type">
+ <option value="contains">
+ <title>contains</title>
+ <code>
+ (match-all (header-contains "Bcc" ${recipient}))
+ </code>
+ </option>
+ <option value="not contains">
+ <title>does not contain</title>
+ <code>
+ (match-all (not (header-contains "Bcc" ${recipient})))
+ </code>
+ </option>
+ <option value="is">
+ <title>is</title>
+ <code>
+ (match-all (header-matches "Bcc" ${recipient}))
+ </code>
+ </option>
+ <option value="is not">
+ <title>is not</title>
+ <code>
+ (match-all (not (header-matches "Bcc" ${recipient})))
+ </code>
+ </option>
+ <option value="starts with">
+ <title>starts with</title>
+ <code>
+ (match-all (header-starts-with "Bcc" ${recipient}))
+ </code>
+ </option>
+ <option value="not starts with">
+ <title>does not start with</title>
+ <code>
+ (match-all (not (header-starts-with "Bcc" ${recipient})))
+ </code>
+ </option>
+ <option value="ends with">
+ <title>ends with</title>
+ <code>
+ (match-all (header-ends-with "Bcc" ${recipient}))
+ </code>
+ </option>
+ <option value="not ends with">
+ <title>does not end with</title>
+ <code>
+ (match-all (not (header-ends-with "Bcc" ${recipient})))
+ </code>
+ </option>
+ <option value="matches soundex">
+ <title>sounds like</title>
+ <code>
+ (match-all (header-soundex "Bcc" ${recipient}))
+ </code>
+ </option>
+ <option value="not match soundex">
+ <title>does not sound like</title>
+ <code>
+ (match-all (not (header-soundex "Bcc" ${recipient})))
+ </code>
+ </option>
+ </input>
+ <input type="address" name="recipient"/>
+ </part>
+
+ <part name="senderto">
+ <title>Sender or Recipients</title>
+ <input type="optionlist" name="recipient-type">
+ <option value="contains">
+ <title>contains</title>
+ <code>
+ (match-all (or (header-contains "From" ${recipient})
+ (header-contains "To" ${recipient})
+ (header-contains "Cc" ${recipient})
+ (header-contains "Bcc" ${recipient})))
+ </code>
+ </option>
+ <option value="not contains">
+ <title>does not contain</title>
+ <code>
+ (match-all (not (or
+ (header-contains "From" ${recipient})
+ (header-contains "To" ${recipient})
+ (header-contains "Cc" ${recipient})
+ (header-contains "Bcc" ${recipient}))))
+ </code>
+ </option>
+ <option value="is">
+ <title>is</title>
+ <code>
+ (match-all (or (header-matches "From" ${recipient})
+ (header-matches "To" ${recipient})
+ (header-matches "Cc" ${recipient})
+ (header-matches "Bcc" ${recipient})))
+ </code>
+ </option>
+ <option value="is not">
+ <title>is not</title>
+ <code>
+ (match-all (not (or
+ (header-matches "From" ${recipient})
+ (header-matches "To" ${recipient})
+ (header-matches "Cc" ${recipient})
+ (header-matches "Bcc" ${recipient}))))
+ </code>
+ </option>
+ <option value="starts with">
+ <title>starts with</title>
+ <code>
+ (match-all (or (header-starts-with "From" ${recipient})
+ (header-starts-with "To" ${recipient})
+ (header-starts-with "Cc" ${recipient})
+ (header-starts-with "Bcc" ${recipient})))
+ </code>
+ </option>
+ <option value="not starts with">
+ <title>does not start with</title>
+ <code>
+ (match-all (not (or
+ (header-starts-with "From" ${recipient})
+ (header-starts-with "To" ${recipient})
+ (header-starts-with "Cc" ${recipient})
+ (header-starts-with "Bcc" ${recipient}))))
+ </code>
+ </option>
+ <option value="ends with">
+ <title>ends with</title>
+ <code>
+ (match-all (or (header-ends-with "From" ${recipient})
+ (header-ends-with "To" ${recipient})
+ (header-ends-with "Cc" ${recipient})
+ (header-ends-with "Bcc" ${recipient})))
+ </code>
+ </option>
+ <option value="not ends with">
+ <title>does not end with</title>
+ <code>
+ (match-all (not (or
+ (header-ends-with "From" ${recipient})
+ (header-ends-with "To" ${recipient})
+ (header-ends-with "Cc" ${recipient})
+ (header-ends-with "Bcc" ${recipient}))))
+ </code>
+ </option>
+ </input>
+ <input type="address" name="recipient"/>
+ </part>
+
<part name="subject">
<title>Subject</title>
<input type="optionlist" name="subject-type">
@@ -169,6 +386,87 @@
</input>
<input type="string" name="subject"/>
</part>
+
+ <part name="header">
+ <title>Specific header</title>
+ <input type="string" name="header-field"/>
+ <input type="optionlist" name="header-type">
+ <option value="contains">
+ <title>contains</title>
+ <code>
+ (match-all (header-contains ${header-field} ${word}))
+ </code>
+ </option>
+ <option value="not contains">
+ <title>does not contain</title>
+ <code>
+ (match-all (not (header-contains ${header-field} ${word})))
+ </code>
+ </option>
+ <option value="is">
+ <title>is</title>
+ <code>
+ (match-all (header-matches ${header-field} ${word}))
+ </code>
+ </option>
+ <option value="is not">
+ <title>is not</title>
+ <code>
+ (match-all (not (header-matches ${header-field} ${word})))
+ </code>
+ </option>
+ <option value="starts with">
+ <title>starts with</title>
+ <code>
+ (match-all (header-starts-with ${header-field} ${word}))
+ </code>
+ </option>
+ <option value="not starts with">
+ <title>does not start with</title>
+ <code>
+ (match-all (not (header-starts-with ${header-field} ${word})))
+ </code>
+ </option>
+ <option value="ends with">
+ <title>ends with</title>
+ <code>
+ (match-all (header-ends-with ${header-field} ${word}))
+ </code>
+ </option>
+ <option value="not ends with">
+ <title>does not end with</title>
+ <code>
+ (match-all (not (header-ends-with ${header-field} ${word})))
+ </code>
+ </option>
+ <option value="exists">
+ <title>exists</title>
+ <code>
+ (match-all (header-exists ${header-field}))
+ </code>
+ </option>
+ <option value="not exists">
+ <title>does not exist</title>
+ <code>
+ (match-all (not (header-exists ${header-field})))
+ </code>
+ </option>
+ <option value="matches soundex">
+ <title>sounds like</title>
+ <code>
+ (match-all (header-soundex ${header-field} ${word}))
+ </code>
+ </option>
+ <option value="not match soundex">
+ <title>does not sound like</title>
+ <code>
+ (match-all (not (header-soundex ${header-field} ${word})))
+ </code>
+ </option>
+ </input>
+ <input type="string" name="word"/>
+ </part>
+
<part name="body">
<title>Message Body</title>
<input type="optionlist" name="body-type">
@@ -437,6 +735,25 @@
<input type="string" name="mlist"/>
</part>
+ <part name="regex">
+ <title>Regex Match</title>
+ <input type="optionlist" name="match-type">
+ <option value="header">
+ <title>Message Header</title>
+ <code>
+ (match-all (header-full-regex ${expression}))
+ </code>
+ </option>
+ <option value="body">
+ <title>Message Body</title>
+ <code>
+ (match-all (body-regex ${expression}))
+ </code>
+ </option>
+ </input>
+ <input type="regex" name="expression"/>
+ </part>
+
<part name="all">
<title>Match All</title>
<code>
Modified: branches/kill-bonobo/mail/vfoldertypes.xml
==============================================================================
--- branches/kill-bonobo/mail/vfoldertypes.xml (original)
+++ branches/kill-bonobo/mail/vfoldertypes.xml Mon Jan 12 04:12:01 2009
@@ -115,6 +115,140 @@
<input type="address" name="recipient"/>
</part>
+ <part name="cc">
+ <title>CC</title>
+ <input type="optionlist" name="recipient-type">
+ <option value="contains">
+ <title>contains</title>
+ <code>
+ (match-all (header-contains "Cc" ${recipient}))
+ </code>
+ </option>
+ <option value="not contains">
+ <title>does not contain</title>
+ <code>
+ (match-all (not (header-contains "Cc" ${recipient})))
+ </code>
+ </option>
+ <option value="is">
+ <title>is</title>
+ <code>
+ (match-all (header-matches "Cc" ${recipient}))
+ </code>
+ </option>
+ <option value="is not">
+ <title>is not</title>
+ <code>
+ (match-all (not (header-matches "Cc" ${recipient})))
+ </code>
+ </option>
+ <option value="starts with">
+ <title>starts with</title>
+ <code>
+ (match-all (header-starts-with "Cc" ${recipient}))
+ </code>
+ </option>
+ <option value="not starts with">
+ <title>does not start with</title>
+ <code>
+ (match-all (not (header-starts-with "Cc" ${recipient})))
+ </code>
+ </option>
+ <option value="ends with">
+ <title>ends with</title>
+ <code>
+ (match-all (header-ends-with "Cc" ${recipient}))
+ </code>
+ </option>
+ <option value="not ends with">
+ <title>does not end with</title>
+ <code>
+ (match-all (not (header-ends-with "Cc" ${recipient})))
+ </code>
+ </option>
+ <option value="matches soundex">
+ <title>sounds like</title>
+ <code>
+ (match-all (header-soundex "Cc" ${recipient}))
+ </code>
+ </option>
+ <option value="not match soundex">
+ <title>does not sound like</title>
+ <code>
+ (match-all (not (header-soundex "Cc" ${recipient})))
+ </code>
+ </option>
+ </input>
+ <input type="address" name="recipient"/>
+ </part>
+
+ <part name="bcc">
+ <title>BCC</title>
+ <input type="optionlist" name="recipient-type">
+ <option value="contains">
+ <title>contains</title>
+ <code>
+ (match-all (header-contains "Bcc" ${recipient}))
+ </code>
+ </option>
+ <option value="not contains">
+ <title>does not contain</title>
+ <code>
+ (match-all (not (header-contains "Bcc" ${recipient})))
+ </code>
+ </option>
+ <option value="is">
+ <title>is</title>
+ <code>
+ (match-all (header-matches "Bcc" ${recipient}))
+ </code>
+ </option>
+ <option value="is not">
+ <title>is not</title>
+ <code>
+ (match-all (not (header-matches "Bcc" ${recipient})))
+ </code>
+ </option>
+ <option value="starts with">
+ <title>starts with</title>
+ <code>
+ (match-all (header-starts-with "Bcc" ${recipient}))
+ </code>
+ </option>
+ <option value="not starts with">
+ <title>does not start with</title>
+ <code>
+ (match-all (not (header-starts-with "Bcc" ${recipient})))
+ </code>
+ </option>
+ <option value="ends with">
+ <title>ends with</title>
+ <code>
+ (match-all (header-ends-with "Bcc" ${recipient}))
+ </code>
+ </option>
+ <option value="not ends with">
+ <title>does not end with</title>
+ <code>
+ (match-all (not (header-ends-with "Bcc" ${recipient})))
+ </code>
+ </option>
+ <option value="matches soundex">
+ <title>sounds like</title>
+ <code>
+ (match-all (header-soundex "Bcc" ${recipient}))
+ </code>
+ </option>
+ <option value="not match soundex">
+ <title>does not sound like</title>
+ <code>
+ (match-all (not (header-soundex "Bcc" ${recipient})))
+ </code>
+ </option>
+ </input>
+ <input type="address" name="recipient"/>
+ </part>
+
<part name="senderto">
<title>Sender or Recipients</title>
<input type="optionlist" name="recipient-type">
@@ -252,6 +386,87 @@
</input>
<input type="string" name="subject"/>
</part>
+
+ <part name="header">
+ <title>Specific header</title>
+ <input type="string" name="header-field"/>
+ <input type="optionlist" name="header-type">
+ <option value="contains">
+ <title>contains</title>
+ <code>
+ (match-all (header-contains ${header-field} ${word}))
+ </code>
+ </option>
+ <option value="not contains">
+ <title>does not contain</title>
+ <code>
+ (match-all (not (header-contains ${header-field} ${word})))
+ </code>
+ </option>
+ <option value="is">
+ <title>is</title>
+ <code>
+ (match-all (header-matches ${header-field} ${word}))
+ </code>
+ </option>
+ <option value="is not">
+ <title>is not</title>
+ <code>
+ (match-all (not (header-matches ${header-field} ${word})))
+ </code>
+ </option>
+ <option value="starts with">
+ <title>starts with</title>
+ <code>
+ (match-all (header-starts-with ${header-field} ${word}))
+ </code>
+ </option>
+ <option value="not starts with">
+ <title>does not start with</title>
+ <code>
+ (match-all (not (header-starts-with ${header-field} ${word})))
+ </code>
+ </option>
+ <option value="ends with">
+ <title>ends with</title>
+ <code>
+ (match-all (header-ends-with ${header-field} ${word}))
+ </code>
+ </option>
+ <option value="not ends with">
+ <title>does not end with</title>
+ <code>
+ (match-all (not (header-ends-with ${header-field} ${word})))
+ </code>
+ </option>
+ <option value="exists">
+ <title>exists</title>
+ <code>
+ (match-all (header-exists ${header-field}))
+ </code>
+ </option>
+ <option value="not exists">
+ <title>does not exist</title>
+ <code>
+ (match-all (not (header-exists ${header-field})))
+ </code>
+ </option>
+ <option value="matches soundex">
+ <title>sounds like</title>
+ <code>
+ (match-all (header-soundex ${header-field} ${word}))
+ </code>
+ </option>
+ <option value="not match soundex">
+ <title>does not sound like</title>
+ <code>
+ (match-all (not (header-soundex ${header-field} ${word})))
+ </code>
+ </option>
+ </input>
+ <input type="string" name="word"/>
+ </part>
+
<part name="body">
<title>Message Body</title>
<input type="optionlist" name="body-type">
@@ -523,6 +738,44 @@
<input type="string" name="mlist"/>
</part>
+ <part name="regex">
+ <title>Regex Match</title>
+ <input type="optionlist" name="match-type">
+ <option value="header">
+ <title>Message Header</title>
+ <code>
+ (match-all (header-full-regex ${expression}))
+ </code>
+ </option>
+ <option value="body">
+ <title>Message Body</title>
+ <code>
+ (match-all (body-regex ${expression}))
+ </code>
+ </option>
+ </input>
+ <input type="regex" name="expression"/>
+ </part>
+
+ <part name="location">
+ <title>Message Location</title>
+ <input type="optionlist" name="msglocation-type">
+ <option value="is">
+ <title>is</title>
+ <code>
+ (match-all (message-location ${folder}))
+ </code>
+ </option>
+ <option value="is-not">
+ <title>is not</title>
+ <code>
+ (match-all (not (message-location ${folder})))
+ </code>
+ </option>
+ </input>
+ <input type="folder-curi" name="folder"/>
+ </part>
+
<part name="all">
<title>Match All</title>
<code>
Modified: branches/kill-bonobo/plugins/bogo-junk-plugin/Makefile.am
==============================================================================
--- branches/kill-bonobo/plugins/bogo-junk-plugin/Makefile.am (original)
+++ branches/kill-bonobo/plugins/bogo-junk-plugin/Makefile.am Mon Jan 12 04:12:01 2009
@@ -1,5 +1,6 @@
INCLUDES = \
-I$(top_srcdir) \
+ -DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" \
$(EVOLUTION_MAIL_CFLAGS)
@EVO_PLUGIN_RULE@
Modified: branches/kill-bonobo/plugins/bogo-junk-plugin/bf-junk-filter.c
==============================================================================
--- branches/kill-bonobo/plugins/bogo-junk-plugin/bf-junk-filter.c (original)
+++ branches/kill-bonobo/plugins/bogo-junk-plugin/bf-junk-filter.c Mon Jan 12 04:12:01 2009
@@ -40,6 +40,8 @@
#include "mail/em-config.h"
#include <mail/em-junk-hook.h>
#include <camel/camel-data-wrapper.h>
+#include <camel/camel-mime-message.h>
+#include <camel/camel-mime-parser.h>
#include <camel/camel-stream-fs.h>
#include <camel/camel-debug.h>
#include <gconf/gconf-client.h>
@@ -69,6 +71,7 @@
void em_junk_bf_report_junk (EPlugin *ep, EMJunkHookTarget *target);
void em_junk_bf_report_non_junk (EPlugin *ep, EMJunkHookTarget *target);
void em_junk_bf_commit_reports (EPlugin *ep, EMJunkHookTarget *target);
+static gint pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv, GError **error);
/* eplugin stuff */
int e_plugin_lib_enable (EPluginLib *ep, int enable);
@@ -78,6 +81,37 @@
static gboolean em_junk_bf_unicode = TRUE;
+static void
+init_db ()
+{
+ CamelStream *stream = camel_stream_fs_new_with_name (WELCOME_MESSAGE, O_RDONLY, 0);
+ CamelMimeParser *parser = camel_mime_parser_new ();
+ CamelMimeMessage *msg = camel_mime_message_new ();
+ gchar *argv[] = {
+ em_junk_bf_binary,
+ "-n",
+ NULL,
+ NULL
+ };
+
+ camel_mime_parser_init_with_stream (parser, stream);
+ camel_mime_parser_scan_from (parser, FALSE);
+ camel_object_unref (stream);
+
+ camel_mime_part_construct_from_parser ((CamelMimePart *) msg, parser);
+ camel_object_unref (parser);
+
+ d(fprintf (stderr, "Initing the bogofilter DB with Welcome message\n"));
+
+ if (em_junk_bf_unicode) {
+ argv[2] = "--unicode=yes";
+ }
+
+ pipe_to_bogofilter (msg, argv, NULL);
+ camel_object_unref (msg);
+
+}
+
static gint
pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv, GError **error)
{
@@ -88,7 +122,9 @@
gint status;
gint waitres;
gint res;
+ static gboolean only_once = FALSE;
+retry:
if (camel_debug_start ("junk")) {
int i;
@@ -153,8 +189,17 @@
res = BOGOFILTER_ERROR;
}
- if (res < 0 || res > 2)
+ if (res < 0 || res > 2) {
+ if (!only_once) {
+ /* Create wordlist.db */
+ only_once = TRUE;
+ init_db();
+
+ goto retry;
+ }
g_set_error (error, EM_JUNK_ERROR, res, _("Pipe to Bogofilter failed, error code: %d."), res);
+
+ }
return res;
}
Modified: branches/kill-bonobo/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
==============================================================================
--- branches/kill-bonobo/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in (original)
+++ branches/kill-bonobo/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in Mon Jan 12 04:12:01 2009
@@ -8,6 +8,7 @@
<list_type>string</list_type>
<default>[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]</default>
<locale name="C">
+ <default><!-- Translators: '=' and ';' should not be changed but ASCII -->[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]</default>
<short>List of Custom Headers</short>
<long>The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by "=" and the values separated by ";"</long>
</locale>
Modified: branches/kill-bonobo/plugins/email-custom-header/email-custom-header.c
==============================================================================
--- branches/kill-bonobo/plugins/email-custom-header/email-custom-header.c (original)
+++ branches/kill-bonobo/plugins/email-custom-header/email-custom-header.c Mon Jan 12 04:12:01 2009
@@ -367,7 +367,7 @@
(temp_header_value_ptr->sub_header_string_value)->str);
}
- gtk_combo_box_append_text (GTK_COMBO_BOX (sub_combo_box_ptr->header_value_combo_box),"None");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (sub_combo_box_ptr->header_value_combo_box), _("None"));
gtk_widget_show (sub_combo_box_ptr->header_value_combo_box);
}
}
Modified: branches/kill-bonobo/plugins/groupwise-features/mail-retract.c
==============================================================================
--- branches/kill-bonobo/plugins/groupwise-features/mail-retract.c (original)
+++ branches/kill-bonobo/plugins/groupwise-features/mail-retract.c Mon Jan 12 04:12:01 2009
@@ -104,8 +104,8 @@
/* for translation*/
if (!first) {
- popup_items[0].label = _(popup_items[0].label);
- popup_items[0].user_data = g_strdup((char *) g_ptr_array_index(uids, 0));
+ popup_items[1].label = _(popup_items[1].label);
+ popup_items[1].user_data = g_strdup((char *) g_ptr_array_index(uids, 0));
}
first++;
Modified: branches/kill-bonobo/plugins/mailing-list-actions/mailing-list-actions.c
==============================================================================
--- branches/kill-bonobo/plugins/mailing-list-actions/mailing-list-actions.c (original)
+++ branches/kill-bonobo/plugins/mailing-list-actions/mailing-list-actions.c Mon Jan 12 04:12:01 2009
@@ -43,6 +43,7 @@
#include "mail/mail-ops.h"
#include "mail/mail-mt.h"
#include "mail/mail-config.h"
+#include "e-util/e-util.h"
#include "e-util/e-error.h"
typedef enum {
Modified: branches/kill-bonobo/plugins/publish-calendar/url-editor-dialog.c
==============================================================================
--- branches/kill-bonobo/plugins/publish-calendar/url-editor-dialog.c (original)
+++ branches/kill-bonobo/plugins/publish-calendar/url-editor-dialog.c Mon Jan 12 04:12:01 2009
@@ -24,6 +24,7 @@
#include <libedataserverui/e-passwords.h>
#include <libedataserver/e-url.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <string.h>
#include <e-util/e-util-private.h>
@@ -456,6 +457,11 @@
dialog->url_list_model = g_object_ref (url_list_model);
dialog->uri = uri;
+ if (!uri)
+ gtk_window_set_title (GTK_WINDOW (dialog), _("New Location"));
+ else
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Location"));
+
if (url_editor_dialog_construct (dialog))
return GTK_WIDGET (dialog);
Modified: branches/kill-bonobo/po/POTFILES.in
==============================================================================
--- branches/kill-bonobo/po/POTFILES.in (original)
+++ branches/kill-bonobo/po/POTFILES.in Mon Jan 12 04:12:01 2009
@@ -189,6 +189,8 @@
e-util/e-dialog-utils.c
e-util/e-error.c
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.c
e-util/e-print.c
e-util/e-system.error.xml
@@ -198,7 +200,6 @@
filter/filter-datespec.c
filter/filter-file.c
filter/filter-input.c
-filter/filter-label.c
filter/filter-option.c
filter/filter-part.c
filter/filter-rule.c
@@ -400,6 +401,7 @@
plugins/publish-calendar/org-gnome-publish-calendar.xml
plugins/publish-calendar/publish-calendar.c
plugins/publish-calendar/publish-calendar.glade
+plugins/publish-calendar/url-editor-dialog.c
plugins/python/example/org-gnome-hello-python-ui.xml
plugins/python/example/org-gnome-hello-python.eplug.xml
plugins/python/org-gnome-evolution-python.eplug.xml
Modified: branches/kill-bonobo/shell/importer/intelligent.c
==============================================================================
--- branches/kill-bonobo/shell/importer/intelligent.c (original)
+++ branches/kill-bonobo/shell/importer/intelligent.c Mon Jan 12 04:12:01 2009
@@ -29,7 +29,6 @@
#include <gtk/gtk.h>
#include <libgnome/gnome-config.h>
-/*#include <libgnome/gnome-util.h>*/
#include <glib/gi18n.h>
#include <bonobo/bonobo-object.h>
Modified: branches/kill-bonobo/shell/main.c
==============================================================================
--- branches/kill-bonobo/shell/main.c (original)
+++ branches/kill-bonobo/shell/main.c Mon Jan 12 04:12:01 2009
@@ -49,7 +49,6 @@
#include <gconf/gconf-client.h>
#include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
#include <libgnome/gnome-sound.h>
#include <libgnomeui/gnome-ui-init.h>
#include <libgnomeui/gnome-client.h>
@@ -456,6 +455,8 @@
g_warning ("Could not set PATH for Evolution and its child processes");
g_free (path);
+ g_free (exe_folder_utf8);
+ g_free (components_folder_utf8);
g_free (top_folder_utf8);
}
Modified: branches/kill-bonobo/widgets/menus/gal-view-collection.c
==============================================================================
--- branches/kill-bonobo/widgets/menus/gal-view-collection.c (original)
+++ branches/kill-bonobo/widgets/menus/gal-view-collection.c Mon Jan 12 04:12:01 2009
@@ -28,7 +28,6 @@
#include <glib.h>
#include <libxml/parser.h>
-#include <libgnome/gnome-util.h>
#include <libedataserver/e-xml-utils.h>
#include <glib/gi18n.h>
Modified: branches/kill-bonobo/widgets/menus/gal-view-instance.c
==============================================================================
--- branches/kill-bonobo/widgets/menus/gal-view-instance.c (original)
+++ branches/kill-bonobo/widgets/menus/gal-view-instance.c Mon Jan 12 04:12:01 2009
@@ -31,7 +31,6 @@
#include <gtk/gtk.h>
#include <libxml/parser.h>
-#include <libgnome/gnome-util.h>
#include <glib/gstdio.h>
#include <libedataserver/e-xml-utils.h>
#include <libedataserver/e-data-server-util.h>
Modified: branches/kill-bonobo/widgets/misc/e-cell-date-edit.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-cell-date-edit.c (original)
+++ branches/kill-bonobo/widgets/misc/e-cell-date-edit.c Mon Jan 12 04:12:01 2009
@@ -42,7 +42,6 @@
#include <table/e-table-item.h>
#include <table/e-cell-text.h>
-#include <libgnomeui/gnome-messagebox.h>
#include <glib/gi18n.h>
#include <libedataserver/e-time-utils.h>
Modified: branches/kill-bonobo/widgets/misc/e-cell-percent.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-cell-percent.c (original)
+++ branches/kill-bonobo/widgets/misc/e-cell-percent.c Mon Jan 12 04:12:01 2009
@@ -34,7 +34,6 @@
#include <sys/time.h>
#include <unistd.h>
#include <stdio.h>
-#include <libgnomeui/gnome-messagebox.h>
#include <glib/gi18n.h>
#include "e-cell-percent.h"
Modified: branches/kill-bonobo/widgets/misc/e-charset-picker.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-charset-picker.c (original)
+++ branches/kill-bonobo/widgets/misc/e-charset-picker.c Mon Jan 12 04:12:01 2009
@@ -29,7 +29,7 @@
#include <string.h>
#include <iconv.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <bonobo/bonobo-ui-node.h>
#include <bonobo/bonobo-ui-util.h>
Modified: branches/kill-bonobo/widgets/misc/e-dropdown-button.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-dropdown-button.c (original)
+++ branches/kill-bonobo/widgets/misc/e-dropdown-button.c Mon Jan 12 04:12:01 2009
@@ -28,7 +28,6 @@
#include "e-dropdown-button.h"
#include <stdio.h>
-#include <libgnomeui/gnome-popup-menu.h>
struct _EDropdownButtonPrivate {
GtkAccelGroup *accel_group;
Modified: branches/kill-bonobo/widgets/misc/e-signature-combo-box.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-signature-combo-box.c (original)
+++ branches/kill-bonobo/widgets/misc/e-signature-combo-box.c Mon Jan 12 04:12:01 2009
@@ -18,9 +18,13 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "e-signature-combo-box.h"
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#define E_SIGNATURE_COMBO_BOX_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
Modified: branches/kill-bonobo/widgets/misc/test-dropdown-button.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/test-dropdown-button.c (original)
+++ branches/kill-bonobo/widgets/misc/test-dropdown-button.c Mon Jan 12 04:12:01 2009
@@ -31,7 +31,6 @@
#include <libgnomeui/gnome-app.h>
#include <libgnomeui/gnome-app-helper.h>
#include <libgnomeui/gnome-ui-init.h>
-#include <libgnomeui/gnome-stock-icons.h>
#include "e-dropdown-button.h"
Modified: branches/kill-bonobo/widgets/table/e-table-state.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-table-state.c (original)
+++ branches/kill-bonobo/widgets/table/e-table-state.c Mon Jan 12 04:12:01 2009
@@ -189,6 +189,9 @@
state->columns = g_new(int, state->col_count);
state->expansions = g_new(double, state->col_count);
+ if (!state->sort_info)
+ state->sort_info = e_table_sort_info_new ();
+
for (iterator = list, i = 0; iterator; i++) {
int_and_double *column_info = iterator->data;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
