mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-10-02 14:03:39 +00:00
reviewed by: Pavel Cisler <pavel@eazel.com> (except
fix for bug 5884, which nobody reviewed) Fixed bug 5766 (assertion when switching views) Fixed bug 5884 (Rename file dialog for missing file quotes intended name rather than current) * libnautilus-extensions/nautilus-mime-actions.c: (nautilus_mime_get_default_action_type_for_file), (nautilus_mime_get_default_action_for_file), (nautilus_mime_get_default_application_for_file_internal), (nautilus_mime_get_default_component_for_file_internal), (nautilus_mime_get_short_list_applications_for_file), (nautilus_mime_get_short_list_components_for_file), (nautilus_mime_get_short_list_methods_for_file), (nautilus_mime_get_all_applications_for_file), (nautilus_mime_get_all_components_for_file): These functions were all using return_val_if_fail if nautilus_mime_actions_check_if_minimum_attributes_ready returned FALSE. In keeping with the style used in NautilusFile, changed these to check and return, but not complain, in these cases where the answer is "not enough info yet". I did not change the setters; they still complain. * src/file-manager/fm-error-reporting.c: (fm_report_error_renaming_file): Use "original_name" instead of "new_name" in error message.
This commit is contained in:
John Sullivan
parent
e514640932
commit
410347490d
31
ChangeLog
31
ChangeLog
|
|
@ -1,3 +1,34 @@
|
|||
2001-01-20 John Sullivan <sullivan@eazel.com>
|
||||
|
||||
reviewed by: Pavel Cisler <pavel@eazel.com> (except
|
||||
fix for bug 5884, which nobody reviewed)
|
||||
|
||||
Fixed bug 5766 (assertion when switching views)
|
||||
Fixed bug 5884 (Rename file dialog for missing file
|
||||
quotes intended name rather than current)
|
||||
|
||||
* libnautilus-extensions/nautilus-mime-actions.c:
|
||||
(nautilus_mime_get_default_action_type_for_file),
|
||||
(nautilus_mime_get_default_action_for_file),
|
||||
(nautilus_mime_get_default_application_for_file_internal),
|
||||
(nautilus_mime_get_default_component_for_file_internal),
|
||||
(nautilus_mime_get_short_list_applications_for_file),
|
||||
(nautilus_mime_get_short_list_components_for_file),
|
||||
(nautilus_mime_get_short_list_methods_for_file),
|
||||
(nautilus_mime_get_all_applications_for_file),
|
||||
(nautilus_mime_get_all_components_for_file):
|
||||
These functions were all using return_val_if_fail if
|
||||
nautilus_mime_actions_check_if_minimum_attributes_ready
|
||||
returned FALSE. In keeping with the style used in
|
||||
NautilusFile, changed these to check and return, but
|
||||
not complain, in these cases where the answer is
|
||||
"not enough info yet". I did not change the setters;
|
||||
they still complain.
|
||||
|
||||
* src/file-manager/fm-error-reporting.c:
|
||||
(fm_report_error_renaming_file): Use "original_name" instead
|
||||
of "new_name" in error message.
|
||||
|
||||
2001-01-22 Rebecca Schulman <rebecka@eazel.com>
|
||||
Fix bugzilla.eazel.com bug 2659, that behavior
|
||||
with backup search is inconsistent, because content
|
||||
|
|
|
|||
|
|
@ -142,13 +142,13 @@ ORBIT_CONFIG = /gnome/bin/orbit-config
|
|||
ORBIT_IDL = /gnome/bin/orbit-idl
|
||||
ORBIT_LIBS = -L/gnome/lib -lORBit -lIIOP -lORBitutil -lglib -lnsl -lm
|
||||
PACKAGE = nautilus
|
||||
PACKAGESYSTEM = libeazelpackagesystem-rpm4.la
|
||||
PACKAGESYSTEM = libeazelpackagesystem-rpm3.la
|
||||
PAM_LIBS = -ldl -lpam -lpam_misc
|
||||
POFILES = ca.po da.po de.po en_GB.po es.po fi.po fr.po ga.po gl.po hu.po it.po ja.po ko.po nl.po no.po pl.po pt_BR.po ru.po sk.po sv.po ta.po tr.po uk.po zh_TW.Big5.po
|
||||
POSUB = po
|
||||
RANLIB = ranlib
|
||||
RPM_LIBS = -lrpm -lz -lbz2 -lpopt -ldb2 -lrpmio
|
||||
RPM_VERSION = 4.0
|
||||
RPM_LIBS = -lrpm -lz -lbz2 -lpopt -ldb1
|
||||
RPM_VERSION = 3.0.5
|
||||
USE_INCLUDED_LIBINTL = no
|
||||
USE_NLS = yes
|
||||
VERSION = 0.5.0
|
||||
|
|
|
|||
|
|
@ -134,8 +134,9 @@ nautilus_mime_get_default_action_type_for_file (NautilusFile *file)
|
|||
char *action_type_string;
|
||||
GnomeVFSMimeActionType action_type;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
GNOME_VFS_MIME_ACTION_TYPE_NONE);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return GNOME_VFS_MIME_ACTION_TYPE_NONE;
|
||||
}
|
||||
|
||||
action_type_string = nautilus_file_get_metadata
|
||||
(file, NAUTILUS_METADATA_KEY_DEFAULT_ACTION_TYPE, NULL);
|
||||
|
|
@ -161,8 +162,9 @@ nautilus_mime_get_default_action_for_file (NautilusFile *file)
|
|||
{
|
||||
GnomeVFSMimeAction *action;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
NULL);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
action = g_new0 (GnomeVFSMimeAction, 1);
|
||||
|
||||
|
|
@ -205,8 +207,9 @@ nautilus_mime_get_default_application_for_file_internal (NautilusFile *file,
|
|||
char *default_application_string;
|
||||
gboolean used_user_chosen_info;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
NULL);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
used_user_chosen_info = TRUE;
|
||||
|
||||
|
|
@ -350,8 +353,9 @@ nautilus_mime_get_default_component_for_file_internal (NautilusFile *file,
|
|||
gboolean used_user_chosen_info;
|
||||
gboolean metadata_default;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
NULL);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
used_user_chosen_info = TRUE;
|
||||
|
||||
|
|
@ -474,8 +478,9 @@ nautilus_mime_get_short_list_applications_for_file (NautilusFile *file)
|
|||
GnomeVFSMimeApplication *application;
|
||||
CORBA_Environment ev;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
NULL);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
CORBA_exception_init (&ev);
|
||||
|
||||
|
|
@ -536,8 +541,9 @@ nautilus_mime_get_short_list_components_for_file (NautilusFile *file)
|
|||
char *extra_requirements;
|
||||
char *prev;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
NULL);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
CORBA_exception_init (&ev);
|
||||
|
||||
|
|
@ -626,8 +632,9 @@ nautilus_mime_get_short_list_methods_for_file (NautilusFile *file)
|
|||
char *mime_type;
|
||||
const char *method;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
NULL);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
mime_type = nautilus_file_get_mime_type (file);
|
||||
method = gnome_vfs_mime_get_value (mime_type, "vfs_method");
|
||||
|
|
@ -644,8 +651,9 @@ nautilus_mime_get_all_applications_for_file (NautilusFile *file)
|
|||
GList *p;
|
||||
GnomeVFSMimeApplication *application;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
NULL);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
metadata_application_ids = nautilus_file_get_metadata_list
|
||||
(file,
|
||||
|
|
@ -740,8 +748,9 @@ nautilus_mime_get_all_components_for_file (NautilusFile *file)
|
|||
GList *explicit_iids;
|
||||
CORBA_Environment ev;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
NULL);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
CORBA_exception_init (&ev);
|
||||
|
||||
|
|
|
|||
|
|
@ -134,8 +134,9 @@ nautilus_mime_get_default_action_type_for_file (NautilusFile *file)
|
|||
char *action_type_string;
|
||||
GnomeVFSMimeActionType action_type;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
GNOME_VFS_MIME_ACTION_TYPE_NONE);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return GNOME_VFS_MIME_ACTION_TYPE_NONE;
|
||||
}
|
||||
|
||||
action_type_string = nautilus_file_get_metadata
|
||||
(file, NAUTILUS_METADATA_KEY_DEFAULT_ACTION_TYPE, NULL);
|
||||
|
|
@ -161,8 +162,9 @@ nautilus_mime_get_default_action_for_file (NautilusFile *file)
|
|||
{
|
||||
GnomeVFSMimeAction *action;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
NULL);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
action = g_new0 (GnomeVFSMimeAction, 1);
|
||||
|
||||
|
|
@ -205,8 +207,9 @@ nautilus_mime_get_default_application_for_file_internal (NautilusFile *file,
|
|||
char *default_application_string;
|
||||
gboolean used_user_chosen_info;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
NULL);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
used_user_chosen_info = TRUE;
|
||||
|
||||
|
|
@ -350,8 +353,9 @@ nautilus_mime_get_default_component_for_file_internal (NautilusFile *file,
|
|||
gboolean used_user_chosen_info;
|
||||
gboolean metadata_default;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
NULL);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
used_user_chosen_info = TRUE;
|
||||
|
||||
|
|
@ -474,8 +478,9 @@ nautilus_mime_get_short_list_applications_for_file (NautilusFile *file)
|
|||
GnomeVFSMimeApplication *application;
|
||||
CORBA_Environment ev;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
NULL);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
CORBA_exception_init (&ev);
|
||||
|
||||
|
|
@ -536,8 +541,9 @@ nautilus_mime_get_short_list_components_for_file (NautilusFile *file)
|
|||
char *extra_requirements;
|
||||
char *prev;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
NULL);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
CORBA_exception_init (&ev);
|
||||
|
||||
|
|
@ -626,8 +632,9 @@ nautilus_mime_get_short_list_methods_for_file (NautilusFile *file)
|
|||
char *mime_type;
|
||||
const char *method;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
NULL);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
mime_type = nautilus_file_get_mime_type (file);
|
||||
method = gnome_vfs_mime_get_value (mime_type, "vfs_method");
|
||||
|
|
@ -644,8 +651,9 @@ nautilus_mime_get_all_applications_for_file (NautilusFile *file)
|
|||
GList *p;
|
||||
GnomeVFSMimeApplication *application;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
NULL);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
metadata_application_ids = nautilus_file_get_metadata_list
|
||||
(file,
|
||||
|
|
@ -740,8 +748,9 @@ nautilus_mime_get_all_components_for_file (NautilusFile *file)
|
|||
GList *explicit_iids;
|
||||
CORBA_Environment ev;
|
||||
|
||||
g_return_val_if_fail (nautilus_mime_actions_check_if_minimum_attributes_ready (file),
|
||||
NULL);
|
||||
if (!nautilus_mime_actions_check_if_minimum_attributes_ready (file)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
CORBA_exception_init (&ev);
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ fm_report_error_renaming_file (NautilusFile *file,
|
|||
case GNOME_VFS_ERROR_NOT_FOUND:
|
||||
message = g_strdup_printf (_("There is no \"%s\" in this folder. "
|
||||
"Perhaps it was just moved or deleted?"),
|
||||
new_name);
|
||||
original_name);
|
||||
break;
|
||||
case GNOME_VFS_ERROR_ACCESS_DENIED:
|
||||
message = g_strdup_printf (_("You do not have the permissions necessary to rename \"%s\"."),
|
||||
|
|
|
|||
Loading…
Reference in a new issue