callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a bug in the storage icon code

Browse Source 
svn path=/trunk/; revision=15974
This commit is contained in:
Dan Winship
2002-03-07 22:11:26 +00:00
parent 7ad4ab01e6
commit 46af4ae9b3
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shell/ChangeLog
View File

@ -55,8 +55,7 @@
* e-storage-set-view.c (set_e_shortcut_selection): Remove * e-storage-set-view.c (set_e_shortcut_selection): Remove
special-case for storages. special-case for storages.
(etree_icon_at): Remove special case for figuring out storage (etree_icon_at): Remove special case for figuring out storage
icons (but leave the code that makes the icon disappear once the icons (but leave the code for storages without icons).
storage is opened).
(etree_value_at): Remove special case for storage names. (But (etree_value_at): Remove special case for storage names. (But
still make storages always bold.) Remove unused special-case code still make storages always bold.) Remove unused special-case code
for Summary. for Summary.

13
shell/e-storage-set-view.c
View File

@ -1363,11 +1363,18 @@ etree_icon_at (ETreeModel *etree,
path = (char*) e_tree_memory_node_get_data (E_TREE_MEMORY(etree), tree_path); path = (char*) e_tree_memory_node_get_data (E_TREE_MEMORY(etree), tree_path);
/* No icon for a storage with children */ folder = e_storage_set_get_folder (storage_set, path);
if (folder == NULL)
return NULL;
/* No icon for a storage with children (or with no real root folder) */
if (path_is_storage (etree, tree_path)) { if (path_is_storage (etree, tree_path)) {
EStorage *storage; EStorage *storage;
GList *subfolder_paths; GList *subfolder_paths;
if (! strcmp (e_folder_get_type_string (folder), "noselect"))
return NULL;
storage = e_storage_set_get_storage (storage_set, path + 1); storage = e_storage_set_get_storage (storage_set, path + 1);
subfolder_paths = e_storage_get_subfolder_paths (storage, "/"); subfolder_paths = e_storage_get_subfolder_paths (storage, "/");
if (subfolder_paths != NULL) { if (subfolder_paths != NULL) {
@ -1376,10 +1383,6 @@ etree_icon_at (ETreeModel *etree,
} }
} }
folder = e_storage_set_get_folder (storage_set, path);
if (folder == NULL)
return NULL;
return get_pixbuf_for_folder (storage_set_view, folder); return get_pixbuf_for_folder (storage_set_view, folder);
} }