Commit 1f59bf3c authored by Darin Adler's avatar Darin Adler

Need a cast in here so people can build while I wait for the OK from

	* libnautilus/nautilus-icon-factory.c:
	(nautilus_icon_factory_load_icon):
	Need a cast in here so people can build while I wait for the OK
	from Federico to check in my const change to gdk-pixbuf.
parent e22cc60a
2000-02-14 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-icon-factory.c:
(nautilus_icon_factory_load_icon):
Need a cast in here so people can build while I wait for the OK
from Federico to check in my const change to gdk-pixbuf.
2000-02-14 Elliot Lee <sopwith@redhat.com>
* libnautilus/nautilus-icon-factory.c: Use GPOINTER_TO_UINT() instead of a manual cast.
* libnautilus/nautilus-icon-factory.c: Use GPOINTER_TO_UINT()
instead of a manual cast.
2000-02-14 Darin Adler <darin@eazel.com>
......
......@@ -406,7 +406,7 @@ nautilus_icon_factory_load_icon (const char *name, gboolean is_symbolic_link)
image = nautilus_icon_factory_load_file (name);
if (image == NULL)
/* This is the fallback icon. */
image = gdk_pixbuf_new_from_data (nautilus_default_file_icon,
image = gdk_pixbuf_new_from_data ((char *)nautilus_default_file_icon,
ART_PIX_RGB,
nautilus_default_file_icon_has_alpha,
nautilus_default_file_icon_width,
......@@ -706,7 +706,7 @@ nautilus_icon_cache_key_hash (gconstpointer p)
const NautilusIconCacheKey *key;
key = p;
return GPOINTER_TO_UINT(key->scalable_icon) ^ key->size_in_pixels;
return GPOINTER_TO_UINT (key->scalable_icon) ^ key->size_in_pixels;
}
static gboolean
......
......@@ -406,7 +406,7 @@ nautilus_icon_factory_load_icon (const char *name, gboolean is_symbolic_link)
image = nautilus_icon_factory_load_file (name);
if (image == NULL)
/* This is the fallback icon. */
image = gdk_pixbuf_new_from_data (nautilus_default_file_icon,
image = gdk_pixbuf_new_from_data ((char *)nautilus_default_file_icon,
ART_PIX_RGB,
nautilus_default_file_icon_has_alpha,
nautilus_default_file_icon_width,
......@@ -706,7 +706,7 @@ nautilus_icon_cache_key_hash (gconstpointer p)
const NautilusIconCacheKey *key;
key = p;
return GPOINTER_TO_UINT(key->scalable_icon) ^ key->size_in_pixels;
return GPOINTER_TO_UINT (key->scalable_icon) ^ key->size_in_pixels;
}
static gboolean
......
......@@ -406,7 +406,7 @@ nautilus_icon_factory_load_icon (const char *name, gboolean is_symbolic_link)
image = nautilus_icon_factory_load_file (name);
if (image == NULL)
/* This is the fallback icon. */
image = gdk_pixbuf_new_from_data (nautilus_default_file_icon,
image = gdk_pixbuf_new_from_data ((char *)nautilus_default_file_icon,
ART_PIX_RGB,
nautilus_default_file_icon_has_alpha,
nautilus_default_file_icon_width,
......@@ -706,7 +706,7 @@ nautilus_icon_cache_key_hash (gconstpointer p)
const NautilusIconCacheKey *key;
key = p;
return GPOINTER_TO_UINT(key->scalable_icon) ^ key->size_in_pixels;
return GPOINTER_TO_UINT (key->scalable_icon) ^ key->size_in_pixels;
}
static gboolean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment