[evolution/eds-mailer: 49/49] Merge remote branch 'origin/master' into eds-mailer
- From: Jonathon Jongsma <jjongsma src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution/eds-mailer: 49/49] Merge remote branch 'origin/master' into eds-mailer
- Date: Wed, 13 Jan 2010 15:48:38 +0000 (UTC)
commit 2f9dda5c4d1c520b9354a5a79b51f929233ddfad
Merge: 372e4d5 7d445c8
Author: Jonathon Jongsma <jonathon quotidian org>
Date: Mon Jan 11 14:12:04 2010 -0600
Merge remote branch 'origin/master' into eds-mailer
Conflicts:
filter/e-filter-rule.h
mail/e-mail-store.c
mail/em-utils.c
mail/em-utils.h
mail/mail-session.c
addressbook/gui/widgets/e-addressbook-model.c | 1 -
.../gui/widgets/e-addressbook-reflow-adapter.c | 1 -
addressbook/gui/widgets/e-addressbook-view.c | 70 +-
addressbook/gui/widgets/e-minicard-view.c | 19 +-
addressbook/gui/widgets/e-minicard.c | 2 +-
addressbook/importers/evolution-csv-importer.c | 8 +-
addressbook/importers/evolution-ldif-importer.c | 33 +-
addressbook/importers/evolution-vcard-importer.c | 18 +-
addressbook/printing/e-contact-print.c | 6 +-
addressbook/util/addressbook.c | 7 +-
calendar/gui/alarm-notify/alarm.c | 3 +-
calendar/gui/alarm-notify/config-data.c | 8 +-
calendar/gui/dialogs/comp-editor.h | 27 +-
calendar/gui/e-cal-list-view.c | 1 -
calendar/gui/e-calendar-view.c | 391 +-
calendar/gui/e-calendar-view.h | 8 +-
calendar/gui/e-day-view-time-item.c | 1 -
calendar/gui/e-day-view.c | 1 -
calendar/gui/e-meeting-attendee.c | 13 +-
calendar/gui/e-memo-table.c | 249 +-
calendar/gui/e-memo-table.h | 1 -
calendar/gui/e-task-table.c | 348 +-
calendar/gui/e-task-table.h | 1 -
calendar/gui/e-timezone-entry.c | 2 +-
calendar/gui/e-week-view-main-item.c | 20 +-
calendar/gui/e-week-view.c | 1 -
calendar/gui/ea-cal-view-event.c | 4 +-
calendar/gui/ea-cal-view.c | 6 +-
calendar/gui/ea-day-view-cell.c | 6 +-
calendar/gui/ea-gnome-calendar.c | 34 +-
calendar/gui/ea-jump-button.c | 3 +-
calendar/gui/ea-week-view-cell.c | 2 +-
calendar/gui/ea-week-view-main-item.c | 9 +-
calendar/gui/gnome-cal.c | 6 +-
calendar/gui/gnome-cal.h | 20 +-
calendar/gui/weekday-picker.c | 475 +-
composer/e-composer-header.c | 14 +-
composer/e-composer-private.c | 58 +
composer/e-composer-private.h | 17 +
composer/e-msg-composer.c | 99 +-
configure.ac | 4 +-
devel-docs/Makefile.am | 5 -
devel-docs/camel/Makefile.am | 103 -
devel-docs/camel/README_AND_TODO.txt | 43 -
devel-docs/camel/camel-docs.sgml | 28 -
devel-docs/camel/camel-sections.txt | 154 -
devel-docs/camel/camel.types | 9 -
devel-docs/camel/tmpl/camel-data-wrapper.sgml | 26 -
devel-docs/camel/tmpl/camel-folder.sgml | 96 -
devel-docs/camel/tmpl/camel-mime-message.sgml | 171 -
devel-docs/camel/tmpl/camel-mime-part.sgml | 151 -
devel-docs/camel/tmpl/camel-recipient.sgml | 88 -
devel-docs/camel/tmpl/camel-service.sgml | 72 -
devel-docs/camel/tmpl/camel-store.sgml | 45 -
devel-docs/camel/tmpl/camel-stream.sgml | 101 -
doc/reference/shell/tmpl/e-shell-searchbar.sgml | 5 +
e-util/e-html-utils.c | 5 +-
e-util/e-logger.c | 10 +-
e-util/e-non-intrusive-error-dialog.c | 11 +-
e-util/e-pilot-map.c | 10 +-
e-util/e-plugin.c | 16 +-
e-util/e-unicode.c | 29 +-
e-util/e-unicode.h | 1 +
e-util/e-util.c | 85 +-
e-util/e-util.h | 2 +-
e-util/gconf-bridge.c | 64 +-
filter/e-filter-int.c | 4 +-
filter/e-filter-option.c | 13 +-
filter/e-filter-rule.c | 2 +-
filter/e-rule-context.c | 23 +-
mail/e-mail-label-manager.c | 2 +-
mail/e-mail-reader.c | 2 +
mail/e-mail-sidebar.c | 99 +-
mail/e-mail-store.c | 12 +-
mail/em-account-editor.c | 2 +-
mail/em-composer-utils.c | 9 +-
mail/em-filter-rule.c | 11 +-
mail/em-folder-selection-button.c | 3 +-
mail/em-folder-selector.c | 1 -
mail/em-folder-tree-model.c | 30 +-
mail/em-folder-tree.c | 142 +-
mail/em-folder-tree.h | 4 +
mail/em-folder-utils.c | 2 +
mail/em-format-html-display.c | 25 +-
mail/em-utils.c | 35 +
mail/em-utils.h | 3 +
mail/em-vfolder-rule.c | 3 +-
mail/importers/elm-importer.c | 10 +-
mail/importers/evolution-mbox-importer.c | 4 +-
mail/message-list.c | 133 +-
modules/addressbook/e-book-shell-view-actions.c | 11 +-
modules/addressbook/e-book-shell-view-private.h | 1 +
modules/calendar/e-cal-attachment-handler.c | 4 +-
modules/calendar/e-cal-shell-backend.c | 52 +-
modules/calendar/e-cal-shell-content.c | 133 +-
modules/calendar/e-cal-shell-content.h | 4 -
modules/calendar/e-cal-shell-view-actions.c | 44 +-
modules/calendar/e-cal-shell-view-actions.h | 4 -
modules/calendar/e-cal-shell-view-memopad.c | 31 -
modules/calendar/e-cal-shell-view-private.h | 3 +-
modules/calendar/e-cal-shell-view-taskpad.c | 31 -
modules/calendar/e-cal-shell-view.c | 61 +-
modules/calendar/e-memo-shell-backend.c | 10 +-
modules/calendar/e-memo-shell-view-actions.c | 47 +-
modules/calendar/e-memo-shell-view-private.h | 3 +-
modules/calendar/e-task-shell-backend.c | 10 +-
modules/calendar/e-task-shell-view-actions.c | 22 +-
modules/calendar/e-task-shell-view-private.h | 3 +-
modules/mail/e-mail-attachment-handler.c | 4 +-
modules/mail/e-mail-shell-backend.c | 8 +
modules/mail/e-mail-shell-view-actions.c | 8 +-
modules/mail/e-mail-shell-view.c | 39 +-
modules/mail/em-account-prefs.c | 8 +-
modules/mail/em-composer-prefs.c | 2 -
plugins/bbdb/gaimbuddies.c | 16 +-
plugins/contacts-map/contacts-map.c | 14 +-
plugins/groupwise-features/install-shared.c | 2 +-
plugins/groupwise-features/send-options.c | 4 +-
plugins/image-inline/image-inline.c | 81 +-
plugins/itip-formatter/itip-view.c | 46 +-
plugins/mail-notification/mail-notification.c | 8 +-
.../mailing-list-actions/mailing-list-actions.c | 18 +-
plugins/save-calendar/save-calendar.c | 10 +-
po/POTFILES.in | 3 +-
po/cs.po | 3626 ++---
po/es.po | 2071 ++--
po/nb.po | 4138 +++---
po/pl.po |16390 +++++++++-----------
po/sl.po | 4013 +++---
po/sv.po | 5613 ++++----
po/te.po | 13 +-
shell/e-shell-nm.c | 3 +-
shell/e-shell-searchbar.c | 3 +-
shell/e-shell-sidebar.c | 5 +-
shell/main.c | 52 +-
smclient/eggsmclient-xsmp.c | 33 +-
smime/lib/e-asn1-object.c | 3 +-
smime/lib/e-cert-db.c | 130 +-
smime/lib/e-cert.c | 18 +-
smime/lib/e-pkcs12.c | 9 +-
ui/evolution-calendars.ui | 7 +-
ui/evolution-contacts.ui | 15 +-
ui/evolution-memos.ui | 5 +-
ui/evolution-tasks.ui | 5 +-
widgets/e-timezone-dialog/e-timezone-dialog.c | 54 +-
widgets/e-timezone-dialog/e-timezone-dialog.h | 62 +-
widgets/menus/gal-view-etable.c | 6 +-
widgets/misc/Makefile.am | 4 -
widgets/misc/e-attachment-handler-image.c | 2 +-
widgets/misc/e-attachment-handler-sendto.c | 2 +-
widgets/misc/e-attachment-view.c | 20 +-
widgets/misc/e-attachment.c | 2 +-
widgets/misc/e-attachment.h | 4 +-
widgets/misc/e-calendar-item.c | 101 +-
widgets/misc/e-calendar.c | 7 +-
widgets/misc/e-canvas-background.c | 14 +-
widgets/misc/e-canvas.c | 2 +-
widgets/misc/e-charset-combo-box.c | 2 +-
widgets/misc/e-colors.c | 91 -
widgets/misc/e-colors.h | 41 -
widgets/misc/e-dateedit.c | 78 +-
widgets/misc/e-gui-utils.c | 55 -
widgets/misc/e-gui-utils.h | 35 -
widgets/misc/e-hsv-utils.c | 135 +-
widgets/misc/e-hsv-utils.h | 20 +-
widgets/misc/e-import-assistant.c | 16 +-
widgets/misc/e-popup-menu.c | 1 -
widgets/misc/e-selection-model.c | 14 +-
widgets/misc/e-signature-manager.c | 4 +-
widgets/misc/e-url-entry.c | 4 +-
widgets/misc/e-web-view.c | 6 +-
widgets/misc/ea-calendar-cell.c | 2 +-
widgets/misc/ea-calendar-item.c | 43 +-
widgets/misc/test-dateedit.c | 5 +-
widgets/table/e-cell-checkbox.c | 14 +-
widgets/table/e-cell-pixbuf.c | 3 +-
widgets/table/e-cell-popup.c | 27 +-
widgets/table/e-cell-toggle.c | 416 +-
widgets/table/e-cell-toggle.h | 59 +-
widgets/table/e-table-click-to-add.c | 16 +-
widgets/table/e-table-col.c | 108 +-
widgets/table/e-table-col.h | 125 +-
widgets/table/e-table-extras.c | 199 +-
widgets/table/e-table-extras.h | 99 +-
widgets/table/e-table-header-item.c | 14 +-
widgets/table/e-table-header-utils.c | 13 +-
widgets/table/e-table-memory-callbacks.c | 17 +-
widgets/table/e-table-state.c | 18 +-
widgets/table/e-table-utils.c | 30 +-
widgets/table/e-tree-memory.c | 19 +-
widgets/table/gal-a11y-e-cell-registry.c | 2 +-
widgets/table/gal-a11y-e-cell.c | 9 +-
widgets/text/e-text.c | 4 +-
193 files changed, 20065 insertions(+), 22757 deletions(-)
---
diff --cc e-util/e-util.h
index f45040a,276d20f..321561c
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@@ -37,12 -37,6 +37,12 @@@
#include <e-util/e-marshal.h>
+#define E_FILTER_SOURCE_INCOMING "incoming" /* performed on incoming email */
+#define E_FILTER_SOURCE_DEMAND "demand" /* performed on the selected folder
+ * when the user asks for it */
+#define E_FILTER_SOURCE_OUTGOING "outgoing"/* performed on outgoing mail */
- #define E_FILTER_SOURCE_JUNKTEST "junktest"/* perform only junktest on incoming mail */
++#define E_FILTER_SOURCE_JUNKTEST "junktest"/* check incoming mail for junk */
+
/* Convenience macro to help migrate from libglade to GtkBuilder.
* Use it as a direct replacement for glade_xml_get_widget(). */
#define e_builder_get_widget(builder, name) \
diff --cc mail/em-utils.c
index a2dfe5b,eab434d..a7ad3fa
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@@ -1032,3 -2054,194 +1032,38 @@@ em_utils_show_info_silent (GtkWidget *w
widget, "response",
G_CALLBACK (gtk_widget_destroy), NULL);
}
+
-gchar *
-em_utils_url_unescape_amp (const gchar *url)
-{
- gchar *buff;
- gint i, j, amps;
-
- if (!url)
- return NULL;
-
- amps = 0;
- for (i = 0; url [i]; i++) {
- if (url [i] == '&' && strncmp (url + i, "&", 5) == 0)
- amps++;
- }
-
- buff = g_strdup (url);
-
- if (!amps)
- return buff;
-
- for (i = 0, j = 0; url [i]; i++, j++) {
- buff [j] = url [i];
-
- if (url [i] == '&' && strncmp (url + i, "&", 5) == 0)
- i += 4;
- }
- buff [j] = 0;
-
- return buff;
-}
-
-static EAccount *
-guess_account_folder (CamelFolder *folder)
-{
- EAccount *account;
- gchar *tmp;
-
- tmp = camel_url_to_string (CAMEL_SERVICE (folder->parent_store)->url, CAMEL_URL_HIDE_ALL);
- account = mail_config_get_account_by_source_url (tmp);
- g_free (tmp);
-
- return account;
-}
-
-GHashTable *
-em_utils_generate_account_hash (void)
-{
- GHashTable *account_hash;
- EAccount *account, *def;
- EAccountList *accounts;
- EIterator *iter;
-
- accounts = e_get_account_list ();
- account_hash = g_hash_table_new (camel_strcase_hash, camel_strcase_equal);
-
- def = e_get_default_account ();
-
- iter = e_list_get_iterator ((EList *) accounts);
- while (e_iterator_is_valid (iter)) {
- account = (EAccount *) e_iterator_get (iter);
-
- if (account->id->address) {
- EAccount *acnt;
-
- /* Accounts with identical email addresses that are enabled
- * take precedence over the accounts that aren't. If all
- * accounts with matching email addresses are disabled, then
- * the first one in the list takes precedence. The default
- * account always takes precedence no matter what.
- */
- acnt = g_hash_table_lookup (account_hash, account->id->address);
- if (acnt && acnt != def && !acnt->enabled && account->enabled) {
- g_hash_table_remove (account_hash, acnt->id->address);
- acnt = NULL;
- }
-
- if (!acnt)
- g_hash_table_insert (account_hash, (gchar *) account->id->address, (gpointer) account);
- }
-
- e_iterator_next (iter);
- }
-
- g_object_unref (iter);
-
- /* The default account has to be there if none of the enabled accounts are present */
- if (g_hash_table_size (account_hash) == 0 && def && def->id->address)
- g_hash_table_insert (account_hash, (gchar *) def->id->address, (gpointer) def);
-
- return account_hash;
-}
-
-EAccount *
-em_utils_guess_account_with_recipients (CamelMimeMessage *message, CamelFolder *folder)
-{
- GHashTable *account_hash = NULL;
- EAccount *account = NULL;
- const gchar *tmp;
- gint i;
- GList *l, *recipients = NULL;
- const CamelInternetAddress *addr;
-
- account = em_utils_guess_account (message, folder);
- if (account)
- return account;
- addr = camel_mime_message_get_recipients(message, CAMEL_RECIPIENT_TYPE_TO);
- if (addr)
- recipients = g_list_append (recipients, (gpointer) addr);
- addr = camel_mime_message_get_recipients(message, CAMEL_RECIPIENT_TYPE_CC);
- if (addr)
- recipients = g_list_append (recipients, (gpointer) addr);
-
- /* finally recipient (to/cc) in account table */
- account_hash = em_utils_generate_account_hash ();
- for (l = recipients; l == NULL; l = l->next) {
- const CamelInternetAddress *to;
-
- to = (CamelInternetAddress*)l->data;
- if (to) {
- for (i = 0; camel_internet_address_get(to, i, NULL, &tmp); i++) {
- account = g_hash_table_lookup(account_hash, tmp);
- if (account && account->enabled)
- break;
- }
- }
- }
- g_hash_table_destroy(account_hash);
-
- return account;
-}
-
-EAccount *
-em_utils_guess_account (CamelMimeMessage *message, CamelFolder *folder)
-{
- EAccount *account = NULL;
- const gchar *tmp;
-
- /* check for newsgroup header */
- if (folder
- && camel_medium_get_header ((CamelMedium *)message, "Newsgroups")
- && (account = guess_account_folder (folder)))
- return account;
-
- /* check for source folder */
- if (folder)
- account = guess_account_folder (folder);
-
- /* then message source */
- if (account == NULL
- && (tmp = camel_mime_message_get_source (message))) {
- account = mail_config_get_account_by_source_url (tmp);
- }
-
- return account;
-}
-
+ void
+ emu_restore_folder_tree_state (EMFolderTree *folder_tree)
+ {
+ EShell *shell;
+ EShellBackend *backend;
+ GKeyFile *key_file;
+ const gchar *config_dir;
+ gchar *filename;
+ GError *error = NULL;
+
+ g_return_if_fail (folder_tree != NULL);
+ g_return_if_fail (EM_IS_FOLDER_TREE (folder_tree));
+
+ shell = e_shell_get_default ();
+ backend = e_shell_get_backend_by_name (shell, "mail");
+ g_return_if_fail (backend != NULL);
+
+ config_dir = e_shell_backend_get_config_dir (backend);
+ g_return_if_fail (config_dir != NULL);
+
+ filename = g_build_filename (config_dir, "state", NULL);
+
+ key_file = g_key_file_new ();
+ g_key_file_load_from_file (key_file, filename, 0, &error);
+ g_free (filename);
+
+ if (error) {
+ g_error_free (error);
+ } else {
+ em_folder_tree_restore_state (folder_tree, key_file);
+ }
+
+ g_key_file_free (key_file);
+ }
diff --cc mail/em-utils.h
index a4ebd96,4e3b95e..2868af6
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@@ -33,7 -33,7 +33,8 @@@
#include <camel/camel-stream.h>
#include <mail/e-mail-reader.h>
+#include <mail/mail-utils.h>
+ #include <mail/em-folder-tree.h>
G_BEGIN_DECLS
@@@ -72,6 -92,26 +73,8 @@@ void em_utils_empty_trash (GtkWidget *p
void em_utils_show_error_silent (GtkWidget *widget);
void em_utils_show_info_silent (GtkWidget *widget);
-/* is this address in the addressbook? caches results */
-gboolean em_utils_in_addressbook (CamelInternetAddress *addr, gboolean local_only);
-CamelMimePart *em_utils_contact_photo (CamelInternetAddress *addr, gboolean local);
-
-/* clears flag 'get_password_canceled' at every known accounts, so if needed, get_password will show dialog */
-void em_utils_clear_get_password_canceled_accounts_flag (void);
-
-/* Unescapes & back to a real & in URIs */
-gchar *em_utils_url_unescape_amp (const gchar *url);
-
-GHashTable * em_utils_generate_account_hash (void);
-struct _EAccount *em_utils_guess_account (CamelMimeMessage *message, CamelFolder *folder);
-struct _EAccount *em_utils_guess_account_with_recipients (CamelMimeMessage *message, CamelFolder *folder);
-
-void emu_remove_from_mail_cache (const GSList *addresses);
-void emu_remove_from_mail_cache_1 (const gchar *address);
-void emu_free_mail_cache (void);
-
+ void emu_restore_folder_tree_state (EMFolderTree *folder_tree);
+
G_END_DECLS
#endif /* __EM_UTILS_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
