diff --git a/ChangeLog b/ChangeLog
index 9e6f63698..1e7abca88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-11  jacob berkman  <jacob@ximian.com>
+
+	* (various files): fix improper use of guint as GType
+
 2002-04-10  Kevin Breit  <mrproper@ximian.com>
 
 	* configure.in: Added the help/Makefile.am and help/C/Makefile.am.
diff --git a/archiver/archive.h b/archiver/archive.h
index 6e8335963..c446285a8 100644
--- a/archiver/archive.h
+++ b/archiver/archive.h
@@ -57,7 +57,7 @@ struct _ArchiveClass
 	POA_ConfigArchiver_Archive__epv epv;
 };
 
-guint         archive_get_type                (void);
+GType         archive_get_type                (void);
 
 gboolean      archive_construct               (Archive                       *archive,
 					       gboolean                       is_new);
diff --git a/archiver/backend-list.h b/archiver/backend-list.h
index 664950b55..20aae22f3 100644
--- a/archiver/backend-list.h
+++ b/archiver/backend-list.h
@@ -55,7 +55,7 @@ struct _BackendListClass
 	POA_ConfigArchiver_BackendList__epv epv;
 };
 
-guint         backend_list_get_type    (void);
+GType         backend_list_get_type    (void);
 
 BonoboObject *backend_list_new         (gboolean is_global);
 
diff --git a/archiver/cluster-location.c b/archiver/cluster-location.c
index 1458261f9..2fe987c3c 100644
--- a/archiver/cluster-location.c
+++ b/archiver/cluster-location.c
@@ -67,10 +67,10 @@ static gboolean host_cb                      (Cluster *cluster,
 					      gchar *hostname,
 					      pair_t *pair);
 
