Changed GtkType in GType



Hello!

This is quite a no-brainer. I just put GType where appropriate instead of
GtkType. The only code I didn't touch was that one in 'cut-n-paste'.
I'll write a ChangeLog entry if it's ok to commit.

Greetings,
Christian

------------------------------------------------------------------------------

? autom4te.cache
? nautilus-file-management-properties.desktop
? nautilus-gtype.patch
? components/emblem/Makefile
? components/emblem/Makefile.in
? components/emblem/Nautilus_View_emblem.server
? components/emblem/Nautilus_View_emblem.server.in
? cut-n-paste-code/libegg/Makefile
? cut-n-paste-code/libegg/Makefile.in
? src/nautilus-file-management-properties
? src/nautilus-server-connect
? src/nautilus-server-connect.desktop
? src/network-scheme.desktop
Index: components/adapter/nautilus-adapter-control-embed-strategy.h
===================================================================
RCS file:
/cvs/gnome/nautilus/components/adapter/nautilus-adapter-control-embed-strategy
.h,v
retrieving revision 1.2
diff -u -p -r1.2 nautilus-adapter-control-embed-strategy.h
--- components/adapter/nautilus-adapter-control-embed-strategy.h	5 Oct 2000 23:47:33 -0000	1.2
+++ components/adapter/nautilus-adapter-control-embed-strategy.h	30 Jan 2003 17:22:55 -0000
@@ -46,8 +46,8 @@ typedef struct {
 	NautilusAdapterEmbedStrategyClass parent;
 } NautilusAdapterControlEmbedStrategyClass;
 
-/* GtkObject support */
-GtkType                            
nautilus_adapter_control_embed_strategy_get_type (void);
+/* GObject support */
+GType                              
nautilus_adapter_control_embed_strategy_get_type (void);
 
 NautilusAdapterEmbedStrategy      
*nautilus_adapter_control_embed_strategy_new      (Bonobo_Control     control,
 										      Bonobo_UIContainer
ui_container);
Index: components/adapter/nautilus-adapter-embed-strategy.h
===================================================================
RCS file:
/cvs/gnome/nautilus/components/adapter/nautilus-adapter-embed-strategy.h,v
retrieving revision 1.4
diff -u -p -r1.4 nautilus-adapter-embed-strategy.h
--- components/adapter/nautilus-adapter-embed-strategy.h	16 Nov 2000 22:16:32 -0000	1.4
+++ components/adapter/nautilus-adapter-embed-strategy.h	30 Jan 2003 17:22:55 -0000
@@ -59,19 +59,19 @@ typedef struct {
 
 } NautilusAdapterEmbedStrategyClass;
 
-/* GtkObject support */
-GtkType                      nautilus_adapter_embed_strategy_get_type     
(void);
+/* GObject support */
+GType			      nautilus_adapter_embed_strategy_get_type	   (void);
 
 /* Instantiates the proper concrete subclass */
-NautilusAdapterEmbedStrategy *nautilus_adapter_embed_strategy_get      
(Bonobo_Unknown     component);
+NautilusAdapterEmbedStrategy *nautilus_adapter_embed_strategy_get         
(Bonobo_Unknown	component);
 
-void                          nautilus_adapter_embed_strategy_activate 
(NautilusAdapterEmbedStrategy *strategy,
-									 Bonobo_UIContainer            ui_container);
-void                         
nautilus_adapter_embed_strategy_deactivate(NautilusAdapterEmbedStrategy
*strategy);
+void                          nautilus_adapter_embed_strategy_activate    
(NautilusAdapterEmbedStrategy *strategy,
+									    Bonobo_UIContainer           
ui_container);
+void                          nautilus_adapter_embed_strategy_deactivate  
(NautilusAdapterEmbedStrategy *strategy);
 
-GtkWidget                   *nautilus_adapter_embed_strategy_get_widget
(NautilusAdapterEmbedStrategy *strategy);
+GtkWidget                    *nautilus_adapter_embed_strategy_get_widget  
(NautilusAdapterEmbedStrategy *strategy);
 
-BonoboObject                *nautilus_adapter_embed_strategy_get_zoomable
(NautilusAdapterEmbedStrategy *strategy);
+BonoboObject                 *nautilus_adapter_embed_strategy_get_zoomable
(NautilusAdapterEmbedStrategy *strategy);
 
 
 #endif /* NAUTILUS_ADAPTER_EMBED_STRATEGY_H */
Index: components/adapter/nautilus-adapter-file-load-strategy.h
===================================================================
RCS file:
/cvs/gnome/nautilus/components/adapter/nautilus-adapter-file-load-strategy.h,v
retrieving revision 1.2
diff -u -p -r1.2 nautilus-adapter-file-load-strategy.h
--- components/adapter/nautilus-adapter-file-load-strategy.h	3 Oct 2000 04:12:50 -0000	1.2
+++ components/adapter/nautilus-adapter-file-load-strategy.h	30 Jan 2003 17:22:55 -0000
@@ -46,8 +46,8 @@ typedef struct {
 	NautilusAdapterLoadStrategyClass parent;
 } NautilusAdapterFileLoadStrategyClass;
 
-/* GtkObject support */
-GtkType                           
nautilus_adapter_file_load_strategy_get_type (void);
+/* GObject support */
+GType                             
nautilus_adapter_file_load_strategy_get_type (void);
 
 NautilusAdapterLoadStrategy       *nautilus_adapter_file_load_strategy_new    
 (Bonobo_PersistFile  persist_file);
 
Index: components/adapter/nautilus-adapter-load-strategy.h
===================================================================
RCS file:
/cvs/gnome/nautilus/components/adapter/nautilus-adapter-load-strategy.h,v
retrieving revision 1.3
diff -u -p -r1.3 nautilus-adapter-load-strategy.h
--- components/adapter/nautilus-adapter-load-strategy.h	31 May 2002 16:18:12 -0000	1.3
+++ components/adapter/nautilus-adapter-load-strategy.h	30 Jan 2003 17:22:55 -0000
@@ -60,8 +60,8 @@ typedef struct {
 	void  (*stop_loading)  (NautilusAdapterLoadStrategy *strategy);
 } NautilusAdapterLoadStrategyClass;
 
-/* GtkObject support */
-GtkType                      nautilus_adapter_load_strategy_get_type          
   (void);
