[gnome-pilot/gtk3: 2/6] Fix a few more stray gtk3 changes.

[Matthew Charles Davey <mcdavey src gnome org>]

commit c6b5fe213e6f72795bd7accb3ffa47855d77c5bb
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Sat Jan 29 19:43:36 2011 +0000

    Fix a few more stray gtk3 changes.

 capplet/gnome-pilot-capplet.c                    |    1 -
 conduits/evolution-data-server/address-conduit.c |    2 +-
 conduits/evolution-data-server/todo-conduit.c    |    2 +-
 conduits/file/file_conduit.c                     |    2 +-
 gpilotd/gnome-pilot-client.gob                   |    1 -
 5 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/capplet/gnome-pilot-capplet.c b/capplet/gnome-pilot-capplet.c
index 83763e2..7f81d03 100644
--- a/capplet/gnome-pilot-capplet.c
+++ b/capplet/gnome-pilot-capplet.c
@@ -1345,7 +1345,6 @@ gpcap_dispose (GObject *object)
 {
 	GnomePilotCapplet *gpcap = GNOME_PILOT_CAPPLET (object);
 	GnomePilotCappletPrivate *priv;
-	GObjectClass *gppd_class;
 	
 	priv = gpcap->priv;
 
diff --git a/conduits/evolution-data-server/address-conduit.c b/conduits/evolution-data-server/address-conduit.c
index 64ba5ca..7cfa7e8 100644
--- a/conduits/evolution-data-server/address-conduit.c
+++ b/conduits/evolution-data-server/address-conduit.c
@@ -594,7 +594,7 @@ e_addr_gui_new (EPilotSettings *ps)
 	gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
 	gui->default_address = gtk_combo_box_text_new ();
 	for (i = 0; items[i] != NULL; i++) {
-		gtk_combo_box_append_text (GTK_COMBO_BOX (gui->default_address), items[i]);
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (gui->default_address), items[i]);
 	}
 	gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, rows, rows + 1);
         gtk_table_attach_defaults (GTK_TABLE (ps), gui->default_address, 1, 2, rows, rows + 1);
diff --git a/conduits/evolution-data-server/todo-conduit.c b/conduits/evolution-data-server/todo-conduit.c
index 2111f88..bf7b1e7 100644
--- a/conduits/evolution-data-server/todo-conduit.c
+++ b/conduits/evolution-data-server/todo-conduit.c
@@ -213,7 +213,7 @@ e_todo_gui_new (EPilotSettings *ps)
 {
 	EToDoConduitGui *gui;
 	GtkWidget *lbl;
-	GObject *adj;
+	GtkAdjustment *adj;
 	gint rows;
 
 	g_return_val_if_fail (ps != NULL, NULL);
diff --git a/conduits/file/file_conduit.c b/conduits/file/file_conduit.c
index 4533db2..b46a074 100644
--- a/conduits/file/file_conduit.c
+++ b/conduits/file/file_conduit.c
@@ -443,5 +443,5 @@ conduit_load_gpilot_conduit (GPilotPilot *pilot)
 void
 conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
 {
-	gtk_object_destroy (GTK_OBJECT (conduit));
+	g_object_unref (G_OBJECT (conduit));
 }
diff --git a/gpilotd/gnome-pilot-client.gob b/gpilotd/gnome-pilot-client.gob
index 4956277..70c76fe 100644
--- a/gpilotd/gnome-pilot-client.gob
+++ b/gpilotd/gnome-pilot-client.gob
@@ -77,7 +77,6 @@ class Gnome:Pilot:Client from G:Object {
 	public DBusGProxy *proxy;
 
 	class_init (class) {
-		GObjectClass   *object_class = G_OBJECT_CLASS (class);
 	}
 
 	init (self) {