Only get folder info if this is a folder we're displaying.

	* e-summary-mail.c (update_folder_cb): Only get folder info if
	this is a folder we're displaying.

svn path=/trunk/; revision=17746

2 files changed, 19 insertions, 29 deletions

diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index a44f1ec44b..512f155827 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,8 +1,14 @@
+2002-08-07  Dan Winship  <danw@ximian.com>
+
+	* e-summary-mail.c (update_folder_cb): Only get folder info if
+	this is a folder we're displaying.
+
 2002-08-07  Anna Marie Dirks  <anna@ximian.com>
 
-	* e-summary-shown.c (e_summary_shown_init): Added an alignment to make
-	button position be the same as the other buttons of this type in evo.
-	(add_clicked): make this buttons sensitive when there is no proper 
+	* e-summary-shown.c (e_summary_shown_init): Added an alignment to
+	make button position be the same as the other buttons of this type
+	in evo.
+	(add_clicked): make this buttons sensitive when there is no proper
 	selection
 	(remove_clicked): same thing with the button
 
diff --git a/my-evolution/e-summary-mail.c b/my-evolution/e-summary-mail.c
index aa9f81e57e..5ec4e4b8be 100644
--- a/my-evolution/e-summary-mail.c
+++ b/my-evolution/e-summary-mail.c
@@ -259,36 +259,20 @@ update_folder_cb (EvolutionStorageListener *listener,
 		  int unread_count,
 		  StorageInfo *si)
 {
-	char *evolution_dir;
-	char *proto;
-	char *uri;
-
-	if (strcmp (si->name, _("VFolders")) == 0) {
-		evolution_dir = gnome_util_prepend_user_home ("evolution/vfolder");
-		uri = g_strdup_printf ("vfolder:%s#%s", evolution_dir,
-				       path + 1);
-		g_free (evolution_dir);
-	} else if (strcmp (si->name, _("Local Folders")) == 0) {
-		evolution_dir = gnome_util_prepend_user_home ("evolution/local");
-		proto = g_strconcat ("file://", evolution_dir, NULL);
-		g_free (evolution_dir);
-		uri = e_path_to_physical (proto, path);
-	} else {
-		GNOME_Evolution_Folder *folder;
-		CORBA_Environment ev;
+	ESummaryMailFolder *mail_folder;
+	GList *p;
 
-		CORBA_exception_init (&ev);
-		folder = GNOME_Evolution_Storage_getFolderAtPath (si->storage, path, &ev);
+	mail_folder = g_hash_table_lookup (folder_store->folders, path);
+	if (mail_folder == NULL) {
+		return;
+	}
 
-		if (BONOBO_EX (&ev))
+	for (p = folder_store->shown; p; p = p->next) {
+		if (p->data == mail_folder) {
+			g_idle_add (e_summary_mail_idle_get_info, mail_folder->path);
 			return;
-
-		uri = g_strdup (folder->physicalUri);
-		CORBA_free (folder);
-		CORBA_exception_free (&ev);
+		}
 	}
-
-	g_idle_add (e_summary_mail_idle_get_info, uri);
 }
 
 static void