+/* GObject support */
+GType			     nautilus_adapter_load_strategy_get_type              (void);
 
 /* Instantiates the proper concrete subclass */
 NautilusAdapterLoadStrategy *nautilus_adapter_load_strategy_get               
   (Bonobo_Unknown  component);
Index: components/adapter/nautilus-adapter-stream-load-strategy.h
===================================================================
RCS file:
/cvs/gnome/nautilus/components/adapter/nautilus-adapter-stream-load-strategy.h
,v
retrieving revision 1.2
diff -u -p -r1.2 nautilus-adapter-stream-load-strategy.h
--- components/adapter/nautilus-adapter-stream-load-strategy.h	3 Oct 2000 04:12:50 -0000	1.2
+++ components/adapter/nautilus-adapter-stream-load-strategy.h	30 Jan 2003 17:22:55 -0000
@@ -46,8 +46,8 @@ typedef struct {
 	NautilusAdapterLoadStrategyClass parent;
 } NautilusAdapterStreamLoadStrategyClass;
 
-/* GtkObject support */
-GtkType                           
nautilus_adapter_stream_load_strategy_get_type (void);
+/* GObject support */
+GType                             
nautilus_adapter_stream_load_strategy_get_type (void);
 
 NautilusAdapterLoadStrategy       *nautilus_adapter_stream_load_strategy_new  
   (Bonobo_PersistStream  persist_stream);
 
Index: components/adapter/nautilus-adapter.h
===================================================================
RCS file: /cvs/gnome/nautilus/components/adapter/nautilus-adapter.h,v
retrieving revision 1.3
diff -u -p -r1.3 nautilus-adapter.h
--- components/adapter/nautilus-adapter.h	25 Sep 2001 18:26:15 -0000	1.3
+++ components/adapter/nautilus-adapter.h	30 Jan 2003 17:22:55 -0000
@@ -46,8 +46,8 @@ typedef struct {
 	GtkObjectClass parent;
 } NautilusAdapterClass;
 
-/* GtkObject support */
-GtkType          nautilus_adapter_get_type          (void);
+/* GObject support */
+GType            nautilus_adapter_get_type          (void);
 
 NautilusAdapter *nautilus_adapter_new               (Bonobo_Unknown
component);
 NautilusView    *nautilus_adapter_get_nautilus_view (NautilusAdapter
*adapter);
Index: components/adapter/nautilus-zoomable-proxy.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/adapter/nautilus-zoomable-proxy.c,v
retrieving revision 1.4
diff -u -p -r1.4 nautilus-zoomable-proxy.c
--- components/adapter/nautilus-zoomable-proxy.c	4 Jan 2002 20:52:16 -0000	1.4
+++ components/adapter/nautilus-zoomable-proxy.c	30 Jan 2003 17:22:56 -0000
@@ -267,7 +267,7 @@ nautilus_zoomable_proxy_init (NautilusZo
 /**
  * nautilus_zoomable_proxy_get_type:
  *
- * Returns: the GtkType for a NautilusZoomableProxy object.
+ * Returns: the GType for a NautilusZoomableProxy object.
  */
 GType
 nautilus_zoomable_proxy_get_type (void)
Index: components/emblem/nautilus-emblem-view.h
===================================================================
RCS file: /cvs/gnome/nautilus/components/emblem/nautilus-emblem-view.h,v
retrieving revision 1.1
diff -u -p -r1.1 nautilus-emblem-view.h
--- components/emblem/nautilus-emblem-view.h	4 Oct 2002 16:59:26 -0000	1.1
+++ components/emblem/nautilus-emblem-view.h	30 Jan 2003 17:22:56 -0000
@@ -52,6 +52,6 @@ typedef struct {
 	
 } NautilusEmblemViewClass;
 
-GtkType              nautilus_emblem_view_get_type     (void);
+GType	nautilus_emblem_view_get_type     (void);
 
 #endif /* NAUTILUS_EMBLEM_VIEW_H */
Index: components/hardware/nautilus-hardware-view.h
===================================================================
RCS file: /cvs/gnome/nautilus/components/hardware/nautilus-hardware-view.h,v
retrieving revision 1.7
diff -u -p -r1.7 nautilus-hardware-view.h
--- components/hardware/nautilus-hardware-view.h	24 Jul 2002 20:20:49 -0000	1.7
+++ components/hardware/nautilus-hardware-view.h	30 Jan 2003 17:22:56 -0000
@@ -49,8 +49,8 @@ struct _NautilusHardwareViewClass {
 	EelBackgroundBoxClass parent_class;
 };
 
-/* GtkObject support */
-GtkType       nautilus_hardware_view_get_type          (void);
+/* GObject support */
+GType	      nautilus_hardware_view_get_type          (void);
 
 /* Component embedding support */
 BonoboObject *nautilus_hardware_view_get_nautilus_view (NautilusHardwareView
*view);
Index: components/loser/content/nautilus-content-loser.h
===================================================================
RCS file:
/cvs/gnome/nautilus/components/loser/content/nautilus-content-loser.h,v
retrieving revision 1.5
diff -u -p -r1.5 nautilus-content-loser.h
--- components/loser/content/nautilus-content-loser.h	13 Jul 2000 16:45:33 -0000	1.5
+++ components/loser/content/nautilus-content-loser.h	30 Jan 2003 17:22:59 -0000
@@ -51,8 +51,8 @@ struct NautilusContentLoserClass {
 	GtkLabelClass parent_class;
 };
 
-/* GtkObject support */
-GtkType       nautilus_content_loser_get_type          (void);
+/* GObject support */
+GType	      nautilus_content_loser_get_type          (void);
 
 /* Component embedding support */
 NautilusView *nautilus_content_loser_get_nautilus_view (NautilusContentLoser
*view);
Index: components/loser/sidebar/nautilus-sidebar-loser.h
===================================================================
RCS file:
/cvs/gnome/nautilus/components/loser/sidebar/nautilus-sidebar-loser.h,v
retrieving revision 1.5
diff -u -p -r1.5 nautilus-sidebar-loser.h
--- components/loser/sidebar/nautilus-sidebar-loser.h	13 Jul 2000 16:45:33 -0000	1.5
+++ components/loser/sidebar/nautilus-sidebar-loser.h	30 Jan 2003 17:22:59 -0000
@@ -51,8 +51,8 @@ struct NautilusSidebarLoserClass {
 	GtkLabelClass parent_class;
 };
 
-/* GtkObject support */
-GtkType       nautilus_sidebar_loser_get_type          (void);
+/* GObject support */
+GType	      nautilus_sidebar_loser_get_type          (void);
 
 /* Component embedding support */
 NautilusView *nautilus_sidebar_loser_get_nautilus_view (NautilusSidebarLoser
*view);
Index: components/music/nautilus-music-view.h
===================================================================
RCS file: /cvs/gnome/nautilus/components/music/nautilus-music-view.h,v
retrieving revision 1.7
diff -u -p -r1.7 nautilus-music-view.h
--- components/music/nautilus-music-view.h	2 Feb 2001 03:52:07 -0000	1.7
+++ components/music/nautilus-music-view.h	30 Jan 2003 17:23:04 -0000
@@ -50,7 +50,7 @@ struct NautilusMusicViewClass {
 
 
 
-/* GtkObject support */
-GtkType       nautilus_music_view_get_type          (void);
+/* GObject support */
+GType	nautilus_music_view_get_type	    (void);
 
 #endif /* NAUTILUS_MUSIC_VIEW_H */
Index: components/news/nautilus-cell-renderer-news.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/news/nautilus-cell-renderer-news.c,v
retrieving revision 1.2
diff -u -p -r1.2 nautilus-cell-renderer-news.c
--- components/news/nautilus-cell-renderer-news.c	7 Mar 2002 19:35:47 -0000	1.2
+++ components/news/nautilus-cell-renderer-news.c	30 Jan 2003 17:23:04 -0000
@@ -88,7 +88,7 @@ static gpointer parent_class;
 GType
 nautilus_cell_renderer_news_get_type (void)
 {
-        static GtkType cell_news_type = 0;
+        static GType cell_news_type = 0;
 
         if (!cell_news_type) {
                 static const GTypeInfo cell_news_info = {
Index: components/text/nautilus-text-view.h
===================================================================
RCS file: /cvs/gnome/nautilus/components/text/nautilus-text-view.h,v
retrieving revision 1.2
diff -u -p -r1.2 nautilus-text-view.h
--- components/text/nautilus-text-view.h	2 Feb 2001 03:52:17 -0000	1.2
+++ components/text/nautilus-text-view.h	30 Jan 2003 17:23:06 -0000
@@ -31,11 +31,11 @@
 typedef struct NautilusTextView      NautilusTextView;
 typedef struct NautilusTextViewClass NautilusTextViewClass;
 
-#define NAUTILUS_TYPE_TEXT_VIEW	    (nautilus_text_view_get_type ())
-#define NAUTILUS_TEXT_VIEW(obj)	    (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_TEXT_VIEW,
NautilusTextView))
-#define NAUTILUS_TEXT_VIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass),
NAUTILUS_TYPE_TEXT_VIEW, NautilusTextViewClass))
-#define NAUTILUS_IS_TEXT_VIEW(obj)	    (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_TEXT_VIEW))
-#define NAUTILUS_IS_TEXT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass),
NAUTILUS_TYPE_TEXT_VIEW))
+#define NAUTILUS_TYPE_TEXT_VIEW			(nautilus_text_view_get_type ())
+#define NAUTILUS_TEXT_VIEW(obj)			(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_TEXT_VIEW,
NautilusTextView))
+#define NAUTILUS_TEXT_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_TEXT_VIEW,
NautilusTextViewClass))
+#define NAUTILUS_IS_TEXT_VIEW(obj)		(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_TEXT_VIEW))
+#define NAUTILUS_IS_TEXT_VIEW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_TEXT_VIEW))
 
 typedef struct NautilusTextViewDetails NautilusTextViewDetails;
 
