[nautilus: 33/47] view: remove emblems_changed code



commit 9ab314c1dd30dc2d30fc46a62e2d31059c4c340a
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Dec 31 19:07:51 2010 +0100

    view: remove emblems_changed code
    
    This hack should not be required anymore now that we don't have user
    emblems.
    Other emblems should be taken care of by the normal NautilusFile's
    changed signal.

 src/file-manager/fm-icon-view.c |    9 ---------
 src/file-manager/fm-list-view.c |   11 -----------
 src/nautilus-view.c             |   10 ----------
 src/nautilus-view.h             |    2 --
 4 files changed, 0 insertions(+), 32 deletions(-)
---
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index d4fad01..c3ab50e 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -2499,14 +2499,6 @@ fm_icon_view_click_policy_changed (FMDirectoryView *directory_view)
 }
 
 static void
-fm_icon_view_emblems_changed (FMDirectoryView *directory_view)
-{
-	g_assert (FM_IS_ICON_VIEW (directory_view));
-
-	nautilus_icon_container_request_update_all (get_icon_container (FM_ICON_VIEW (directory_view)));
-}
-
-static void
 default_sort_order_changed_callback (gpointer callback_data)
 {
 	FMIconView *icon_view;
@@ -2982,7 +2974,6 @@ fm_icon_view_class_init (FMIconViewClass *klass)
 	fm_directory_view_class->get_zoom_level = fm_icon_view_get_zoom_level;
         fm_directory_view_class->click_policy_changed = fm_icon_view_click_policy_changed;
         fm_directory_view_class->embedded_text_policy_changed = fm_icon_view_embedded_text_policy_changed;
-        fm_directory_view_class->emblems_changed = fm_icon_view_emblems_changed;
         fm_directory_view_class->image_display_policy_changed = fm_icon_view_image_display_policy_changed;
         fm_directory_view_class->merge_menus = fm_icon_view_merge_menus;
         fm_directory_view_class->unmerge_menus = fm_icon_view_unmerge_menus;
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 89b08e2..671c4f2 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -2913,16 +2913,6 @@ fm_list_view_finalize (GObject *object)
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-static void
-fm_list_view_emblems_changed (FMDirectoryView *directory_view)
-{
-	g_assert (FM_IS_LIST_VIEW (directory_view));
-
-	/* FIXME: This needs to update the emblems of the icons, since
-	 * relative emblems may have changed.
-	 */
-}
-
 static char *
 fm_list_view_get_first_visible_file (NautilusView *view)
 {
@@ -3081,7 +3071,6 @@ fm_list_view_class_init (FMListViewClass *class)
 	fm_directory_view_class->start_renaming_file = fm_list_view_start_renaming_file;
 	fm_directory_view_class->get_zoom_level = fm_list_view_get_zoom_level;
 	fm_directory_view_class->zoom_to_level = fm_list_view_zoom_to_level;
-        fm_directory_view_class->emblems_changed = fm_list_view_emblems_changed;
 	fm_directory_view_class->end_file_changes = fm_list_view_end_file_changes;
 	fm_directory_view_class->using_manual_layout = fm_list_view_using_manual_layout;
 	fm_directory_view_class->set_is_active = real_set_is_active;
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index b6b3e49..8ac4ad6 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -9077,16 +9077,6 @@ file_changed_callback (NautilusFile *file, gpointer callback_data)
 
 	schedule_update_menus (view);
 	schedule_update_status (view);
-
-	/* We might have different capabilities, so we need to update
-	 * relative icon emblems . (Writeable etc).
-	 * Don't do this for trash, as it never changes writability
-	 * but does change a lot for the file count attribute.
-	 */
-	if (!nautilus_file_is_in_trash (file)) {
-		EEL_CALL_METHOD
-			(FM_DIRECTORY_VIEW_CLASS, view, emblems_changed, (view));
-	}
 }
 
 /**
diff --git a/src/nautilus-view.h b/src/nautilus-view.h
index 230fc65..dad2a14 100644
--- a/src/nautilus-view.h
+++ b/src/nautilus-view.h
@@ -303,8 +303,6 @@ struct FMDirectoryViewClass {
 	void	(* click_policy_changed)	   (FMDirectoryView *view);
 	void	(* sort_directories_first_changed) (FMDirectoryView *view);
 
-	void	(* emblems_changed)                (FMDirectoryView *view);
-
 	void    (* set_is_active)                  (FMDirectoryView *view,
 						    gboolean         is_active);
 



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