gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-09-29 20:44:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug 1826 by pointing the update download uri to it's real location

Browse source 
* src/nautilus-first-time-druid.c: (initiate_file_download):
	fixed bug 1826 by pointing the update download uri to it's
	real location at services.eazel.com.

	* src/nautilus-window-manage-views.c: (just_one_window),
	(nautilus_window_end_location_change_callback):
	fixed bug 4351, nautilus quits after running the first time
	druid if services are inaccessible.  Fixed by making it
	not quit if there's a single window that fails, going to
	the home directory (if it's valid) instead.

	* icons/loading.png:
	a better version of the non-anti-aliased loading icon from Susan.
This commit is contained in:
Andy Hertzfeld 2000-11-02 03:27:21 +00:00
parent 32a68c1673
commit 06f5c77133
4 changed files with 46 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -1,3 +1,19 @@
2000-11-01 Andy Hertzfeld <andy@eazel.com>
* src/nautilus-first-time-druid.c: (initiate_file_download):
fixed bug 1826 by pointing the update download uri to it's
real location at services.eazel.com.
* src/nautilus-window-manage-views.c: (just_one_window),
(nautilus_window_end_location_change_callback):
fixed bug 4351, nautilus quits after running the first time
druid if services are inaccessible. Fixed by making it
not quit if there's a single window that fails, going to
the home directory (if it's valid) instead.
* icons/loading.png:
a better version of the non-anti-aliased loading icon from Susan.
2000-11-01 Robey Pointer <robey@eazel.com>
* components/services/summary/nautilus-view/nautilus-summary-view.c

BIN
icons/loading.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 6 KiB

4
src/nautilus-first-time-druid.c
View file

@ -866,9 +866,7 @@ static void
initiate_file_download (GnomeDruid *druid)
{
NautilusReadFileHandle *file_handle;
/* FIXME bugzilla.eazel.com 1826: for testing; this needs to move to the real service */
const char *file_uri = "http://www.eazel.com/software/nautilus/updates.tgz";
const char *file_uri = "http://services.eazel.com/downloads/eazel/updates.tgz";
/* disable the next and previous buttons during the file loading process */
gtk_widget_set_sensitive (druid->next, FALSE);

38
src/nautilus-window-manage-views.c
View file

@ -1062,6 +1062,15 @@ position_and_show_window_callback (NautilusFile *file,
nautilus_file_unref (file);
}
/* utility routine that returns true if there's one or fewer windows in the window list */
static gboolean
just_one_window (void)
{
GSList *window_list;
window_list = nautilus_application_windows ();
return window_list == NULL || window_list->next == NULL;
}
static void
nautilus_window_end_location_change_callback (NautilusNavigationResult result_code,
NautilusNavigationInfo *navigation_info,
@ -1233,17 +1242,28 @@ nautilus_window_end_location_change_callback (NautilusNavigationResult result_co
dialog = nautilus_error_dialog (error_message, dialog_title, NULL);
/* If window is the sole window open, destroying it will
* kill the main event loop and the dialog will go away
* before the user has a chance to see it. Prevent this
* by registering the dialog before calling destroy.
*/
if (nautilus_main_is_event_loop_mainstay (GTK_OBJECT (window))) {
nautilus_main_event_loop_register (GTK_OBJECT (dialog));
}
/* if this is the only window, we don't want to quit, so we redirect it to home */
if (just_one_window ()) {
char *home_uri, *default_home_uri;
/* the user could have typed in a home directory that doesn't exist,
in which case going home would cause an infinite loop, so we
better test for that */
default_home_uri = gnome_vfs_get_uri_from_local_path (g_get_home_dir ());
home_uri = nautilus_preferences_get (NAUTILUS_PREFERENCES_HOME_URI, default_home_uri);
if (!nautilus_uris_match (home_uri, location)) {
nautilus_window_go_home (NAUTILUS_WINDOW (window));
} else {
/* the last fallback is to go to a known place that can't be deleted! */
nautilus_window_goto_uri (NAUTILUS_WINDOW (window), "file:///");
}
g_free (default_home_uri);
g_free (home_uri);
} else {
/* Since this is a window, destroying it will also unref it. */
gtk_object_destroy (GTK_OBJECT (window));
}
} else {
/* Clean up state of already-showing window */
nautilus_window_allow_stop (window, FALSE);