Fixed bugs 1985 and 1986 (infinite loops using Mozilla). Both were

2000-08-07  Darin Adler  <darin@eazel.com>

	Fixed bugs 1985 and 1986 (infinite loops using Mozilla).
	Both were triggered by the fact that Mozilla reports that
	it is done before it reports that it is underway. Made
	the state machine less picky about this.

	* src/nautilus-window-manage-views.c:
	(nautilus_window_set_state_info): Made the "DONE" state
	also do all the "INITIAL" state work so that reporting
	you are done before you report that you started does not
	cause any trouble.

	* docs/recommended-books.html: Fixed a bad URL in here.

	* libnautilus-extensions/nautilus-list.c:
	(nautilus_list_set_single_click_mode): Fixed formatting.

	* src/nautilus-window.c: (nautilus_window_go_home):
	Use real function to convert path to URI instead of just
	prepending "file://".

ChangeLog

@@ -1,3 +1,25 @@
+2000-08-07  Darin Adler  <darin@eazel.com>
+
+	Fixed bugs 1985 and 1986 (infinite loops using Mozilla).
+	Both were triggered by the fact that Mozilla reports that
+	it is done before it reports that it is underway. Made
+	the state machine less picky about this.
+	
+	* src/nautilus-window-manage-views.c:
+	(nautilus_window_set_state_info): Made the "DONE" state
+	also do all the "INITIAL" state work so that reporting
+	you are done before you report that you started does not
+	cause any trouble.
+	
+	* docs/recommended-books.html: Fixed a bad URL in here.
+	
+	* libnautilus-extensions/nautilus-list.c:
+	(nautilus_list_set_single_click_mode): Fixed formatting.
+	
+	* src/nautilus-window.c: (nautilus_window_go_home):
+	Use real function to convert path to URI instead of just
+	prepending "file://".
+
 2000-08-07  Ramiro Estrugo  <ramiro@eazel.com>
 
 	Fix bug 2019.  Zoom control doesnt play nicely with gtk theme
@@ -26,7 +48,6 @@
 	* icons/arlo/Makefile.am
 	Add disabled zoom widgets.
 
-
 2000-08-07  John Sullivan  <sullivan@eazel.com>
 
 	Fixed bug 1979 (Crash involving bookmarks)

docs/recommended-books.html

@@ -84,7 +84,7 @@ of references and pointers and why you'd use one or the other. It covers templat
 
 <p>OK, so I'm not an expert on Gtk yet. But I'm becoming one.</p>
 
-<p><a href="http://www.amazon.com/exec/obidos/ASIN/0201924889/dianepattersonstA"><b><i>Gtk+/Gnome Application Development</i></b></a>,
+<p><a href="http://www.amazon.com/exec/obidos/ASIN/0735700788/dianepattersonstA"><b><i>Gtk+/Gnome Application Development</i></b></a>,
 Havoc Pennington. I learned a lot from this book. But it's all Gtk+ and C; things are done
 a bit differently with Gtk-- from C++. It's still worth reading.</p>
 

libnautilus-extensions/nautilus-list.c

@@ -467,8 +467,8 @@ event_state_modifies_selection (guint event_state)
 }
 
 void
-nautilus_list_set_single_click_mode (NautilusList	*list,
+nautilus_list_set_single_click_mode (NautilusList *list,
-				     gboolean		single_click_mode)
+				     gboolean single_click_mode)
 {
 	list->details->single_click_mode = single_click_mode;
 }

libnautilus-private/nautilus-list.c

@@ -467,8 +467,8 @@ event_state_modifies_selection (guint event_state)
 }
 
 void
-nautilus_list_set_single_click_mode (NautilusList	*list,
+nautilus_list_set_single_click_mode (NautilusList *list,
-				     gboolean		single_click_mode)
+				     gboolean single_click_mode)
 {
 	list->details->single_click_mode = single_click_mode;
 }

src/nautilus-navigation-window.c

@@ -968,7 +968,7 @@ nautilus_window_go_home (NautilusWindow *window)
 {
 	char *default_home_uri, *home_uri;
 
-	default_home_uri = g_strdup_printf ("file://%s", g_get_home_dir());
+	default_home_uri = nautilus_get_uri_from_local_path (g_get_home_dir ());
 	home_uri = nautilus_preferences_get (NAUTILUS_PREFERENCES_HOME_URI, default_home_uri);
 	g_free (default_home_uri);
 	

src/nautilus-object-window.c

@@ -968,7 +968,7 @@ nautilus_window_go_home (NautilusWindow *window)
 {
 	char *default_home_uri, *home_uri;
 
-	default_home_uri = g_strdup_printf ("file://%s", g_get_home_dir());
+	default_home_uri = nautilus_get_uri_from_local_path (g_get_home_dir ());
 	home_uri = nautilus_preferences_get (NAUTILUS_PREFERENCES_HOME_URI, default_home_uri);
 	g_free (default_home_uri);
 	

src/nautilus-spatial-window.c

@@ -968,7 +968,7 @@ nautilus_window_go_home (NautilusWindow *window)
 {
 	char *default_home_uri, *home_uri;
 
-	default_home_uri = g_strdup_printf ("file://%s", g_get_home_dir());
+	default_home_uri = nautilus_get_uri_from_local_path (g_get_home_dir ());
 	home_uri = nautilus_preferences_get (NAUTILUS_PREFERENCES_HOME_URI, default_home_uri);
 	g_free (default_home_uri);
 	

src/nautilus-window-manage-views.c

@@ -744,10 +744,9 @@ nautilus_window_load_content_view (NautilusWindow *window,
                                    NautilusViewIdentifier *id,
                                    NautilusViewFrame **requesting_view)
 {
+        const char *iid;
         NautilusViewFrame *content_view;
         NautilusViewFrame *new_view;
-        
-        char *iid;
 
  	/* FIXME bugzilla.eazel.com 1243: 
 	 * We should use inheritance instead of these special cases
@@ -1137,8 +1136,6 @@ nautilus_window_set_state_info (NautilusWindow *window, ...)
                 case CV_PROGRESS_INITIAL: /* We have received an "I am loading" indication from the content view */
                         x_message (("CV_PROGRESS_INITIAL"));
                         window->cv_progress_initial = TRUE;
-                        window->cv_progress_done = FALSE;
-                        window->cv_progress_error = FALSE;
                         window->changes_pending = TRUE;
                         break;
 
@@ -1149,6 +1146,10 @@ nautilus_window_set_state_info (NautilusWindow *window, ...)
 
                 case CV_PROGRESS_DONE: /* The content view is done loading */
                         x_message (("CV_PROGRESS_DONE"));
+                        if (!window->cv_progress_initial) {
+                                window->cv_progress_initial = TRUE;
+                                window->changes_pending = TRUE;
+                        }
                         window->cv_progress_done = TRUE;
                         break;
 

src/nautilus-window.c

@@ -968,7 +968,7 @@ nautilus_window_go_home (NautilusWindow *window)
 {
 	char *default_home_uri, *home_uri;
 
-	default_home_uri = g_strdup_printf ("file://%s", g_get_home_dir());
+	default_home_uri = nautilus_get_uri_from_local_path (g_get_home_dir ());
 	home_uri = nautilus_preferences_get (NAUTILUS_PREFERENCES_HOME_URI, default_home_uri);
 	g_free (default_home_uri);