@@ -50,8 +50,8 @@ struct NautilusTextViewClass {
 
 
 
-/* GtkObject support */
-GtkType       nautilus_text_view_get_type          (void);
+/* GObject support */
+GType	nautilus_text_view_get_type		(void);
 
 
 #endif /* NAUTILUS_TEXT_VIEW_H */
Index: components/throbber/nautilus-throbber.h
===================================================================
RCS file: /cvs/gnome/nautilus/components/throbber/nautilus-throbber.h,v
retrieving revision 1.3
diff -u -p -r1.3 nautilus-throbber.h
--- components/throbber/nautilus-throbber.h	7 Mar 2002 14:02:12 -0000	1.3
+++ components/throbber/nautilus-throbber.h	30 Jan 2003 17:23:06 -0000
@@ -56,7 +56,7 @@ struct NautilusThrobberClass {
 				   const char       *location);
 };
 
-GtkType       nautilus_throbber_get_type       (void);
+GType         nautilus_throbber_get_type       (void);
 GtkWidget    *nautilus_throbber_new            (void);
 BonoboObject *nautilus_throbber_get_control    (NautilusThrobber *throbber);
 void          nautilus_throbber_start          (NautilusThrobber *throbber);
Index: libnautilus/nautilus-view-standard-main.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus/nautilus-view-standard-main.c,v
retrieving revision 1.34
diff -u -p -r1.34 nautilus-view-standard-main.c
--- libnautilus/nautilus-view-standard-main.c	22 Jan 2003 17:44:03 -0000	1.34
+++ libnautilus/nautilus-view-standard-main.c	30 Jan 2003 17:28:44 -0000
@@ -415,7 +415,7 @@ nautilus_view_standard_main (const char 
 						  user_data);
 }
 
-typedef GtkType (* TypeFunc) (void);
+typedef GType (* TypeFunc) (void);
 
 BonoboObject *
 nautilus_view_create_from_get_type_function (const char *iid, void *user_data)
Index: libnautilus/nautilus-view.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus/nautilus-view.h,v
retrieving revision 1.47
diff -u -p -r1.47 nautilus-view.h
--- libnautilus/nautilus-view.h	8 Jan 2002 17:35:48 -0000	1.47
+++ libnautilus/nautilus-view.h	30 Jan 2003 17:28:44 -0000
@@ -64,7 +64,7 @@ typedef struct {
 				    GList                  *selection);
 } NautilusViewClass;
 