-guint
+GType
 cluster_location_get_type (void)
 {
-	static guint cluster_location_type = 0;
+	static GType cluster_location_type = 0;
 
 	if (!cluster_location_type) {
 		GtkTypeInfo cluster_location_info = {
diff --git a/archiver/cluster-location.h b/archiver/cluster-location.h
index 66592fcc3..2aa54a532 100644
--- a/archiver/cluster-location.h
+++ b/archiver/cluster-location.h
@@ -50,7 +50,7 @@ struct _ClusterLocationClass
 	LocationClass location_class;
 };
 
-guint cluster_location_get_type         (void);
+GType cluster_location_get_type         (void);
 
 GtkObject *cluster_location_new         (void);
 
diff --git a/archiver/cluster.c b/archiver/cluster.c
index c9749b167..f3a3c08f5 100644
--- a/archiver/cluster.c
+++ b/archiver/cluster.c
@@ -80,10 +80,10 @@ static SlaveHost  *slave_host_new            (gchar *hostname);
 static SlaveHost  *slave_host_read_xml       (xmlNodePtr node);
 static xmlNodePtr  slave_host_write_xml      (SlaveHost *host);
 
-guint
+GType
 cluster_get_type (void)
 {
-	static guint cluster_type = 0;
+	static GType cluster_type = 0;
 
 	if (!cluster_type) {
 		GtkTypeInfo cluster_info = {
diff --git a/archiver/cluster.h b/archiver/cluster.h
index 223852019..85dc503bb 100644
--- a/archiver/cluster.h
+++ b/archiver/cluster.h
@@ -52,7 +52,7 @@ struct _ClusterClass
 	ArchiveClass archive_class;
 };
 
-guint      cluster_get_type          (void);
+GType      cluster_get_type          (void);
 
 GtkObject *cluster_new               (gchar         *prefix);
 GtkObject *cluster_load              (gchar         *prefix);
diff --git a/archiver/config-log.c b/archiver/config-log.c
index 8d40a06cb..2b08c0b61 100644
--- a/archiver/config-log.c
+++ b/archiver/config-log.c
@@ -118,10 +118,10 @@ static void       config_log_entry_destroy      (ConfigLogEntry  *entry);
 static void       dump_file                     (FILE            *input,
 						 FILE            *output);
 
-guint
+GType
 config_log_get_type (void) 
 {
-	static guint config_log_type;
+	static GType config_log_type;
 
 	if (!config_log_type) {
 		GtkTypeInfo config_log_info = {
diff --git a/archiver/config-log.h b/archiver/config-log.h
index ef3b9632b..aed9c8205 100644
--- a/archiver/config-log.h
+++ b/archiver/config-log.h
@@ -54,7 +54,7 @@ struct _ConfigLogClass
 	GtkObjectClass parent;
 };
 
-guint      config_log_get_type                 (void);
+GType      config_log_get_type                 (void);
 
 GtkObject *config_log_open                     (Location            *location);
 void       config_log_delete                   (ConfigLog           *config_log);
diff --git a/archiver/location.h b/archiver/location.h
index c42a3b0e2..8bc2527d8 100644
--- a/archiver/location.h
+++ b/archiver/location.h
@@ -63,7 +63,7 @@ struct _LocationClass
 				 xmlDocPtr xml_doc);
 };
 
-guint           location_get_type                     (void);
+GType           location_get_type                     (void);
 
 BonoboObject   *location_new                          (Archive         *archive, 
 						       const gchar     *locid, 
diff --git a/capplets/background/prefs-widget.c b/capplets/background/prefs-widget.c
index fea2c39b3..52b3d1413 100644
--- a/capplets/background/prefs-widget.c
+++ b/capplets/background/prefs-widget.c
@@ -90,10 +90,10 @@ static void adjust_opacity_toggled_cb    (GtkToggleButton *tb,
 static void opacity_adjust_changed_cb    (GtkAdjustment *adjustment,
 					  PrefsWidget *prefs_widget);
 
-guint
+GType
 prefs_widget_get_type (void)
 {
-	static guint prefs_widget_type = 0;
+	static GType prefs_widget_type = 0;
 
 	if (!prefs_widget_type) {
 		GtkTypeInfo prefs_widget_info = {
diff --git a/capplets/background/prefs-widget.h b/capplets/background/prefs-widget.h
index ac7748c7d..08d92d31a 100644
--- a/capplets/background/prefs-widget.h
+++ b/capplets/background/prefs-widget.h
@@ -54,7 +54,7 @@ struct _PrefsWidgetClass
 	CappletWidgetClass parent_class;
 };
 
-guint prefs_widget_get_type (void);
+GType prefs_widget_get_type (void);
 
 GtkWidget *prefs_widget_new         (Preferences *prefs);
 
diff --git a/capplets/file-types/file-types-icon-entry.c b/capplets/file-types/file-types-icon-entry.c
index a6f5307de..74ead133e 100644
--- a/capplets/file-types/file-types-icon-entry.c
+++ b/capplets/file-types/file-types-icon-entry.c
@@ -41,10 +41,10 @@ static GtkVBoxClass *parent_class;
 
 static GtkTargetEntry drop_types[] = { { "text/uri-list", 0, 0 } };
 
-guint
+GType
 nautilus_mime_type_icon_entry_get_type (void)
 {
-	static guint icon_entry_type = 0;
+	static GType icon_entry_type = 0;
 
 	if (!icon_entry_type) {
 		GtkTypeInfo icon_entry_info = {
diff --git a/capplets/file-types/file-types-icon-entry.h b/capplets/file-types/file-types-icon-entry.h
index 95899902a..fe7811def 100644
--- a/capplets/file-types/file-types-icon-entry.h
+++ b/capplets/file-types/file-types-icon-entry.h
@@ -46,7 +46,7 @@ struct _NautilusMimeIconEntryClass {
 };
 
 
-guint      nautilus_mime_type_icon_entry_get_type    (void);
+GType      nautilus_mime_type_icon_entry_get_type    (void);
 GtkWidget *nautilus_mime_type_icon_entry_new         (const gchar *history_id,
 					 const gchar *browse_dialog_title);
 
diff --git a/capplets/rollback/rollback-capplet-dialog.c b/capplets/rollback/rollback-capplet-dialog.c
index a0e667219..7cd020a15 100644
--- a/capplets/rollback/rollback-capplet-dialog.c
+++ b/capplets/rollback/rollback-capplet-dialog.c
@@ -106,10 +106,10 @@ static void      apply_cb                           (GtkButton
 static void      close_cb                           (GtkButton                  *button,
 						     RollbackCappletDialog      *dialog);
 
-guint
+GType
 rollback_capplet_dialog_get_type (void)
 {
-	static guint rollback_capplet_dialog_type = 0;
+	static GType rollback_capplet_dialog_type = 0;
 
 	if (!rollback_capplet_dialog_type) {
 		GtkTypeInfo rollback_capplet_dialog_info = {
diff --git a/capplets/rollback/rollback-capplet-dialog.h b/capplets/rollback/rollback-capplet-dialog.h
index 87561bcef..6202e648a 100644
--- a/capplets/rollback/rollback-capplet-dialog.h
+++ b/capplets/rollback/rollback-capplet-dialog.h
@@ -49,7 +49,7 @@ struct _RollbackCappletDialogClass
 	GnomeDialogClass gnome_dialog_class;
 };
 
-guint rollback_capplet_dialog_get_type         (void);
+GType rollback_capplet_dialog_get_type         (void);
 
 GtkObject *rollback_capplet_dialog_new         (gchar *capplet_name);
 
diff --git a/capplets/rollback/rollback-control.c b/capplets/rollback/rollback-control.c
index 7c136c727..9e0573afe 100644
--- a/capplets/rollback/rollback-control.c
+++ b/capplets/rollback/rollback-control.c
@@ -85,11 +85,11 @@ static gint time_to_x                    (time_t t, gint width);
 static gint horner                       (gint *coeff, gint degree, 
 					  gint divisor, gint x);
 
-guint
+GType
 rollback_control_get_type (void)
 {
-	static guint rollback_control_type = 0;
-
+	static GType rollback_control_type = 0;
+	
 	if (!rollback_control_type) {
 		GtkTypeInfo rollback_control_info = {
 			"RollbackControl",
diff --git a/capplets/rollback/rollback-control.h b/capplets/rollback/rollback-control.h
index 8cc8b4ed3..dda28b590 100644
--- a/capplets/rollback/rollback-control.h
+++ b/capplets/rollback/rollback-control.h
@@ -49,7 +49,7 @@ struct _RollbackControlClass
 	GnomeCanvasItemClass gnome_canvas_item_class;
 };
 
-guint rollback_control_get_type         (void);
+GType rollback_control_get_type         (void);
 
 END_GNOME_DECLS
 
diff --git a/capplets/rollback/rollback-widget.c b/capplets/rollback/rollback-widget.c
index eeb3020ef..d86a6f606 100644
--- a/capplets/rollback/rollback-widget.c
+++ b/capplets/rollback/rollback-widget.c
@@ -54,10 +54,10 @@ static void rollback_widget_finalize    (GtkObject *object);
 static void rollback_widget_realize     (GtkWidget *widget);
 static void rollback_widget_unrealize   (GtkWidget *widget);
 
-guint
+GType
 rollback_widget_get_type (void)
 {
-	static guint rollback_widget_type = 0;
+	static GType rollback_widget_type = 0;
 
 	if (!rollback_widget_type) {
 		GtkTypeInfo rollback_widget_info = {
diff --git a/capplets/rollback/rollback-widget.h b/capplets/rollback/rollback-widget.h
index 079fbe74a..7e901dc3a 100644
--- a/capplets/rollback/rollback-widget.h
+++ b/capplets/rollback/rollback-widget.h
@@ -58,7 +58,7 @@ struct _RollbackWidgetClass
 	GnomeCanvasClass gnome_canvas_class;
 };
 
-guint rollback_widget_get_type         (void);
+GType rollback_widget_get_type         (void);
 
 GtkObject *rollback_widget_new         (void);
 
diff --git a/capplets/sound/preferences.c b/capplets/sound/preferences.c
index b599f6eb7..0b35c2a3d 100644
--- a/capplets/sound/preferences.c
+++ b/capplets/sound/preferences.c
@@ -79,10 +79,10 @@ static SoundEvent *sound_event_read_xml  (xmlNodePtr event_node);
 
 static void start_esd                    (void);
 
-guint
+GType
 preferences_get_type (void)
 {
-	static guint preferences_type = 0;
+	static GType preferences_type = 0;
 
 	if (!preferences_type) {
 		GtkTypeInfo preferences_info = {
diff --git a/capplets/sound/preferences.h b/capplets/sound/preferences.h
index 0dcfd28bc..c2dac0d9a 100644
--- a/capplets/sound/preferences.h
+++ b/capplets/sound/preferences.h
@@ -83,7 +83,7 @@ struct _PreferencesClass
 	GtkObjectClass klass;
 };
 
-guint        preferences_get_type   (void);
+GType        preferences_get_type   (void);
 
 GtkObject   *preferences_new        (void);
 GtkObject   *preferences_clone      (Preferences *prefs);
diff --git a/capplets/sound/prefs-widget.c b/capplets/sound/prefs-widget.c
index 2150cb147..18688a17f 100644
--- a/capplets/sound/prefs-widget.c
+++ b/capplets/sound/prefs-widget.c
@@ -79,10 +79,10 @@ static void events_tree_select_cb         (GtkCTree *ctree,
 static void sound_file_entry_changed_cb   (GtkEntry *entry, 
 					   PrefsWidget *prefs_widget);
 
-guint
+GType
 prefs_widget_get_type (void)
 {
-	static guint prefs_widget_type = 0;
+	static GType prefs_widget_type = 0;
 
 	if (!prefs_widget_type) {
 		GtkTypeInfo prefs_widget_info = {
diff --git a/capplets/sound/prefs-widget.h b/capplets/sound/prefs-widget.h
index 38bbd4d0e..f08a9aaff 100644
--- a/capplets/sound/prefs-widget.h
+++ b/capplets/sound/prefs-widget.h
@@ -54,7 +54,7 @@ struct _PrefsWidgetClass
 	CappletWidgetClass parent_class;
 };
 
-guint prefs_widget_get_type (void);
+GType prefs_widget_get_type (void);
 
 GtkWidget *prefs_widget_new         (Preferences *prefs);
 
diff --git a/capplets/ui-properties/preferences.c b/capplets/ui-properties/preferences.c
index c37c17135..286674516 100644
--- a/capplets/ui-properties/preferences.c
+++ b/capplets/ui-properties/preferences.c
@@ -41,10 +41,10 @@ static gint apply_timeout_cb             (Preferences *prefs);
 
 #define DGI "/desktop/gnome/interface/"
 
-guint
+GType
 preferences_get_type (void)
 {
-	static guint preferences_type = 0;
+	static GType preferences_type = 0;
 
 	if (!preferences_type) {
 		GtkTypeInfo preferences_info = {
diff --git a/capplets/ui-properties/preferences.h b/capplets/ui-properties/preferences.h
index cb352adbb..98645ff7d 100644
--- a/capplets/ui-properties/preferences.h
+++ b/capplets/ui-properties/preferences.h
@@ -68,7 +68,7 @@ struct _PreferencesClass
 	GtkObjectClass klass;
 };
 
-guint        preferences_get_type   (void);
+GType        preferences_get_type   (void);
 
 GtkObject   *preferences_new        (void);
 GtkObject   *preferences_clone      (Preferences *prefs);
diff --git a/capplets/ui-properties/prefs-widget-app.c b/capplets/ui-properties/prefs-widget-app.c
index da722cd83..4d2554fb7 100644
--- a/capplets/ui-properties/prefs-widget-app.c
+++ b/capplets/ui-properties/prefs-widget-app.c
@@ -47,10 +47,10 @@ static widget_desc_t widget_desc[] = {
 static void prefs_widget_app_init         (PrefsWidgetApp *prefs_widget_app);
 static void prefs_widget_app_class_init   (PrefsWidgetAppClass *class);
 
-guint
+GType
 prefs_widget_app_get_type (void)
 {
-	static guint prefs_widget_app_type = 0;
+	static GType prefs_widget_app_type = 0;
 
 	if (!prefs_widget_app_type) {
 		GtkTypeInfo prefs_widget_app_info = {
diff --git a/capplets/ui-properties/prefs-widget-app.h b/capplets/ui-properties/prefs-widget-app.h
index 4a71318c1..14b5a68ee 100644
--- a/capplets/ui-properties/prefs-widget-app.h
+++ b/capplets/ui-properties/prefs-widget-app.h
@@ -47,7 +47,7 @@ struct _PrefsWidgetAppClass
 	PrefsWidgetClass parent_class;
 };
 
-guint prefs_widget_app_get_type (void);
+GType prefs_widget_app_get_type (void);
 
 GtkWidget *prefs_widget_app_new         (Preferences *prefs);
 
diff --git a/capplets/ui-properties/prefs-widget-dialogs.c b/capplets/ui-properties/prefs-widget-dialogs.c
index bcfa73329..0df139e83 100644
--- a/capplets/ui-properties/prefs-widget-dialogs.c
+++ b/capplets/ui-properties/prefs-widget-dialogs.c
@@ -43,10 +43,10 @@ static widget_desc_t widget_desc[] = {
 static void prefs_widget_dialogs_init (PrefsWidgetDialogs *prefs_widget_dlgs);
 static void prefs_widget_dialogs_class_init (PrefsWidgetDialogsClass *class);
 
-guint
+GType
 prefs_widget_dialogs_get_type (void)
 {
-	static guint prefs_widget_dialogs_type = 0;
+	static GType prefs_widget_dialogs_type = 0;
 
 	if (!prefs_widget_dialogs_type) {
 		GtkTypeInfo prefs_widget_dialogs_info = {
diff --git a/capplets/ui-properties/prefs-widget-dialogs.h b/capplets/ui-properties/prefs-widget-dialogs.h
index e7e2d587d..b37ad4eff 100644
--- a/capplets/ui-properties/prefs-widget-dialogs.h
+++ b/capplets/ui-properties/prefs-widget-dialogs.h
@@ -47,7 +47,7 @@ struct _PrefsWidgetDialogsClass
 	PrefsWidgetClass parent_class;
 };
 
-guint prefs_widget_dialogs_get_type (void);
+GType prefs_widget_dialogs_get_type (void);
 
 GtkWidget *prefs_widget_dialogs_new         (Preferences *prefs);
 
diff --git a/capplets/ui-properties/prefs-widget-mdi.c b/capplets/ui-properties/prefs-widget-mdi.c
index 7435ba736..dda60de7d 100644
--- a/capplets/ui-properties/prefs-widget-mdi.c
+++ b/capplets/ui-properties/prefs-widget-mdi.c
@@ -40,10 +40,10 @@ static widget_desc_t widget_desc[] = {
 static void prefs_widget_mdi_init         (PrefsWidgetMDI *prefs_widget_mdi);
 static void prefs_widget_mdi_class_init   (PrefsWidgetMDIClass *class);
 
-guint
+GType
 prefs_widget_mdi_get_type (void)
 {
-	static guint prefs_widget_mdi_type = 0;
+	static GType prefs_widget_mdi_type = 0;
 
 	if (!prefs_widget_mdi_type) {
 		GtkTypeInfo prefs_widget_mdi_info = {
diff --git a/capplets/ui-properties/prefs-widget-mdi.h b/capplets/ui-properties/prefs-widget-mdi.h
index 84063c2cf..51dcccf6f 100644
--- a/capplets/ui-properties/prefs-widget-mdi.h
+++ b/capplets/ui-properties/prefs-widget-mdi.h
@@ -47,7 +47,7 @@ struct _PrefsWidgetMDIClass
 	PrefsWidgetClass parent_class;
 };
 
-guint prefs_widget_mdi_get_type (void);
+GType prefs_widget_mdi_get_type (void);
 
 GtkWidget *prefs_widget_mdi_new         (Preferences *prefs);
 
diff --git a/capplets/ui-properties/prefs-widget.c b/capplets/ui-properties/prefs-widget.c
index 5eb6cc442..a7a99072c 100644
--- a/capplets/ui-properties/prefs-widget.c
+++ b/capplets/ui-properties/prefs-widget.c
@@ -103,10 +103,10 @@ static void prefs_widget_response_cb	  (PrefsWidget *prefs_widget, GtkResponseTy
 
 #define CAPPLET_WIDGET(x) GTK_DIALOG(x)
 
-guint
+GType
 prefs_widget_get_type (void)
 {
-	static guint prefs_widget_type = 0;
+	static GType prefs_widget_type = 0;
 
 	if (!prefs_widget_type) {
 		GtkTypeInfo prefs_widget_info = {
diff --git a/capplets/ui-properties/prefs-widget.h b/capplets/ui-properties/prefs-widget.h
index 3b4b7facc..588cb990d 100644
--- a/capplets/ui-properties/prefs-widget.h
+++ b/capplets/ui-properties/prefs-widget.h
@@ -85,7 +85,7 @@ struct _PrefsWidgetClass
 	widget_desc_t *widget_desc;
 };
 
-guint prefs_widget_get_type (void);
+GType prefs_widget_get_type (void);
 
 GtkWidget *prefs_widget_new         (Preferences *prefs);
 
diff --git a/control-center/preferences.c b/control-center/preferences.c
index f418ea45f..2cac61776 100644
--- a/control-center/preferences.c
+++ b/control-center/preferences.c
@@ -51,10 +51,10 @@ static void gnomecc_preferences_class_init (GnomeCCPreferencesClass *klass);
 
 static void set_single_window_controls_sensitive (GladeXML *data, gboolean s);
 
-guint
+GType
 gnomecc_preferences_get_type (void) 
 {
-	static guint gnomecc_preferences_type;
+	static GType gnomecc_preferences_type;
 
 	if (!gnomecc_preferences_type) {
 		static const GTypeInfo gnomecc_preferences_info = {
diff --git a/control-center/preferences.h b/control-center/preferences.h
index 520197f7c..cd398a9a9 100644
--- a/control-center/preferences.h
+++ b/control-center/preferences.h
@@ -58,7 +58,7 @@ struct _GnomeCCPreferencesClass
 	void (*changed) (GnomeCCPreferences *);
 };
 
-guint gnomecc_preferences_get_type (void);
+GType gnomecc_preferences_get_type (void);
 
 GnomeCCPreferences *gnomecc_preferences_new (void);
 GnomeCCPreferences *gnomecc_preferences_clone (GnomeCCPreferences *prefs);
diff --git a/libbackground/applier.c b/libbackground/applier.c
index 712c5982e..b6025a298 100644
--- a/libbackground/applier.c
+++ b/libbackground/applier.c
@@ -181,10 +181,10 @@ static gboolean cleanup_cb           (BGApplier *bg_applier);
 static void preview_realized_cb      (GtkWidget *preview,
 				      BGApplier *bg_applier);
 
-guint
+GType
 bg_applier_get_type (void)
 {
-	static guint bg_applier_type = 0;
+	static GType bg_applier_type = 0;
 
 	if (!bg_applier_type) {
 		static GTypeInfo bg_applier_info = {
diff --git a/libbackground/applier.h b/libbackground/applier.h
index e4a782f9e..34c790c07 100644
--- a/libbackground/applier.h
+++ b/libbackground/applier.h
@@ -56,7 +56,7 @@ struct _BGApplierClass
 	GObjectClass klass;
 };
 
-guint      bg_applier_get_type             (void);
+GType      bg_applier_get_type             (void);
 
 GObject   *bg_applier_new                  (BGApplierType          type);
 GObject   *bg_applier_new_at_size          (BGApplierType          type,