[nautilus] file: remove unused code



commit 7cbd07aa15a3c099dfd69ab7cdcfd3dcbea38b51
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Jan 12 19:26:27 2011 +0100

    file: remove unused code

 libnautilus-private/nautilus-file.c |   20 ----------------
 libnautilus-private/nautilus-file.h |    4 ---
 src/nautilus-pathbar.c              |   42 +----------------------------------
 3 files changed, 1 insertions(+), 65 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 31d2871..8951776 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -4271,26 +4271,6 @@ nautilus_file_get_icon_pixbuf (NautilusFile *file,
 	return pixbuf;
 }
 
-char *
-nautilus_file_get_custom_icon (NautilusFile *file)
-{
-	char *custom_icon;
-
-	if (file == NULL) {
-		return NULL;
-	}
-
-	/* Metadata takes precedence */
-	custom_icon = get_custom_icon_metadata_uri (file);
- 
-	if (custom_icon == NULL && file->details->got_link_info) {
-		custom_icon = g_strdup (file->details->custom_icon);
- 	}
- 
-	return custom_icon;
-}
-
-
 gboolean
 nautilus_file_get_date (NautilusFile *file,
 			NautilusDateType date_type,
diff --git a/libnautilus-private/nautilus-file.h b/libnautilus-private/nautilus-file.h
index d8d8334..7dce93e 100644
--- a/libnautilus-private/nautilus-file.h
+++ b/libnautilus-private/nautilus-file.h
@@ -431,10 +431,6 @@ GFile *                 nautilus_file_get_activation_location           (Nautilu
 
 char *                  nautilus_file_get_drop_target_uri               (NautilusFile                   *file);
 
-/* Get custom icon (if specified by metadata or link contents) */
-char *                  nautilus_file_get_custom_icon                   (NautilusFile                   *file);
-
-
 GIcon *                 nautilus_file_get_gicon                         (NautilusFile                   *file,
 									 NautilusFileIconFlags           flags);
 NautilusIconInfo *      nautilus_file_get_icon                          (NautilusFile                   *file,
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index 1ada80d..cdec438 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;
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]