[gnome-pilot] #594214: Remove GtkType, gtk_type_unique, gtk_type_class, gtk_type_new

[Matthew Charles Davey <mcdavey src gnome org>]

commit d41c41b88b8bd35cbda1ced188ac1e7db6126cd9
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Sat Aug 7 16:00:03 2010 +0100

     #594214:  Remove GtkType, gtk_type_unique, gtk_type_class, gtk_type_new

 ChangeLog                                  |   10 +++++++++-
 capplet/gnome-pilot-assistant.c            |   10 +++++-----
 capplet/gnome-pilot-capplet.c              |    2 +-
 capplet/gnome-pilot-cdialog.c              |    4 ++--
 capplet/gnome-pilot-ddialog.c              |    4 ++--
 capplet/gnome-pilot-pdialog.c              |    4 ++--
 gpilotd/gnome-pilot-conduit-standard-abs.c |    2 +-
 gpilotd/gnome-pilot-conduit-sync-abs.c     |    2 +-
 8 files changed, 23 insertions(+), 15 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 54ddffc..ead0c89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,18 @@
+2010-08-07 Matt Davey <mcdavey mrao cam ac uk>
+       * #619315  Thanks to Matthew Barnes.  Handle new Evolution
+		directory locations in evo >= 2.31.6.
+       * #594214:  Remove GtkType, gtk_type_unique, gtk_type_class,
+		gtk_type_new
+       * gnome-pilot-assistant.c: fix some printf type warnings.
+
+
 2010-07-31 Matt Davey <mcdavey mrao cam ac uk>
        * #619315  Thanks to Matthew Barnes.  Move Evolution conduits into gnome-pilot
 		codebase.
 
 2010-07-31 Matt Davey <mcdavey mrao cam ac uk>
     Initialise gtk in gpilotd.  Remove gnome_program_init.  Some other cleanups.
-    
+
        applet/pilot.c: Add Halton to Authors credits; Add more consistent state-change
           messages to console output.
        conduits/file/gpilot_install_file.c: remove gnome_program_init
diff --git a/capplet/gnome-pilot-assistant.c b/capplet/gnome-pilot-assistant.c
index 48afbc0..a8aa5d3 100644
--- a/capplet/gnome-pilot-assistant.c
+++ b/capplet/gnome-pilot-assistant.c
@@ -169,7 +169,7 @@ class_init (GnomePilotAssistantClass *klass)
 
 	object_class = GTK_OBJECT_CLASS (klass);
 
-	parent_class = gtk_type_class (gtk_object_get_type ());
+	parent_class = g_type_class_peek (gtk_object_get_type ());
 
 	object_class->destroy = gpd_destroy;
 }
@@ -231,7 +231,7 @@ gnome_pilot_assistant_new (GnomePilotClient *gpc)
 	GnomePilotAssistant *gpd;
 	GtkObject *obj;
 	
-	obj = gtk_type_new (GNOME_PILOT_TYPE_ASSISTANT);
+	obj = GTK_OBJECT(g_type_create_instance (GNOME_PILOT_TYPE_ASSISTANT));
 	
 	gpd = GNOME_PILOT_ASSISTANT (obj);
 	gpd->priv->gpc = gpc;
@@ -941,7 +941,7 @@ gpd_userinfo_requested (GnomePilotClient *gpc, const gchar *device, const GNOME_
 	priv = gpd->priv;
 	
 	g_message ("device %s sent userinfo", device);
-	g_message ("user->userID   = %d", user->userID);
+	g_message ("user->userID   = %lu", user->userID);
 	g_message ("user->username = %s", user->username);
 
 	priv->pilot->pilot_id = user->userID;
@@ -979,8 +979,8 @@ gpd_system_info_requested (GnomePilotClient *gpc,
 	priv = gpd->priv;
 	
 	g_message ("device %s sent sysinfo", device);
-	g_message ("sysinfo->creation   = %d", sysinfo->creation);
-	g_message ("sysinfo->romVersion = 0x%x", sysinfo->romVersion);
+	g_message ("sysinfo->creation   = %ld", sysinfo->creation);
+	g_message ("sysinfo->romVersion = 0x%lx", sysinfo->romVersion);
 
 	priv->pilot->creation = sysinfo->creation;
 	priv->pilot->romversion = sysinfo->romVersion;
diff --git a/capplet/gnome-pilot-capplet.c b/capplet/gnome-pilot-capplet.c
index f7766e1..f495e4e 100644
--- a/capplet/gnome-pilot-capplet.c
+++ b/capplet/gnome-pilot-capplet.c
@@ -1367,7 +1367,7 @@ gpcap_dispose (GObject *object)
 
 		/* destroy pilot dialog, if it was loaded */
 		if (priv->pdialog) {
-			gppd_class = gtk_type_class (gnome_pilot_pdialog_get_type());
+			gppd_class = g_type_class_peek (gnome_pilot_pdialog_get_type());
 			if (GTK_OBJECT_CLASS (gppd_class)->destroy)
 				GTK_OBJECT_CLASS (gppd_class)->destroy (priv->pdialog);
 		}
diff --git a/capplet/gnome-pilot-cdialog.c b/capplet/gnome-pilot-cdialog.c
index f324ea7..003aa65 100644
--- a/capplet/gnome-pilot-cdialog.c
+++ b/capplet/gnome-pilot-cdialog.c
@@ -94,7 +94,7 @@ class_init (GnomePilotCDialogClass *klass)
 
 	object_class = GTK_OBJECT_CLASS (klass);
 
-	parent_class = gtk_type_class (gtk_object_get_type ());
+	parent_class = g_type_class_peek (gtk_object_get_type ());
 
 	object_class->destroy = gpcd_destroy;
 }
@@ -139,7 +139,7 @@ gnome_pilot_cdialog_new (ConduitState *state)
 	GnomePilotCDialog *gpcd;
 	GtkObject *object;
 	
-	object = gtk_type_new (GNOME_PILOT_TYPE_CDIALOG);
+	object = GTK_OBJECT(g_type_create_instance(GNOME_PILOT_TYPE_CDIALOG));
 	
 	gpcd = GNOME_PILOT_CDIALOG (object);
 	gpcd->priv->state = state;
diff --git a/capplet/gnome-pilot-ddialog.c b/capplet/gnome-pilot-ddialog.c
index b7a3704..e169c66 100644
--- a/capplet/gnome-pilot-ddialog.c
+++ b/capplet/gnome-pilot-ddialog.c
@@ -106,7 +106,7 @@ class_init (GnomePilotDDialogClass *klass)
 
 	object_class = GTK_OBJECT_CLASS (klass);
 
-	parent_class = gtk_type_class (gtk_object_get_type ());
+	parent_class = g_type_class_peek (gtk_object_get_type ());
 
 	object_class->destroy = gpdd_destroy;
 }
