gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-08-24 18:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove title from alerts. (#323134)

Browse source 
2005-12-09  Alexander Larsson  <alexl@redhat.com>

	* libnautilus-private/nautilus-emblem-utils.c:
	* libnautilus-private/nautilus-file-operations.c:
	* libnautilus-private/nautilus-program-choosing.c:
	* src/file-manager/fm-directory-view.c:
	* src/file-manager/fm-error-reporting.c:
	* src/file-manager/fm-properties-window.c:
	* src/file-manager/fm-tree-view.c:
	* src/nautilus-application.c:
	* src/nautilus-connect-server-dialog-main.c:
	* src/nautilus-connect-server-dialog.c:
	* src/nautilus-emblem-sidebar.c:
	* src/nautilus-information-panel.c:
	* src/nautilus-navigation-window-menus.c:
	* src/nautilus-property-browser.c:
	* src/nautilus-window-bookmarks.c:
	* src/nautilus-window-manage-views.c:
	Remove title from alerts. (#323134)

	Patch from jaap@haitsma.org

	* libnautilus-private/nautilus-file-queue.c (nautilus_file_queue_enqueue):
	Fix warning from ignoring g_list_append return value
This commit is contained in:
Alexander Larsson 2005-12-09 14:35:33 +00:00 committed by Alexander Larsson
parent a01c847e4d
commit 79a384cbbe
18 changed files with 79 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ChangeLog
View file

@ -1,3 +1,28 @@
2005-12-09 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-emblem-utils.c:
* libnautilus-private/nautilus-file-operations.c:
* libnautilus-private/nautilus-program-choosing.c:
* src/file-manager/fm-directory-view.c:
* src/file-manager/fm-error-reporting.c:
* src/file-manager/fm-properties-window.c:
* src/file-manager/fm-tree-view.c:
* src/nautilus-application.c:
* src/nautilus-connect-server-dialog-main.c:
* src/nautilus-connect-server-dialog.c:
* src/nautilus-emblem-sidebar.c:
* src/nautilus-information-panel.c:
* src/nautilus-navigation-window-menus.c:
* src/nautilus-property-browser.c:
* src/nautilus-window-bookmarks.c:
* src/nautilus-window-manage-views.c:
Remove title from alerts. (#323134)
Patch from jaap@haitsma.org
* libnautilus-private/nautilus-file-queue.c (nautilus_file_queue_enqueue):
Fix warning from ignoring g_list_append return value
2005-12-09 Alexander Larsson <alexl@redhat.com>
* src/nautilus-navigation-window.[ch]:

11
libnautilus-private/nautilus-emblem-utils.c
View file

@ -196,12 +196,12 @@ nautilus_emblem_verify_keyword (GtkWindow *parent_window,
if (keyword == NULL || strlen (keyword) == 0) {
eel_show_error_dialog (_("The emblem cannot be installed."),
_("Sorry, but you must specify a non-blank keyword for the new emblem."),
_("Couldn't Install Emblem"), GTK_WINDOW (parent_window));
GTK_WINDOW (parent_window));
return FALSE;
} else if (!emblem_keyword_valid (keyword)) {
eel_show_error_dialog (_("The emblem cannot be installed."),
_("Sorry, but emblem keywords can only contain letters, spaces and numbers."),
_("Couldn't Install Emblem"), GTK_WINDOW (parent_window));
GTK_WINDOW (parent_window));
return FALSE;
} else if (is_reserved_keyword (keyword)) {
char *error_string;
@ -212,7 +212,7 @@ nautilus_emblem_verify_keyword (GtkWindow *parent_window,
*/
error_string = g_strdup_printf (_("Sorry, but there is already an emblem named \"%s\"."), display_name);
eel_show_error_dialog (_("Please choose a different emblem name."), error_string,
_("Couldn't install emblem"), GTK_WINDOW (parent_window));
GTK_WINDOW (parent_window));
g_free (error_string);
return FALSE;
}
@ -255,8 +255,7 @@ nautilus_emblem_install_custom_emblem (GdkPixbuf *pixbuf,
/* save the image */
if (eel_gdk_pixbuf_save_to_file (pixbuf, path) != TRUE) {
eel_show_error_dialog (_("The emblem cannot be installed."),
_("Sorry, unable to save custom emblem."),
_("Couldn't Install Emblem"),
_("Sorry, unable to save custom emblem."),
GTK_WINDOW (parent_window));
g_free (dir);
g_free (stat_dir);
@ -274,7 +273,7 @@ nautilus_emblem_install_custom_emblem (GdkPixbuf *pixbuf,
if (file == NULL) {
eel_show_error_dialog (_("The emblem cannot be installed."),
_("Sorry, unable to save custom emblem name."),
_("Couldn't Install Emblem"), GTK_WINDOW (parent_window));
GTK_WINDOW (parent_window));
g_free (stat_dir);
g_free (dir);
return;

34
libnautilus-private/nautilus-file-operations.c
View file

@ -914,7 +914,6 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
char *detail;
char *formatted_source_name;
char *formatted_target_name;
const char *dialog_title;
NautilusFileOperationsErrorKind error_kind;
NautilusFileOperationsErrorLocation error_location;
@ -1008,40 +1007,18 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
progress_info->vfs_status,
&text, &detail);
switch (transfer_info->kind) {
case TRANSFER_COPY:
case TRANSFER_DUPLICATE:
dialog_title = _("Error While Copying");
break;
case TRANSFER_MOVE:
dialog_title = _("Error While Moving");
break;
case TRANSFER_LINK:
dialog_title = _("Error While Linking");
break;
case TRANSFER_DELETE:
case TRANSFER_EMPTY_TRASH:
case TRANSFER_MOVE_TO_TRASH:
dialog_title = _("Error While Deleting");
break;
default:
dialog_title = NULL;
break;
}
if (error_location == ERROR_LOCATION_TARGET ||
error_kind == ERROR_SOURCE_IN_TARGET) {
/* We can't continue, just tell the user. */
eel_run_simple_dialog (parent_for_error_dialog (transfer_info),
TRUE, GTK_MESSAGE_ERROR, text, detail, dialog_title, GTK_STOCK_OK, NULL);
TRUE, GTK_MESSAGE_ERROR, text, detail, GTK_STOCK_OK, NULL);
error_dialog_result = GNOME_VFS_XFER_ERROR_ACTION_ABORT;
} else if (progress_info->files_total == 1) {
error_dialog_button_pressed = eel_run_simple_dialog
(parent_for_error_dialog (transfer_info), TRUE,
GTK_MESSAGE_ERROR, text,
detail, dialog_title,
GTK_STOCK_CANCEL, _("_Retry"), NULL);
detail, GTK_STOCK_CANCEL, _("_Retry"), NULL);
switch (error_dialog_button_pressed) {
case 0:
@ -1058,8 +1035,7 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
error_dialog_button_pressed = eel_run_simple_dialog
(parent_for_error_dialog (transfer_info), TRUE,
GTK_MESSAGE_ERROR, text,
detail, dialog_title,
_("_Skip"), GTK_STOCK_CANCEL, _("_Retry"), NULL);
detail, _("_Skip"), GTK_STOCK_CANCEL, _("_Retry"), NULL);
switch (error_dialog_button_pressed) {
case 0:
@ -2238,7 +2214,7 @@ handle_new_folder_vfs_error (const GnomeVFSXferProgressInfo *progress_info, NewF
error_string_to_free = (char *)error_string;
}
eel_show_error_dialog (_("Error creating new folder."), error_string, _("Error Creating New Folder"),
eel_show_error_dialog (_("Error creating new folder."), error_string,
GTK_WINDOW (gtk_widget_get_toplevel (state->parent_view)));
g_free (error_string_to_free);
@ -2398,7 +2374,7 @@ handle_new_file_vfs_error (const GnomeVFSXferProgressInfo *progress_info, NewFil
error_string_to_free = (char *)error_string;
}
eel_show_error_dialog (_("Error creating new document."), error_string, _("Error Creating New Document"),
eel_show_error_dialog (_("Error creating new document."), error_string,
GTK_WINDOW (gtk_widget_get_toplevel (state->parent_view)));
g_free (error_string_to_free);

2
libnautilus-private/nautilus-file-queue.c
View file

@ -63,7 +63,7 @@ nautilus_file_queue_enqueue (NautilusFileQueue *queue,
queue->head = g_list_append (NULL, file);
queue->tail = queue->head;
} else {
g_list_append (queue->tail, file);
queue->tail = g_list_append (queue->tail, file);
queue->tail = queue->tail->next;
}

7
libnautilus-private/nautilus-program-choosing.c
View file

@ -643,7 +643,7 @@ void nautilus_launch_show_file (NautilusFile *file,
}
if (error_message != NULL) {
eel_show_error_dialog (error_message, detail_message, _("Can't Display Location"), parent_window);
eel_show_error_dialog (error_message, detail_message, parent_window);
g_free (error_message);
g_free (detail_message);
@ -877,7 +877,6 @@ nautilus_launch_desktop_file (GdkScreen *screen,
(_("Sorry, but you can't execute commands from "
"a remote site."),
_("This is disabled due to security considerations."),
_("Can't Execute Remote Links"),
parent_window);
return;
@ -891,7 +890,6 @@ nautilus_launch_desktop_file (GdkScreen *screen,
eel_show_error_dialog
(_("There was an error launching the application."),
message,
_("Error Launching Application"),
parent_window);
g_error_free (error);
@ -922,7 +920,6 @@ nautilus_launch_desktop_file (GdkScreen *screen,
(_("This drop target only supports local files."),
_("To open non-local files copy them to a local folder and then"
" drop them again."),
_("Drop Target Only Supports Local Files"),
parent_window);
gnome_desktop_item_unref (ditem);
@ -934,7 +931,6 @@ nautilus_launch_desktop_file (GdkScreen *screen,
(_("This drop target only supports local files."),
_("To open non-local files copy them to a local folder and then"
" drop them again. The local files you dropped have already been opened."),
_("Drop Target Only Supports Local Files"),
parent_window);
}
}
@ -962,7 +958,6 @@ nautilus_launch_desktop_file (GdkScreen *screen,
eel_show_error_dialog
(_("There was an error launching the application."),
message,
_("Error Launching Application"),
parent_window);
g_error_free (error);

32
src/file-manager/fm-directory-view.c
View file

@ -557,7 +557,6 @@ fm_directory_view_confirm_multiple_windows (FMDirectoryView *view, int count)
{
GtkDialog *dialog;
char *prompt;
char *title;
char *detail;
int response;
@ -565,15 +564,13 @@ fm_directory_view_confirm_multiple_windows (FMDirectoryView *view, int count)
return TRUE;
}
title = g_strdup_printf (ngettext("Open %d Window?", "Open %d Windows?", count), count);
prompt = _("Are you sure you want to open all files?");
detail = g_strdup_printf (ngettext("This will open %d separate window.",
"This will open %d separate windows.", count), count);
dialog = eel_show_yes_no_dialog (prompt, detail, title,
dialog = eel_show_yes_no_dialog (prompt, detail,
GTK_STOCK_OK, GTK_STOCK_CANCEL,
fm_directory_view_get_containing_window (view));
g_free (detail);
g_free (title);
response = gtk_dialog_run (dialog);
gtk_object_destroy (GTK_OBJECT (dialog));
@ -910,8 +907,7 @@ confirm_delete_directly (FMDirectoryView *view,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE,
prompt,
_("If you delete an item, it is permanently lost."),
""));
_("If you delete an item, it is permanently lost.")));
gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (dialog, GTK_STOCK_DELETE, GTK_RESPONSE_YES);
@ -2080,7 +2076,6 @@ real_file_limit_reached (FMDirectoryView *view)
dialog = eel_show_warning_dialog (message,
_("Some files will not be displayed."),
_("Too Many Files"),
fm_directory_view_get_containing_window (view));
g_free (message);
}
@ -3494,7 +3489,7 @@ fm_directory_view_confirm_deletion (FMDirectoryView *view, GList *uris, gboolean
dialog = eel_show_yes_no_dialog
(prompt,
detail, _("Delete Immediately?"), GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
detail, GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
fm_directory_view_get_containing_window (view));
g_free (detail);
@ -3540,7 +3535,7 @@ confirm_delete_from_trash (FMDirectoryView *view, GList *uris)
dialog = eel_show_yes_no_dialog (
prompt, _("If you delete an item, it will be permanently lost."),
_("Delete From Trash?"), GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
fm_directory_view_get_containing_window (view));
g_free (prompt);
@ -4213,7 +4208,6 @@ get_executable_text_file_action (FMDirectoryView *view, NautilusFile *file)
dialog = eel_create_question_dialog (prompt,
detail,
_("Run or Display?"),
_("Run in _Terminal"), RESPONSE_RUN_IN_TERMINAL,
_("_Display"), RESPONSE_DISPLAY,
fm_directory_view_get_containing_window (view));
@ -4626,8 +4620,7 @@ warn_mismatched_mime_types (FMDirectoryView *view,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_NONE,
primary,
secondary,
primary);
secondary);
g_free (primary);
g_free (secondary);
@ -5460,7 +5453,6 @@ action_open_scripts_folder_callback (GtkAction *action,
"Scripts menu."),
_("Choosing a script from the menu will run "
"that script with any selected items as input."),
_("About Scripts"),
_("All executable files in this folder will appear in the "
"Scripts menu. Choosing a script from the menu will run "
"that script.\n\n"
@ -5860,7 +5852,7 @@ drive_mounted_callback (gboolean succeeded,
{
if (!succeeded) {
eel_show_error_dialog_with_details (error, NULL,
_("Mount Error"), detailed_error, NULL);
detailed_error, NULL);
}
}
@ -5912,7 +5904,7 @@ volume_or_drive_unmounted_callback (gboolean succeeded,
{
if (!succeeded) {
eel_show_error_dialog_with_details (error, NULL,
_("Unmount Error"), detailed_error, NULL);
detailed_error, NULL);
}
}
@ -5925,7 +5917,7 @@ volume_or_drive_ejected_callback (gboolean succeeded,
{
if (!succeeded) {
eel_show_error_dialog_with_details (error, NULL,
_("Eject Error"), detailed_error, NULL);
detailed_error, NULL);
}
}
@ -7409,8 +7401,7 @@ report_broken_symbolic_link (FMDirectoryView *view, NautilusFile *file)
"\"%s\" doesn't exist."), target_path);
}
dialog = eel_show_yes_no_dialog (prompt,
detail, _("Broken Link"), _("Mo_ve to Trash"), GTK_STOCK_CANCEL,
dialog = eel_show_yes_no_dialog (prompt, detail, _("Mo_ve to Trash"), GTK_STOCK_CANCEL,
fm_directory_view_get_containing_window (view));
gtk_dialog_set_default_response (dialog, GTK_RESPONSE_YES);
@ -7696,7 +7687,6 @@ activation_drive_mounted_callback (gboolean succeeded,
if (!succeeded && !parameters->cancelled) {
eel_show_error_dialog_with_details (error, NULL,
_("Mount Error"),
detailed_error,
NULL);
}
@ -7913,7 +7903,6 @@ fm_directory_view_activate_files (FMDirectoryView *view,
(DELAY_UNTIL_CANCEL_MSECS,
cancel_activate_callback,
parameters,
_("Cancel Open?"),
timed_wait_prompt,
fm_directory_view_get_containing_window (view));
g_free (timed_wait_prompt);
@ -8850,7 +8839,6 @@ fm_directory_view_handle_url_drop (FMDirectoryView *view,
EEL_VFS_CAPABILITY_IS_REMOTE_AND_SLOW)) {
eel_show_warning_dialog (_("Drag and drop is not supported."),
_("Drag and drop is only supported on local file systems."),
_("Drag and Drop Error"),
fm_directory_view_get_containing_window (view));
g_free (container_uri);
return;
@ -8903,7 +8891,6 @@ fm_directory_view_handle_url_drop (FMDirectoryView *view,
(action != GDK_ACTION_LINK)) {
eel_show_warning_dialog (_("Drag and drop is not supported."),
_("An invalid drag type was used."),
_("Drag and Drop Error"),
fm_directory_view_get_containing_window (view));
g_free (container_uri);
return;
@ -9001,7 +8988,6 @@ fm_directory_view_handle_uri_list_drop (FMDirectoryView *view,
(action != GDK_ACTION_LINK)) {
eel_show_warning_dialog (_("Drag and drop is not supported."),
_("An invalid drag type was used."),
_("Drag and Drop Error"),
fm_directory_view_get_containing_window (view));
g_free (container_uri);
return;

18
src/file-manager/fm-error-reporting.c
View file

@ -68,8 +68,7 @@ fm_report_error_loading_directory (NautilusFile *file,
message = g_strdup_printf (_("Sorry, couldn't display all the contents of \"%s\"."), file_name);
}
eel_show_error_dialog (_("The folder contents could not be displayed."), message,
_("Error Displaying Folder"), parent_window);
eel_show_error_dialog (_("The folder contents could not be displayed."), message, parent_window);
g_free (file_name);
g_free (message);
@ -141,8 +140,7 @@ fm_report_error_renaming_file (NautilusFile *file,
g_free (original_name_truncated);
g_free (new_name_truncated);
eel_show_error_dialog (_("The item could not be renamed."), message,
_("Renaming Error"), parent_window);
eel_show_error_dialog (_("The item could not be renamed."), message, parent_window);
g_free (message);
}
@ -178,7 +176,7 @@ fm_report_error_setting_group (NautilusFile *file,
g_free (file_name);
}
eel_show_error_dialog (_("The group could not be changed."), message , _("Error Setting Group"), parent_window);
eel_show_error_dialog (_("The group could not be changed."), message, parent_window);
g_free (file_name);
g_free (message);
@ -210,7 +208,7 @@ fm_report_error_setting_owner (NautilusFile *file,
message = g_strdup_printf (_("Sorry, couldn't change the owner of \"%s\"."), file_name);
}
eel_show_error_dialog (_("The owner could not be changed."), message, _("Error Setting Owner"), parent_window);
eel_show_error_dialog (_("The owner could not be changed."), message, parent_window);
g_free (file_name);
g_free (message);
@ -242,8 +240,7 @@ fm_report_error_setting_permissions (NautilusFile *file,
message = g_strdup_printf (_("Sorry, couldn't change the permissions of \"%s\"."), file_name);
}
eel_show_error_dialog (_("The permissions could not be changed."), message,
_("Error Setting Permissions"), parent_window);
eel_show_error_dialog (_("The permissions could not be changed."), message, parent_window);
g_free (file_name);
g_free (message);
@ -313,9 +310,8 @@ fm_rename_file (NautilusFile *file,
old_name,
new_name);
g_free (old_name);
eel_timed_wait_start (cancel_rename_callback, file,
_("Cancel Rename?"), wait_message,
NULL); /* FIXME bugzilla.gnome.org 42395: Parent this? */
eel_timed_wait_start (cancel_rename_callback, file, wait_message,
NULL); /* FIXME bugzilla.gnome.org 42395: Parent this? */
g_free (wait_message);
/* Start the rename. */

8
src/file-manager/fm-properties-window.c
View file

@ -508,7 +508,6 @@ fm_properties_window_drag_data_received (GtkWidget *widget, GdkDragContext *cont
eel_show_error_dialog
(_("You can't assign more than one custom icon at a time!"),
_("Please drag just one image to set a custom icon."),
_("More Than One Image"),
window);
} else {
if (uri_is_local_image (uris[0])) {
@ -520,14 +519,12 @@ fm_properties_window_drag_data_received (GtkWidget *widget, GdkDragContext *cont
eel_show_error_dialog
(_("The file that you dropped is not local."),
_("You can only use local images as custom icons."),
_("Local Images Only"),
window);
} else {
eel_show_error_dialog
(_("The file that you dropped is not an image."),
_("You can only use local images as custom icons."),
_("Images Only"),
window);
}
}
@ -1544,7 +1541,6 @@ activate_group_callback (GtkMenuItem *menu_item, FileNamePair *pair)
(cancel_group_change_callback,
pair->file,
_("Cancel Group Change?"),
_("Changing group."),
NULL); /* FIXME bugzilla.gnome.org 42397: Parent this? */
nautilus_file_set_group
(pair->file, pair->name,
@ -1706,7 +1702,6 @@ activate_owner_callback (GtkMenuItem *menu_item, FileNamePair *pair)
(cancel_owner_change_callback,
pair->file,
_("Cancel Owner Change?"),
_("Changing owner."),
NULL); /* FIXME bugzilla.gnome.org 42397: Parent this? */
nautilus_file_set_owner
(pair->file, pair->name,
@ -3231,7 +3226,7 @@ help_button_callback (GtkWidget *widget, GtkWidget *property_window)
&error);
if (error) {
eel_show_error_dialog (_("There was an error displaying help."), error->message, _("Couldn't Show Help"),
eel_show_error_dialog (_("There was an error displaying help."), error->message,
GTK_WINDOW (property_window));
g_error_free (error);
}
@ -3626,7 +3621,6 @@ fm_properties_window_present (GList *original_files,
eel_timed_wait_start
(cancel_create_properties_window_callback,
startup_data,
_("Cancel Showing Properties Window?"),
_("Creating Properties window."),
parent_window == NULL ? NULL : GTK_WINDOW (parent_window));

6
src/file-manager/fm-tree-view.c
View file

@ -1061,11 +1061,9 @@ volume_or_drive_unmounted_callback (gboolean succeeded,
eject = GPOINTER_TO_INT (data);
if (!succeeded) {
if (eject) {
eel_show_error_dialog_with_details (error, NULL,
_("Eject Error"), detailed_error, NULL);
eel_show_error_dialog_with_details (error, NULL, detailed_error, NULL);
} else {
eel_show_error_dialog_with_details (error, NULL,
_("Unmount Error"), detailed_error, NULL);
eel_show_error_dialog_with_details (error, NULL, detailed_error, NULL);
}
}
}

8
src/nautilus-application.c
View file

@ -227,7 +227,6 @@ check_required_directories (NautilusApplication *application)
char *directories_as_string;
char *error_string;
char *detail_string;
char *dialog_title;
GtkDialog *dialog;
int failed_count;
@ -254,20 +253,18 @@ check_required_directories (NautilusApplication *application)
directories_as_string = eel_string_list_as_string (directories, ", ", EEL_STRING_LIST_ALL_STRINGS);
if (failed_count == 1) {
dialog_title = _("Couldn't Create Required Folder");
error_string = g_strdup_printf (_("Nautilus could not create the required folder \"%s\"."),
directories_as_string);
detail_string = _("Before running Nautilus, please create the following folder, or "
"set permissions such that Nautilus can create it.");
} else {
dialog_title = _("Couldn't Create Required Folders");
error_string = g_strdup_printf (_("Nautilus could not create the following required folders: "
"%s."), directories_as_string);
detail_string = _("Before running Nautilus, please create these folders, or "
"set permissions such that Nautilus can create them.");
}
dialog = eel_show_error_dialog (error_string, detail_string, dialog_title, NULL);
dialog = eel_show_error_dialog (error_string, detail_string, NULL);
/* We need the main event loop so the user has a chance to see the dialog. */
nautilus_main_event_loop_register (GTK_OBJECT (dialog));
@ -350,7 +347,6 @@ migrate_old_nautilus_files (void)
eel_show_info_dialog (_("A link called \"Link To Old Desktop\" has been created on the desktop."),
_("The location of the desktop directory has changed in GNOME 2.4. "
"You can open the link and move over the files you want, then delete the link."),
_("Migrated Old Desktop"),
NULL);
}
g_free (old_desktop_dir);
@ -579,7 +575,7 @@ nautilus_application_startup (NautilusApplication *application,
}
if (message != NULL) {
dialog = eel_show_error_dialog_with_details (message, NULL, NULL, detailed_message, NULL);
dialog = eel_show_error_dialog_with_details (message, NULL, detailed_message, NULL);
/* We need the main event loop so the user has a chance to see the dialog. */
nautilus_main_event_loop_register (GTK_OBJECT (dialog));
goto out;

1
src/nautilus-connect-server-dialog-main.c
View file

@ -69,7 +69,6 @@ show_uri (const char *uri,
error_dialog = eel_show_error_dialog (error_message,
error->message,
_("Can't Display Location"),
NULL);
open_dialogs++;

8
src/nautilus-connect-server-dialog.c
View file

@ -139,10 +139,10 @@ connect_to_server (NautilusConnectServerDialog *dialog)
if (vfs_uri == NULL) {
error_message = g_strdup_printf
(_("\"%s\" is not a valid location."),
(_("Can't Connect to Server. \"%s\" is not a valid location."),
uri);
eel_show_error_dialog (error_message, _("Please check the spelling and try again."),
_("Can't Connect to Server"), GTK_WINDOW (dialog));
GTK_WINDOW (dialog));
g_free (error_message);
return;
} else {
@ -155,9 +155,9 @@ connect_to_server (NautilusConnectServerDialog *dialog)
server = gtk_editable_get_chars (GTK_EDITABLE (dialog->details->server_entry), 0, -1);
if (strlen (server) == 0) {
eel_show_error_dialog (_("You must enter a name for the server."),
eel_show_error_dialog (_("Can't Connect to Server. You must enter a name for the server."),
_("Please enter a name and try again."),
_("Can't Connect to Server"), GTK_WINDOW (dialog));
GTK_WINDOW (dialog));
g_free (server);
return;
}

14
src/nautilus-emblem-sidebar.c
View file

@ -240,7 +240,6 @@ nautilus_emblem_sidebar_delete_cb (GtkWidget *menu_item,
} else {
error = g_strdup_printf (_("Couldn't remove emblem with name '%s'."), emblem_sidebar->details->popup_emblem_display_name);
eel_show_error_dialog (error, _("This is probably because the emblem is a permanent one, and not one that you added yourself."),
_("Couldn't Remove Emblem"),
NULL);
g_free (error);
}
@ -275,7 +274,6 @@ rename_dialog_response_cb (GtkWidget *dialog, int response,
} else {
error = g_strdup_printf (_("Couldn't rename emblem with name '%s'."), name);
eel_show_error_dialog (error, _("This is probably because the emblem is a permanent one, and not one that you added yourself."),
_("Couldn't Rename Emblem"),
NULL);
g_free (error);
}
@ -776,9 +774,9 @@ nautilus_emblem_sidebar_drag_received_cb (GtkWidget *widget,
nautilus_icon_dnd_uri_list_free_strings (uris);
if (had_failure && emblems != NULL) {
eel_show_error_dialog (_("Some of the files could not be added as emblems."), _("The emblems do not appear to be valid images."), _("Couldn't Add Emblems"), NULL);
eel_show_error_dialog (_("Some of the files could not be added as emblems."), _("The emblems do not appear to be valid images."), NULL);
} else if (had_failure && emblems == NULL) {
eel_show_error_dialog (_("None of the files could be added as emblems."), _("The emblems do not appear to be valid images."), _("Couldn't Add Emblems"), NULL);
eel_show_error_dialog (_("None of the files could be added as emblems."), _("The emblems do not appear to be valid images."), NULL);
}
@ -799,7 +797,7 @@ nautilus_emblem_sidebar_drag_received_cb (GtkWidget *widget,
uri = g_strndup (data->data, data->length);
if (!eel_is_valid_uri (uri)) {
eel_show_error_dialog (_("The emblem cannot be added."), _("The dragged text was not a valid file location."), _("Couldn't Add Emblem"), NULL);
eel_show_error_dialog (_("The emblem cannot be added."), _("The dragged text was not a valid file location."), NULL);
break;
}
@ -824,8 +822,7 @@ nautilus_emblem_sidebar_drag_received_cb (GtkWidget *widget,
} else {
error = g_strdup (_("The dragged file does not appear to be a valid image."));
}
eel_show_error_dialog (_("The emblem cannot be added."), error, _("Couldn't Add Emblem"),
NULL);
eel_show_error_dialog (_("The emblem cannot be added."), error, NULL);
g_free (error);
g_free (uri_utf8);
}
@ -874,8 +871,7 @@ nautilus_emblem_sidebar_drag_received_cb (GtkWidget *widget,
g_warning ("Tried to load '%s', but failed.\n",
uri);
error = g_strdup_printf (_("The file '%s' does not appear to be a valid image."), uri);
eel_show_error_dialog (_("The emblem cannot be added."), error, _("Couldn't Add Emblem"),
NULL);
eel_show_error_dialog (_("The emblem cannot be added."), error, NULL);
g_free (error);
}
break;

4
src/nautilus-information-panel.c
View file

@ -553,7 +553,6 @@ receive_dropped_uri_list (NautilusInformationPanel *information_panel,
eel_show_error_dialog (
_("You can't assign more than one custom icon at a time."),
_("Please drag just one image to set a custom icon."),
_("More Than One Image"),
window);
break;
}
@ -574,14 +573,12 @@ receive_dropped_uri_list (NautilusInformationPanel *information_panel,
eel_show_error_dialog (
_("The file that you dropped is not local."),
_("You can only use local images as custom icons."),
_("Local Images Only"),
window);
} else {
eel_show_error_dialog (
_("The file that you dropped is not an image."),
_("You can only use images as custom icons."),
_("Images Only"),
window);
}
}
@ -991,7 +988,6 @@ burn_cd_callback (GtkWidget *button, gpointer data)
NULL,
&error)) {
eel_show_error_dialog (_("Unable to launch the cd burner application."), error->message,
_("Can't Launch CD Burner"),
GTK_WINDOW (gtk_widget_get_toplevel (button)));
g_error_free (error);
}

2
src/nautilus-navigation-window-menus.c
View file

@ -123,7 +123,6 @@ forget_history_if_confirmed (NautilusWindow *window)
dialog = eel_create_question_dialog (prompt,
detail,
_("Clear History"),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_CLEAR, RESPONSE_FORGET,
GTK_WINDOW (window));
@ -289,7 +288,6 @@ show_bogus_history_window (NautilusWindow *window,
eel_show_warning_dialog (_("The history location doesn't exist."),
detail,
_("Bookmark for Nonexistent Location"),
GTK_WINDOW (window));
g_free (uri);

18
src/nautilus-property-browser.c
View file

@ -959,7 +959,7 @@ remove_pattern(NautilusPropertyBrowser *property_browser, const char* pattern_na
if (gnome_vfs_unlink (pattern_uri) != GNOME_VFS_OK) {
char *message = g_strdup_printf (_("Sorry, but pattern %s couldn't be deleted."), pattern_name);
char *detail = _("Check that you have permission to delete the pattern.");
eel_show_error_dialog (message, detail, _("Couldn't Delete Pattern"), GTK_WINDOW (property_browser));
eel_show_error_dialog (message, detail, GTK_WINDOW (property_browser));
g_free (message);
}
@ -989,7 +989,7 @@ remove_emblem (NautilusPropertyBrowser *property_browser, const char* emblem_nam
if (gnome_vfs_unlink (emblem_uri) != GNOME_VFS_OK) {
char *message = g_strdup_printf (_("Sorry, but emblem %s couldn't be deleted."), emblem_name);
char *detail = _("Check that you have permission to delete the emblem.");
eel_show_error_dialog (message, detail, _("Couldn't Delete Emblem"), GTK_WINDOW (property_browser));
eel_show_error_dialog (message, detail, GTK_WINDOW (property_browser));
g_free (message);
}
else {
@ -1154,7 +1154,7 @@ add_pattern_to_browser (const char *path_name, gpointer *data)
message = g_strdup (_("Sorry, but you did not supply a valid file name."));
detail = _("Please try again.");
}
eel_show_error_dialog (message, detail, _("Couldn't Install Pattern"), GTK_WINDOW (property_browser));
eel_show_error_dialog (message, detail, GTK_WINDOW (property_browser));
g_free (message);
return;
}
@ -1167,7 +1167,7 @@ add_pattern_to_browser (const char *path_name, gpointer *data)
if (basename && eel_strcmp (basename, RESET_IMAGE_NAME) == 0) {
eel_show_error_dialog (_("Sorry, but you can't replace the reset image."),
_("Reset is a special image that cannot be deleted."),
_("Not an Image"), NULL);
NULL);
g_free (path_uri);
g_free (basename);
return;
@ -1199,7 +1199,7 @@ add_pattern_to_browser (const char *path_name, gpointer *data)
result = eel_copy_uri_simple (path_name, destination_name);
if (result != GNOME_VFS_OK) {
char *message = g_strdup_printf (_("Sorry, but the pattern %s couldn't be installed."), path_name);
eel_show_error_dialog (message, NULL, _("Couldn't Install Pattern"), GTK_WINDOW (property_browser));
eel_show_error_dialog (message, NULL, GTK_WINDOW (property_browser));
g_free (message);
}
@ -1272,7 +1272,7 @@ add_color_to_file (NautilusPropertyBrowser *property_browser, const char *color_
} else {
eel_show_error_dialog (_("The color cannot be installed."),
_("Sorry, but you must specify an unused color name for the new color."),
_("Couldn't Install Color"), GTK_WINDOW (property_browser));
GTK_WINDOW (property_browser));
}
}
@ -1303,7 +1303,7 @@ add_color_to_browser (GtkWidget *widget, gint which_button, gpointer *data)
if (strlen (stripped_color_name) == 0) {
eel_show_error_dialog (_("The color cannot be installed."),
_("Sorry, but you must specify a non-blank name for the new color."),
_("Couldn't Install Color"), GTK_WINDOW (property_browser));
GTK_WINDOW (property_browser));
} else {
add_color_to_file (property_browser, color_spec, stripped_color_name);
@ -1393,7 +1393,7 @@ emblem_dialog_clicked (GtkWidget *dialog, int which_button, NautilusPropertyBrow
} else {
char *message = g_strdup_printf
(_("Sorry, but \"%s\" is not a usable image file."), emblem_path);
eel_show_error_dialog (_("The file is not an image."), message, _("Not an Image"), GTK_WINDOW (property_browser));
eel_show_error_dialog (_("The file is not an image."), message, GTK_WINDOW (property_browser));
g_free (message);
g_free (emblem_path);
return;
@ -1409,7 +1409,7 @@ emblem_dialog_clicked (GtkWidget *dialog, int which_button, NautilusPropertyBrow
if (pixbuf == NULL) {
char *message = g_strdup_printf
(_("Sorry, but \"%s\" is not a usable image file."), property_browser->details->image_path);
eel_show_error_dialog (_("The file is not an image."), message, _("Not an Image"), GTK_WINDOW (property_browser));
eel_show_error_dialog (_("The file is not an image."), message, GTK_WINDOW (property_browser));
g_free (message);
}

2
src/nautilus-window-bookmarks.c
View file

@ -97,7 +97,7 @@ show_bogus_bookmark_window (NautilusWindow *window,
dialog = eel_show_yes_no_dialog (prompt, detail,
_("Bookmark for Nonexistent Location"),
_("Remove"), GTK_STOCK_CANCEL,
GTK_STOCK_CANCEL,
GTK_WINDOW (window));
eel_gtk_signal_connect_free_data

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

@ -607,7 +607,6 @@ report_current_content_view_failure_to_user (NautilusWindow *window,
message = nautilus_window_get_view_startup_error_label (window);
eel_show_error_dialog (message,
_("You can choose another view or go to a different location."),
_("View Failed"),
GTK_WINDOW (window));
g_free (message);
}
@ -621,7 +620,6 @@ report_nascent_content_view_failure_to_user (NautilusWindow *window,
message = nautilus_window_get_view_error_label (window);
eel_show_error_dialog (message,
_("The location cannot be displayed with this viewer."),
_("View Failed"),
GTK_WINDOW (window));
g_free (message);
}
@ -1342,7 +1340,6 @@ display_view_selection_failure (NautilusWindow *window, NautilusFile *file,
char *error_message;
char *detail_message;
char *scheme_string;
char *dialog_title;
const char *host_name;
GtkDialog *dialog;
GnomeVFSURI *vfs_uri;
@ -1358,9 +1355,7 @@ display_view_selection_failure (NautilusWindow *window, NautilusFile *file,
uri_for_display = eel_str_middle_truncate
(full_uri_for_display, MAX_URI_IN_DIALOG_LENGTH);
g_free (full_uri_for_display);
dialog_title = NULL;
switch (result_code) {
case GNOME_VFS_OK:
if (nautilus_file_is_directory (file)) {
@ -1458,13 +1453,8 @@ display_view_selection_failure (NautilusWindow *window, NautilusFile *file,
detail_message = g_strdup (_("Please select another viewer and try again."));
}
if (dialog_title == NULL) {
dialog_title = g_strdup (_("Can't Display Location"));
}
dialog = eel_show_error_dialog (error_message, detail_message, dialog_title, NULL);
dialog = eel_show_error_dialog (error_message, detail_message, NULL);
g_free (dialog_title);
g_free (uri_for_display);
g_free (error_message);
g_free (detail_message);