Commit 6263d07e authored by Darin Adler's avatar Darin Adler
Browse files

Fix a divide-by-zero problem. (play_status_display),

	* components/music/nautilus-music-view.c: (fetch_play_time):
	Fix a divide-by-zero problem.
	(play_status_display), (slider_moved_callback),
	(slider_release_callback): Added FIXMEs at other possible
	divide-by-zero problems where I am less sure what the solution is.
	* libnautilus-extensions/nautilus-directory-async.c:
	(allow_metafile), (nautilus_directory_request_read_metafile),
	(nautilus_directory_request_write_metafile): Disable metafile
	reading and writing for "pipe:" URIs for now. This turns off the
	creation of alternate metafiles too. Hope this turns out to be
	good.
	(start_monitoring_file_list): Fixed a wrong assert.
	* libnautilus-extensions/nautilus-gnome-extensions.c:
	(nautilus_gnome_canvas_fill_with_gradient): Fixed a divide by zero
	bug in here.
	* src/file-manager/fm-icon-view.c: (fm_icon_view_destroy),
	(directory_view_font_family_changed_callback),
	(fm_icon_view_initialize): Changed spelling of "familiy" to the more
	standard "family".
	* src/nautilus-application.c: (nautilus_application_startup): Put
	in some more verbose detailed error messages; we'll have to do more
	iteration on these.
