Fixes for bug #4480

2002-08-27  Jeffrey Stedfast  <fejj@ximian.com>

	Fixes for bug #4480

	* folder-browser-factory.c (control_activate): Call
	folder_browser_reload() instead of refreshing the folder
	ourselves.

	* folder-browser.c (folder_browser_reload): New convenience
	function. If the folder-browser's folder is already loaded,
	refresh the contents, otherwise if the folder has not been loaded
	- try loading the folder again (it may have failed to open last
	time for some reason?).

svn path=/trunk/; revision=17876

1 files changed, 13 insertions, 10 deletions

diff --git a/mail/folder-browser.h b/mail/folder-browser.h
index 349dbb987b..dfd6ec89dd 100644
--- a/mail/folder-browser.h
+++ b/mail/folder-browser.h
@@ -52,12 +52,13 @@ struct  _FolderBrowser {
 	int          unread_count; /* last known unread message count */
 	
 	/* async loading stuff */
-	char	    *loading_uid;/* what uid am i loading now */
-	char	    *pending_uid; /* what uid should i load next */
-	char	    *new_uid;	/* place to save the next uid during idle timeout */
-	char	    *loaded_uid; /* what we have loaded */
-	guint	     loading_id, seen_id;
-
+	char	    *loading_uid;  /* what uid am i loading now */
+	char	    *pending_uid;  /* what uid should i load next */
+	char	    *new_uid;      /* place to save the next uid during idle timeout */
+	char	    *loaded_uid;   /* what we have loaded */
+	guint	     loading_id;
+	guint        seen_id;
+	
 	/* a folder we are expunging, dont use other than to compare the pointer value */
 	CamelFolder *expunging;
 	
@@ -68,9 +69,9 @@ struct  _FolderBrowser {
 	EFilterBar  *search;
 	FilterRule  *search_full; /* if we have a full search active */
 	
-	gboolean     preview_shown;
-	gboolean     threaded;
-	gboolean     pref_master;
+	guint32 preview_shown  : 1;
+	guint32 threaded       : 1;
+	guint32 pref_master    : 1;
 	
 	FolderBrowserSelectionState selection_state;
 	GSList *sensitize_changes;
@@ -89,7 +90,7 @@ struct  _FolderBrowser {
 	struct _MailAsyncEvent *async_event;
 	
 	int get_id;		/* for getting folder op */
-
+	
 	/* info used by popup for filter/vfolder */
 	struct _popup_filter_data *popup;
 };
@@ -125,6 +126,8 @@ void       folder_browser_cut                  (GtkWidget *widget, FolderBrowser
 void       folder_browser_copy                 (GtkWidget *widget, FolderBrowser *fb);
 void       folder_browser_paste                (GtkWidget *widget, FolderBrowser *fb);
 
+void       folder_browser_reload               (FolderBrowser *fb);
+
 /* callbacks for functions on the folder-browser */
 void vfolder_subject   (GtkWidget *w, FolderBrowser *fb);
 void vfolder_sender    (GtkWidget *w, FolderBrowser *fb);