aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog119
-rw-r--r--mail/em-folder-view.c33
2 files changed, 83 insertions, 69 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index d33a0b4442..a160bbd841 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,80 +1,92 @@
+2006-06-02 Jeffrey Stedfast <fejj@novell.com>
+
+ * em-folder-view.c (emfv_setup_view_instance): Can't make camel
+ calls from the main thread or we run the risk of deadlocking.
+
2006-06-02 Srinivasa Ragavan <sragavan@novell.com>
** Added support for Vertical View in evolution in addition to the
existing classical view. It also supports a composite headers to be
shown in a multilined column.
- * em-folder-browser.c: (emfb_pane_realised),
- (emfb_pane_button_release_event), (emfb_init),
- (em_folder_browser_show_preview), (em_folder_browser_show_wide),
- (emfb_show_next), (emfb_show_below), (emfb_activate): Added code to
+ * em-folder-browser.c (emfb_pane_realised),
+ (emfb_pane_button_release_event, emfb_init),
+ (em_folder_browser_show_preview, em_folder_browser_show_wide),
+ (emfb_show_next, emfb_show_below, emfb_activate): Added code to
handle the new wide mode in Evolution.
- * em-folder-browser.h:
- * em-folder-view.c: (emfv_setup_view_instance),
- (em_folder_view_setup_view_instance): Added code to handle the default
- view in the wide mode for normal and sent/draft folders.
- * em-folder-view.h:
- * evolution-mail.schemas.in.in: Added schema for hpane size, showing
- email in the composite headers and toggling wide more.
+
+ * em-folder-view.c (emfv_setup_view_instance),
+ (em_folder_view_setup_view_instance): Added code to handle the
+ default view in the wide mode for normal and sent/draft folders.
+
+ * evolution-mail.schemas.in.in: Added schema for hpane size,
+ showing email in the composite headers and toggling wide more.
- * message-list.c: (ml_duplicate_value), (ml_free_value),
- (ml_initialize_value), (ml_value_is_empty), (ml_value_to_string),
- (sanitize_recipients), (ml_tree_value_at), (create_composite_cell),
+ * message-list.c (ml_duplicate_value, ml_free_value),
+ (ml_initialize_value, ml_value_is_empty, ml_value_to_string),
+ (sanitize_recipients, ml_tree_value_at, create_composite_cell),
(message_list_create_extras): Added a new composite header
render_composite_from/recipient which shows the headers in a
- multilined column.
+ multilined column.
+
* message-list.etspec: Added three new columns, Recipent, Messages
- column for normal folders and Messages column for sent/draft folders.
- * message-list.h:
+ column for normal folders and Messages column for sent/draft
+ folders.
2006-05-30 Li Yuan <li.yuan@sun.com>
Fix for #341381.
- * message-list.c: (message_list_set_folder):
- We should lock e-tree-memory when we change it.
+
+ * message-list.c (message_list_set_folder): We should lock
+ e-tree-memory when we change it.
2006-05-30 Srinivasa Ragavan <sragavan@novell.com>
** Fixes bug #332936
- * mail.error.xml: Used a new property called scroll
- that adds the multilines error messages into a viewport.
+
+ * mail.error.xml: Used a new property called scroll that adds the
+ multilines error messages into a viewport.
2006-05-25 Srinivasa Ragavan <sragavan@novell.com>
** Added remote shares save/load support across evolution.
-
- * em-utils.c: (emu_file_check_local), (emu_get_save_filesel),
- (emu_save_part_response), (emu_save_parts_response),
- (emu_save_messages_response): Added code to save messages/attachments
- to remote shares.
- * mail-ops.c: (save_messages_save), (save_part_save):
+
+ * em-utils.c (emu_file_check_local, emu_get_save_filesel),
+ (emu_save_part_response, emu_save_parts_response),
+ (emu_save_messages_response): Added code to save
+ messages/attachments to remote shares.
+
+ * mail-ops.c (save_messages_save, save_part_save): Same.
2006-05-25 Srinivasa Ragavan <sragavan@novell.com>
** fixes bug #342092
-
- * em-popup.c: (emp_standard_menu_factory): Read the mime
- from the right file.
+
+ * em-popup.c (emp_standard_menu_factory): Read the mime from the
+ right file.
2006-05-25 Srinivasa Ragavan <sragavan@novell.com>
Added support for collapsible headers for To/Cc/Bcc fields.
- * em-folder-view.c: (emfv_format_link_clicked), (emfv_on_url_cb):
- * em-format-html-display.c: (efhd_html_button_press_event),
- (efhd_html_link_clicked), (efhd_html_on_url), (efhd_format_clone):
- * em-format-html.c: (efh_url_requested), (efh_format_text_header),
- (efh_format_address), (efh_format_header):
- * em-format-html.h:
- * em-mailer-prefs.c: (address_compress_count_changed),
- (toggle_button_init), (em_mailer_prefs_construct):
- * em-mailer-prefs.h:
+ * em-folder-view.c (emfv_format_link_clicked, emfv_on_url_cb):
+
+ * em-format-html-display.c (efhd_html_button_press_event),
+ (efhd_html_link_clicked, efhd_html_on_url, efhd_format_clone):
+
+ * em-format-html.c (efh_url_requested, efh_format_text_header),
+ (efh_format_address, efh_format_header):
+
+ * em-mailer-prefs.c (address_compress_count_changed),
+ (toggle_button_init, em_mailer_prefs_construct):
+
* evolution-mail.schemas.in.in:
- * mail-config.c: (gconf_address_count_changed),
- (gconf_address_compress_changed), (mail_config_init),
- (mail_config_get_labels), (mail_config_get_address_count):
+
+ * mail-config.c (gconf_address_count_changed),
+ (gconf_address_compress_changed, mail_config_init),
+ (mail_config_get_labels, mail_config_get_address_count):
+
* mail-config.glade:
- * mail-config.h:
2006-05-24 Srinivasa Ragavan <sragavan@novell.com>
@@ -95,18 +107,25 @@
** Fixes bug #323853
* em-composer-prefs.c (sig_edit_cb, sig_add_script_response):
- * em-mailer-prefs.c (notify_sound_changed, em_mailer_prefs_construct):
+
+ * em-mailer-prefs.c (notify_sound_changed)
+ (em_mailer_prefs_construct):
+
* em-mailer-prefs.h:
- * mail-config.glade: Replace GnomeFileEntry by GtkFileChooserButton.
+
+ * mail-config.glade: Replace GnomeFileEntry by
+ GtkFileChooserButton.
2006-04-27 Rodney Dawes <dobey@novell.com>
- * em-folder-tree.c (render_pixbuf): Use gnome-fs-trash-empty rather
- than stock_delete for the Trash folder icon
+ * em-folder-tree.c (render_pixbuf): Use gnome-fs-trash-empty
+ rather than stock_delete for the Trash folder icon
- * em-folder-view.c (emfv_popup_items[]): Don't set an icon for Undelete
- (emfv_message_pixmaps[]): Don't set an icon for Undelete and set the
- icon for deleting a message to gnome-fs-trash-empty, not stock_delete
+ * em-folder-view.c (emfv_popup_items[]): Don't set an icon for
+ Undelete
+ (emfv_message_pixmaps[]): Don't set an icon for Undelete and set
+ the icon for deleting a message to gnome-fs-trash-empty, not
+ stock_delete
Fixes #339626
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 5b002cdaa9..4c0c225393 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -497,16 +497,14 @@ emfv_list_display_view(GalViewInstance *instance, GalView *view, EMFolderView *e
static void
emfv_setup_view_instance(EMFolderView *emfv)
{
+ static GalViewCollection *collection = NULL;
struct _EMFolderViewPrivate *p = emfv->priv;
- gboolean outgoing;
+ gboolean outgoing, show_wide;
char *id;
- static GalViewCollection *collection = NULL;
- CamelFolderInfo *fi = NULL;
- gboolean show_wide = gconf_client_get_bool (mail_config_get_gconf_client (), "/apps/evolution/mail/display/show_wide", NULL);
g_assert(emfv->folder);
g_assert(emfv->folder_uri);
-
+
if (collection == NULL) {
ETableSpecification *spec;
GalViewFactory *factory;
@@ -552,18 +550,16 @@ emfv_setup_view_instance(EMFolderView *emfv)
g_object_unref(p->view_menus);
p->view_menus = NULL;
}
-
- outgoing = em_utils_folder_is_drafts (emfv->folder, emfv->folder_uri)
- || em_utils_folder_is_sent (emfv->folder, emfv->folder_uri)
- || em_utils_folder_is_outbox (emfv->folder, emfv->folder_uri);
/* TODO: should this go through mail-config api? */
id = mail_config_folder_to_safe_url (emfv->folder);
p->view_instance = gal_view_instance_new (collection, id);
-
+
+ show_wide = gconf_client_get_bool (mail_config_get_gconf_client (), "/apps/evolution/mail/display/show_wide", NULL);
+
if (show_wide) {
char *safe_id, *filename;
-
+
/* Force to use the wide view */
g_free (p->view_instance->custom_filename);
g_free (p->view_instance->current_view_filename);
@@ -577,21 +573,20 @@ emfv_setup_view_instance(EMFolderView *emfv)
g_free (safe_id);
}
g_free (id);
-
- fi = camel_store_get_folder_info (emfv->folder->parent_store,
- emfv->folder->full_name,
- CAMEL_STORE_FOLDER_INFO_SUBSCRIBED,
- NULL);
- if (outgoing || (fi && ((fi->flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_SENT))) {
+
+ outgoing = em_utils_folder_is_drafts (emfv->folder, emfv->folder_uri)
+ || em_utils_folder_is_sent (emfv->folder, emfv->folder_uri)
+ || em_utils_folder_is_outbox (emfv->folder, emfv->folder_uri);
+
+ if (outgoing) {
if (show_wide)
gal_view_instance_set_default_view(p->view_instance, "Wide_View_Sent");
else
gal_view_instance_set_default_view(p->view_instance, "As_Sent_Folder");
- } else if (show_wide){
+ } else if (show_wide) {
gal_view_instance_set_default_view(p->view_instance, "Wide_View_Normal");
}
-
gal_view_instance_load(p->view_instance);
if (!gal_view_instance_exists(p->view_instance)) {