gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-10-29 03:34:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed bugs in thumbnail stuff by quoting parameters to the scaling command

Browse source 
fixed bugs in thumbnail stuff by quoting parameters to the scaling
	command and handling a NULL controller better.
This commit is contained in:
Andy Hertzfeld 2000-03-02 05:10:45 +00:00
parent 618ca4bc4a
commit dae237b696
4 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog-20000414
View file

@ -1,3 +1,9 @@
2000-03-01 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus_icon_factory.c:
some bug fixes. Quoted filenames when invoking convert. Checked for a null
icon controller in some places and handled accordingly
2000-03-01 Andy Hertzfeld <andy@eazel.com>
implemented automatic thumbnail creation for large images.

9
libnautilus-extensions/nautilus-icon-factory.c
View file

@ -611,7 +611,7 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, void *controller)
if (nautilus_file_get_size (file) < SELF_THUMBNAIL_SIZE_THRESHOLD)
uri = nautilus_file_get_uri (file);
else
uri = nautilus_icon_factory_get_thumbnail_uri(file, NAUTILUS_ICONS_CONTROLLER(controller));
uri = nautilus_icon_factory_get_thumbnail_uri(file, controller ? NAUTILUS_ICONS_CONTROLLER(controller) : NULL);
}
/* Get the generic icon set for this file. */
@ -1188,8 +1188,9 @@ nautilus_icon_factory_make_thumbnails(gpointer data)
check if the pending one is completed. */
if (factory->thumbnail_in_progress) {
if (vfs_file_exists(factory->new_thumbnail_path)) {
/* update the icon */
nautilus_icons_controller_update_icon(NAUTILUS_ICONS_CONTROLLER(info->controller), info->thumbnail_uri);
/* update the icon if a controller is available */
if (info->controller)
nautilus_icons_controller_update_icon(NAUTILUS_ICONS_CONTROLLER(info->controller), info->thumbnail_uri);
/* done making the thumbnail, so dispose of the list element */
g_free(info->thumbnail_uri);
@ -1208,7 +1209,7 @@ nautilus_icon_factory_make_thumbnails(gpointer data)
/* fork a task to make the thumbnail. */
if (!(thumbnail_pid = fork())) {
gchar *temp_str = g_strdup_printf("convert -geometry 96x96 %s png:%s",
gchar *temp_str = g_strdup_printf("convert -geometry 96x96 \"%s\" png:\"%s\"",
(gchar*) info->thumbnail_uri + 7, factory->new_thumbnail_path + 7);
system(temp_str);
g_free(temp_str);

9
libnautilus-private/nautilus-icon-factory.c
View file

@ -611,7 +611,7 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, void *controller)
if (nautilus_file_get_size (file) < SELF_THUMBNAIL_SIZE_THRESHOLD)
uri = nautilus_file_get_uri (file);
else
uri = nautilus_icon_factory_get_thumbnail_uri(file, NAUTILUS_ICONS_CONTROLLER(controller));
uri = nautilus_icon_factory_get_thumbnail_uri(file, controller ? NAUTILUS_ICONS_CONTROLLER(controller) : NULL);
}
/* Get the generic icon set for this file. */
@ -1188,8 +1188,9 @@ nautilus_icon_factory_make_thumbnails(gpointer data)
check if the pending one is completed. */
if (factory->thumbnail_in_progress) {
if (vfs_file_exists(factory->new_thumbnail_path)) {
/* update the icon */
nautilus_icons_controller_update_icon(NAUTILUS_ICONS_CONTROLLER(info->controller), info->thumbnail_uri);
/* update the icon if a controller is available */
if (info->controller)
nautilus_icons_controller_update_icon(NAUTILUS_ICONS_CONTROLLER(info->controller), info->thumbnail_uri);
/* done making the thumbnail, so dispose of the list element */
g_free(info->thumbnail_uri);
@ -1208,7 +1209,7 @@ nautilus_icon_factory_make_thumbnails(gpointer data)
/* fork a task to make the thumbnail. */
if (!(thumbnail_pid = fork())) {
gchar *temp_str = g_strdup_printf("convert -geometry 96x96 %s png:%s",
gchar *temp_str = g_strdup_printf("convert -geometry 96x96 \"%s\" png:\"%s\"",
(gchar*) info->thumbnail_uri + 7, factory->new_thumbnail_path + 7);
system(temp_str);
g_free(temp_str);

9
libnautilus/nautilus-icon-factory.c
View file

@ -611,7 +611,7 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, void *controller)
if (nautilus_file_get_size (file) < SELF_THUMBNAIL_SIZE_THRESHOLD)
uri = nautilus_file_get_uri (file);
else
uri = nautilus_icon_factory_get_thumbnail_uri(file, NAUTILUS_ICONS_CONTROLLER(controller));
uri = nautilus_icon_factory_get_thumbnail_uri(file, controller ? NAUTILUS_ICONS_CONTROLLER(controller) : NULL);
}
/* Get the generic icon set for this file. */
@ -1188,8 +1188,9 @@ nautilus_icon_factory_make_thumbnails(gpointer data)
check if the pending one is completed. */
if (factory->thumbnail_in_progress) {
if (vfs_file_exists(factory->new_thumbnail_path)) {
/* update the icon */
nautilus_icons_controller_update_icon(NAUTILUS_ICONS_CONTROLLER(info->controller), info->thumbnail_uri);
/* update the icon if a controller is available */
if (info->controller)
nautilus_icons_controller_update_icon(NAUTILUS_ICONS_CONTROLLER(info->controller), info->thumbnail_uri);
/* done making the thumbnail, so dispose of the list element */
g_free(info->thumbnail_uri);
@ -1208,7 +1209,7 @@ nautilus_icon_factory_make_thumbnails(gpointer data)
/* fork a task to make the thumbnail. */
if (!(thumbnail_pid = fork())) {
gchar *temp_str = g_strdup_printf("convert -geometry 96x96 %s png:%s",
gchar *temp_str = g_strdup_printf("convert -geometry 96x96 \"%s\" png:\"%s\"",
(gchar*) info->thumbnail_uri + 7, factory->new_thumbnail_path + 7);
system(temp_str);
g_free(temp_str);