aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2002-05-29 05:56:11 +0800
committerChris Toshok <toshok@src.gnome.org>2002-05-29 05:56:11 +0800
commit0c4f8063584fb5587df2d58411fbbdc581835ac7 (patch)
treeec78fbf524f90ea674ef50f3ea72548a32498520
parentab3174aaefd433eba42140d13e70bbecac612578 (diff)
downloadgsoc2013-evolution-0c4f8063584fb5587df2d58411fbbdc581835ac7.tar
gsoc2013-evolution-0c4f8063584fb5587df2d58411fbbdc581835ac7.tar.gz
gsoc2013-evolution-0c4f8063584fb5587df2d58411fbbdc581835ac7.tar.bz2
gsoc2013-evolution-0c4f8063584fb5587df2d58411fbbdc581835ac7.tar.lz
gsoc2013-evolution-0c4f8063584fb5587df2d58411fbbdc581835ac7.tar.xz
gsoc2013-evolution-0c4f8063584fb5587df2d58411fbbdc581835ac7.tar.zst
gsoc2013-evolution-0c4f8063584fb5587df2d58411fbbdc581835ac7.zip
skip folders that aren't valid uri's. (e_folder_list_get_items): didn't
2002-05-28 Chris Toshok <toshok@ximian.com> * e-folder-list.c (e_folder_list_set_items): skip folders that aren't valid uri's. (e_folder_list_get_items): didn't update this to track the change in model columns. bad toshok. svn path=/trunk/; revision=17028
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/e-folder-list.c10
2 files changed, 13 insertions, 4 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 86fea25bda..2df5e5b634 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-28 Chris Toshok <toshok@ximian.com>
+
+ * e-folder-list.c (e_folder_list_set_items): skip folders that
+ aren't valid uri's.
+ (e_folder_list_get_items): didn't update this to track the change
+ in model columns. bad toshok.
+
2002-05-24 Chris Toshok <toshok@ximian.com>
[ fixes 90% of #25047 ]
diff --git a/shell/e-folder-list.c b/shell/e-folder-list.c
index fcf29bc140..985eed4f4c 100644
--- a/shell/e-folder-list.c
+++ b/shell/e-folder-list.c
@@ -572,9 +572,11 @@ e_folder_list_set_items (EFolderList *efl, EFolderListItem *items)
GdkPixbuf *pixbuf;
char *display_string;
+ folder = get_folder_for_uri (efl, items[i].uri);
+ if (!folder)
+ continue;
display_string = create_display_string (efl, items[i].uri, items[i].display_name);
- folder = get_folder_for_uri (efl, items[i].uri);
pixbuf = evolution_shell_client_get_pixbuf_for_type (efl->priv->client, folder->type, TRUE);
e_table_memory_store_insert (efl->priv->model, -1, NULL,
@@ -598,9 +600,9 @@ e_folder_list_get_items (EFolderList *efl)
items = g_new (EFolderListItem, count + 1);
for (i = 0; i < count; i++) {
- items[i].display_name = g_strdup (e_table_model_value_at (E_TABLE_MODEL (efl->priv->model), 0, i));
- items[i].uri = g_strdup (e_table_model_value_at (E_TABLE_MODEL (efl->priv->model), 1, i));
- items[i].physical_uri = g_strdup (e_table_model_value_at (E_TABLE_MODEL (efl->priv->model), 2, i));
+ items[i].display_name = g_strdup (e_table_model_value_at (E_TABLE_MODEL (efl->priv->model), 2, i));
+ items[i].uri = g_strdup (e_table_model_value_at (E_TABLE_MODEL (efl->priv->model), 3, i));
+ items[i].physical_uri = g_strdup (e_table_model_value_at (E_TABLE_MODEL (efl->priv->model), 4, i));
}
items[i].uri = NULL;
items[i].physical_uri = NULL;