diff options
| author | Srinivasa Ragavan <sragavan@novell.com> | 2008-01-24 11:03:46 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2008-01-24 11:03:46 +0800 |
| commit | 2c0ce47a992b68ccfe06d6b3da22da3aec07e872 (patch) | |
| tree | 1fab9c37a286409e8fc2a89b2be3e2157a6eeeac /mail/em-folder-view.c | |
| parent | 06be294b09f6a3d05ad67b7d6c40f9cddd3567e7 (diff) | |
| download | gsoc2013-evolution-2c0ce47a992b68ccfe06d6b3da22da3aec07e872.tar gsoc2013-evolution-2c0ce47a992b68ccfe06d6b3da22da3aec07e872.tar.gz gsoc2013-evolution-2c0ce47a992b68ccfe06d6b3da22da3aec07e872.tar.bz2 gsoc2013-evolution-2c0ce47a992b68ccfe06d6b3da22da3aec07e872.tar.lz gsoc2013-evolution-2c0ce47a992b68ccfe06d6b3da22da3aec07e872.tar.xz gsoc2013-evolution-2c0ce47a992b68ccfe06d6b3da22da3aec07e872.tar.zst gsoc2013-evolution-2c0ce47a992b68ccfe06d6b3da22da3aec07e872.zip | |
** Fix for bug #510779
2008-01-24 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #510779
* em-mailer-prefs.c: (jh_tree_refill), (jh_add_cb), (jh_remove_cb),
(init_junk_tree), (custom_junk_button_toggled),
(em_mailer_prefs_construct): Added UI for the new junk preferences.
* em-mailer-prefs.h:
* evolution-mail.schemas.in: Add schema for junk header and address
lookup.
* mail-config.c: (gconf_jh_check_changed),
(gconf_lookup_book_changed), (gconf_jh_headers_changed),
(mail_config_init), (mail_config_reload_junk_headers),
(mail_config_get_lookup_book):
* mail-config.glade:
* mail-config.h:
* mail-session.c: (class_init), (lookup_addressbook),
(mail_session_init), (mail_session_set_junk_headers):
* mail-session.h:
2008-01-22 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #405777
* em-folder-view.c: (emfv_setup_view_instance),
(emfv_setting_notify): Don't break abstraction. Call the right derived
class.
svn path=/trunk/; revision=34873
Diffstat (limited to 'mail/em-folder-view.c')
| -rw-r--r-- | mail/em-folder-view.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 1ff388e504..e9f798ca2d 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -589,7 +589,7 @@ emfv_setup_view_instance(EMFolderView *emfv) { static GalViewCollection *collection = NULL; struct _EMFolderViewPrivate *p = emfv->priv; - gboolean outgoing, show_wide; + gboolean outgoing, show_wide=FALSE; char *id; g_return_if_fail (emfv->folder); @@ -647,7 +647,7 @@ emfv_setup_view_instance(EMFolderView *emfv) id = mail_config_folder_to_safe_url (emfv->folder); p->view_instance = gal_view_instance_new (collection, id); - show_wide = em_folder_browser_get_wide ((EMFolderBrowser *) emfv); + show_wide = emfv->list_active ? em_folder_browser_get_wide ((EMFolderBrowser *) emfv):FALSE; if (show_wide) { char *safe_id, *filename; @@ -3158,7 +3158,8 @@ emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFold if (camel_object_meta_set (emfv->folder, "evolution:show_preview", state_gconf ? "1" : "0")) camel_object_state_write (emfv->folder); - em_folder_browser_show_preview ((EMFolderBrowser *)emfv, state_gconf); + if (emfv->list_active) + em_folder_browser_show_preview ((EMFolderBrowser *)emfv, state_gconf); bonobo_ui_component_set_prop (emfv->uic, "/commands/ViewPreview", "state", state_gconf ? "1" : "0", NULL); break; } case EMFV_SHOW_DELETED: { |