[nautilus] all: don't use EEL_CALL_METHOD* macros

From: Cosimo Cecchi <cosimoc src gnome org>
To: commits-list gnome org
Cc:
Subject: [nautilus] all: don't use EEL_CALL_METHOD* macros
Date: Wed, 5 Oct 2011 16:31:51 +0000 (UTC)
commit 2797c72a906ed6395afd45b9fa7c516d6ef3299f
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Oct 5 11:48:26 2011 -0400

    all: don't use EEL_CALL_METHOD* macros

 libnautilus-private/nautilus-directory.c |   66 ++++----------
 libnautilus-private/nautilus-directory.h |    1 -
 libnautilus-private/nautilus-file.c      |   60 ++++---------
 src/nautilus-view.c                      |  144 +++++++++---------------------
 src/nautilus-window-slot.c               |    3 +-
 5 files changed, 80 insertions(+), 194 deletions(-)
---
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index 546b44b..0934809 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -54,7 +54,6 @@ static GHashTable *directories;
 
 static void               nautilus_directory_finalize         (GObject                *object);
 static NautilusDirectory *nautilus_directory_new              (GFile                  *location);
-static char *             real_get_name_for_self_as_new_file  (NautilusDirectory      *directory);
 static GList *            real_get_file_list                  (NautilusDirectory      *directory);
 static gboolean		  real_is_editable                    (NautilusDirectory      *directory);
 static void               set_directory_location              (NautilusDirectory      *directory,
@@ -104,7 +103,6 @@ nautilus_directory_class_init (NautilusDirectoryClass *klass)
 		              g_cclosure_marshal_VOID__POINTER,
 		              G_TYPE_NONE, 1, G_TYPE_POINTER);
 
-	klass->get_name_for_self_as_new_file = real_get_name_for_self_as_new_file;
 	klass->get_file_list = real_get_file_list;
 	klass->is_editable = real_is_editable;
 
@@ -477,16 +475,6 @@ nautilus_directory_get_existing_corresponding_file (NautilusDirectory *directory
 char *
 nautilus_directory_get_name_for_self_as_new_file (NautilusDirectory *directory)
 {
-	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL);
-	
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_DIRECTORY_CLASS, directory,
-		 get_name_for_self_as_new_file, (directory));
-}
-
-static char *
-real_get_name_for_self_as_new_file (NautilusDirectory *directory)
-{
 	char *directory_uri;
 	char *name, *colon;
 	
@@ -573,10 +561,8 @@ gboolean
 nautilus_directory_are_all_files_seen (NautilusDirectory *directory)
 {
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), FALSE);
-	
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_DIRECTORY_CLASS, directory,
-		 are_all_files_seen, (directory));
+
+	return NAUTILUS_DIRECTORY_CLASS (G_OBJECT_GET_CLASS (directory))->are_all_files_seen (directory);
 }
 
 static void
@@ -1479,9 +1465,7 @@ nautilus_directory_contains_file (NautilusDirectory *directory,
 		return FALSE;
 	}
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_DIRECTORY_CLASS, directory,
-		 contains_file, (directory, file));
+	return NAUTILUS_DIRECTORY_CLASS (G_OBJECT_GET_CLASS (directory))->contains_file (directory, file);
 }
 
 char *
@@ -1513,10 +1497,9 @@ nautilus_directory_call_when_ready (NautilusDirectory *directory,
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (callback != NULL);
 
-	EEL_CALL_METHOD
-		(NAUTILUS_DIRECTORY_CLASS, directory,
-		 call_when_ready, (directory, file_attributes, wait_for_all_files,
-				   callback, callback_data));
+	NAUTILUS_DIRECTORY_CLASS (G_OBJECT_GET_CLASS (directory))->call_when_ready 
+		(directory, file_attributes, wait_for_all_files,
+		 callback, callback_data);
 }
 
 void
