GNOME.org
 

[nautilus: 40/47] icon-view-container: rename FMIconContainer -> NautilusIconViewContainer

commit 757a5acffc9e4ac7bdbd0dcfb5eaa1f64da8a471
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Jan 11 13:01:51 2011 +0100

    icon-view-container: rename FMIconContainer -> NautilusIconViewContainer

 src/nautilus-desktop-icon-view.c   |    2 +-
 src/nautilus-icon-view-container.c |  132 ++++++++++++++++++------------------
 src/nautilus-icon-view-container.h |   50 +++++++-------
 src/nautilus-icon-view.c           |    2 +-
 4 files changed, 93 insertions(+), 93 deletions(-)
---
diff --git a/src/nautilus-desktop-icon-view.c b/src/nautilus-desktop-icon-view.c
index 9ec72b6..5c95e4f 100644
--- a/src/nautilus-desktop-icon-view.c
+++ b/src/nautilus-desktop-icon-view.c
@@ -587,7 +587,7 @@ nautilus_desktop_icon_view_init (NautilusDesktopIconView *desktop_icon_view)
 	nautilus_icon_view_filter_by_screen (NAUTILUS_ICON_VIEW (desktop_icon_view), TRUE);
 	icon_container = get_icon_container (desktop_icon_view);
 	nautilus_icon_container_set_use_drop_shadows (icon_container, TRUE);
-	fm_icon_container_set_sort_desktop (FM_ICON_CONTAINER (icon_container), TRUE);
+	nautilus_icon_view_container_set_sort_desktop (NAUTILUS_ICON_VIEW_CONTAINER (icon_container), TRUE);
 
 	/* Do a reload on the desktop if we don't have FAM, a smarter
 	 * way to keep track of the items on the desktop.
diff --git a/src/nautilus-icon-view-container.c b/src/nautilus-icon-view-container.c
index f3673f8..873eeb8 100644
--- a/src/nautilus-icon-view-container.c
+++ b/src/nautilus-icon-view-container.c
@@ -37,7 +37,7 @@
 #define ICON_TEXT_ATTRIBUTES_NUM_ITEMS		3
 #define ICON_TEXT_ATTRIBUTES_DEFAULT_TOKENS	"size,date_modified,type"
 
-G_DEFINE_TYPE (FMIconContainer, fm_icon_container, NAUTILUS_TYPE_ICON_CONTAINER);
+G_DEFINE_TYPE (NautilusIconViewContainer, nautilus_icon_view_container, NAUTILUS_TYPE_ICON_CONTAINER);
 
 static GQuark attribute_none_q;
 
@@ -45,18 +45,18 @@ static NautilusIconView *
 get_icon_view (NautilusIconContainer *container)
 {
 	/* Type unsafe comparison for performance */
-	return ((FMIconContainer *)container)->view;
+	return ((NautilusIconViewContainer *)container)->view;
 }
 
 static NautilusIconInfo *
