diff options
author | John Sullivan <sullivan@src.gnome.org> | 2000-06-19 19:42:30 +0000 |
---|---|---|
committer | John Sullivan <sullivan@src.gnome.org> | 2000-06-19 19:42:30 +0000 |
commit | e3f2dd160fb0353a12372dacf90da7dca45b44ce (patch) | |
tree | 42a25fba6f3a90f97c1d0820cc1b50f553013a64 /libnautilus-private/nautilus-string.c | |
parent | 2d46af0716e0dce97a72e19ab60aad8ee5c179b9 (diff) | |
download | nautilus-e3f2dd160fb0353a12372dacf90da7dca45b44ce.tar.gz |
Fixed uninitialized variable that was masking the real
reason why eazel: URIs don't work today (real reason
has not been figured out yet).
* src/nautilus-applicable-views.c: (got_file_info_callback):
Initialize default_id to NULL.
More work towards bug 1401 (bookmark icon never updates).
Almost done, but for a bug where bookmark for current
location in Go menu doesn't get an icon.
* libnautilus-extensions/nautilus-string.h,
* libnautilus-extensions/nautilus-string.c:
(nautilus_str_is_empty): New function, returns TRUE for
NULL or zero-length string.
* libnautilus-extensions/nautilus-file-attributes.h:
Added #define for NAUTILUS_FILE_ATTRIBUTE_CUSTOM_ICON
* libnautilus-extensions/nautilus-directory-async.c:
Add file_info to Request struct.
(request_is_satisfied): Renamed from ready_callback_is_satisfied;
now takes a Request and a NautilusFile instead of a ReadyCallback.
(call_ready_callbacks): Update existing caller for API change.
(set_up_request_by_file_attributes): Set request's file_info
field to TRUE if mime type requested; set request's metafile
field to TRUE if custom icon requested.
(nautilus_directory_check_if_ready_internal): New function,
use request_is_satisfied to see whether specified attributes
are available.
* libnautilus-extensions/nautilus-directory-private.h:
Added nautilus_directory_check_if_ready_internal.
* libnautilus-extensions/nautilus-file.c:
(nautilus_file_check_if_ready): Call nautilus_directory_check_
if_ready_internal.
* libnautilus-extensions/nautilus-icon-factory.c:
(nautilus_icon_factory_is_icon_ready_for_file): Implemented
this formerly nonexistent function by calling
nautilus_file_check_if_ready
* libnautilus-extensions/nautilus-bookmark.c:
(nautilus_bookmark_destroy), (nautilus_bookmark_icon_is_different),
(nautilus_bookmark_update_icon), (bookmark_file_changed_callback),
(nautilus_bookmark_set_icon_to_default), (nautilus_bookmark_new),
(nautilus_bookmark_new_with_icon): NautilusBookmark now keeps
ahold of a NautilusFile internally so it can notice its
"changed" signal. When this signal fires, the bookmark determines
whether a changed icon is available.
Diffstat (limited to 'libnautilus-private/nautilus-string.c')
-rw-r--r-- | libnautilus-private/nautilus-string.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libnautilus-private/nautilus-string.c b/libnautilus-private/nautilus-string.c index 6acbccc03..fc09c59e1 100644 --- a/libnautilus-private/nautilus-string.c +++ b/libnautilus-private/nautilus-string.c @@ -50,6 +50,12 @@ nautilus_strcmp (const char *string_a, const char *string_b) string_b == NULL ? "" : string_b); } +gboolean +nautilus_str_is_empty (const char *string_or_null) +{ + return nautilus_strcmp (string_or_null, NULL) == 0; +} + int nautilus_str_compare (gconstpointer string_a, gconstpointer string_b) { |