summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2011-01-12 19:26:27 +0100
committerCosimo Cecchi <cosimoc@gnome.org>2011-01-12 19:26:27 +0100
commit7cbd07aa15a3c099dfd69ab7cdcfd3dcbea38b51 (patch)
tree689c1db3d46c70950e365f6d6e426f649abe4fac /src
parentf1c782c13dd675bafffb2a4d85900da52be88f3f (diff)
downloadnautilus-7cbd07aa15a3c099dfd69ab7cdcfd3dcbea38b51.tar.gz
file: remove unused code
Diffstat (limited to 'src')
-rw-r--r--src/nautilus-pathbar.c42
1 files changed, 1 insertions, 41 deletions
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index 1ada80d10..cdec43851 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -1196,43 +1196,6 @@ button_clicked_cb (GtkWidget *button,
}
static NautilusIconInfo *
-get_custom_user_icon_info (ButtonData *button_data)
-{
-/* Bug 80925: With tiny display sizes we get huge memory allocations. */
-#if 0
- NautilusIconInfo *icon_info;
- GFile *icon_file;
- GIcon *icon;
- char *custom_icon_uri;
-
- icon = NULL;
-
- if (button_data->file != NULL) {
- custom_icon_uri = nautilus_file_get_custom_icon (button_data->file);
- if (custom_icon_uri != NULL) {
- icon_file = g_file_new_for_uri (custom_icon_uri);
-
- if (g_file_is_native (icon_file)) {
- icon = g_file_icon_new (icon_file);
- }
-
- g_object_unref (icon_file);
- g_free (custom_icon_uri);
- }
- }
-
- if (icon != NULL) {
- icon_info = nautilus_icon_info_lookup (icon, NAUTILUS_PATH_BAR_ICON_SIZE);
- g_object_unref (icon);
-
- return icon_info;
- }
-#endif
-
- return NULL;
-}
-
-static NautilusIconInfo *
get_type_icon_info (ButtonData *button_data)
{
switch (button_data->type)
@@ -1343,10 +1306,7 @@ nautilus_path_bar_update_button_appearance (ButtonData *button_data)
gtk_image_set_from_pixbuf (GTK_IMAGE (button_data->image), button_data->custom_icon);
gtk_widget_show (GTK_WIDGET (button_data->image));
} else {
- icon_info = get_custom_user_icon_info (button_data);
- if (icon_info == NULL) {
- icon_info = get_type_icon_info (button_data);
- }
+ icon_info = get_type_icon_info (button_data);
pixbuf = NULL;