[nautilus] all: don't use EEL_CLASS_BOILERPLATE macro

[Cosimo Cecchi <cosimoc src gnome org>]

commit deb560128734593d9941f4a414e165b3943d61bf
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Oct 5 10:57:34 2011 -0400

    all: don't use EEL_CLASS_BOILERPLATE macro

 libnautilus-private/nautilus-vfs-directory.c |   18 +++++-------------
 libnautilus-private/nautilus-vfs-file.c      |   17 ++++-------------
 2 files changed, 9 insertions(+), 26 deletions(-)
---
diff --git a/libnautilus-private/nautilus-vfs-directory.c b/libnautilus-private/nautilus-vfs-directory.c
index 7b74246..29264ce 100644
--- a/libnautilus-private/nautilus-vfs-directory.c
+++ b/libnautilus-private/nautilus-vfs-directory.c
@@ -27,20 +27,14 @@
 #include "nautilus-vfs-directory.h"
 
 #include "nautilus-directory-private.h"
-#include <eel/eel-gtk-macros.h>
 #include "nautilus-file-private.h"
 
-static void nautilus_vfs_directory_init       (gpointer   object,
-					       gpointer   klass);
-static void nautilus_vfs_directory_class_init (gpointer   klass);
-
-EEL_CLASS_BOILERPLATE (NautilusVFSDirectory,
-		       nautilus_vfs_directory,
-		       NAUTILUS_TYPE_DIRECTORY)
+G_DEFINE_TYPE (NautilusVFSDirectory, nautilus_vfs_directory, NAUTILUS_TYPE_DIRECTORY);
 
 static void
-nautilus_vfs_directory_init (gpointer object, gpointer klass)
+nautilus_vfs_directory_init (NautilusVFSDirectory *directory)
 {
+
 }
 
 static gboolean
@@ -146,12 +140,10 @@ vfs_is_not_empty (NautilusDirectory *directory)
 }
 
 static void
-nautilus_vfs_directory_class_init (gpointer klass)
+nautilus_vfs_directory_class_init (NautilusVFSDirectoryClass *klass)
 {
-	NautilusDirectoryClass *directory_class;
+	NautilusDirectoryClass *directory_class = NAUTILUS_DIRECTORY_CLASS (klass);
 
-	directory_class = NAUTILUS_DIRECTORY_CLASS (klass);
-	
 	directory_class->contains_file = vfs_contains_file;
 	directory_class->call_when_ready = vfs_call_when_ready;
 	directory_class->cancel_callback = vfs_cancel_callback;
diff --git a/libnautilus-private/nautilus-vfs-file.c b/libnautilus-private/nautilus-vfs-file.c
index 38c064b..fdb3ad0 100644
--- a/libnautilus-private/nautilus-vfs-file.c
+++ b/libnautilus-private/nautilus-vfs-file.c
@@ -29,16 +29,9 @@
 #include "nautilus-directory-notify.h"
 #include "nautilus-directory-private.h"
 #include "nautilus-file-private.h"
-#include <eel/eel-gtk-macros.h>
 #include <glib/gi18n.h>
 
-static void nautilus_vfs_file_init       (gpointer   object,
-						gpointer   klass);
-static void nautilus_vfs_file_class_init (gpointer   klass);
-
-EEL_CLASS_BOILERPLATE (NautilusVFSFile,
-		       nautilus_vfs_file,
-		       NAUTILUS_TYPE_FILE)
+G_DEFINE_TYPE (NautilusVFSFile, nautilus_vfs_file, NAUTILUS_TYPE_FILE);
 
 static void             
 vfs_file_monitor_add (NautilusFile *file,
@@ -688,16 +681,14 @@ vfs_file_poll_for_media (NautilusFile *file)
 }
 
 static void
-nautilus_vfs_file_init (gpointer object, gpointer klass)
+nautilus_vfs_file_init (NautilusVFSFile *file)
 {
 }
 
 static void
-nautilus_vfs_file_class_init (gpointer klass)
+nautilus_vfs_file_class_init (NautilusVFSFileClass *klass)
 {
-	NautilusFileClass *file_class;
-
-	file_class = NAUTILUS_FILE_CLASS (klass);
+	NautilusFileClass *file_class = NAUTILUS_FILE_CLASS (klass);
 
 	file_class->monitor_add = vfs_file_monitor_add;
 	file_class->monitor_remove = vfs_file_monitor_remove;