-GtkType            nautilus_view_get_type                             (void);
+GType              nautilus_view_get_type                             (void);
 NautilusView *     nautilus_view_new                                 
(GtkWidget              *widget);
 NautilusView *     nautilus_view_new_from_bonobo_control             
(BonoboControl          *bonobo_control);
 BonoboControl *    nautilus_view_get_bonobo_control                  
(NautilusView           *view);
Index: libnautilus-private/nautilus-directory-metafile-monitor.h
===================================================================
RCS file:
/cvs/gnome/nautilus/libnautilus-private/nautilus-directory-metafile-monitor.h,v
retrieving revision 1.6
diff -u -p -r1.6 nautilus-directory-metafile-monitor.h
--- libnautilus-private/nautilus-directory-metafile-monitor.h	21 Feb 2002 19:26:46 -0000	1.6
+++ libnautilus-private/nautilus-directory-metafile-monitor.h	30 Jan 2003 17:28:48 -0000
@@ -45,7 +45,7 @@ typedef struct {
 	POA_Nautilus_MetafileMonitor__epv epv;
 } NautilusMetafileMonitorClass;
 
-GtkType                  nautilus_metafile_monitor_get_type (void);
+GType                    nautilus_metafile_monitor_get_type (void);
 NautilusMetafileMonitor *nautilus_metafile_monitor_new      (NautilusDirectory
*directory);
 
 #endif /* NAUTILUS_METAFILE_MONITOR_H */
Index: libnautilus-private/nautilus-directory.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-directory.h,v
retrieving revision 1.61
diff -u -p -r1.61 nautilus-directory.h
--- libnautilus-private/nautilus-directory.h	28 Jun 2002 14:28:27 -0000	1.61
+++ libnautilus-private/nautilus-directory.h	30 Jan 2003 17:28:49 -0000
@@ -127,8 +127,8 @@ typedef struct
 	char *	 (* get_name_for_self_as_new_file) (NautilusDirectory
*directory);
 } NautilusDirectoryClass;
 
-/* Basic GtkObject requirements. */
-GtkType            nautilus_directory_get_type                 (void);
+/* Basic GObject requirements. */
+GType              nautilus_directory_get_type                 (void);
 
 /* Get a directory given a uri.
  * Creates the appropriate subclass given the uri mappings.
Index: libnautilus-private/nautilus-entry.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-entry.h,v
retrieving revision 1.18
diff -u -p -r1.18 nautilus-entry.h
--- libnautilus-private/nautilus-entry.h	28 Oct 2001 20:21:45 -0000	1.18
+++ libnautilus-private/nautilus-entry.h	30 Jan 2003 17:28:49 -0000
@@ -56,7 +56,7 @@ typedef struct {
 	void (*selection_changed) (NautilusEntry *entry);
 } NautilusEntryClass;
 
-GtkType     nautilus_entry_get_type                 (void);
+GType       nautilus_entry_get_type                 (void);
 GtkWidget  *nautilus_entry_new                      (void);
 GtkWidget  *nautilus_entry_new_with_max_length      (guint16        max);
 void        nautilus_entry_set_text                 (NautilusEntry *entry,
Index: libnautilus-private/nautilus-file.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-file.h,v
retrieving revision 1.90
diff -u -p -r1.90 nautilus-file.h
--- libnautilus-private/nautilus-file.h	18 Sep 2002 18:26:09 -0000	1.90
+++ libnautilus-private/nautilus-file.h	30 Jan 2003 17:28:53 -0000
@@ -83,8 +83,8 @@ typedef char * (*NautilusTruncateCallbac
 					       int	      width,
 					       void	     *context);
 
-/* GtkObject requirements. */
-GtkType                 nautilus_file_get_type                         
(void);
+/* GObject requirements. */
+GType                   nautilus_file_get_type                         
(void);
 
 /* Getting at a single file. */
 NautilusFile *          nautilus_file_get                               (const
char                     *uri);
Index: libnautilus-private/nautilus-horizontal-splitter.h
===================================================================
RCS file:
/cvs/gnome/nautilus/libnautilus-private/nautilus-horizontal-splitter.h,v
retrieving revision 1.10
diff -u -p -r1.10 nautilus-horizontal-splitter.h
--- libnautilus-private/nautilus-horizontal-splitter.h	7 Mar 2002 14:02:17 -0000	1.10
+++ libnautilus-private/nautilus-horizontal-splitter.h	30 Jan 2003 17:28:53 -0000
@@ -47,7 +47,7 @@ typedef struct {
 } NautilusHorizontalSplitterClass;
 
 /* NautilusHorizontalSplitter public methods */
-GtkType    nautilus_horizontal_splitter_get_type (void);
+GType      nautilus_horizontal_splitter_get_type (void);
 GtkWidget *nautilus_horizontal_splitter_new      (void);
 
 gboolean   nautilus_horizontal_splitter_is_hidden	(NautilusHorizontalSplitter *splitter);
Index: libnautilus-private/nautilus-icon-canvas-item.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-canvas-item.h,v
retrieving revision 1.24
diff -u -p -r1.24 nautilus-icon-canvas-item.h
--- libnautilus-private/nautilus-icon-canvas-item.h	26 Sep 2002 10:07:40 -0000	1.24
+++ libnautilus-private/nautilus-icon-canvas-item.h	30 Jan 2003 17:28:54 -0000
@@ -57,8 +57,8 @@ struct NautilusIconCanvasItemClass {
 	EelCanvasItemClass parent_class;
 };
 
-/* GtkObject */
-GtkType     nautilus_icon_canvas_item_get_type                 (void);
+/* GObject */
+GType       nautilus_icon_canvas_item_get_type                 (void);
 
 /* attributes */
 void        nautilus_icon_canvas_item_set_image               
(NautilusIconCanvasItem       *item,
Index: libnautilus-private/nautilus-keep-last-vertical-box.h
===================================================================
RCS file:
/cvs/gnome/nautilus/libnautilus-private/nautilus-keep-last-vertical-box.h,v
retrieving revision 1.1
diff -u -p -r1.1 nautilus-keep-last-vertical-box.h
--- libnautilus-private/nautilus-keep-last-vertical-box.h	19 May 2000 02:24:39 -0000	1.1
+++ libnautilus-private/nautilus-keep-last-vertical-box.h	30 Jan 2003 17:28:58 -0000
@@ -45,7 +45,7 @@ struct NautilusKeepLastVerticalBoxClass 
 	GtkVBoxClass parent_class;
 };
 
