summaryrefslogtreecommitdiff
path: root/src/nautilus-property-browser.c
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2004-11-29 16:39:32 +0000
committerAlexander Larsson <alexl@src.gnome.org>2004-11-29 16:39:32 +0000
commit5abd560192c4641dbb34ca539f74081c40f9767a (patch)
tree78710c7ba8f8c66750c8f14f3565d8263472ff24 /src/nautilus-property-browser.c
parent935586e568e866a070cdaab2bde2a687096d21a1 (diff)
downloadnautilus-5abd560192c4641dbb34ca539f74081c40f9767a.tar.gz
Force size for pixbufs.
2004-11-29 Alexander Larsson <alexl@redhat.com> * libnautilus-private/nautilus-bookmark.c: (nautilus_bookmark_get_pixbuf): Force size for pixbufs. * libnautilus-private/nautilus-icon-factory.c: (load_icon_file): Load force-sized svgs right. (nautilus_icon_factory_get_pixbuf_from_name): Allow force-size loading * libnautilus-private/nautilus-icon-factory.h: Allow force-size loading in nautilus_icon_factory_get_pixbuf_from_name * libnautilus-private/nautilus-ui-utilities.c: (nautilus_action_from_menu_item), (nautilus_toolbar_action_from_menu_item): * src/nautilus-emblem-sidebar.c: (create_emblem_widget): * src/nautilus-property-browser.c: (make_drag_image), (make_properties_from_directories): * src/nautilus-sidebar-title.c: (update_icon): * src/file-manager/fm-directory-view.c: (add_extension_action_for_files): * src/file-manager/fm-properties-window.c: (create_emblems_page): * src/file-manager/fm-tree-model.c: (tree_node_get_pixbuf_from_factory): Force-size load icons * src/nautilus-throbber.c: (nautilus_throbber_instance_init), (nautilus_throbber_finalize): Disconnect icon theme changed signal on finalize.
Diffstat (limited to 'src/nautilus-property-browser.c')
-rw-r--r--src/nautilus-property-browser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c
index e880488be..40063a2ea 100644
--- a/src/nautilus-property-browser.c
+++ b/src/nautilus-property-browser.c
@@ -693,7 +693,7 @@ make_drag_image (NautilusPropertyBrowser *property_browser, const char* file_nam
} else {
icon_name = nautilus_emblem_get_icon_name_from_keyword (file_name);
pixbuf = nautilus_icon_factory_get_pixbuf_from_name (icon_name, NULL,
- NAUTILUS_ICON_SIZE_STANDARD,
+ NAUTILUS_ICON_SIZE_STANDARD, TRUE,
NULL);
g_free (icon_name);
}
@@ -1644,7 +1644,7 @@ make_properties_from_directories (NautilusPropertyBrowser *property_browser)
}
object_name = nautilus_emblem_get_keyword_from_icon_name (icon_name);
object_pixbuf = nautilus_icon_factory_get_pixbuf_from_name (icon_name, NULL,
- NAUTILUS_ICON_SIZE_SMALL,
+ NAUTILUS_ICON_SIZE_SMALL, TRUE,
&object_label);
if (object_label == NULL) {
object_label = g_strdup (object_name);