@@ -1527,9 +1510,8 @@ nautilus_directory_cancel_callback (NautilusDirectory *directory,
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (callback != NULL);
 
-	EEL_CALL_METHOD
-		(NAUTILUS_DIRECTORY_CLASS, directory,
-		 cancel_callback, (directory, callback, callback_data));
+	NAUTILUS_DIRECTORY_CLASS (G_OBJECT_GET_CLASS (directory))->cancel_callback 
+		(directory, callback, callback_data);
 }
 
 void
@@ -1543,12 +1525,11 @@ nautilus_directory_file_monitor_add (NautilusDirectory *directory,
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (client != NULL);
 
-	EEL_CALL_METHOD
-		(NAUTILUS_DIRECTORY_CLASS, directory,
-		 file_monitor_add, (directory, client,
-				    monitor_hidden_files,
-				    file_attributes,
-				    callback, callback_data));
+	NAUTILUS_DIRECTORY_CLASS (G_OBJECT_GET_CLASS (directory))->file_monitor_add 
+		(directory, client,
+		 monitor_hidden_files,
+		 file_attributes,
+		 callback, callback_data);
 }
 
 void
@@ -1558,9 +1539,8 @@ nautilus_directory_file_monitor_remove (NautilusDirectory *directory,
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (client != NULL);
 
-	EEL_CALL_METHOD
-		(NAUTILUS_DIRECTORY_CLASS, directory,
-		 file_monitor_remove, (directory, client));
+	NAUTILUS_DIRECTORY_CLASS (G_OBJECT_GET_CLASS (directory))->file_monitor_remove
+		(directory, client);
 }
 
 void
@@ -1568,9 +1548,7 @@ nautilus_directory_force_reload (NautilusDirectory *directory)
 {
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 
-	EEL_CALL_METHOD
-		(NAUTILUS_DIRECTORY_CLASS, directory,
-		 force_reload, (directory));
+	NAUTILUS_DIRECTORY_CLASS (G_OBJECT_GET_CLASS (directory))->force_reload (directory);
 }
 
 gboolean
@@ -1578,9 +1556,7 @@ nautilus_directory_is_not_empty (NautilusDirectory *directory)
 {
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), FALSE);
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_DIRECTORY_CLASS, directory,
-		 is_not_empty, (directory));
+	return NAUTILUS_DIRECTORY_CLASS (G_OBJECT_GET_CLASS (directory))->is_not_empty (directory);
 }
 
 static gboolean
@@ -1601,9 +1577,7 @@ is_tentative (gpointer data, gpointer callback_data)
 GList *
 nautilus_directory_get_file_list (NautilusDirectory *directory)
 {
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_DIRECTORY_CLASS, directory,
-		 get_file_list, (directory));
+	return NAUTILUS_DIRECTORY_CLASS (G_OBJECT_GET_CLASS (directory))->get_file_list (directory);
 }
 
 static GList *
@@ -1629,9 +1603,7 @@ real_is_editable (NautilusDirectory *directory)
 gboolean
 nautilus_directory_is_editable (NautilusDirectory *directory)
 {
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_DIRECTORY_CLASS, directory, 
-		 is_editable, (directory));
+	return NAUTILUS_DIRECTORY_CLASS (G_OBJECT_GET_CLASS (directory))->is_editable (directory);
 }
 
 GList *
diff --git a/libnautilus-private/nautilus-directory.h b/libnautilus-private/nautilus-directory.h
index 65225a4..22d40eb 100644
--- a/libnautilus-private/nautilus-directory.h
+++ b/libnautilus-private/nautilus-directory.h
@@ -126,7 +126,6 @@ typedef struct
 	void     (* force_reload)        (NautilusDirectory         *directory);
 	gboolean (* are_all_files_seen)  (NautilusDirectory         *directory);
 	gboolean (* is_not_empty)        (NautilusDirectory         *directory);