@@ -154,7 +154,7 @@ gnome_pilot_ddialog_new (GPilotDevice *device)
 	GnomePilotDDialog *gpdd;
 	GtkObject *object;
 	
-	object = gtk_type_new (GNOME_PILOT_TYPE_DDIALOG);
+	object = GTK_OBJECT (g_type_create_instance (GNOME_PILOT_TYPE_DDIALOG));
 	
 	gpdd = GNOME_PILOT_DDIALOG (object);
 	gpdd->priv->device = device;
diff --git a/capplet/gnome-pilot-pdialog.c b/capplet/gnome-pilot-pdialog.c
index 851c933..0e3b94c 100644
--- a/capplet/gnome-pilot-pdialog.c
+++ b/capplet/gnome-pilot-pdialog.c
@@ -124,7 +124,7 @@ class_init (GnomePilotPDialogClass *klass)
 
 	object_class = GTK_OBJECT_CLASS (klass);
 
-	parent_class = gtk_type_class (gtk_object_get_type ());
+	parent_class = g_type_class_peek (gtk_object_get_type ());
 
 	object_class->destroy = gppd_destroy;
 }
@@ -171,7 +171,7 @@ gnome_pilot_pdialog_new (GnomePilotClient *gpc, PilotState *state, GPilotPilot *
 	GnomePilotPDialog *gppd;
 	GtkObject *object;
 	
-	object = gtk_type_new (GNOME_PILOT_TYPE_PDIALOG);
+	object = GTK_OBJECT(g_type_create_instance (GNOME_PILOT_TYPE_PDIALOG));
 	
 	gppd = GNOME_PILOT_PDIALOG (object);
 	gppd->priv->gpc = gpc;
diff --git a/gpilotd/gnome-pilot-conduit-standard-abs.c b/gpilotd/gnome-pilot-conduit-standard-abs.c
index dc9694a..33293c6 100644
--- a/gpilotd/gnome-pilot-conduit-standard-abs.c
+++ b/gpilotd/gnome-pilot-conduit-standard-abs.c
@@ -229,7 +229,7 @@ gnome_pilot_conduit_standard_abs_class_init (GnomePilotConduitStandardAbsClass *
 	object_class = (GtkObjectClass*) klass;
 	conduit_standard_class = (GnomePilotConduitStandardClass *) klass;
 
-	parent_class = gtk_type_class (gnome_pilot_conduit_standard_get_type ());
+	parent_class = g_type_class_peek (gnome_pilot_conduit_standard_get_type ());
 
 	pilot_conduit_standard_abs_signals[MATCH_RECORD] =
 		gtk_signal_new ("match_record",
diff --git a/gpilotd/gnome-pilot-conduit-sync-abs.c b/gpilotd/gnome-pilot-conduit-sync-abs.c
index ceeab72..7de48c7 100644
--- a/gpilotd/gnome-pilot-conduit-sync-abs.c
+++ b/gpilotd/gnome-pilot-conduit-sync-abs.c
@@ -137,7 +137,7 @@ gnome_pilot_conduit_sync_abs_class_init (GnomePilotConduitSyncAbsClass *klass)
 	object_class = (GtkObjectClass*) klass;
 	conduit_standard_class = (GnomePilotConduitStandardClass *) klass;
 
-	parent_class = gtk_type_class (gnome_pilot_conduit_standard_get_type ());
+	parent_class = g_type_class_peek (gnome_pilot_conduit_standard_get_type ());
 
 	pilot_conduit_sync_abs_signals[PRE_SYNC] =
 		gtk_signal_new ("pre_sync",