Use G_DEFINE_TYPE instead of libgnome macros.

2008-10-06  Cosimo Cecchi  <cosimoc@gnome.org>

        * libnautilus-private/nautilus-bookmark.c:
        * libnautilus-private/nautilus-desktop-directory.c:
        * libnautilus-private/nautilus-icon-container.c:
        * libnautilus-private/nautilus-merged-directory.c:
        * libnautilus-private/nautilus-module.c:
        * libnautilus-private/nautilus-module.h:
        * libnautilus-private/nautilus-search-directory.c:
        * libnautilus-private/nautilus-signaller.c:
        * libnautilus-private/nautilus-tree-view-drag-dest.c:
        * src/file-manager/fm-icon-container.c:
        * src/nautilus-application.c:
        * src/nautilus-desktop-window.c:
        * src/nautilus-file-management-properties-main.c:
        * src/nautilus-zoom-control.c:
	Use G_DEFINE_TYPE instead of libgnome macros.


svn path=/trunk/; revision=14686

5 files changed, 15 insertions, 21 deletions

diff --git a/src/file-manager/fm-icon-container.c b/src/file-manager/fm-icon-container.c
index f815451d7..c50a5326f 100644
--- a/src/file-manager/fm-icon-container.c
+++ b/src/file-manager/fm-icon-container.c
@@ -24,7 +24,6 @@
 #include <config.h>
 
 #include <string.h>
-#include <libgnome/gnome-macros.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
@@ -37,9 +36,7 @@
 #define ICON_TEXT_ATTRIBUTES_NUM_ITEMS		3
 #define ICON_TEXT_ATTRIBUTES_DEFAULT_TOKENS	"size,date_modified,type"
 
-GNOME_CLASS_BOILERPLATE (FMIconContainer, fm_icon_container,
-			 NautilusIconContainer,
-			 nautilus_icon_container_get_type ())
+G_DEFINE_TYPE (FMIconContainer, fm_icon_container, nautilus_icon_container_get_type ());
 
 static GQuark attribute_none_q;
 
@@ -517,7 +514,7 @@ fm_icon_container_dispose (GObject *object)
 
 	icon_container->view = NULL;
 
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
+	G_OBJECT_CLASS (fm_icon_container_parent_class)->dispose (object);
 }
 
 static void
@@ -545,7 +542,7 @@ fm_icon_container_class_init (FMIconContainerClass *klass)
 }
 
 static void
-fm_icon_container_instance_init (FMIconContainer *icon_container)
+fm_icon_container_init (FMIconContainer *icon_container)
 {
 }
 
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 9d959187c..5dbe32219 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -460,7 +460,7 @@ finish_startup (NautilusApplication *application)
 	GList *drives;
 
 	/* initialize nautilus modules */
-	nautilus_module_init ();
+	nautilus_module_setup ();
 
 	/* attach menu-provider module callback */
 	menu_provider_init_callback ();
diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
index 181a45693..b4219d005 100644
--- a/src/nautilus-desktop-window.c
+++ b/src/nautilus-desktop-window.c
@@ -32,7 +32,6 @@
 #include <gtk/gtk.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-vfs-extensions.h>
-#include <libgnome/gnome-macros.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-icon-names.h>
 #include <gio/gio.h>
@@ -44,11 +43,11 @@ struct NautilusDesktopWindowDetails {
 
 static void set_wmspec_desktop_hint (GdkWindow *window);
 
-GNOME_CLASS_BOILERPLATE (NautilusDesktopWindow, nautilus_desktop_window,
-			 NautilusSpatialWindow, NAUTILUS_TYPE_SPATIAL_WINDOW)
+G_DEFINE_TYPE (NautilusDesktopWindow, nautilus_desktop_window, 
+	       NAUTILUS_TYPE_SPATIAL_WINDOW);
 
 static void
-nautilus_desktop_window_instance_init (NautilusDesktopWindow *window)
+nautilus_desktop_window_init (NautilusDesktopWindow *window)
 {
 	GtkAction *action;
 	
@@ -149,14 +148,14 @@ finalize (GObject *object)
 
 	g_free (window->details);
 
-	G_OBJECT_CLASS (parent_class)->finalize (object);
+	G_OBJECT_CLASS (nautilus_desktop_window_parent_class)->finalize (object);
 }
 
 static void
 map (GtkWidget *widget)
 {
 	/* Chain up to realize our children */
-	GTK_WIDGET_CLASS (parent_class)->map (widget);
+	GTK_WIDGET_CLASS (nautilus_desktop_window_parent_class)->map (widget);
 	gdk_window_lower (widget->window);
 }
 
@@ -179,7 +178,7 @@ unrealize (GtkWidget *widget)
 					      G_CALLBACK (nautilus_desktop_window_screen_size_changed),
 					      window);
 		
-	GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
+	GTK_WIDGET_CLASS (nautilus_desktop_window_parent_class)->unrealize (widget);
 }
 
 static void
@@ -227,7 +226,7 @@ realize (GtkWidget *widget)
 			      | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
 			      
 	/* Do the work of realizing. */
-	GTK_WIDGET_CLASS (parent_class)->realize (widget);
+	GTK_WIDGET_CLASS (nautilus_desktop_window_parent_class)->realize (widget);
 
 	/* This is the new way to set up the desktop window */
 	set_wmspec_desktop_hint (widget->window);
diff --git a/src/nautilus-file-management-properties-main.c b/src/nautilus-file-management-properties-main.c
index 44943a61a..4ea92a407 100644
--- a/src/nautilus-file-management-properties-main.c
+++ b/src/nautilus-file-management-properties-main.c
@@ -53,7 +53,7 @@ main (int argc, char *argv[])
 
 	eel_preferences_init ("/apps/nautilus");
 
-	nautilus_module_init ();
+	nautilus_module_setup ();
 
 	nautilus_file_management_properties_dialog_show (G_CALLBACK (nautilus_file_management_properties_main_close_callback), NULL);
 
diff --git a/src/nautilus-zoom-control.c b/src/nautilus-zoom-control.c
index 397c13ce4..e2f504014 100644
--- a/src/nautilus-zoom-control.c
+++ b/src/nautilus-zoom-control.c
@@ -38,7 +38,6 @@
 #include <eel/eel-gtk-extensions.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-macros.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus-private/nautilus-marshal.h>
@@ -103,15 +102,14 @@ static GType nautilus_zoom_control_accessible_get_type (void);
 
 #define NUM_ACTIONS ((int)G_N_ELEMENTS (nautilus_zoom_control_accessible_action_names))
 
-GNOME_CLASS_BOILERPLATE (NautilusZoomControl, nautilus_zoom_control,
-			 GtkHBox, GTK_TYPE_HBOX)
+G_DEFINE_TYPE (NautilusZoomControl, nautilus_zoom_control, GTK_TYPE_HBOX);
 
 static void
 nautilus_zoom_control_finalize (GObject *object)
 {
 	g_list_free (NAUTILUS_ZOOM_CONTROL (object)->details->preferred_zoom_levels);
 
-	G_OBJECT_CLASS (parent_class)->finalize (object);
+	G_OBJECT_CLASS (nautilus_zoom_control_parent_class)->finalize (object);
 }
 
 static void 
@@ -268,7 +266,7 @@ label_style_set_callback (GtkWidget *label,
 }		  
 
 static void
-nautilus_zoom_control_instance_init (NautilusZoomControl *zoom_control)
+nautilus_zoom_control_init (NautilusZoomControl *zoom_control)
 {
 	GtkWidget *image;
 	int i;