-GtkType    nautilus_keep_last_vertical_box_get_type  (void);
+GType      nautilus_keep_last_vertical_box_get_type  (void);
 GtkWidget *nautilus_keep_last_vertical_box_new       (gint spacing);
 
 #endif /* NAUTILUS_KEEP_LAST_VERTICAL_BOX_H */
Index: libnautilus-private/nautilus-merged-directory.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-merged-directory.h,v
retrieving revision 1.5
diff -u -p -r1.5 nautilus-merged-directory.h
--- libnautilus-private/nautilus-merged-directory.h	21 Feb 2002 19:26:47 -0000	1.5
+++ libnautilus-private/nautilus-merged-directory.h	30 Jan 2003 17:28:59 -0000
@@ -56,7 +56,7 @@ typedef struct {
 					NautilusDirectory       *real_directory);
 } NautilusMergedDirectoryClass;
 
-GtkType nautilus_merged_directory_get_type              (void);
+GType   nautilus_merged_directory_get_type              (void);
 void    nautilus_merged_directory_add_real_directory   
(NautilusMergedDirectory *merged_directory,
 							 NautilusDirectory       *real_directory);
 void    nautilus_merged_directory_remove_real_directory
(NautilusMergedDirectory *merged_directory,
Index: libnautilus-private/nautilus-metafile.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-metafile.h,v
retrieving revision 1.12
diff -u -p -r1.12 nautilus-metafile.h
--- libnautilus-private/nautilus-metafile.h	9 May 2002 19:49:32 -0000	1.12
+++ libnautilus-private/nautilus-metafile.h	30 Jan 2003 17:28:59 -0000
@@ -46,7 +46,7 @@ typedef struct {
 	POA_Nautilus_Metafile__epv epv;
 } NautilusMetafileClass;
 
-GtkType nautilus_metafile_get_type (void);
+GType   nautilus_metafile_get_type (void);
 
 NautilusMetafile *nautilus_metafile_get (const char *directory_uri);
 
Index: libnautilus-private/nautilus-program-chooser.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-program-chooser.h,v
retrieving revision 1.7
diff -u -p -r1.7 nautilus-program-chooser.h
--- libnautilus-private/nautilus-program-chooser.h	21 Feb 2002 19:26:47 -0000	1.7
+++ libnautilus-private/nautilus-program-chooser.h	30 Jan 2003 17:29:01 -0000
@@ -54,7 +54,7 @@ struct NautilusProgramChooserClass
 	GtkDialogClass parent_class;
 };
 
-GtkType                  nautilus_program_chooser_get_type               
(void);
+GType                    nautilus_program_chooser_get_type               
(void);
 GtkWidget 		*nautilus_program_chooser_new 		  	 
(GnomeVFSMimeActionType  type, 
 					   			   	   NautilusFile 	  *file);
 
Index: libnautilus-private/nautilus-trash-directory.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-trash-directory.h,v
retrieving revision 1.7
diff -u -p -r1.7 nautilus-trash-directory.h
--- libnautilus-private/nautilus-trash-directory.h	21 Feb 2002 19:26:47 -0000	1.7
+++ libnautilus-private/nautilus-trash-directory.h	30 Jan 2003 17:29:02 -0000
@@ -50,7 +50,7 @@ typedef struct {
 	NautilusMergedDirectoryClass parent_slot;
 } NautilusTrashDirectoryClass;
 
-GtkType nautilus_trash_directory_get_type (void);
+GType   nautilus_trash_directory_get_type (void);
 void	nautilus_trash_directory_finish_initializing (NautilusTrashDirectory
*trash);
 
 #endif /* NAUTILUS_TRASH_DIRECTORY_H */
Index: libnautilus-private/nautilus-trash-file.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-trash-file.h,v
retrieving revision 1.3
diff -u -p -r1.3 nautilus-trash-file.h
--- libnautilus-private/nautilus-trash-file.h	21 Feb 2002 19:26:47 -0000	1.3
+++ libnautilus-private/nautilus-trash-file.h	30 Jan 2003 17:29:02 -0000
@@ -50,6 +50,6 @@ typedef struct {
 	NautilusFileClass parent_slot;
 } NautilusTrashFileClass;
 
-GtkType nautilus_trash_file_get_type (void);
+GType   nautilus_trash_file_get_type (void);
 
 #endif /* NAUTILUS_TRASH_FILE_H */
Index: libnautilus-private/nautilus-vfs-directory.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-vfs-directory.h,v
retrieving revision 1.3
diff -u -p -r1.3 nautilus-vfs-directory.h
--- libnautilus-private/nautilus-vfs-directory.h	21 Feb 2002 19:26:47 -0000	1.3
+++ libnautilus-private/nautilus-vfs-directory.h	30 Jan 2003 17:29:03 -0000
@@ -50,6 +50,6 @@ typedef struct {
 	NautilusDirectoryClass parent_slot;
 } NautilusVFSDirectoryClass;
 
-GtkType nautilus_vfs_directory_get_type (void);
+GType   nautilus_vfs_directory_get_type (void);
 
 #endif /* NAUTILUS_VFS_DIRECTORY_H */
Index: libnautilus-private/nautilus-vfs-file.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-vfs-file.h,v
retrieving revision 1.3
diff -u -p -r1.3 nautilus-vfs-file.h
--- libnautilus-private/nautilus-vfs-file.h	21 Feb 2002 19:26:47 -0000	1.3
+++ libnautilus-private/nautilus-vfs-file.h	30 Jan 2003 17:29:03 -0000
@@ -50,6 +50,6 @@ typedef struct {
 	NautilusFileClass parent_slot;
 } NautilusVFSFileClass;
 
-GtkType nautilus_vfs_file_get_type (void);
+GType   nautilus_vfs_file_get_type (void);
 
 #endif /* NAUTILUS_VFS_FILE_H */
