summaryrefslogtreecommitdiff
path: root/components/music
diff options
context:
space:
mode:
authorMathieu Lacage <set EMAIL_ADDRESS environment variable>2000-07-22 00:06:08 +0000
committerMathieu Lacage <mathieu@src.gnome.org>2000-07-22 00:06:08 +0000
commit23a10890caf3e742df9df50d94e06661f21e797d (patch)
tree770f2a241c319de8b7069e3342f23ccb0214281c /components/music
parent13072e74af761941e0cfb3e05a34554e6bb439ab (diff)
downloadnautilus-23a10890caf3e742df9df50d94e06661f21e797d.tar.gz
Updates nautilus to the latest gnome-vfs changes.
2000-07-21 Mathieu Lacage <set EMAIL_ADDRESS environment variable> Updates nautilus to the latest gnome-vfs changes. * components/music/nautilus-music-view.c: (play_current_file), (nautilus_music_view_update_from_uri): * components/services/vault/command-line/vault-operations.c: (vault_list): * libnautilus-extensions/bonobo-stream-vfs.c: (vfs_length): * libnautilus-extensions/nautilus-directory-async.c: (nautilus_directory_get_info_for_new_files), (start_monitoring_file_list), (start_getting_directory_counts), (deep_count_load), (start_getting_file_info): * libnautilus-extensions/nautilus-icon-factory.c: (vfs_file_exists), (first_file_more_recent), (path_represents_svg_image), (cached_image_still_valid): * libnautilus-extensions/nautilus-mime-actions.c: (get_mime_type_from_uri): * libnautilus-extensions/nautilus-preferences-item.c: (has_image_file), (add_icon_themes): * src/file-manager/fm-properties-window.c: (get_property_names_from_uri): * src/nautilus-applicable-views.c: (async_get_file_info_text): * src/nautilus-link-set-window.c: (get_link_set_names): * src/nautilus-location-bar.c: (try_to_expand_path): * src/nautilus-property-browser.c: (ensure_uri_is_image), (make_properties_from_directory_path), (vfs_file_exists), (make_properties_from_themes):
Diffstat (limited to 'components/music')
-rw-r--r--components/music/nautilus-music-view.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c
index e13a43279..b56a0790e 100644
--- a/components/music/nautilus-music-view.c
+++ b/components/music/nautilus-music-view.c
@@ -827,7 +827,7 @@ play_current_file (NautilusMusicView *music_view, gboolean from_start)
music_view->details->selected_index, 9, &temp_str);
music_view->details->current_samprate = atoi (temp_str);
result = gnome_vfs_get_file_info (song_uri, &file_info,
- GNOME_VFS_FILE_INFO_DEFAULT, NULL);
+ GNOME_VFS_FILE_INFO_DEFAULT);
music_view->details->current_file_size =
(result == GNOME_VFS_OK
&& (file_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) != 0)
@@ -1205,7 +1205,7 @@ nautilus_music_view_update_from_uri (NautilusMusicView *music_view, const char *
result = gnome_vfs_directory_list_load (&list, uri,
GNOME_VFS_FILE_INFO_GET_MIME_TYPE,
- NULL, NULL);
+ NULL);
if (result != GNOME_VFS_OK) {
/* FIXME bugzilla.eazel.com 1280: need to show an alert here */
g_warning("cant open %s in music_view_update", uri);