-fm_icon_container_get_icon_images (NautilusIconContainer *container,
-				   NautilusIconData      *data,
-				   int                    size,
-				   char                 **embedded_text,
-				   gboolean               for_drag_accept,
-				   gboolean               need_large_embeddded_text,
-				   gboolean              *embedded_text_needs_loading,
-				   gboolean              *has_window_open)
+nautilus_icon_view_container_get_icon_images (NautilusIconContainer *container,
+					      NautilusIconData      *data,
+					      int                    size,
+					      char                 **embedded_text,
+					      gboolean               for_drag_accept,
+					      gboolean               need_large_embeddded_text,
+					      gboolean              *embedded_text_needs_loading,
+					      gboolean              *has_window_open)
 {
 	NautilusIconView *icon_view;
 	char **emblems_to_ignore;
@@ -138,8 +138,8 @@ fm_icon_container_get_icon_images (NautilusIconContainer *container,
 }
 
 static char *
-fm_icon_container_get_icon_description (NautilusIconContainer *container,
-				        NautilusIconData      *data)
+nautilus_icon_view_container_get_icon_description (NautilusIconContainer *container,
+						   NautilusIconData      *data)
 {
 	NautilusFile *file;
 	char *mime_type;
@@ -159,10 +159,10 @@ fm_icon_container_get_icon_description (NautilusIconContainer *container,
 }
 
 static void
-fm_icon_container_start_monitor_top_left (NautilusIconContainer *container,
-					  NautilusIconData      *data,
-					  gconstpointer          client,
-					  gboolean               large_text)
+nautilus_icon_view_container_start_monitor_top_left (NautilusIconContainer *container,
+						     NautilusIconData      *data,
+						     gconstpointer          client,
+						     gboolean               large_text)
 {
 	NautilusFile *file;
 	NautilusFileAttributes attributes;
@@ -179,9 +179,9 @@ fm_icon_container_start_monitor_top_left (NautilusIconContainer *container,
 }
 
 static void
-fm_icon_container_stop_monitor_top_left (NautilusIconContainer *container,
-					 NautilusIconData      *data,
-					 gconstpointer          client)
+nautilus_icon_view_container_stop_monitor_top_left (NautilusIconContainer *container,
+						    NautilusIconData      *data,
+						    gconstpointer          client)
 {
 	NautilusFile *file;
 
@@ -193,8 +193,8 @@ fm_icon_container_stop_monitor_top_left (NautilusIconContainer *container,
 }
 
 static void
-fm_icon_container_prioritize_thumbnailing (NautilusIconContainer *container,
-					   NautilusIconData      *data)
+nautilus_icon_view_container_prioritize_thumbnailing (NautilusIconContainer *container,
+						      NautilusIconData      *data)
 {
 	NautilusFile *file;
 	char *uri;
@@ -215,7 +215,7 @@ fm_icon_container_prioritize_thumbnailing (NautilusIconContainer *container,
  * beneath icons.
  */
 static GQuark *
-fm_icon_container_get_icon_text_attributes_from_preferences (void)
+nautilus_icon_view_container_get_icon_text_attributes_from_preferences (void)
 {
 	static GQuark *attributes = NULL;
 
@@ -275,8 +275,8 @@ quarkv_length (GQuark *attributes)
  * 
  **/
 static GQuark *
-fm_icon_container_get_icon_text_attribute_names (NautilusIconContainer *container,
-						 int *len)
+nautilus_icon_view_container_get_icon_text_attribute_names (NautilusIconContainer *container,
+							    int *len)
 {
 	GQuark *attributes;
 	int piece_count;
@@ -293,7 +293,7 @@ fm_icon_container_get_icon_text_attribute_names (NautilusIconContainer *containe
 
 	piece_count = pieces_by_level[nautilus_icon_container_get_zoom_level (container)];
 
-	attributes = fm_icon_container_get_icon_text_attributes_from_preferences ();
+	attributes = nautilus_icon_view_container_get_icon_text_attributes_from_preferences ();
 
 	*len = MIN (piece_count, quarkv_length (attributes));
 
@@ -304,11 +304,11 @@ fm_icon_container_get_icon_text_attribute_names (NautilusIconContainer *containe
  * part below that is not editable.
  */
 static void
-fm_icon_container_get_icon_text (NautilusIconContainer *container,
-				 NautilusIconData      *data,
-				 char                 **editable_text,
-				 char                 **additional_text,
-				 gboolean               include_invisible)
+nautilus_icon_view_container_get_icon_text (NautilusIconContainer *container,
+					    NautilusIconData      *data,
+					    char                 **editable_text,
+					    char                 **additional_text,
+					    gboolean               include_invisible)
 {
 	char *actual_uri;
 	gchar *description;
@@ -371,7 +371,7 @@ fm_icon_container_get_icon_text (NautilusIconContainer *container,
 	}
 
 	/* Find out what attributes go below each icon. */
-	attributes = fm_icon_container_get_icon_text_attribute_names (container,
+	attributes = nautilus_icon_view_container_get_icon_text_attribute_names (container,
 									   &num_attributes);
 
 	/* Get the attributes. */
@@ -469,7 +469,7 @@ fm_desktop_icon_container_icons_compare (NautilusIconContainer *container,
 	file_a = (NautilusFile *) data_a;
 	file_b = (NautilusFile *) data_b;
 
-	directory_view = NAUTILUS_VIEW (FM_ICON_CONTAINER (container)->view);
+	directory_view = NAUTILUS_VIEW (NAUTILUS_ICON_VIEW_CONTAINER (container)->view);
 	g_return_val_if_fail (directory_view != NULL, 0);
 	
 	category_a = get_sort_category (file_a);
@@ -490,16 +490,16 @@ fm_desktop_icon_container_icons_compare (NautilusIconContainer *container,
 }
 
 static int
-fm_icon_container_compare_icons (NautilusIconContainer *container,
-				 NautilusIconData      *icon_a,
-				 NautilusIconData      *icon_b)
+nautilus_icon_view_container_compare_icons (NautilusIconContainer *container,
+					    NautilusIconData      *icon_a,
+					    NautilusIconData      *icon_b)
 {
 	NautilusIconView *icon_view;
 
 	icon_view = get_icon_view (container);
 	g_return_val_if_fail (icon_view != NULL, 0);
 
-	if (FM_ICON_CONTAINER (container)->sort_for_desktop) {
+	if (NAUTILUS_ICON_VIEW_CONTAINER (container)->sort_for_desktop) {
 		return fm_desktop_icon_container_icons_compare
 			(container, icon_a, icon_b);
 	}
@@ -511,9 +511,9 @@ fm_icon_container_compare_icons (NautilusIconContainer *container,
 }
 
 static int
-fm_icon_container_compare_icons_by_name (NautilusIconContainer *container,
-					 NautilusIconData      *icon_a,
-					 NautilusIconData      *icon_b)
+nautilus_icon_view_container_compare_icons_by_name (NautilusIconContainer *container,
+						    NautilusIconData      *icon_a,
+						    NautilusIconData      *icon_b)
 {
 	return nautilus_file_compare_for_sort
 		(NAUTILUS_FILE (icon_a),
@@ -523,7 +523,7 @@ fm_icon_container_compare_icons_by_name (NautilusIconContainer *container,
 }
 
 static void
-fm_icon_container_freeze_updates (NautilusIconContainer *container)
+nautilus_icon_view_container_freeze_updates (NautilusIconContainer *container)
 {
 	NautilusIconView *icon_view;
 	icon_view = get_icon_view (container);
@@ -532,7 +532,7 @@ fm_icon_container_freeze_updates (NautilusIconContainer *container)
 }
 
 static void
-fm_icon_container_unfreeze_updates (NautilusIconContainer *container)
+nautilus_icon_view_container_unfreeze_updates (NautilusIconContainer *container)
 {
 	NautilusIconView *icon_view;
 	icon_view = get_icon_view (container);
@@ -541,19 +541,19 @@ fm_icon_container_unfreeze_updates (NautilusIconContainer *container)
 }
 
 static void
-fm_icon_container_dispose (GObject *object)
+nautilus_icon_view_container_dispose (GObject *object)
 {
-	FMIconContainer *icon_container;
+	NautilusIconViewContainer *icon_container;
 
-	icon_container = FM_ICON_CONTAINER (object);
+	icon_container = NAUTILUS_ICON_VIEW_CONTAINER (object);
 
 	icon_container->view = NULL;
 
-	G_OBJECT_CLASS (fm_icon_container_parent_class)->dispose (object);
+	G_OBJECT_CLASS (nautilus_icon_view_container_parent_class)->dispose (object);
 }
 
 static void
-fm_icon_container_class_init (FMIconContainerClass *klass)
+nautilus_icon_view_container_class_init (NautilusIconViewContainerClass *klass)
 {
 	NautilusIconContainerClass *ic_class;
 
@@ -561,28 +561,28 @@ fm_icon_container_class_init (FMIconContainerClass *klass)
 
 	attribute_none_q = g_quark_from_static_string ("none");
 	
-	ic_class->get_icon_text = fm_icon_container_get_icon_text;
-	ic_class->get_icon_images = fm_icon_container_get_icon_images;
-	ic_class->get_icon_description = fm_icon_container_get_icon_description;
-	ic_class->start_monitor_top_left = fm_icon_container_start_monitor_top_left;
-	ic_class->stop_monitor_top_left = fm_icon_container_stop_monitor_top_left;
-	ic_class->prioritize_thumbnailing = fm_icon_container_prioritize_thumbnailing;
-
-	ic_class->compare_icons = fm_icon_container_compare_icons;
-	ic_class->compare_icons_by_name = fm_icon_container_compare_icons_by_name;
-	ic_class->freeze_updates = fm_icon_container_freeze_updates;
-	ic_class->unfreeze_updates = fm_icon_container_unfreeze_updates;
-
-	G_OBJECT_CLASS (klass)->dispose = fm_icon_container_dispose;
+	ic_class->get_icon_text = nautilus_icon_view_container_get_icon_text;
+	ic_class->get_icon_images = nautilus_icon_view_container_get_icon_images;
+	ic_class->get_icon_description = nautilus_icon_view_container_get_icon_description;
+	ic_class->start_monitor_top_left = nautilus_icon_view_container_start_monitor_top_left;
+	ic_class->stop_monitor_top_left = nautilus_icon_view_container_stop_monitor_top_left;
+	ic_class->prioritize_thumbnailing = nautilus_icon_view_container_prioritize_thumbnailing;
+
+	ic_class->compare_icons = nautilus_icon_view_container_compare_icons;
+	ic_class->compare_icons_by_name = nautilus_icon_view_container_compare_icons_by_name;
+	ic_class->freeze_updates = nautilus_icon_view_container_freeze_updates;
+	ic_class->unfreeze_updates = nautilus_icon_view_container_unfreeze_updates;
+
+	G_OBJECT_CLASS (klass)->dispose = nautilus_icon_view_container_dispose;
 }
 
 static void
-fm_icon_container_init (FMIconContainer *icon_container)
+nautilus_icon_view_container_init (NautilusIconViewContainer *icon_container)
 {
 }
 
 NautilusIconContainer *
-fm_icon_container_construct (FMIconContainer *icon_container, NautilusIconView *view)
+nautilus_icon_view_container_construct (NautilusIconViewContainer *icon_container, NautilusIconView *view)
 {
 	AtkObject *atk_obj;
 
@@ -596,16 +596,16 @@ fm_icon_container_construct (FMIconContainer *icon_container, NautilusIconView *
 }
 
 NautilusIconContainer *
-fm_icon_container_new (NautilusIconView *view)
+nautilus_icon_view_container_new (NautilusIconView *view)
 {
-	return fm_icon_container_construct
-		(g_object_new (FM_TYPE_ICON_CONTAINER, NULL),
+	return nautilus_icon_view_container_construct
+		(g_object_new (NAUTILUS_TYPE_ICON_VIEW_CONTAINER, NULL),
 		 view);
 }
 
 void
-fm_icon_container_set_sort_desktop (FMIconContainer *container,
-				    gboolean         desktop)
+nautilus_icon_view_container_set_sort_desktop (NautilusIconViewContainer *container,
+					       gboolean         desktop)
 {
 	container->sort_for_desktop = desktop;
 }
diff --git a/src/nautilus-icon-view-container.h b/src/nautilus-icon-view-container.h
index ab37c49..1946e35 100644
--- a/src/nautilus-icon-view-container.h
+++ b/src/nautilus-icon-view-container.h
@@ -22,46 +22,46 @@
    Author: Michael Meeks <michael ximian com>
 */
 
-#ifndef FM_ICON_CONTAINER_H
-#define FM_ICON_CONTAINER_H
+#ifndef NAUTILUS_ICON_VIEW_CONTAINER_H
+#define NAUTILUS_ICON_VIEW_CONTAINER_H
 
 #include "nautilus-icon-view.h"
 
 #include <libnautilus-private/nautilus-icon-container.h>
 
-typedef struct FMIconContainer FMIconContainer;
-typedef struct FMIconContainerClass FMIconContainerClass;
+typedef struct NautilusIconViewContainer NautilusIconViewContainer;
+typedef struct NautilusIconViewContainerClass NautilusIconViewContainerClass;
 
-#define FM_TYPE_ICON_CONTAINER fm_icon_container_get_type()
-#define FM_ICON_CONTAINER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), FM_TYPE_ICON_CONTAINER, FMIconContainer))
-#define FM_ICON_CONTAINER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), FM_TYPE_ICON_CONTAINER, FMIconContainerClass))
-#define FM_IS_ICON_CONTAINER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FM_TYPE_ICON_CONTAINER))
-#define FM_IS_ICON_CONTAINER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), FM_TYPE_ICON_CONTAINER))
-#define FM_ICON_CONTAINER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), FM_TYPE_ICON_CONTAINER, FMIconContainerClass))
+#define NAUTILUS_TYPE_ICON_VIEW_CONTAINER nautilus_icon_view_container_get_type()
+#define NAUTILUS_ICON_VIEW_CONTAINER(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_ICON_VIEW_CONTAINER, NautilusIconViewContainer))
+#define NAUTILUS_ICON_VIEW_CONTAINER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_ICON_VIEW_CONTAINER, NautilusIconViewContainerClass))
+#define NAUTILUS_IS_ICON_VIEW_CONTAINER(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_ICON_VIEW_CONTAINER))
+#define NAUTILUS_IS_ICON_VIEW_CONTAINER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_ICON_VIEW_CONTAINER))
+#define NAUTILUS_ICON_VIEW_CONTAINER_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_ICON_VIEW_CONTAINER, NautilusIconViewContainerClass))
 
-typedef struct FMIconContainerDetails FMIconContainerDetails;
+typedef struct NautilusIconViewContainerDetails NautilusIconViewContainerDetails;
 
-struct FMIconContainer {
+struct NautilusIconViewContainer {
 	NautilusIconContainer parent;
 
 	NautilusIconView *view;
 	gboolean    sort_for_desktop;
 };
 
-struct FMIconContainerClass {
+struct NautilusIconViewContainerClass {
 	NautilusIconContainerClass parent_class;
 };
 
-GType                  fm_icon_container_get_type         (void);
-NautilusIconContainer *fm_icon_container_construct        (FMIconContainer *icon_container,
-							   NautilusIconView      *view);
-NautilusIconContainer *fm_icon_container_new              (NautilusIconView      *view);
-void                   fm_icon_container_set_sort_desktop (FMIconContainer *container,
-							   gboolean         desktop);
+GType                  nautilus_icon_view_container_get_type         (void);
+NautilusIconContainer *nautilus_icon_view_container_construct        (NautilusIconViewContainer *icon_container,
+								      NautilusIconView      *view);
+NautilusIconContainer *nautilus_icon_view_container_new              (NautilusIconView      *view);
+void                   nautilus_icon_view_container_set_sort_desktop (NautilusIconViewContainer *container,
+								      gboolean         desktop);
 
-#endif /* FM_ICON_CONTAINER_H */
+#endif /* NAUTILUS_ICON_VIEW_CONTAINER_H */
diff --git a/src/nautilus-icon-view.c b/src/nautilus-icon-view.c
index 2ced068..a4b90ca 100644
--- a/src/nautilus-icon-view.c
+++ b/src/nautilus-icon-view.c
@@ -2703,7 +2703,7 @@ create_icon_container (NautilusIconView *icon_view)
 {
 	NautilusIconContainer *icon_container;
 
-	icon_container = fm_icon_container_new (icon_view);
+	icon_container = nautilus_icon_view_container_new (icon_view);
 
 	gtk_widget_set_can_focus (GTK_WIDGET (icon_container), TRUE);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]