-	char *	 (* get_name_for_self_as_new_file) (NautilusDirectory *directory);
 
 	/* get_file_list is a function pointer that subclasses may override to
 	 * customize collecting the list of files in a directory.
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index db46f9c..3965852 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -3461,9 +3461,7 @@ nautilus_file_set_metadata (NautilusFile *file,
 		val = default_metadata;
 	}
 
-	EEL_CALL_METHOD
-		(NAUTILUS_FILE_CLASS, file,
-		 set_metadata, (file, key, val));
+	NAUTILUS_FILE_CLASS (G_OBJECT_GET_CLASS (file))->set_metadata (file, key, val);
 }
 
 void
@@ -3486,14 +3484,11 @@ nautilus_file_set_metadata_list (NautilusFile *file,
 	}
 	val[i] = NULL;
 
-	EEL_CALL_METHOD
-		(NAUTILUS_FILE_CLASS, file,
-		 set_metadata_as_list, (file, key, val));
+	NAUTILUS_FILE_CLASS (G_OBJECT_GET_CLASS (file))->set_metadata_as_list (file, key, val);
 
 	g_free (val);
 }
 
-
 gboolean
 nautilus_file_get_boolean_metadata (NautilusFile *file,
 				    const char   *key,
@@ -3752,9 +3747,7 @@ nautilus_file_monitor_add (NautilusFile *file,
 	g_return_if_fail (NAUTILUS_IS_FILE (file));
 	g_return_if_fail (client != NULL);
 
-	EEL_CALL_METHOD
-		(NAUTILUS_FILE_CLASS, file,
-		 monitor_add, (file, client, attributes));
+	NAUTILUS_FILE_CLASS (G_OBJECT_GET_CLASS (file))->monitor_add (file, client, attributes);
 }   
 			   
 void
@@ -3764,9 +3757,7 @@ nautilus_file_monitor_remove (NautilusFile *file,
 	g_return_if_fail (NAUTILUS_IS_FILE (file));
 	g_return_if_fail (client != NULL);
 
-	EEL_CALL_METHOD
-		(NAUTILUS_FILE_CLASS, file,
-		 monitor_remove, (file, client));
+	NAUTILUS_FILE_CLASS (G_OBJECT_GET_CLASS (file))->monitor_remove (file, client);
 }			      
 
 gboolean
@@ -4322,9 +4313,7 @@ nautilus_file_get_date (NautilusFile *file,
 
 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_FILE_CLASS, file,
-		 get_date, (file, date_type, date));
+	return NAUTILUS_FILE_CLASS (G_OBJECT_GET_CLASS (file))->get_date (file, date_type, date);
 }
 
 static char *
@@ -4336,9 +4325,7 @@ nautilus_file_get_where_string (NautilusFile *file)
 
 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_FILE_CLASS, file,
-		 get_where_string, (file));
+	return NAUTILUS_FILE_CLASS (G_OBJECT_GET_CLASS (file))->get_where_string (file);
 }
 
 static const char *TODAY_TIME_FORMATS [] = {
@@ -4754,9 +4741,8 @@ nautilus_file_get_directory_item_count (NautilusFile *file,
 		return FALSE;
 	}
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_FILE_CLASS, file,
-		 get_item_count, (file, count, count_unreadable));
+	return NAUTILUS_FILE_CLASS (G_OBJECT_GET_CLASS (file))->get_item_count 
+		(file, count, count_unreadable);
 }
 
 /**
@@ -4807,13 +4793,9 @@ nautilus_file_get_deep_counts (NautilusFile *file,
 		return file->details->deep_counts_status;
 	}
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_FILE_CLASS, file,
-		 get_deep_counts, (file,
-				   directory_count,
-				   file_count,
-				   unreadable_directory_count,
-				   total_size));
+	return NAUTILUS_FILE_CLASS (G_OBJECT_GET_CLASS (file))->get_deep_counts 
+		(file, directory_count, file_count,
+		 unreadable_directory_count, total_size);
 }
 
 void
@@ -7174,9 +7156,7 @@ nautilus_file_check_if_ready (NautilusFile *file,
 
 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_FILE_CLASS, file,
-		 check_if_ready, (file, file_attributes));
+	return NAUTILUS_FILE_CLASS (G_OBJECT_GET_CLASS (file))->check_if_ready (file, file_attributes);
 }			      
 
 void
@@ -7193,10 +7173,8 @@ nautilus_file_call_when_ready (NautilusFile *file,
 
 	g_return_if_fail (NAUTILUS_IS_FILE (file));
 
-	EEL_CALL_METHOD
-		(NAUTILUS_FILE_CLASS, file,
-		 call_when_ready, (file, file_attributes, 
-				   callback, callback_data));
+	NAUTILUS_FILE_CLASS (G_OBJECT_GET_CLASS (file))->call_when_ready
+		(file, file_attributes, callback, callback_data);
 }
 
 void
@@ -7212,9 +7190,8 @@ nautilus_file_cancel_call_when_ready (NautilusFile *file,
 
 	g_return_if_fail (NAUTILUS_IS_FILE (file));
 
-	EEL_CALL_METHOD
-		(NAUTILUS_FILE_CLASS, file,
-		 cancel_call_when_ready, (file, callback, callback_data));
+	NAUTILUS_FILE_CLASS (G_OBJECT_GET_CLASS (file))->cancel_call_when_ready
+		(file, callback, callback_data);
 }
 
 static void
@@ -7744,9 +7721,8 @@ nautilus_file_list_cancel_call_when_ready (NautilusFileListHandle *handle)
 		for (l = data->remaining_files; l != NULL; l = l->next) {
 			file = NAUTILUS_FILE (l->data);
 
-			EEL_CALL_METHOD
-				(NAUTILUS_FILE_CLASS, file,
-				 cancel_call_when_ready, (file, file_list_file_ready_callback, data));
+			NAUTILUS_FILE_CLASS (G_OBJECT_GET_CLASS (file))->cancel_call_when_ready
+				(file, file_list_file_ready_callback, data);
 		}
 
 		file_list_ready_data_free (data);
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index 127675e..3fa945a 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -346,9 +346,7 @@ nautilus_view_merge_menus (NautilusView *view)
 {
 	g_return_if_fail (NAUTILUS_IS_VIEW (view));
 
-	EEL_CALL_METHOD
-		(NAUTILUS_VIEW_CLASS, view,
-		 merge_menus, (view));
+	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->merge_menus (view);
 }
 
 static void
@@ -356,10 +354,7 @@ nautilus_view_unmerge_menus (NautilusView *view)
 {
 	g_return_if_fail (NAUTILUS_IS_VIEW (view));
 
-	EEL_CALL_METHOD
-		(NAUTILUS_VIEW_CLASS, view,
-		 unmerge_menus, (view));
-}
+	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->unmerge_menus (view);}
 
 static char *
 real_get_backing_uri (NautilusView *view)
@@ -401,9 +396,7 @@ nautilus_view_get_backing_uri (NautilusView *view)
 {
 	g_return_val_if_fail (NAUTILUS_IS_VIEW (view), NULL);
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_VIEW_CLASS, view,
-		 get_backing_uri, (view));
+	return NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_backing_uri (view);
 }
 
 /**
@@ -417,9 +410,7 @@ nautilus_view_select_all (NautilusView *view)
 {
 	g_return_if_fail (NAUTILUS_IS_VIEW (view));
 
-	EEL_CALL_METHOD
-		(NAUTILUS_VIEW_CLASS, view,
-		 select_all, (view));
+	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->select_all (view);
 }
 
 static void
@@ -427,9 +418,7 @@ nautilus_view_call_set_selection (NautilusView *view, GList *selection)
 {
 	g_return_if_fail (NAUTILUS_IS_VIEW (view));
 
-	EEL_CALL_METHOD
-		(NAUTILUS_VIEW_CLASS, view,
-		 set_selection, (view, selection));
+	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->set_selection (view, selection);
 }
 
 static GList *
@@ -437,9 +426,7 @@ nautilus_view_get_selection_for_file_transfer (NautilusView *view)
 {
 	g_return_val_if_fail (NAUTILUS_IS_VIEW (view), NULL);
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_VIEW_CLASS, view,
-		 get_selection_for_file_transfer, (view));
+	return NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_selection_for_file_transfer (view);
 }
 
 /**
@@ -454,9 +441,7 @@ nautilus_view_get_selected_icon_locations (NautilusView *view)
 {
 	g_return_val_if_fail (NAUTILUS_IS_VIEW (view), NULL);
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_VIEW_CLASS, view,
-		 get_selected_icon_locations, (view));
+	return NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_selected_icon_locations (view);
 }
 
 static void
@@ -464,9 +449,7 @@ nautilus_view_invert_selection (NautilusView *view)
 {
 	g_return_if_fail (NAUTILUS_IS_VIEW (view));
 
-	EEL_CALL_METHOD
-		(NAUTILUS_VIEW_CLASS, view,
-		 invert_selection, (view));
+	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->invert_selection (view);
 }
 
 /**
@@ -479,9 +462,7 @@ nautilus_view_reveal_selection (NautilusView *view)
 {
 	g_return_if_fail (NAUTILUS_IS_VIEW (view));
 
-	EEL_CALL_METHOD
-		(NAUTILUS_VIEW_CLASS, view,
-		 reveal_selection, (view));
+	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->reveal_selection (view);
 }
 
 /**
@@ -496,10 +477,9 @@ nautilus_view_reset_to_defaults (NautilusView *view)
 	NautilusWindowShowHiddenFilesMode mode;
 
 	g_return_if_fail (NAUTILUS_IS_VIEW (view));
-	
-	EEL_CALL_METHOD
-		(NAUTILUS_VIEW_CLASS, view,
-		 reset_to_defaults, (view));
+
+	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->reset_to_defaults (view);
+
 	mode = nautilus_window_get_hidden_files_mode (view->details->window);
 	if (mode != NAUTILUS_WINDOW_SHOW_HIDDEN_FILES_DEFAULT) {
 		nautilus_window_set_hidden_files_mode (view->details->window,
@@ -512,9 +492,7 @@ nautilus_view_using_manual_layout (NautilusView  *view)
 {
 	g_return_val_if_fail (NAUTILUS_IS_VIEW (view), FALSE);
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_VIEW_CLASS, view,
-		 using_manual_layout, (view));
+	return 	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->using_manual_layout (view);
 }
 
 static guint
@@ -522,9 +500,7 @@ nautilus_view_get_item_count (NautilusView *view)
 {
 	g_return_val_if_fail (NAUTILUS_IS_VIEW (view), 0);
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_VIEW_CLASS, view,
-		 get_item_count, (view));
+	return 	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_item_count (view);
 }
 
 /**
@@ -539,9 +515,7 @@ nautilus_view_get_item_count (NautilusView *view)
 static gboolean
 nautilus_view_can_rename_file (NautilusView *view, NautilusFile *file)
 {
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_VIEW_CLASS, view,
-		 can_rename_file, (view, file));
+	return 	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->can_rename_file (view, file);
 }
 
 static gboolean
@@ -549,9 +523,7 @@ nautilus_view_is_read_only (NautilusView *view)
 {
 	g_return_val_if_fail (NAUTILUS_IS_VIEW (view), FALSE);
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_VIEW_CLASS, view,
-		 is_read_only, (view));
+	return 	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->is_read_only (view);
 }
 
 static gboolean
@@ -579,9 +551,7 @@ nautilus_view_is_empty (NautilusView *view)
 {
 	g_return_val_if_fail (NAUTILUS_IS_VIEW (view), FALSE);
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_VIEW_CLASS, view,
-		 is_empty, (view));
+	return 	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->is_empty (view);
 }
 
 /**
@@ -600,9 +570,7 @@ nautilus_view_bump_zoom_level (NautilusView *view,
 		return;
 	}
 
-	EEL_CALL_METHOD
-		(NAUTILUS_VIEW_CLASS, view,
-		 bump_zoom_level, (view, zoom_increment));
+	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->bump_zoom_level (view, zoom_increment);
 }
 
 /**
@@ -621,9 +589,7 @@ nautilus_view_zoom_to_level (NautilusView *view,
 		return;
 	}
 
-	EEL_CALL_METHOD
-		(NAUTILUS_VIEW_CLASS, view,
-		 zoom_to_level, (view, zoom_level));
+	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->zoom_to_level (view, zoom_level);
 }
 
 NautilusZoomLevel
@@ -635,9 +601,7 @@ nautilus_view_get_zoom_level (NautilusView *view)
 		return NAUTILUS_ZOOM_LEVEL_STANDARD;
 	}
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_VIEW_CLASS, view,
-		 get_zoom_level, (view));
+	return NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_zoom_level (view);
 }
 
 /**
@@ -658,9 +622,7 @@ nautilus_view_can_zoom_in (NautilusView *view)
 		return FALSE;
 	}
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_VIEW_CLASS, view,
-		 can_zoom_in, (view));
+	return NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->can_zoom_in (view);
 }
 
 /**
@@ -681,9 +643,7 @@ nautilus_view_can_zoom_out (NautilusView *view)
 		return FALSE;
 	}
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_VIEW_CLASS, view,
-		 can_zoom_out, (view));
+	return NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->can_zoom_out (view);
 }
 
 gboolean
@@ -709,34 +669,26 @@ nautilus_view_restore_default_zoom_level (NautilusView *view)
 		return;
 	}
 
-	EEL_CALL_METHOD
-		(NAUTILUS_VIEW_CLASS, view,
-		 restore_default_zoom_level, (view));
+	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->restore_default_zoom_level (view);
 }
 
 const char *
 nautilus_view_get_view_id (NautilusView *view)
 {
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_VIEW_CLASS, view,
-		 get_view_id, (view));
+	return NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_view_id (view);
 }
 
 char *
 nautilus_view_get_first_visible_file (NautilusView *view)
 {
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_VIEW_CLASS, view,
-		 get_first_visible_file, (view));
+	return NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_first_visible_file (view);
 }
 
 void
 nautilus_view_scroll_to_file (NautilusView *view,
 			      const char *uri)
 {
-	EEL_CALL_METHOD
-		(NAUTILUS_VIEW_CLASS, view,
-		 scroll_to_file, (view, uri));
+	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->scroll_to_file (view, uri);
 }
 
 char **
@@ -767,8 +719,7 @@ nautilus_view_set_is_active (NautilusView *view,
 {
 	g_return_if_fail (NAUTILUS_IS_VIEW (view));
 
-	EEL_CALL_METHOD (NAUTILUS_VIEW_CLASS, view,
-			 set_is_active, (view, is_active));
+	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->set_is_active (view, is_active);
 }
 
 /**
@@ -788,12 +739,9 @@ nautilus_view_get_selection (NautilusView *view)
 {
 	g_return_val_if_fail (NAUTILUS_IS_VIEW (view), NULL);
 
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(NAUTILUS_VIEW_CLASS, view,
-		 get_selection, (view));
+	return NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_selection (view);
 }
 
-
 /**
  * nautilus_view_update_menus:
  * 
@@ -809,10 +757,7 @@ nautilus_view_update_menus (NautilusView *view)
 		return;
 	}
 
-
-	EEL_CALL_METHOD
-		(NAUTILUS_VIEW_CLASS, view,
-		 update_menus, (view));
+	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->update_menus (view);
 
 	view->details->menu_states_untrustworthy = FALSE;
 }
@@ -1806,7 +1751,7 @@ delayed_rename_file_hack_callback (RenameData *data)
 
 	if (view->details->window != NULL &&
 	    view->details->active) {
-		EEL_CALL_METHOD (NAUTILUS_VIEW_CLASS, view, start_renaming_file, (view, new_file, FALSE));
+		NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->start_renaming_file (view, new_file, FALSE);
 		nautilus_view_reveal_selection (view);
 	}
 
@@ -1857,7 +1802,7 @@ rename_file (NautilusView *view, NautilusFile *new_file)
 	/* no need to select because start_renaming_file selects
 	 * nautilus_view_select_file (view, new_file);
 	 */