Index: libnautilus-private/nautilus-volume-monitor.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-volume-monitor.h,v
retrieving revision 1.39
diff -u -p -r1.39 nautilus-volume-monitor.h
--- libnautilus-private/nautilus-volume-monitor.h	28 Aug 2002 16:09:19 -0000	1.39
+++ libnautilus-private/nautilus-volume-monitor.h	30 Jan 2003 17:29:04 -0000
@@ -74,7 +74,7 @@ typedef enum {
 
 typedef gboolean (* NautilusEachVolumeCallback) (const NautilusVolume *,
gpointer callback_data);
 
-GtkType                  nautilus_volume_monitor_get_type                  
(void);
+GType                    nautilus_volume_monitor_get_type                  
(void);
 NautilusVolumeMonitor  	*nautilus_volume_monitor_get                       
(void);
 void                     nautilus_volume_monitor_mount_unmount_removable   
(NautilusVolumeMonitor      *monitor,
 									     const char                
*mount_point,
Index: src/nautilus-bookmark-list.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-bookmark-list.h,v
retrieving revision 1.6
diff -u -p -r1.6 nautilus-bookmark-list.h
--- src/nautilus-bookmark-list.h	4 May 2001 03:14:38 -0000	1.6
+++ src/nautilus-bookmark-list.h	30 Jan 2003 17:31:17 -0000
@@ -54,7 +54,7 @@ struct NautilusBookmarkListClass {
 	void (* contents_changed) (NautilusBookmarkList *bookmarks);
 };
 
-GtkType                 nautilus_bookmark_list_get_type            (void);
+GType                   nautilus_bookmark_list_get_type            (void);
 NautilusBookmarkList *  nautilus_bookmark_list_new                 (void);
 void                    nautilus_bookmark_list_append             
(NautilusBookmarkList   *bookmarks,
 								    NautilusBookmark *bookmark);
Index: src/nautilus-complex-search-bar.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-complex-search-bar.h,v
retrieving revision 1.10
diff -u -p -r1.10 nautilus-complex-search-bar.h
--- src/nautilus-complex-search-bar.h	4 May 2001 03:14:38 -0000	1.10
+++ src/nautilus-complex-search-bar.h	30 Jan 2003 17:31:18 -0000
@@ -53,7 +53,7 @@ typedef struct {
 	NautilusSearchBarClass parent_slot;
 } NautilusComplexSearchBarClass;
 
-GtkType    nautilus_complex_search_bar_get_type (void);
+GType      nautilus_complex_search_bar_get_type (void);
 GtkWidget *nautilus_complex_search_bar_new      (NautilusWindow *window);
 
 GSList *   nautilus_complex_search_bar_get_search_criteria
(NautilusComplexSearchBar *bar);
Index: src/nautilus-component-adapter-factory.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-component-adapter-factory.h,v
retrieving revision 1.3
diff -u -p -r1.3 nautilus-component-adapter-factory.h
--- src/nautilus-component-adapter-factory.h	30 Oct 2001 19:31:54 -0000	1.3
+++ src/nautilus-component-adapter-factory.h	30 Jan 2003 17:31:18 -0000
@@ -59,7 +59,7 @@ struct NautilusComponentAdapterFactoryCl
 	GtkObjectClass parent_class;
 };
 
-GtkType                          nautilus_component_adapter_factory_get_type  
    (void);
+GType                            nautilus_component_adapter_factory_get_type  
    (void);
 NautilusComponentAdapterFactory *nautilus_component_adapter_factory_get       
    (void);
 Nautilus_View                   
nautilus_component_adapter_factory_create_adapter
(NautilusComponentAdapterFactory *factory,
 										    Bonobo_Unknown                  
component);
Index: src/nautilus-desktop-window.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-desktop-window.h,v
retrieving revision 1.9
diff -u -p -r1.9 nautilus-desktop-window.h
--- src/nautilus-desktop-window.h	2 Oct 2002 05:36:51 -0000	1.9
+++ src/nautilus-desktop-window.h	30 Jan 2003 17:31:18 -0000
@@ -49,7 +49,7 @@ typedef struct {
 	NautilusWindowClass parent_spot;
 } NautilusDesktopWindowClass;
 
-GtkType                nautilus_desktop_window_get_type            (void);
+GType                  nautilus_desktop_window_get_type            (void);
 NautilusDesktopWindow *nautilus_desktop_window_new                
(NautilusApplication *application,
 								    GdkScreen           *screen);
 void                   nautilus_desktop_window_update_directory   
(NautilusDesktopWindow *window);
Index: src/nautilus-information-panel.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-information-panel.h,v
retrieving revision 1.17
diff -u -p -r1.17 nautilus-information-panel.h
--- src/nautilus-information-panel.h	21 Sep 2002 16:31:23 -0000	1.17
+++ src/nautilus-information-panel.h	30 Jan 2003 17:31:19 -0000
@@ -57,7 +57,7 @@ typedef struct {
 				  const char *location);
 } NautilusInformationPanelClass;
 
-GtkType          nautilus_information_panel_get_type     (void);
+GType            nautilus_information_panel_get_type     (void);
 NautilusInformationPanel *nautilus_information_panel_new          (void);
 void             nautilus_information_panel_set_uri     
