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.

4 files changed, 11 insertions, 9 deletions

diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c
index 0eb30864a..c28c297de 100644
--- a/libnautilus-private/nautilus-bookmark.c
+++ b/libnautilus-private/nautilus-bookmark.c
@@ -217,8 +217,8 @@ nautilus_bookmark_get_pixbuf (NautilusBookmark *bookmark,
 	if (icon == NULL) {
 		return NULL;
 	}
-	
-	result = nautilus_icon_factory_get_pixbuf_for_icon
+
+	result = nautilus_icon_factory_get_pixbuf_for_icon_force_size
 		(icon, NULL,
 		 icon_size, NULL, NULL,
 		 TRUE, NULL);
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c
index abb659faf..151a167e5 100644
--- a/libnautilus-private/nautilus-icon-factory.c
+++ b/libnautilus-private/nautilus-icon-factory.c
@@ -1110,7 +1110,7 @@ load_icon_file (const char    *filename,
 	if (path_represents_svg_image (filename)) {
 		pixbuf = load_pixbuf_svg (filename,
 					  nominal_size,
-					  base_size,
+					  force_nominal ? 0 : base_size,
 					  scale_x, scale_y);
 	} else {
 		is_thumbnail = strstr (filename, "/.thumbnails/")  != NULL;
@@ -1566,12 +1566,13 @@ GdkPixbuf *
 nautilus_icon_factory_get_pixbuf_from_name (const char *icon_name,
 					    const char *modifier,
 					    guint size_in_pixels,
+					    gboolean force_size,
 					    char **display_name)
 {
-	return nautilus_icon_factory_get_pixbuf_for_icon (icon_name, modifier,
-							  size_in_pixels,
-							  NULL, NULL,
-							  TRUE, display_name);
+	return nautilus_icon_factory_get_pixbuf_for_icon_internal (icon_name, modifier,
+								   size_in_pixels, force_size,
+								   NULL, NULL,
+								   TRUE, display_name);
 }
 									  
 GdkPixbuf *
diff --git a/libnautilus-private/nautilus-icon-factory.h b/libnautilus-private/nautilus-icon-factory.h
index e83963d90..7001ce24f 100644
--- a/libnautilus-private/nautilus-icon-factory.h
+++ b/libnautilus-private/nautilus-icon-factory.h
@@ -155,6 +155,7 @@ GdkPixbuf *nautilus_icon_factory_get_pixbuf_for_file_force_size (NautilusFile *f
 GdkPixbuf *           nautilus_icon_factory_get_pixbuf_from_name         (const char                  *icon_name,
 									  const char                  *modifer,
 									  guint                        size_in_pixels,
+									  gboolean                     force_size,
 									  char                       **display_name);
 
 GtkIconTheme *         nautilus_icon_factory_get_icon_theme        (void);
diff --git a/libnautilus-private/nautilus-ui-utilities.c b/libnautilus-private/nautilus-ui-utilities.c
index e806e945c..3027c0682 100644
--- a/libnautilus-private/nautilus-ui-utilities.c
+++ b/libnautilus-private/nautilus-ui-utilities.c
@@ -138,7 +138,7 @@ nautilus_action_from_menu_item (NautilusMenuItem *item)
 		pixbuf = nautilus_icon_factory_get_pixbuf_from_name 
 			(icon,
 			 NULL,
-			 NAUTILUS_ICON_SIZE_FOR_MENUS,
+			 NAUTILUS_ICON_SIZE_FOR_MENUS, TRUE,
 			 NULL);
 		if (pixbuf != NULL) {
 			g_object_set_data_full (G_OBJECT (action), "menu-icon",
@@ -189,7 +189,7 @@ nautilus_toolbar_action_from_menu_item (NautilusMenuItem *item)
 		pixbuf = nautilus_icon_factory_get_pixbuf_from_name 
 			(icon,
 			 NULL,
-			 24,
+			 24, TRUE, 
 			 NULL);
 		if (pixbuf != NULL) {
 			g_object_set_data_full (G_OBJECT (action), "toolbar-icon",