-	EEL_CALL_METHOD (NAUTILUS_VIEW_CLASS, view, start_renaming_file, (view, new_file, FALSE));
+	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->start_renaming_file (view, new_file, FALSE);
 	nautilus_view_reveal_selection (view);
 }
 
@@ -1968,17 +1913,16 @@ new_folder_data_new (NautilusView *directory_view)
 }
 
 static GdkPoint *
-context_menu_to_file_operation_position (NautilusView *directory_view)
+context_menu_to_file_operation_position (NautilusView *view)
 {
-	g_return_val_if_fail (NAUTILUS_IS_VIEW (directory_view), NULL);
+	g_return_val_if_fail (NAUTILUS_IS_VIEW (view), NULL);
 
-	if (nautilus_view_using_manual_layout (directory_view)
-	    && directory_view->details->context_menu_position.x >= 0
-	    && directory_view->details->context_menu_position.y >= 0) {
-		EEL_CALL_METHOD (NAUTILUS_VIEW_CLASS, directory_view,
-				 widget_to_file_operation_position,
-				 (directory_view, &directory_view->details->context_menu_position));
-		return &directory_view->details->context_menu_position;
+	if (nautilus_view_using_manual_layout (view)
+	    && view->details->context_menu_position.x >= 0
+	    && view->details->context_menu_position.y >= 0) {
+		NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->widget_to_file_operation_position
+			(view, &view->details->context_menu_position);
+		return &view->details->context_menu_position;
 	} else {
 		return NULL;
 	}
@@ -2201,9 +2145,7 @@ click_policy_changed_callback (gpointer callback_data)
 
 	view = NAUTILUS_VIEW (callback_data);
 
-	EEL_CALL_METHOD
-		(NAUTILUS_VIEW_CLASS, view,
-		 click_policy_changed, (view));
+	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->click_policy_changed (view);
 }
 
 gboolean
@@ -2225,9 +2167,7 @@ sort_directories_first_changed_callback (gpointer callback_data)
 
 	if (preference_value != view->details->sort_directories_first) {
 		view->details->sort_directories_first = preference_value;
-		EEL_CALL_METHOD
-			(NAUTILUS_VIEW_CLASS, view,
-			 sort_directories_first_changed, (view));
+		return NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->sort_directories_first_changed (view);
 	}
 }
 
@@ -6107,7 +6047,7 @@ real_action_rename (NautilusView *view,
 				 * they are always pre-selected as a whole */
 				select_all = nautilus_file_is_directory (file);
 			}
-			EEL_CALL_METHOD (NAUTILUS_VIEW_CLASS, view, start_renaming_file, (view, file, select_all));
+			NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->start_renaming_file (view, file, select_all);
 		}
 	}
 
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index a604441..5ba27b8 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -406,8 +406,7 @@ nautilus_window_slot_update_icon (NautilusWindowSlot *slot)
 
 	g_return_if_fail (NAUTILUS_IS_WINDOW (window));
 
-	info = EEL_CALL_METHOD_WITH_RETURN_VALUE (NAUTILUS_WINDOW_CLASS, window,
-						 get_icon, (window, slot));
+	info = NAUTILUS_WINDOW_CLASS (G_OBJECT_GET_CLASS (window))->get_icon (window, slot);
 
 	icon_name = NULL;
 	if (info) {
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]