parent f29a0206
2000-07-05 Darin Adler <darin@eazel.com>
* components/music/nautilus-music-view.c: (fetch_play_time):
Fix a divide-by-zero problem.
(play_status_display), (slider_moved_callback),
(slider_release_callback): Added FIXMEs at other possible
divide-by-zero problems where I am less sure what the solution is.
* libnautilus-extensions/nautilus-directory-async.c:
(allow_metafile), (nautilus_directory_request_read_metafile),
(nautilus_directory_request_write_metafile): Disable metafile
reading and writing for "pipe:" URIs for now. This turns off the
creation of alternate metafiles too. Hope this turns out to be
good.
(start_monitoring_file_list): Fixed a wrong assert.
* libnautilus-extensions/nautilus-gnome-extensions.c:
(nautilus_gnome_canvas_fill_with_gradient): Fixed a divide by zero
bug in here.
* src/file-manager/fm-icon-view.c: (fm_icon_view_destroy),
(directory_view_font_family_changed_callback),
(fm_icon_view_initialize): Changed spelling of "familiy" to the more
standard "family".
* src/nautilus-application.c: (nautilus_application_startup): Put
in some more verbose detailed error messages; we'll have to do more
iteration on these.
2000-07-05 Andy Hertzfeld <andy@eazel.com>
* libnautilus-extensions/nautilus-icon-factory.c,h:
......@@ -23,7 +48,6 @@
* libnautilus-extensions/nautilus-global-preferences.c:
(global_preferences_get_sidebar_panel_view_identifiers):
Remove an obsolete FIXME.
2000-07-05 Ramiro Estrugo <ramiro@eazel.com>
......@@ -83,10 +107,10 @@
New function to update the icon container's zoom level specific
fonts.
(directory_view_font_familiy_changed_callback),
(directory_view_font_family_changed_callback),
(fm_icon_view_initialize),
(fm_icon_view_destroy),
Keep track of font familiy preference changes and update the icon
Keep track of font family preference changes and update the icon
container fonts as needed.
(create_icon_container):
......@@ -196,9 +220,8 @@
2000-07-05 J Shane Culpepper <pepper@eazel.com>
*
components/services/startup/nautilus-view/nautilus-service-startup-
view.c: (generate_startup_form):
* components/services/startup/nautilus-view/nautilus-service-startup-view.c:
(generate_startup_form):
More changes to the progress meter.
2000-07-05 Pavel Cisler <pavel@eazel.com>
......@@ -242,11 +265,9 @@
2000-07-04 J Shane Culpepper <pepper@eazel.com>
*
components/services/startup/nautilus-view/nautilus-service-startup-
view.c: (generate_startup_form), (show_feedback),
* components/services/startup/nautilus-view/nautilus-service-startup-view.c:
(generate_startup_form), (show_feedback),
(generate_form_title), (service_load_location_callback):
More work on the progress meter for bootstraping and various ui
enhancements.
......@@ -310,8 +331,8 @@
2000-07-04 J Shane Culpepper <pepper@eazel.com>
* components/services/startup/nautilus-view/icons/Makefile.am:
components/services/startup/nautilus-view/nautilus-service-startup-
view.c: (generate_startup_form), (progress_timeout_cb),
components/services/startup/nautilus-view/nautilus-service-startup-view.c:
(generate_startup_form), (progress_timeout_cb),
(go_to_uri), (generate_form_title):
Added the watch icon and a fake progress meter. Still need to get
......@@ -392,7 +413,7 @@
they are only implemented for anti-aliased mode.
* icons/arlo/arlo.xml:
made the sidebar use a 3-point gradient
2000-07-03 Gene Z. Ragan <gzr@eazel.com>
* libnautilus-extensions/bonobo-stream-vfs.c:
......
......@@ -502,7 +502,8 @@ fetch_play_time (GnomeVFSFileInfo *file_info, int bitrate)
return 0;
}
return file_info->size / (125 * bitrate);
/* Avoid divide by zero. */
return bitrate == 0 ? 0 : file_info->size / (125 * bitrate);
}
/* format_play_time takes the pathname to a file and returns the play time formated as mm:ss */
......@@ -769,13 +770,16 @@ play_status_display (NautilusMusicView *music_view)
if (!music_view->details->slider_dragging) {
frameNo = get_current_frame();
samps_per_frame = (music_view->details->current_samprate >= 32000) ? 1152 : 576;
/* FIXME: Divide by zero possible here? */
seconds = frameNo * samps_per_frame / music_view->details->current_samprate;
minutes = seconds / 60;
seconds = seconds % 60;
sprintf(play_time_str, "%02d:%02d", minutes, seconds);
/* FIXME: Divide by zero possible here? */
avgframesize = (gfloat)samps_per_frame * music_view->details->current_bitrate * 125 / music_view->details->current_samprate;
/* FIXME: Divide by zero possible here? */
percentage = (gfloat) frameNo * avgframesize / music_view->details->current_file_size * 100;
gtk_adjustment_set_value(GTK_ADJUSTMENT(music_view->details->playtime_adjustment), percentage);
gtk_range_set_adjustment(GTK_RANGE(music_view->details->playtime_bar), GTK_ADJUSTMENT(music_view->details->playtime_adjustment));
......@@ -884,28 +888,32 @@ go_to_previous_track (NautilusMusicView *music_view) {
/* callback for buttons */
static void play_button_callback (GtkWidget * widget, NautilusMusicView *music_view)
static void
play_button_callback (GtkWidget * widget, NautilusMusicView *music_view)
{
play_current_file(music_view, FALSE);
}
static void stop_button_callback (GtkWidget * widget, NautilusMusicView *music_view)
static void
stop_button_callback (GtkWidget * widget, NautilusMusicView *music_view)
{
stop_playing_file();
}
static void pause_button_callback (GtkWidget * widget, NautilusMusicView *music_view)
static void
pause_button_callback (GtkWidget * widget, NautilusMusicView *music_view)
{
pause_playing_file();
}
static void prev_button_callback (GtkWidget * widget, NautilusMusicView *music_view)
static void
prev_button_callback (GtkWidget * widget, NautilusMusicView *music_view)
{
go_to_previous_track(music_view);
}
static void next_button_callback (GtkWidget * widget, NautilusMusicView *music_view)
static void
next_button_callback (GtkWidget * widget, NautilusMusicView *music_view)
{
go_to_next_track(music_view);
}
......@@ -916,14 +924,16 @@ static void next_button_callback (GtkWidget * widget, NautilusMusicView *music_v
/* handle slider button press */
static void slider_press_callback(GtkWidget *bar, GdkEvent *event, NautilusMusicView *music_view)
static void
slider_press_callback(GtkWidget *bar, GdkEvent *event, NautilusMusicView *music_view)
{
music_view->details->slider_dragging = TRUE;
}
/* handle mouse motion by updating the time, but not actually seeking until the user lets go */
static void slider_moved_callback(GtkWidget *bar, GdkEvent *event, NautilusMusicView *music_view)
static void
slider_moved_callback(GtkWidget *bar, GdkEvent *event, NautilusMusicView *music_view)
{
char temp_str[256];
int nframe, seconds, minutes;
......@@ -934,8 +944,11 @@ static void slider_moved_callback(GtkWidget *bar, GdkEvent *event, NautilusMusic
if (music_view->details->slider_dragging) {
adjustment = gtk_range_get_adjustment(GTK_RANGE(bar));
samps_per_frame = (music_view->details->current_samprate >= 32000) ? 1152 : 576;
/* FIXME: Divide by zero possible here? */
avgframesize = (gfloat)samps_per_frame * music_view->details->current_bitrate * 125 / music_view->details->current_samprate;
/* FIXME: Divide by zero possible here? */
nframe = adjustment->value / (avgframesize / music_view->details->current_file_size * 100.0);
/* FIXME: Divide by zero possible here? */
seconds = nframe * samps_per_frame / music_view->details->current_samprate;
minutes = seconds / 60;
seconds = seconds % 60;
......@@ -945,7 +958,8 @@ static void slider_moved_callback(GtkWidget *bar, GdkEvent *event, NautilusMusic
}
/* callback for slider button release - seek to desired location */
static void slider_release_callback(GtkWidget *bar, GdkEvent *event, NautilusMusicView *music_view)
static void
slider_release_callback (GtkWidget *bar, GdkEvent *event, NautilusMusicView *music_view)
{
int play_status, nframe;
GtkAdjustment *adjustment;
......@@ -956,12 +970,14 @@ static void slider_release_callback(GtkWidget *bar, GdkEvent *event, NautilusMus
if (music_view->details->slider_dragging) {
adjustment = gtk_range_get_adjustment(GTK_RANGE(bar));
samps_per_frame = (music_view->details->current_samprate >= 32000) ? 1152 : 576;
/* FIXME: Divide by zero possible here? */
avgframesize = (gfloat)samps_per_frame * music_view->details->current_bitrate * 125 / music_view->details->current_samprate;
/* FIXME: Divide by zero possible here? */
nframe = adjustment->value / (avgframesize / music_view->details->current_file_size * 100.0);
if ((play_status == STATUS_PLAY) || (play_status == STATUS_PAUSE)) {
pause_playing_file();
set_current_frame(nframe);
play_current_file(music_view, FALSE);
pause_playing_file ();
set_current_frame (nframe);
play_current_file (music_view, FALSE);
}
}
......@@ -970,7 +986,8 @@ static void slider_release_callback(GtkWidget *bar, GdkEvent *event, NautilusMus
/* create a button with an xpm label */
static GtkWidget *xpm_label_box (NautilusMusicView *music_view, gchar * xpm_data[])
static GtkWidget *
xpm_label_box (NautilusMusicView *music_view, gchar * xpm_data[])
{
GtkWidget *box;
GtkStyle *style;
......@@ -994,7 +1011,10 @@ static GtkWidget *xpm_label_box (NautilusMusicView *music_view, gchar * xpm_data
/* creates a button with 2 internal pixwidgets, with only one visible at a time */
static GtkWidget *xpm_dual_label_box (NautilusMusicView *music_view, char * xpm_data[], gchar *alt_xpm_data[], GtkWidget **main_pixwidget, GtkWidget **alt_pixwidget )
static GtkWidget *
xpm_dual_label_box (NautilusMusicView *music_view, char * xpm_data[],
gchar *alt_xpm_data[],
GtkWidget **main_pixwidget, GtkWidget **alt_pixwidget )
{
GtkWidget *box;
GtkStyle *style;
......@@ -1026,8 +1046,9 @@ static GtkWidget *xpm_dual_label_box (NautilusMusicView *music_view, char * xpm_
/* add the play controls */
static void add_play_controls (NautilusMusicView *music_view)
{
static void
add_play_controls (NautilusMusicView *music_view)
{
GtkWidget *table;
GtkWidget *box;
GtkWidget *vbox, *hbox2;
......
......@@ -281,15 +281,45 @@ metafile_read_start (NautilusDirectory *directory)
g_free (text_uri);
}
void
nautilus_directory_request_read_metafile (NautilusDirectory *directory)
static gboolean
allow_metafile (NautilusDirectory *directory)
{
/* Note that this inhibits both reading and writing metadata
* completely. In the future we may want to inhibit writing to
* the real directory while allowing parallel-directory
* metadata.
*/
g_assert (NAUTILUS_IS_DIRECTORY (directory));
/* Don't read metafiles for search directories since they
* don't exist yet.
*/
if (nautilus_directory_is_search_directory (directory)) {
return FALSE;
}
/* For now, hard-code this one scheme. Perhaps we should
* hardcode the schemes that are good for metadata instead of
* the schemes that are bad for it.
*/
/* FIXME: We need to handle this in a better way. Perhaps a
* better way can wait until we have support for metadata
* access inside gnome-vfs.
*/
if (nautilus_strcasecmp (gnome_vfs_uri_get_scheme (directory->details->uri), "pipe") == 0) {
return FALSE;
}
return TRUE;
}
void
nautilus_directory_request_read_metafile (NautilusDirectory *directory)
{
g_assert (NAUTILUS_IS_DIRECTORY (directory));
if (!allow_metafile (directory)) {
return;
}
......@@ -304,7 +334,6 @@ nautilus_directory_request_read_metafile (NautilusDirectory *directory)
metafile_read_start (directory);
}
static void
metafile_write_done (NautilusDirectory *directory)
{
......@@ -453,6 +482,10 @@ nautilus_directory_request_write_metafile (NautilusDirectory *directory)
{
g_assert (NAUTILUS_IS_DIRECTORY (directory));
if (!allow_metafile (directory)) {
return;
}
/* Set up an idle task that will write the metafile. */
if (directory->details->write_metafile_idle_id == 0) {
nautilus_directory_ref (directory);
......@@ -1408,7 +1441,7 @@ start_monitoring_file_list (NautilusDirectory *directory)
mark_all_files_unconfirmed (directory);
g_assert (directory->details->uri->text != NULL);
g_assert (directory->details->uri_text != NULL);
directory->details->directory_load_list_last_handled
= GNOME_VFS_DIRECTORY_LIST_POSITION_NONE;
......
......@@ -203,10 +203,10 @@ nautilus_gnome_canvas_item_get_world_bounds (GnomeCanvasItem *item,
void
nautilus_gnome_canvas_fill_with_gradient (GnomeCanvasBuf *buffer,
int entire_width, int entire_height,
guint32 start_rgb,
guint32 end_rgb,
gboolean horizontal)
int entire_width, int entire_height,
guint32 start_rgb,
guint32 end_rgb,
gboolean horizontal)
{
GdkRectangle band_box;
guchar *bufptr;
......@@ -221,6 +221,10 @@ nautilus_gnome_canvas_fill_with_gradient (GnomeCanvasBuf *buffer,
g_return_if_fail (horizontal == FALSE || horizontal == TRUE);
if (entire_width == 0 || entire_height == 0) {
return;
}
/* Set up the band box so we can access it the same way for horizontal or vertical. */
band_box.x = buffer->rect.x0;
band_box.y = buffer->rect.y0;
......@@ -241,14 +245,16 @@ nautilus_gnome_canvas_fill_with_gradient (GnomeCanvasBuf *buffer,
for (band = 0; band < num_bands; band++) {
/* Compute a new color value for each band. */
if (horizontal)
if (horizontal) {
fraction = (double) *position / (double) entire_width;
else
} else {
fraction = (double) *position / (double) entire_height;
if (fraction > 1.0)
}
if (fraction > 1.0) {
fraction = 1.0;
else if (fraction < 0.0)
} else if (fraction < 0.0) {
fraction = 0.0;
}
band_rgb = nautilus_interpolate_color (fraction, start_rgb, end_rgb);
red_value = band_rgb >> 16;
......
......@@ -281,15 +281,45 @@ metafile_read_start (NautilusDirectory *directory)
g_free (text_uri);
}
void
nautilus_directory_request_read_metafile (NautilusDirectory *directory)
static gboolean
allow_metafile (NautilusDirectory *directory)
{
/* Note that this inhibits both reading and writing metadata
* completely. In the future we may want to inhibit writing to
* the real directory while allowing parallel-directory
* metadata.
*/
g_assert (NAUTILUS_IS_DIRECTORY (directory));
/* Don't read metafiles for search directories since they
* don't exist yet.
*/
if (nautilus_directory_is_search_directory (directory)) {
return FALSE;
}
/* For now, hard-code this one scheme. Perhaps we should
* hardcode the schemes that are good for metadata instead of
* the schemes that are bad for it.
*/
/* FIXME: We need to handle this in a better way. Perhaps a
* better way can wait until we have support for metadata
* access inside gnome-vfs.
*/
if (nautilus_strcasecmp (gnome_vfs_uri_get_scheme (directory->details->uri), "pipe") == 0) {
return FALSE;
}
return TRUE;
}
void
nautilus_directory_request_read_metafile (NautilusDirectory *directory)
{
g_assert (NAUTILUS_IS_DIRECTORY (directory));
if (!allow_metafile (directory)) {
return;
}
......@@ -304,7 +334,6 @@ nautilus_directory_request_read_metafile (NautilusDirectory *directory)
metafile_read_start (directory);
}
static void
metafile_write_done (NautilusDirectory *directory)
{
......@@ -453,6 +482,10 @@ nautilus_directory_request_write_metafile (NautilusDirectory *directory)
{
g_assert (NAUTILUS_IS_DIRECTORY (directory));
if (!allow_metafile (directory)) {
return;
}
/* Set up an idle task that will write the metafile. */
if (directory->details->write_metafile_idle_id == 0) {
nautilus_directory_ref (directory);
......@@ -1408,7 +1441,7 @@ start_monitoring_file_list (NautilusDirectory *directory)
mark_all_files_unconfirmed (directory);
g_assert (directory->details->uri->text != NULL);
g_assert (directory->details->uri_text != NULL);
directory->details->directory_load_list_last_handled
= GNOME_VFS_DIRECTORY_LIST_POSITION_NONE;
......
......@@ -203,10 +203,10 @@ nautilus_gnome_canvas_item_get_world_bounds (GnomeCanvasItem *item,
void
nautilus_gnome_canvas_fill_with_gradient (GnomeCanvasBuf *buffer,
int entire_width, int entire_height,
guint32 start_rgb,
guint32 end_rgb,
gboolean horizontal)
int entire_width, int entire_height,
guint32 start_rgb,
guint32 end_rgb,
gboolean horizontal)
{
GdkRectangle band_box;
guchar *bufptr;
......@@ -221,6 +221,10 @@ nautilus_gnome_canvas_fill_with_gradient (GnomeCanvasBuf *buffer,
g_return_if_fail (horizontal == FALSE || horizontal == TRUE);
if (entire_width == 0 || entire_height == 0) {
return;
}
/* Set up the band box so we can access it the same way for horizontal or vertical. */
band_box.x = buffer->rect.x0;
band_box.y = buffer->rect.y0;
......@@ -241,14 +245,16 @@ nautilus_gnome_canvas_fill_with_gradient (GnomeCanvasBuf *buffer,
for (band = 0; band < num_bands; band++) {
/* Compute a new color value for each band. */
if (horizontal)
if (horizontal) {
fraction = (double) *position / (double) entire_width;
else
} else {
fraction = (double) *position / (double) entire_height;
if (fraction > 1.0)
}
if (fraction > 1.0) {
fraction = 1.0;
else if (fraction < 0.0)
} else if (fraction < 0.0) {
fraction = 0.0;
}
band_rgb = nautilus_interpolate_color (fraction, start_rgb, end_rgb);
red_value = band_rgb >> 16;
......
......@@ -76,23 +76,22 @@
#define MENU_PATH_RENAME "/File/Rename"
/* forward declarations */
static void create_icon_container (FMIconView *icon_view);
static void fm_icon_view_initialize (FMIconView *icon_view);
static void fm_icon_view_initialize_class (FMIconViewClass *klass);
static void fm_icon_view_set_zoom_level (FMIconView *view,
NautilusZoomLevel new_level,
gboolean always_set_level);
static void fm_icon_view_update_icon_container_fonts (FMIconView *icon_view);
static void fm_icon_view_update_click_mode (FMIconView *icon_view);
static void fm_icon_view_update_anti_aliased_mode (FMIconView *icon_view);
static void create_icon_container (FMIconView *icon_view);
static void fm_icon_view_initialize (FMIconView *icon_view);
static void fm_icon_view_initialize_class (FMIconViewClass *klass);
static void fm_icon_view_set_zoom_level (FMIconView *view,
NautilusZoomLevel new_level,
gboolean always_set_level);
static void fm_icon_view_update_icon_container_fonts (FMIconView *icon_view);
static void fm_icon_view_update_click_mode (FMIconView *icon_view);
static void fm_icon_view_update_anti_aliased_mode (FMIconView *icon_view);
/* Preferences changed callbacks */
static void text_attribute_names_changed_callback (gpointer user_data);
static void directory_view_font_familiy_changed_callback (gpointer user_data);
static void anti_aliased_mode_changed_callback (gpointer user_data);
static void click_policy_changed_callback (gpointer user_data);
static void text_attribute_names_changed_callback (gpointer user_data);
static void directory_view_font_family_changed_callback (gpointer user_data);
static void anti_aliased_mode_changed_callback (gpointer user_data);
static void click_policy_changed_callback (gpointer user_data);
NAUTILUS_DEFINE_CLASS_BOILERPLATE (FMIconView, fm_icon_view, FM_TYPE_DIRECTORY_VIEW);
......@@ -178,7 +177,7 @@ fm_icon_view_destroy (GtkObject *object)
icon_view);
nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_DIRECTORY_VIEW_FONT_FAMILY,
directory_view_font_familiy_changed_callback,
directory_view_font_family_changed_callback,
icon_view);
nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_CLICK_POLICY,
......@@ -1532,7 +1531,7 @@ text_attribute_names_changed_callback (gpointer user_data)
}
static void
directory_view_font_familiy_changed_callback (gpointer user_data)
directory_view_font_family_changed_callback (gpointer user_data)
{
g_assert (user_data != NULL);
g_assert (FM_IS_ICON_VIEW (user_data));
......@@ -1609,9 +1608,9 @@ fm_icon_view_initialize (FMIconView *icon_view)
text_attribute_names_changed_callback,
icon_view);
/* Keep track of changes in the font familiy */
/* Keep track of changes in the font family */
nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_DIRECTORY_VIEW_FONT_FAMILY,
directory_view_font_familiy_changed_callback,
directory_view_font_family_changed_callback,
icon_view);
/* Keep track of changes in clicking policy */
......
......@@ -304,9 +304,9 @@ nautilus_application_startup (NautilusApplication *application,
case OAF_REG_NOT_LISTED:
/* Can't register myself due to trouble locating the
* nautilus.oafinfo file. This has happened when you
* launch Nautilus with a PATH that doesn't include
* directory containg the oafd executable and oafd is
* not already running. It could also happen if the
* launch Nautilus with an LD_LIBRARY_PATH that
* doesn't include the directory containg the oaf
* library. It could also happen if the
* nautilus.oafinfo file was not present for some
* reason. Sometimes killing oafd and gconfd fixes
* this problem but we don't exactly understand why,
......@@ -315,23 +315,26 @@ nautilus_application_startup (NautilusApplication *application,
message = _("Nautilus can't be used now. "
"Rebooting the computer or installing "
"Nautilus again may fix the problem.");
/* FIXME: Add technical details here. They should come
* in the form of more detailed message that replaces
* the novice message if you press a button. The more
* detailed message should be complete and stand alone
* since it replaces the novice message.
*/
/* FIXME: The guesses and stuff here are lame. */
detailed_message = _("Nautilus can't be used now. "
"Rebooting the computer or installing "
"Nautilus again may fix the problem. "
"Check out all of this excellent detail!");
"OAF couldn't locate the nautilus.oafinfo file. "
"One cause of this seems to be an LD_LIBRARY_PATH "
"that does not include the oaf library's directory. "
"Another possible cause would be bad install "
"with a missing nautilus.oafinfo file. "
"Sometimes killing oafd and gconfd fixes "
"the problem, but we don't know why. "
"We need a much less confusing message here for Nautilus 1.0.");
break;
case OAF_REG_ALREADY_ACTIVE:
/* Another copy of Nautilus is already
* running. Eventually we want to "glom on" to this
* old copy.
*/
message = _("Nautilus is already running. Soon, instead of presenting this dialog, the already-running copy of Nautilus will respond by opening windows.");
/* Another copy of Nautilus is already running. */
/* FIXME: We want to "glom on" to this old copy. */
message = _("Nautilus is already running. "
"Soon, instead of presenting this dialog, "
"the already-running copy of Nautilus will "
"respond by opening windows.");
detailed_message = NULL;
break;
default:
......@@ -343,7 +346,8 @@ nautilus_application_startup (NautilusApplication *application,
* program.
*/
message = _("Nautilus can't be used now, due to an unexpected error.");
detailed_message = NULL;
detailed_message = _("Nautilus can't be used now, due to an unexpected error "
"from OAF when attempting to register the file manager view server.");
break;
}
if (message != NULL) {
......