aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
Commit message (Expand)AuthorAgeFilesLines
* Bug #678635 - File->Send/Receive lists too many sourcesMilan Crha2012-07-251-70/+138
* EMailShellBackend: Fix an EAlertSink runtime warning.Matthew Barnes2012-07-191-5/+14
* Bug 679649 - Remove "Recent Messages" from Quick Search BarMatthew Barnes2012-07-104-31/+4
* Bug #602425 - Search in "Current Account"/"All Accounts" depends on vfoldersMilan Crha2012-07-091-102/+103
* Remove mail_expunge_folder().Matthew Barnes2012-07-091-21/+18
* Remove mail_refresh_folder().Matthew Barnes2012-07-091-4/+18
* Add e_mail_reader_unsubscribe_folder_name().Matthew Barnes2012-07-091-63/+16
* Add e_mail_reader_delete_folder_name().Matthew Barnes2012-07-091-4/+13
* Avoid em_folder_tree_get_selected_folder() in some places.Matthew Barnes2012-07-091-2/+20
* Disconnect a CamelService after editing its settings.Matthew Barnes2012-07-071-0/+82
* Fix few memory leaksMilan Crha2012-06-281-0/+2
* Coding style and whitespace cleanup.Matthew Barnes2012-06-251-2/+0
* Bug 678397 - Move "mail-to-task" actions to a submenuMatthew Barnes2012-06-211-8/+8
* Bug 678393 - Disable Properties for built-in mail storesMatthew Barnes2012-06-211-2/+4
* Remove the last remaining usage of GConfMilan Crha2012-06-156-86/+52
* Remove "enable-local" and "enable-vfolders" GSettings key.Matthew Barnes2012-06-093-21/+10
* Fix displayed message headersDan Vrátil2012-06-081-0/+75
* Bug 677624 - Disable Properties when Search Folders is selectedMatthew Barnes2012-06-081-4/+4
* Mail formatter rewriteDan Vrátil2012-06-065-45/+36
* Adapt to single-include E-D-S libraries.Matthew Barnes2012-06-047-10/+3
* Adapt modules/mail to the new ESource API.Matthew Barnes2012-06-038-409/+308
* Revert "Bug #669463 - HTML signature opens in editor as Plain text"Matthew Barnes2012-06-031-12/+7
* Reduce diff noise with 'account-mgmt' branch.Matthew Barnes2012-06-032-8/+12
* Fix an unused-but-set-variable warning.Matthew Barnes2012-06-021-1/+3
* Fix memory leaks around gtk_tree_model_get() functionMilan Crha2012-05-311-0/+7
* Adapt to vFolder changes from evolution-data-serverMilan Crha2012-05-315-9/+45
* Make the settings capplet optional.Matthew Barnes2012-05-293-34/+46
* Adapt to CamelService API changes.Matthew Barnes2012-05-201-2/+2
* Rename Evolution module libraries.Matthew Barnes2012-05-111-5/+5
* Bug #669463 - HTML signature opens in editor as Plain textMilan Crha2012-05-031-7/+12
* Bug #564820 - Search filter persists when changing foldersMilan Crha2012-04-231-1/+6
* Bug #674249 - Crash when showing message with large text/plainDan Vrátil2012-04-191-10/+0
* Bug #600860 - Opening IMAP message with large attachment blocks UIMilan Crha2012-04-131-0/+5
* EMFormat: Add "session" as a constructor property.Matthew Barnes2012-04-012-11/+21
* WebKit port - port formatter and mail moduleDan Vrátil2012-03-297-157/+142
* Add missing linker flags.Matthew Barnes2012-03-041-0/+1
* Whitespace cleanups.Matthew Barnes2012-03-031-4/+4
* Move vfolders to libemail-engine and rest as mail-vfolder-ui. It all works andSrinivasa Ragavan2012-03-033-5/+7
* Move EAlert* and e-xml-utils references from other part of the code to libevo...Srinivasa Ragavan2012-03-032-2/+2
* Bug #671211 - 'Mark Citations' preferences not appliedDan Vrátil2012-03-021-0/+5
* Account properties shown also on remote foldersMilan Crha2012-02-211-1/+1
* Coding style and whitespace cleanup.Matthew Barnes2012-02-208-63/+120
* Use GSettings for EProxyMilan Crha2012-02-172-109/+89
* Bug #668482 - Edit account properties from menu on folder storeMilan Crha2012-02-166-107/+177
* Bug #669113 - Add "File > New > Mail Account"Milan Crha2012-02-161-0/+57
* Bug #655021 - "Character set" vs "Character encoding"Milan Crha2012-02-161-0/+3
* Be able to define help target for Preferences pagesMilan Crha2012-02-151-0/+4
* Bug 418520 - Disable Folder -> Expunge in virtual foldersMatthew Barnes2012-02-071-1/+4
* Bug 659395 - Missing plural handling for "%d attached messages"David Morley2012-02-011-2/+6
* Introduce libemail-engine and libemail-utils.Matthew Barnes2012-01-1910-108/+134
* Do not auto-mark-as-seen when changing filter typeMilan Crha2012-01-111-0/+24
* Move EMailLabelListStore to EMailSession.Matthew Barnes2011-12-256-106/+87
* Bug #661087 - Add ability to remove localized "Re:" prefixes in subjectMilan Crha2011-12-221-0/+5
* Reduce diff noise with account-mgmt branch.Matthew Barnes2011-12-204-9/+30
* Avoid passing EMailBackend as much as possible.Matthew Barnes2011-12-164-45/+96
* mail-send-recv.c: Avoid using EAccount and CamelURL if possible.Matthew Barnes2011-12-161-10/+18
* Reorder accounts by drag-and-drop.Matthew Barnes2011-12-117-311/+123
* Move folder URI caching to MailFolderCache.Matthew Barnes2011-12-081-19/+9
* Miscellaneous EShellView-related cleanups.Matthew Barnes2011-12-0811-134/+109
* Bug #665103 - Blank composer/mail/network preferences windowsMilan Crha2011-11-294-3/+13
* Remove some unnecessary GConf crud.Matthew Barnes2011-11-285-13/+2
* "citation-colour" -> "citation-color"Matthew Barnes2011-11-281-1/+1
* Use e_restore_window() and "org.gnome.evolution.window".Matthew Barnes2011-11-282-2/+0
* Fix some GSettings runtime issues.Matthew Barnes2011-11-232-11/+17
* More compiler warning fixes.Matthew Barnes2011-11-231-1/+0
* Merge branch 'master' into wip/gsettingsMatthew Barnes2011-11-231-63/+51
|\
| * EPreviewPane: Implement EAlertSink.Matthew Barnes2011-11-221-15/+0
| * Add EMailReader.get_preview_pane() method.Matthew Barnes2011-11-221-51/+54
| * Remove some unnecessary #includes.Matthew Barnes2011-11-181-1/+0
* | Miscellaneous cleanups.Matthew Barnes2011-11-231-11/+11
* | Fix compiler warnings.Matthew Barnes2011-11-231-4/+0
* | Build fixesRodrigo Moya2011-11-181-0/+1
* | Merge branch 'master' into wip/gsettingsRodrigo Moya2011-11-172-0/+11
|\|
| * Bug #662914 - Reply to gnupg signed mails should be signedMilan Crha2011-11-142-0/+11
* | Migrate EShellSettings to GSettingsRodrigo Moya2011-11-151-57/+116
* | Merge branch 'master' into wip/gsettingsRodrigo Moya2011-11-143-7/+4
|\|
| * Bug 663372 - Actions not updated after disabling accountMatthew Barnes2011-11-131-0/+2
| * Bug 663376 - Folder->Properties enabled when no folder selectedMatthew Barnes2011-11-131-1/+1
| * Bug #659945 - "New" button in toolbar for new mail message not workingMilan Crha2011-11-101-6/+1
* | Make it fully buildRodrigo Moya2011-11-093-6/+5
* | Merge branch 'master' into wip/gsettingsRodrigo Moya2011-11-081-1/+1
|\|
| * EMAccountEditor: Start using CamelNetworkSettings.Matthew Barnes2011-11-071-1/+1
* | Migrate SA extension to GSettingsRodrigo Moya2011-11-022-63/+56
* | Mail module has now all basic settings in GSettingsRodrigo Moya2011-10-283-50/+21
* | Merge branch 'master' into wip/gsettingsRodrigo Moya2011-10-283-9/+20
|\|
| * e-mail-store.c: Take EMailSession instead of EMailBackend.Matthew Barnes2011-10-273-9/+27
* | Merge branch 'master' into wip/gsettingsRodrigo Moya2011-10-241-4/+31
|\|
| * Bug #660738 - Font changes ignored since 3.2Milan Crha2011-10-211-4/+31
* | Make e_utils_prompt_user and callers use GSettings keysRodrigo Moya2011-10-141-1/+1
* | Merge branch 'master' into wip/gsettingsRodrigo Moya2011-10-103-12/+13
|\|
| * Adapt to CamelFolderSummary API changesMilan Crha2011-10-061-5/+5
| * GtkApplication has some new EShell-like features.Matthew Barnes2011-10-062-7/+8
* | Merge from masterRodrigo Moya2011-10-0513-82/+79
|\|
| * Simplify library dependency flags.Matthew Barnes2011-10-051-9/+7
| * Bug #601898 - SOCKS proxy does not work with mailerMilan Crha2011-09-302-19/+19
| * Miscellaneous cleanups from the account-mgmt branch.Matthew Barnes2011-09-276-59/+46
| * EMFolderTreeModel: Don't use parameters in "get_default" functions.Matthew Barnes2011-09-261-1/+1
| * The EExtension framework is now in libebackend.Matthew Barnes2011-09-263-3/+6
| * Bug #351025 - Make the order of the mail accounts configurableMilan Crha2011-09-263-2/+103
| * Coding style and whitespace cleanup.Matthew Barnes2011-09-045-44/+82
| * Miscellaneous cleanups.Matthew Barnes2011-08-315-33/+34
| * e_mail_store_foreach(): Take an EMailSession parameter.Matthew Barnes2011-08-182-2/+11
| * Use new CamelService:display-name property.Matthew Barnes2011-08-182-4/+2
| * Adapt to new CamelSubscribable interface.Matthew Barnes2011-08-161-9/+9
| * Bug #655254 - Cropped Junk settings textMilan Crha2011-08-161-2/+1
| * Coding style and whitespace cleanup.Matthew Barnes2011-08-131-2/+7
| * Bug #655957 - Current account / all accounts search changes columnMilan Crha2011-08-121-1/+5
| * Bug #656133 - Mail-local not initialized when adding/editing accountMilan Crha2011-08-111-0/+4
| * EConfig: Broadcast abort/commit events by way of signals.Matthew Barnes2011-08-113-3/+3
| * Do not leak memory on each mail folder changeMilan Crha2011-08-011-0/+1
| * Bug #655430 - Forgotten EMailJunkOptions type init for mail-config.uiMilan Crha2011-07-282-0/+4
| * Convert junk filtering EPlugins to EExtensions.Matthew Barnes2011-07-146-565/+19
| * Prefer g_seekable_seek() over camel_stream_reset().Matthew Barnes2011-07-051-1/+1
| * Bug #650671 - Service connect/disconnect not cancelled properlyMilan Crha2011-07-021-2/+2
| * Bug 652958 - Evolution Account Assistant jumps stepsMatthew Barnes2011-07-013-2/+13
| * Bug #530335 - Allow Reply to selected address onlyRathin2011-06-141-2/+2
| * Coding style and whitespace cleanups.Matthew Barnes2011-06-091-1/+2
| * Bug #614274 - Labeling many messages is very slowMatt McCutchen2011-06-031-0/+2
| * EMSubscriptionEditor: Manage stores, not accounts.Matthew Barnes2011-05-291-1/+11
| * EMailShellView: Avoid e_get_subscribable_accounts().Matthew Barnes2011-05-291-16/+17
| * Bug #646109 - Fix use of include <config.h> to make sure translations workMilan Crha2011-05-2716-2/+62
| * Use em_folder_tree_get_selected() in places to simplify code.Matthew Barnes2011-05-253-50/+22
| * EMFolderTree: Add an EAlertSink property.Matthew Barnes2011-05-241-1/+3
| * EMFolderTree: Store an EMailBackend instead of an EMailSession.Matthew Barnes2011-05-245-59/+50
| * Coding style and whitespace cleanup.Matthew Barnes2011-05-221-3/+5
| * Bug 650587 - Hide Search Folder actions when Search Folders are disabledMatthew Barnes2011-05-215-18/+55
| * EMailReader: Support multiple action groups.Matthew Barnes2011-05-211-4/+14
| * Remove mail_remove_folder().Matthew Barnes2011-05-212-6/+6
| * Remove mail_store_prepare_offline().Matthew Barnes2011-05-182-4/+50
| * Bug 650088 - Cannot send message from Contacts viewMatthew Barnes2011-05-171-0/+5
| * Bug #601541 - Add 'Copy Image' Option On Inline Email ImagesMilan Crha2011-05-161-1/+6
| * GN-bug #649935 - Check folder validity before asking for its URIMilan Crha2011-05-131-2/+5
| * EMailShellView: Remove some unused utility functions.Matthew Barnes2011-05-132-159/+0
| * Keep forgetting to add prefixes to EAlert tags.Matthew Barnes2011-05-131-1/+1
| * Miscellaneous cleanups.Matthew Barnes2011-05-132-20/+28
| * em_utils_reply_to_message(): Require a CamelMimeMessage.Matthew Barnes2011-05-131-10/+4
| * Add e_mail_reader_new_activity().Matthew Barnes2011-05-132-14/+12
| * Reimplement em_folder_properties_show().Matthew Barnes2011-05-121-1/+1
| * Add e_activity_handle_cancellation().Matthew Barnes2011-05-122-4/+2
| * Reimplement em_utils_forward_messages().Matthew Barnes2011-05-121-1/+1
| * Coding style cleanups.Matthew Barnes2011-05-093-19/+19
| * Whitespace and coding style cleanups.Matthew Barnes2011-05-081-1/+1
| * Adapt to CamelFolder:name -> display-name.Matthew Barnes2011-05-072-2/+2
| * em_folder_utils_create_folder(): Change function parameters.Matthew Barnes2011-05-072-7/+7
| * em_folder_utils_copy_folder(): Change function parameter.Matthew Barnes2011-05-071-10/+12
| * Drop support for command-line 'email://' URIs.Matthew Barnes2011-05-061-106/+3
| * Remove e_mail_reader_get_folder_uri().Matthew Barnes2011-05-044-26/+34
| * Remove 'from_uri' params from e-msg-composer-utils.c.Matthew Barnes2011-05-041-6/+33
| * Fix compiler warnings.Matthew Barnes2011-05-032-7/+0
| * Drop 'folder_uri' param from em_utils_folder_is_outbox().Matthew Barnes2011-05-031-2/+2
| * Drop 'folder_uri' param from em_utils_folder_is_sent().Matthew Barnes2011-05-032-4/+4
| * Drop 'folder_uri' param from em_utils_folder_is_drafts().Matthew Barnes2011-05-031-1/+1
| * EMailShellView: Open the selected folder ourselves.Matthew Barnes2011-05-035-32/+119
| * Add em_folder_tree_get_selected_account().Matthew Barnes2011-05-032-18/+7
| * Bug #588891 - Spam settings dialog terribly un-higgyDan Vrátil2011-04-291-39/+44
| * Bug #303653 - Make headers collapsable in preview paneDan Vrátil2011-04-271-0/+4
| * Adapt to CamelService changes.Matthew Barnes2011-04-214-26/+20
| * Kill em_composer_prefs_new_signature().Matthew Barnes2011-04-152-14/+0
| * Miscellaneous GtkAction-related cleanups.Matthew Barnes2011-03-282-3/+4
| * Restore lockdown integration.Matthew Barnes2011-03-281-24/+0
| * Bug 643507 - Font preferences don't workMatthew Barnes2011-03-091-17/+182
| * Coding style and whitespace cleanup.Matthew Barnes2011-03-067-7/+19
| * Bug #642093 - Frees message attachment content on ReplyMilan Crha2011-03-011-0/+6
| * Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedlyMilan Crha2011-02-259-72/+40
| * Coding style and whitespace cleanup.Matthew Barnes2011-02-192-3/+13
| * Bug #638333 - Critical warning when invoking File->New->Mail FolderMilan Crha2011-02-162-3/+14
| * Bug 642171 - Implicit libgnome dependency for lockdown GConf keysMatthew Barnes2011-02-131-0/+8
| * Remove NULL checks for GObject methods.Matthew Barnes2011-02-133-6/+6
| * Bug 641756 - Fix warnings from GCC 4.6Kjartan Maraas2011-02-092-6/+0
| * More whitespace cleanup.Matthew Barnes2011-01-312-4/+4
| * Coding style and whitespace cleanup.Matthew Barnes2011-01-303-80/+210
| * Adapt size_request vfuncs to latest gtk+-3.0 API.Rodrigo Moya2011-01-251-5/+15
| * Adapt to GtkComboBox class reorg.Matthew Barnes2011-01-251-2/+7
| * Drop backward-compatibility cruft.Matthew Barnes2011-01-252-6/+0
| * Bug #634403 - Mails Label popup menu is not updated properlyMilan Crha2011-01-192-0/+2
| * Bug #633982 - Crash when trying to Create a search folder from a searchMilan Crha2011-01-191-1/+3
| * Bug #633788 - Mail plugin's update-actions handler is never calledMilan Crha2011-01-191-0/+19
| * Avoid idle callbacks in EMailBackend initialization.Matthew Barnes2011-01-081-0/+6
| * Bug #637906 - Don't ask again when sending to non-mail recipientsMilan Crha2011-01-062-0/+11
| * Fix menu item capitalizaion.Matthew Barnes2010-12-271-2/+2
| * Bug #567879 - Add View >> Gallery Option In Email ComposerMilan Crha2010-12-221-0/+4
| * Bug #637162 - May not add toolbar Send/Receive button multiple timesMilan Crha2010-12-141-22/+29
| * Bug #631568 - Scheduling Meetings with CalDAV calendarsMilan Crha2010-12-081-0/+4
| * Free/busy meeting view doesn't work due to non-working extensionMilan Crha2010-12-063-0/+21
| * Bug 636265 - Trash is untranslated in the window titleMatthew Barnes2010-12-041-10/+16
| * Add option "Check for new messages in all active accounts"Milan Crha2010-11-302-0/+16
| * Set mnemonic widget for lblDefaultCharset in Mail PreferencesMilan Crha2010-11-301-0/+1
| * Bug #633949 - Add an option to disable new e-mail check at startupMilan Crha2010-11-302-0/+11
| * Bug #207580 - Allow new mail check on individual accountsMilan Crha2010-11-265-20/+448
| * Bug #633783 - Folder->Expunge enabled when no folder selectedMilan Crha2010-11-221-0/+4
| * Bug #633779 - GtkComboBoxText issuesMilan Crha2010-11-181-12/+18
| * Bug #632683 - Remove-duplicates should work on selectionMilan Crha2010-11-102-136/+0
| * Coding style and whitespace cleanup.Matthew Barnes2010-11-081-3/+3
| * Bug #632562 - Disabled account in preferences not remove in folder treeMilan Crha2010-11-031-1/+3
| * EMailReader: Add a get_alert_sink() method.Matthew Barnes2010-11-011-0/+15
| * Kill em_folder_utils_unsubscribe_folder().Matthew Barnes2010-11-012-2/+50
| * Bug 633172 - Folder->Subscriptions is always enabledMatthew Barnes2010-10-301-5/+14
* | Bug #351025 - Make the order of the mail accounts configurableMilan Crha2011-09-263-2/+103
* | Coding style and whitespace cleanup.Matthew Barnes2011-09-145-44/+82
* | Miscellaneous cleanups.Matthew Barnes2011-09-145-33/+34
* | e_mail_store_foreach(): Take an EMailSession parameter.Matthew Barnes2011-09-142-2/+11
* | Use new CamelService:display-name property.Matthew Barnes2011-09-142-4/+2
* | Adapt to new CamelSubscribable interface.Matthew Barnes2011-09-141-9/+9
* | Bug #655254 - Cropped Junk settings textMilan Crha2011-09-141-2/+1
* | Coding style and whitespace cleanup.Matthew Barnes2011-09-141-2/+7
* | Bug #655957 - Current account / all accounts search changes columnMilan Crha2011-09-141-1/+5
* | Bug #656133 - Mail-local not initialized when adding/editing accountMilan Crha2011-09-141-0/+4
* | EConfig: Broadcast abort/commit events by way of signals.Matthew Barnes2011-09-143-3/+3
* | Do not leak memory on each mail folder changeMilan Crha2011-09-141-0/+1
* | Bug #655430 - Forgotten EMailJunkOptions type init for mail-config.uiMilan Crha2011-09-142-0/+4
* | Convert junk filtering EPlugins to EExtensions.Matthew Barnes2011-09-146-565/+19
* | Prefer g_seekable_seek() over camel_stream_reset().Matthew Barnes2011-09-141-1/+1
* | Bug #650671 - Service connect/disconnect not cancelled properlyMilan Crha2011-09-141-2/+2
* | Bug 652958 - Evolution Account Assistant jumps stepsMatthew Barnes2011-09-143-2/+13
* | Bug #530335 - Allow Reply to selected address onlyRathin2011-06-301-2/+2
* | Coding style and whitespace cleanups.Matthew Barnes2011-06-301-1/+2
* | Bug #614274 - Labeling many messages is very slowMatt McCutchen2011-06-301-0/+2
* | EMSubscriptionEditor: Manage stores, not accounts.Matthew Barnes2011-06-301-1/+11
* | EMailShellView: Avoid e_get_subscribable_accounts().Matthew Barnes2011-06-301-16/+17
* | Bug #646109 - Fix use of include <config.h> to make sure translations workMilan Crha2011-06-3016-2/+62
* | Use em_folder_tree_get_selected() in places to simplify code.Matthew Barnes2011-06-303-50/+22
* | EMFolderTree: Add an EAlertSink property.Matthew Barnes2011-06-301-1/+3
* | EMFolderTree: Store an EMailBackend instead of an EMailSession.Matthew Barnes2011-06-305-59/+50
* | Coding style and whitespace cleanup.Matthew Barnes2011-06-301-3/+5
* | Bug 650587 - Hide Search Folder actions when Search Folders are disabledMatthew Barnes2011-06-305-18/+55
* | EMailReader: Support multiple action groups.Matthew Barnes2011-06-301-4/+14
* | Remove mail_remove_folder().Matthew Barnes2011-06-302-6/+6
* | Remove mail_store_prepare_offline().Matthew Barnes2011-06-302-4/+50
* | Bug 650088 - Cannot send message from Contacts viewMatthew Barnes2011-06-301-0/+5
* | Bug #601541 - Add 'Copy Image' Option On Inline Email ImagesMilan Crha2011-06-301-1/+6
* | GN-bug #649935 - Check folder validity before asking for its URIMilan Crha2011-06-301-2/+5
* | EMailShellView: Remove some unused utility functions.Matthew Barnes2011-06-302-159/+0
* | Keep forgetting to add prefixes to EAlert tags.Matthew Barnes2011-06-301-1/+1
* | Miscellaneous cleanups.Matthew Barnes2011-06-302-20/+28
* | em_utils_reply_to_message(): Require a CamelMimeMessage.Matthew Barnes2011-06-301-10/+4
* | Add e_mail_reader_new_activity().Matthew Barnes2011-06-302-14/+12
* | Reimplement em_folder_properties_show().Matthew Barnes2011-06-301-1/+1
* | Add e_activity_handle_cancellation().Matthew Barnes2011-06-302-4/+2
* | Reimplement em_utils_forward_messages().Matthew Barnes2011-06-301-1/+1
* | Coding style cleanups.Matthew Barnes2011-06-303-19/+19
* | Whitespace and coding style cleanups.Matthew Barnes2011-06-301-1/+1
* | Adapt to CamelFolder:name -> display-name.Matthew Barnes2011-06-302-2/+2
* | em_folder_utils_create_folder(): Change function parameters.Matthew Barnes2011-06-302-7/+7
* | em_folder_utils_copy_folder(): Change function parameter.Matthew Barnes2011-06-301-10/+12
* | Drop support for command-line 'email://' URIs.Matthew Barnes2011-06-301-106/+3
* | Remove e_mail_reader_get_folder_uri().Matthew Barnes2011-06-304-26/+34
* | Remove 'from_uri' params from e-msg-composer-utils.c.Matthew Barnes2011-06-301-6/+33
* | Fix compiler warnings.Matthew Barnes2011-06-302-7/+0
* | Drop 'folder_uri' param from em_utils_folder_is_outbox().Matthew Barnes2011-06-301-2/+2
* | Drop 'folder_uri' param from em_utils_folder_is_sent().Matthew Barnes2011-06-302-4/+4