(NautilusInformationPanel   *information_panel,
 						const char        *new_uri,
Index: src/nautilus-location-bar.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-location-bar.h,v
retrieving revision 1.12
diff -u -p -r1.12 nautilus-location-bar.h
--- src/nautilus-location-bar.h	9 Feb 2001 01:32:53 -0000	1.12
+++ src/nautilus-location-bar.h	30 Jan 2003 17:31:19 -0000
@@ -55,7 +55,7 @@ typedef struct {
 	NautilusNavigationBarClass parent_class;
 } NautilusLocationBarClass;
 
-GtkType    nautilus_location_bar_get_type     	(void);
+GType      nautilus_location_bar_get_type     	(void);
 GtkWidget* nautilus_location_bar_new          	(NautilusWindow *window);
 
 #endif /* NAUTILUS_LOCATION_BAR_H */
Index: src/nautilus-navigation-bar.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-navigation-bar.h,v
retrieving revision 1.6
diff -u -p -r1.6 nautilus-navigation-bar.h
--- src/nautilus-navigation-bar.h	4 May 2001 10:18:35 -0000	1.6
+++ src/nautilus-navigation-bar.h	30 Jan 2003 17:31:19 -0000
@@ -58,7 +58,7 @@ typedef struct {
 
 } NautilusNavigationBarClass;
 
-GtkType nautilus_navigation_bar_get_type         (void);
+GType   nautilus_navigation_bar_get_type         (void);
 void	nautilus_navigation_bar_activate	 (NautilusNavigationBar *bar);
 char *  nautilus_navigation_bar_get_location     (NautilusNavigationBar *bar);
 void    nautilus_navigation_bar_set_location     (NautilusNavigationBar *bar,
Index: src/nautilus-property-browser.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-property-browser.h,v
retrieving revision 1.5
diff -u -p -r1.5 nautilus-property-browser.h
--- src/nautilus-property-browser.h	2 Oct 2002 05:36:51 -0000	1.5
+++ src/nautilus-property-browser.h	30 Jan 2003 17:31:20 -0000
@@ -61,7 +61,7 @@ struct NautilusPropertyBrowserClass
 	GtkWindowClass parent_class;
 };
 
-GtkType                  nautilus_property_browser_get_type (void);
+GType                    nautilus_property_browser_get_type (void);
 NautilusPropertyBrowser *nautilus_property_browser_new      (GdkScreen        
      *screen);
 void                     nautilus_property_browser_show     (GdkScreen        
      *screen);
 void                     nautilus_property_browser_set_path
(NautilusPropertyBrowser *panel,
Index: src/nautilus-search-bar-criterion.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-search-bar-criterion.h,v
retrieving revision 1.9
diff -u -p -r1.9 nautilus-search-bar-criterion.h
--- src/nautilus-search-bar-criterion.h	4 May 2001 03:14:38 -0000	1.9
+++ src/nautilus-search-bar-criterion.h	30 Jan 2003 17:31:21 -0000
@@ -72,7 +72,7 @@ typedef struct {
 typedef void (* NautilusSearchBarCriterionCallback)
(NautilusSearchBarCriterion *old_criterion,
 						     gpointer data);
 
-GtkType                            nautilus_search_bar_criterion_get_type     
   (void);
+GType                              nautilus_search_bar_criterion_get_type     
   (void);
 
 /* Three new procedures, each with a separate purpose:
    create the initial search option with first_new,
Index: src/nautilus-search-bar.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-search-bar.h,v
retrieving revision 1.7
diff -u -p -r1.7 nautilus-search-bar.h
--- src/nautilus-search-bar.h	4 May 2001 03:14:38 -0000	1.7
+++ src/nautilus-search-bar.h	30 Jan 2003 17:31:21 -0000
@@ -54,6 +54,6 @@ typedef struct {
 	NautilusNavigationBarClass parent_class;
 } NautilusSearchBarClass;
 
-GtkType nautilus_search_bar_get_type (void);
+GType   nautilus_search_bar_get_type (void);
 
 #endif /* NAUTILUS_SEARCH_BAR_H */
Index: src/nautilus-sidebar-title.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-sidebar-title.h,v
retrieving revision 1.12
diff -u -p -r1.12 nautilus-sidebar-title.h
--- src/nautilus-sidebar-title.h	10 Jul 2002 16:23:34 -0000	1.12
+++ src/nautilus-sidebar-title.h	30 Jan 2003 17:31:22 -0000
@@ -52,7 +52,7 @@ typedef struct
 	GtkVBoxClass parent_class;
 } NautilusSidebarTitleClass;
 
-GtkType    nautilus_sidebar_title_get_type          (void);
+GType      nautilus_sidebar_title_get_type          (void);
 GtkWidget *nautilus_sidebar_title_new               (void);
 void       nautilus_sidebar_title_set_file          (NautilusSidebarTitle
*sidebar_title,
 						     NautilusFile         *file,
Index: src/nautilus-simple-search-bar.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-simple-search-bar.h,v
retrieving revision 1.6
diff -u -p -r1.6 nautilus-simple-search-bar.h
--- src/nautilus-simple-search-bar.h	13 Oct 2000 23:47:08 -0000	1.6
+++ src/nautilus-simple-search-bar.h	30 Jan 2003 17:31:22 -0000
@@ -55,7 +55,7 @@ typedef struct {
 	NautilusSearchBarClass parent_class;
 } NautilusSimpleSearchBarClass;
 
-GtkType    nautilus_simple_search_bar_get_type     (void);
+GType      nautilus_simple_search_bar_get_type     (void);
 GtkWidget* nautilus_simple_search_bar_new          (NautilusWindow *window);
 
 #endif /* NAUTILUS_SIMPLE_SEARCH_BAR_H */
Index: src/nautilus-switchable-navigation-bar.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-switchable-navigation-bar.h,v
retrieving revision 1.6
diff -u -p -r1.6 nautilus-switchable-navigation-bar.h
--- src/nautilus-switchable-navigation-bar.h	27 Mar 2001 20:31:21 -0000	1.6
+++ src/nautilus-switchable-navigation-bar.h	30 Jan 2003 17:31:22 -0000
@@ -63,7 +63,7 @@ typedef struct {
 					  NautilusSwitchableNavigationBarMode mode);
 } NautilusSwitchableNavigationBarClass;
 
-GtkType    			    nautilus_switchable_navigation_bar_get_type	(void);
+GType    			    nautilus_switchable_navigation_bar_get_type	(void);
 GtkWidget* 			    nautilus_switchable_navigation_bar_new     
(NautilusWindow *window);
 NautilusSwitchableNavigationBarMode
nautilus_switchable_navigation_bar_get_mode (NautilusSwitchableNavigationBar   
 *switchable_navigation_bar);
 void       			    nautilus_switchable_navigation_bar_set_mode
(NautilusSwitchableNavigationBar     *switchable_navigation_bar,
Index: src/nautilus-switchable-search-bar.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-switchable-search-bar.h,v
retrieving revision 1.7
diff -u -p -r1.7 nautilus-switchable-search-bar.h
--- src/nautilus-switchable-search-bar.h	13 Oct 2000 23:47:08 -0000	1.7
+++ src/nautilus-switchable-search-bar.h	30 Jan 2003 17:31:22 -0000
@@ -59,7 +59,7 @@ typedef struct {
 			       NautilusSearchBarMode        mode);
 } NautilusSwitchableSearchBarClass;
 
-GtkType    nautilus_switchable_search_bar_get_type (void);
+GType      nautilus_switchable_search_bar_get_type (void);
 GtkWidget *nautilus_switchable_search_bar_new      (NautilusWindow *window);
 void       nautilus_switchable_search_bar_set_mode
(NautilusSwitchableSearchBar *search_bar,
 						    NautilusSearchBarMode        mode);
Index: src/nautilus-view-frame.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-view-frame.h,v
retrieving revision 1.69
diff -u -p -r1.69 nautilus-view-frame.h
--- src/nautilus-view-frame.h	26 Apr 2002 19:45:21 -0000	1.69
+++ src/nautilus-view-frame.h	30 Jan 2003 17:31:23 -0000
@@ -96,7 +96,7 @@ typedef struct {
 } NautilusViewFrameClass;
 
 /* basic view management */
-GtkType            nautilus_view_frame_get_type                  (void);
+GType              nautilus_view_frame_get_type                  (void);
 NautilusViewFrame *nautilus_view_frame_new                      
(BonoboUIContainer   *ui_container,
                                                                  
NautilusUndoManager *undo_manager);
 Bonobo_Control	   nautilus_view_frame_get_control		 (NautilusViewFrame   *view);
Index: src/nautilus-window.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window.h,v
retrieving revision 1.105
diff -u -p -r1.105 nautilus-window.h
--- src/nautilus-window.h	7 Jan 2003 05:19:58 -0000	1.105
+++ src/nautilus-window.h	30 Jan 2003 17:31:26 -0000
@@ -116,7 +116,7 @@ struct NautilusWindow {
         NautilusWindowShowState show_state;
 };
 
-GtkType          nautilus_window_get_type             (void);
+GType            nautilus_window_get_type             (void);
 void		 nautilus_window_ui_freeze	      (NautilusWindow	 *window);
 void		 nautilus_window_ui_thaw	      (NautilusWindow	 *window);
 void             nautilus_window_close                (NautilusWindow   
*window);
Index: src/nautilus-zoom-control.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-zoom-control.h,v
retrieving revision 1.16
diff -u -p -r1.16 nautilus-zoom-control.h
--- src/nautilus-zoom-control.h	26 Apr 2002 19:45:22 -0000	1.16
+++ src/nautilus-zoom-control.h	30 Jan 2003 17:31:26 -0000
@@ -59,7 +59,7 @@ struct NautilusZoomControlClass {
 				 GtkScrollType scroll);
 };
 
-GtkType    nautilus_zoom_control_get_type           (void);
+GType      nautilus_zoom_control_get_type           (void);
 GtkWidget *nautilus_zoom_control_new                (void);
 
 void       nautilus_zoom_control_set_zoom_level     (NautilusZoomControl
*zoom_control,
Index: src/file-manager/fm-desktop-icon-view.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-desktop-icon-view.h,v
retrieving revision 1.9
diff -u -p -r1.9 fm-desktop-icon-view.h
--- src/file-manager/fm-desktop-icon-view.h	12 Oct 2000 19:50:48 -0000	1.9
+++ src/file-manager/fm-desktop-icon-view.h	30 Jan 2003 17:31:27 -0000
@@ -43,7 +43,7 @@ typedef struct {
 	FMIconViewClass parent_class;
 } FMDesktopIconViewClass;
 
-/* GtkObject support */
-GtkType fm_desktop_icon_view_get_type (void);
+/* GObject support */
+GType   fm_desktop_icon_view_get_type (void);
 
 #endif /* FM_DESKTOP_ICON_VIEW_H */
Index: src/file-manager/fm-directory-view.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.h,v
retrieving revision 1.126
diff -u -p -r1.126 fm-directory-view.h
--- src/file-manager/fm-directory-view.h	11 Mar 2002 10:17:49 -0000	1.126
+++ src/file-manager/fm-directory-view.h	30 Jan 2003 17:31:29 -0000
@@ -282,8 +282,8 @@ struct FMDirectoryViewClass {
 	void	(* emblems_changed)                (FMDirectoryView *view);
 };
 
-/* GtkObject support */
-GtkType             fm_directory_view_get_type                         (void);
+/* GObject support */
+GType               fm_directory_view_get_type                         (void);
 
 /* Component embedding support */
 NautilusView *      fm_directory_view_get_nautilus_view               
(FMDirectoryView  *view);
Index: src/file-manager/fm-icon-view.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-icon-view.h,v
retrieving revision 1.11
diff -u -p -r1.11 fm-icon-view.h
--- src/file-manager/fm-icon-view.h	19 Dec 2002 19:56:38 -0000	1.11
+++ src/file-manager/fm-icon-view.h	30 Jan 2003 17:31:30 -0000
@@ -86,8 +86,8 @@ struct FMIconViewClass {
 
 };
 
-/* GtkObject support */
-GtkType fm_icon_view_get_type      (void);
+/* GObject support */
+GType   fm_icon_view_get_type      (void);
 int     fm_icon_view_compare_files (FMIconView   *icon_view,
 				    NautilusFile *a,
 				    NautilusFile *b);
Index: src/file-manager/fm-properties-window.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-properties-window.h,v
retrieving revision 1.9
diff -u -p -r1.9 fm-properties-window.h
--- src/file-manager/fm-properties-window.h	28 Nov 2002 12:34:13 -0000	1.9
+++ src/file-manager/fm-properties-window.h	30 Jan 2003 17:31:32 -0000
@@ -59,7 +59,7 @@ typedef struct FMPropertiesWindowClass F
 
 
 
-GtkType fm_properties_window_get_type   (void);
+GType   fm_properties_window_get_type   (void);
 void 	fm_properties_window_present 	(NautilusFile    *file, 
 					 FMDirectoryView *directory_view);
 
Index: src/file-manager/fm-search-list-view.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-search-list-view.h,v
retrieving revision 1.3
diff -u -p -r1.3 fm-search-list-view.h
--- src/file-manager/fm-search-list-view.h	5 Oct 2000 23:47:53 -0000	1.3
+++ src/file-manager/fm-search-list-view.h	30 Jan 2003 17:31:32 -0000
@@ -44,7 +44,7 @@ typedef struct {
 	FMListViewClass parent_slot;
 } FMSearchListViewClass;
 
-/* GtkObject support */
-GtkType fm_search_list_view_get_type (void);
+/* GObject support */
+GType   fm_search_list_view_get_type (void);
 
 #endif /* FM_SEARCH_LIST_VIEW_H */



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