GNOME.org
 

[gnome-pilot] Bug #594214: removed further deprecated symbols: GTK_CHECK_CAST, GTK_CHECK_CLASS_CAST, GTK_CHECK

commit 73a00603b9f4ef23631853a02ff3f8a1554599f9
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Sun Aug 8 10:12:40 2010 +0100

    Bug #594214: removed further deprecated symbols:
    		GTK_CHECK_CAST, GTK_CHECK_CLASS_CAST,
    		GTK_CHECK_CLASS_TYPE, GTK_CHECK_TYPE, GtkClassInitFunc,
    		GtkObjectInitFunc, GtkTypeInfo, gdk_window_get_colormap,
    		gtk_about_dialog_set_name, gtk_entry_new_with_max_length,
    		gtk_menu_append, gtk_object_get_data, gtk_object_new,
    		gtk_object_ref, gtk_object_set

 ChangeLog                                  |    8 ++++++-
 applet/pilot.c                             |    8 +++---
 capplet/gnome-pilot-assistant.h            |    8 +++---
 capplet/gnome-pilot-capplet.c              |   12 +++++-----
 capplet/gnome-pilot-cdialog.h              |    8 +++---
 capplet/gnome-pilot-ddialog.h              |    8 +++---
 capplet/gnome-pilot-pdialog.h              |    8 +++---
 capplet/util.c                             |   32 ++++++++++++++--------------
 conduits/backup/backup_conduit.c           |   19 ++++++++-------
 conduits/backup/backup_conduit.h           |    8 +++---
 conduits/file/gpilot_install_file.c        |    2 +-
 gpilotd/gnome-pilot-conduit-backup.gob     |    6 ++--
 gpilotd/gnome-pilot-conduit-file.gob       |    2 +-
 gpilotd/gnome-pilot-conduit-standard-abs.c |    2 +-
 gpilotd/gnome-pilot-conduit-standard-abs.h |    8 +++---
 gpilotd/gnome-pilot-conduit-standard.gob   |    2 +-
 gpilotd/gnome-pilot-conduit-sync-abs.c     |    2 +-
 gpilotd/gnome-pilot-conduit-sync-abs.h     |    8 +++---
 gpilotd/gpilot-daemon.c                    |   14 ++++++------
 gpilotd/manager.c                          |   12 +++++-----
 20 files changed, 92 insertions(+), 85 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ead0c89..38052f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,14 @@
        * #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
+		gtk_type_new, GTK_CHECK_CAST, GTK_CHECK_CLASS_CAST,
+		GTK_CHECK_CLASS_TYPE, GTK_CHECK_TYPE, GtkClassInitFunc,
+		GtkObjectInitFunc, GtkTypeInfo, gdk_window_get_colormap,
+		gtk_about_dialog_set_name, gtk_entry_new_with_max_length,
+		gtk_menu_append, gtk_object_get_data, gtk_object_new,
+		gtk_object_ref, gtk_object_set
        * gnome-pilot-assistant.c: fix some printf type warnings.
+       * gpilot-daemon.c:         ditto.
 
 
 2010-07-31 Matt Davey <mcdavey mrao cam ac uk>
diff --git a/applet/pilot.c b/applet/pilot.c
index 40fbb3e..824d369 100644
--- a/applet/pilot.c
+++ b/applet/pilot.c
@@ -198,7 +198,7 @@ gpilotd_connect_cb (GnomePilotClient *client,
 	gpilot_applet_progress_set_progress (applet->c_progress, GTK_PROGRESS (applet->conduit_progress_bar));
 	gpilot_applet_progress_start (applet->c_progress);
 
-	colormap = gdk_window_get_colormap (applet->message_area->window);
+	colormap = gdk_drawable_get_colormap (applet->message_area->window);
 	gdk_color_parse ("red",&(applet->errorColor));
 	gdk_colormap_alloc_color (colormap,&(applet->errorColor),FALSE,TRUE);
 }
@@ -481,7 +481,7 @@ about_cb(BonoboUIComponent *uic, PilotApplet *pilot, const gchar *verbname)
 	}
 
 	about = gtk_about_dialog_new ();
-        gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (about), _("gnome-pilot applet"));
+        gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG (about), _("gnome-pilot applet"));
         gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (about), VERSION);
         gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG (about), _("Copyright 2000-2006 Free Software Foundation, Inc."));
         gtk_about_dialog_set_comments (GTK_ABOUT_DIALOG (about), _("A PalmOS PDA monitor.\n"));
@@ -1173,7 +1173,7 @@ pick_pilot (PilotApplet *self)
 
 
 			} else {
-				combo = gtk_object_get_data (GTK_OBJECT (self->chooseDialog), "pilot_combo");
+				combo = g_object_get_data (G_OBJECT (self->chooseDialog), "pilot_combo");
 			}
 
 			list_store = gtk_list_store_new (1, G_TYPE_STRING);
@@ -1199,7 +1199,7 @@ pick_pilot (PilotApplet *self)
 			gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
 			gtk_object_set_data (GTK_OBJECT (self->chooseDialog),"pilot",self->properties.pilot_ids->data);	
 			if (gtk_dialog_run(GTK_DIALOG (self->chooseDialog))== 0) {
-				pilot=(gchar *)gtk_object_get_data (GTK_OBJECT (self->chooseDialog),"pilot");
+				pilot=(gchar *)g_object_get_data (G_OBJECT (self->chooseDialog),"pilot");
 			} else {
 				pilot=NULL;
 			}
diff --git a/capplet/gnome-pilot-assistant.h b/capplet/gnome-pilot-assistant.h
index e8223fd..a67c810 100644
--- a/capplet/gnome-pilot-assistant.h
+++ b/capplet/gnome-pilot-assistant.h
@@ -42,10 +42,10 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define GNOME_PILOT_TYPE_ASSISTANT			(gnome_pilot_assistant_get_type ())
-#define GNOME_PILOT_ASSISTANT(obj)			(GTK_CHECK_CAST ((obj), GNOME_PILOT_TYPE_ASSISTANT, GnomePilotAssistant))
-#define GNOME_PILOT_ASSISTANT_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GNOME_PILOT_TYPE_ASSISTANT, GnomePilotAssistantClass))
-#define GNOME_PILOT_IS_ASSISTANT(obj)			(GTK_CHECK_TYPE ((obj), GNOME_PILOT_TYPE_ASSISTANT))
-#define GNOME_PILOT_IS_ASSISTANT_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), GNOME_PILOT_TYPE_ASSISTANT))
+#define GNOME_PILOT_ASSISTANT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_PILOT_TYPE_ASSISTANT, GnomePilotAssistant))
+#define GNOME_PILOT_ASSISTANT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_PILOT_TYPE_ASSISTANT, GnomePilotAssistantClass))
+#define GNOME_PILOT_IS_ASSISTANT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_PILOT_TYPE_ASSISTANT))
+#define GNOME_PILOT_IS_ASSISTANT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), GNOME_PILOT_TYPE_ASSISTANT))
 
 
 typedef struct _GnomePilotAssistant        GnomePilotAssistant;
diff --git a/capplet/gnome-pilot-capplet.c b/capplet/gnome-pilot-capplet.c
index f495e4e..1c289a3 100644
--- a/capplet/gnome-pilot-capplet.c
+++ b/capplet/gnome-pilot-capplet.c
@@ -238,15 +238,15 @@ get_widgets (GnomePilotCapplet *gpcap)
 		gtk_container_add (GTK_CONTAINER (GTK_DIALOG (gpcap)->vbox), priv->notebook);
 
 	w = GW ("pilots_treeview");
-	priv->pilots_treeview = gtk_object_get_data (GTK_OBJECT (w), "treeview");
-	priv->pilots_model = gtk_object_get_data (GTK_OBJECT (w), "model");
+	priv->pilots_treeview = g_object_get_data (G_OBJECT (w), "treeview");
+	priv->pilots_model = g_object_get_data (G_OBJECT (w), "model");
 	priv->pilots_add = GW ("pilots_add_button");
 	priv->pilots_edit = GW ("pilots_edit_button");
 	priv->pilots_delete = GW ("pilots_delete_button");
 
 	w = GW ("devices_treeview");
-	priv->devices_treeview = gtk_object_get_data (GTK_OBJECT (w), "treeview");
-	priv->devices_model = gtk_object_get_data (GTK_OBJECT (w), "model");
+	priv->devices_treeview = g_object_get_data (G_OBJECT (w), "treeview");
+	priv->devices_model = g_object_get_data (G_OBJECT (w), "model");
 	priv->devices_add = GW ("devices_add_button");
 	priv->devices_edit = GW ("devices_edit_button");
 	priv->devices_delete = GW ("devices_delete_button");
@@ -254,8 +254,8 @@ get_widgets (GnomePilotCapplet *gpcap)
 	priv->pilots_combo = GW ("pilots_combo");
 	priv->pilots_username = GW ("username_label");	
 	w = GW ("conduit_treeview");
-	priv->conduit_treeview = gtk_object_get_data (GTK_OBJECT (w), "treeview");
-	priv->conduit_model = gtk_object_get_data (GTK_OBJECT (w), "model");
+	priv->conduit_treeview = g_object_get_data (G_OBJECT (w), "treeview");
+	priv->conduit_model = g_object_get_data (G_OBJECT (w), "model");
 	priv->conduit_enable = GW ("conduit_enable_button");
 	priv->conduit_disable = GW ("conduit_disable_button");
 	priv->conduit_settings = GW ("conduit_settings_button");
diff --git a/capplet/gnome-pilot-cdialog.h b/capplet/gnome-pilot-cdialog.h
index 25f3c0b..14b3f3a 100644
--- a/capplet/gnome-pilot-cdialog.h
+++ b/capplet/gnome-pilot-cdialog.h
@@ -33,10 +33,10 @@
 G_BEGIN_DECLS
 
 #define GNOME_PILOT_TYPE_CDIALOG			(gnome_pilot_cdialog_get_type ())
-#define GNOME_PILOT_CDIALOG(obj)			(GTK_CHECK_CAST ((obj), GNOME_PILOT_TYPE_CDIALOG, GnomePilotCDialog))
-#define GNOME_PILOT_CDIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GNOME_PILOT_TYPE_CDIALOG, GnomePilotCDialogClass))
-#define GNOME_PILOT_IS_CDIALOG(obj)			(GTK_CHECK_TYPE ((obj), GNOME_PILOT_TYPE_CDIALOG))
-#define GNOME_PILOT_IS_CDIALOG_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), GNOME_PILOT_TYPE_CDIALOG))
+#define GNOME_PILOT_CDIALOG(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_PILOT_TYPE_CDIALOG, GnomePilotCDialog))
+#define GNOME_PILOT_CDIALOG_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_PILOT_TYPE_CDIALOG, GnomePilotCDialogClass))
+#define GNOME_PILOT_IS_CDIALOG(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_PILOT_TYPE_CDIALOG))
+#define GNOME_PILOT_IS_CDIALOG_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), GNOME_PILOT_TYPE_CDIALOG))
 
 
 typedef struct _GnomePilotCDialog        GnomePilotCDialog;
diff --git a/capplet/gnome-pilot-ddialog.h b/capplet/gnome-pilot-ddialog.h
index 94abc74..0a8f707 100644
--- a/capplet/gnome-pilot-ddialog.h
+++ b/capplet/gnome-pilot-ddialog.h
@@ -33,10 +33,10 @@
 G_BEGIN_DECLS
 
 #define GNOME_PILOT_TYPE_DDIALOG			(gnome_pilot_ddialog_get_type ())
-#define GNOME_PILOT_DDIALOG(obj)			(GTK_CHECK_CAST ((obj), GNOME_PILOT_TYPE_DDIALOG, GnomePilotDDialog))
-#define GNOME_PILOT_DDIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GNOME_PILOT_TYPE_DDIALOG, GnomePilotDDialogClass))
-#define GNOME_PILOT_IS_DDIALOG(obj)			(GTK_CHECK_TYPE ((obj), GNOME_PILOT_TYPE_DDIALOG))
-#define GNOME_PILOT_IS_DDIALOG_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), GNOME_PILOT_TYPE_DDIALOG))
+#define GNOME_PILOT_DDIALOG(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_PILOT_TYPE_DDIALOG, GnomePilotDDialog))
+#define GNOME_PILOT_DDIALOG_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_PILOT_TYPE_DDIALOG, GnomePilotDDialogClass))
+#define GNOME_PILOT_IS_DDIALOG(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_PILOT_TYPE_DDIALOG))
+#define GNOME_PILOT_IS_DDIALOG_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), GNOME_PILOT_TYPE_DDIALOG))
 
 
 typedef struct _GnomePilotDDialog        GnomePilotDDialog;
diff --git a/capplet/gnome-pilot-pdialog.h b/capplet/gnome-pilot-pdialog.h
index c951b48..587149c 100644
--- a/capplet/gnome-pilot-pdialog.h
+++ b/capplet/gnome-pilot-pdialog.h
@@ -33,10 +33,10 @@
 G_BEGIN_DECLS
 
 #define GNOME_PILOT_TYPE_PDIALOG			(gnome_pilot_pdialog_get_type ())
-#define GNOME_PILOT_PDIALOG(obj)			(GTK_CHECK_CAST ((obj), GNOME_PILOT_TYPE_PDIALOG, GnomePilotPDialog))
-#define GNOME_PILOT_PDIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GNOME_PILOT_TYPE_PDIALOG, GnomePilotPDialogClass))
-#define GNOME_PILOT_IS_PDIALOG(obj)			(GTK_CHECK_TYPE ((obj), GNOME_PILOT_TYPE_PDIALOG))
-#define GNOME_PILOT_IS_PDIALOG_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), GNOME_PILOT_TYPE_PDIALOG))
+#define GNOME_PILOT_PDIALOG(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_PILOT_TYPE_PDIALOG, GnomePilotPDialog))
+#define GNOME_PILOT_PDIALOG_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_PILOT_TYPE_PDIALOG, GnomePilotPDialogClass))
+#define GNOME_PILOT_IS_PDIALOG(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_PILOT_TYPE_PDIALOG))
+#define GNOME_PILOT_IS_PDIALOG_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), GNOME_PILOT_TYPE_PDIALOG))
 
 
 typedef struct _GnomePilotPDialog        GnomePilotPDialog;
diff --git a/capplet/util.c b/capplet/util.c
index c95759a..8aae72d 100644
--- a/capplet/util.c
+++ b/capplet/util.c
@@ -284,7 +284,7 @@ real_choose_pilot_dialog (PilotState *state)
 		}
 		gtk_object_set_data (GTK_OBJECT (menu_item), "device", dev);
 		gtk_widget_show (menu_item);
-		gtk_menu_append (GTK_MENU (menu), menu_item);
+		gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 		tmp = tmp->next;
 	}
 	gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
@@ -292,7 +292,7 @@ real_choose_pilot_dialog (PilotState *state)
 
 	if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dlg))) {
 		menu_item = gtk_menu_get_active (GTK_MENU (menu));
-		dev = (GPilotDevice *)gtk_object_get_data (GTK_OBJECT (menu_item), "device");
+		dev = (GPilotDevice *)g_object_get_data (G_OBJECT (menu_item), "device");
 	} else {
 		dev = NULL;
 	}
@@ -613,14 +613,14 @@ read_device_config (GtkObject *object, GPilotDevice* device)
 
 	g_return_if_fail (device!= NULL);
 
-	port_entry  = gtk_object_get_data (GTK_OBJECT (object), "port_entry");
-	name_entry  = gtk_object_get_data (GTK_OBJECT (object), "name_entry");
-	speed_combo = gtk_object_get_data (GTK_OBJECT (object), "speed_combo");
-	usb_radio = gtk_object_get_data (GTK_OBJECT (object), "usb_radio");
-	irda_radio = gtk_object_get_data (GTK_OBJECT (object), "irda_radio");
-	network_radio = gtk_object_get_data (GTK_OBJECT (object), "network_radio");
-	bluetooth_radio = gtk_object_get_data (GTK_OBJECT (object), "bluetooth_radio");
-	timeout_spinner = gtk_object_get_data (GTK_OBJECT (object), "timeout_spinner");
+	port_entry  = g_object_get_data (G_OBJECT (object), "port_entry");
+	name_entry  = g_object_get_data (G_OBJECT (object), "name_entry");
+	speed_combo = g_object_get_data (G_OBJECT (object), "speed_combo");
+	usb_radio = g_object_get_data (G_OBJECT (object), "usb_radio");
+	irda_radio = g_object_get_data (G_OBJECT (object), "irda_radio");
+	network_radio = g_object_get_data (G_OBJECT (object), "network_radio");
+	bluetooth_radio = g_object_get_data (G_OBJECT (object), "bluetooth_radio");
+	timeout_spinner = g_object_get_data (G_OBJECT (object), "timeout_spinner");
 
 	if (device->port)
 		g_free (device->port);
@@ -658,14 +658,14 @@ read_pilot_config (GtkObject *object, GPilotPilot *pilot)
 	gint pilotid;
 	g_return_if_fail (pilot!= NULL);
 
-	id      = gtk_object_get_data (GTK_OBJECT (object), "pilotid");
-	name    = gtk_object_get_data (GTK_OBJECT (object), "username");
-	pname   = gtk_object_get_data (GTK_OBJECT (object), "pilotname");
-	basedir = gtk_object_get_data (GTK_OBJECT (object), "basedir");
+	id      = g_object_get_data (G_OBJECT (object), "pilotid");
+	name    = g_object_get_data (G_OBJECT (object), "username");
+	pname   = g_object_get_data (G_OBJECT (object), "pilotname");
+	basedir = g_object_get_data (G_OBJECT (object), "basedir");
 #ifdef PILOT_LINK_0_12
-	charset = gtk_object_get_data (GTK_OBJECT (object), "charset");
+	charset = g_object_get_data (G_OBJECT (object), "charset");
 #endif
-	menu    = gtk_object_get_data (GTK_OBJECT (object), "sync_menu");
+	menu    = g_object_get_data (G_OBJECT (object), "sync_menu");
  	
 	num = gtk_entry_get_text (GTK_ENTRY (id));
 	pilotid = strtol (num, NULL, 10);
diff --git a/conduits/backup/backup_conduit.c b/conduits/backup/backup_conduit.c
index f017f90..0331757 100644
--- a/conduits/backup/backup_conduit.c
+++ b/conduits/backup/backup_conduit.c
@@ -892,7 +892,8 @@ static GtkWidget
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
     
-	entry = gtk_entry_new_with_max_length(128);
+	entry = gtk_entry_new ();
+	gtk_entry_set_max_length(entry, 128);
 	gtk_object_set_data(GTK_OBJECT(vbox), "dir", entry);
 	gtk_table_attach_defaults(GTK_TABLE(table), entry, 1, 2, 0, 1);
 	gtk_signal_connect(GTK_OBJECT(entry), "insert_text",
@@ -1012,10 +1013,10 @@ setOptionsCfg(GtkWidget *pilotcfg, ConduitCfg *state)
 	GtkWidget *dir,*updated_only,*remove_deleted;
 	GtkObject *adj;
 
-	dir  = gtk_object_get_data(GTK_OBJECT(pilotcfg), "dir");
-	updated_only = gtk_object_get_data(GTK_OBJECT(pilotcfg), "only_changed");
-	remove_deleted = gtk_object_get_data(GTK_OBJECT(pilotcfg), "remove_local");
-	adj = gtk_object_get_data(GTK_OBJECT(pilotcfg), "no_of_backups");
+	dir  = g_object_get_data (G_OBJECT(pilotcfg), "dir");
+	updated_only = g_object_get_data (G_OBJECT(pilotcfg), "only_changed");
+	remove_deleted = g_object_get_data (G_OBJECT(pilotcfg), "remove_local");
+	adj = g_object_get_data (G_OBJECT(pilotcfg), "no_of_backups");
 
 	g_assert(dir!=NULL);
 	g_assert(updated_only!=NULL);
@@ -1036,10 +1037,10 @@ readOptionsCfg(GtkWidget *pilotcfg, ConduitCfg *state)
 	GtkWidget *dir,*updated_only,*remove_deleted;
 	GtkObject *adj;
 
-	dir  = gtk_object_get_data(GTK_OBJECT(pilotcfg), "dir");
-	updated_only = gtk_object_get_data(GTK_OBJECT(pilotcfg), "only_changed");
-	remove_deleted = gtk_object_get_data(GTK_OBJECT(pilotcfg), "remove_local");
-	adj = gtk_object_get_data(GTK_OBJECT(pilotcfg), "no_of_backups");
+	dir  = g_object_get_data (G_OBJECT(pilotcfg), "dir");
+	updated_only = g_object_get_data (G_OBJECT(pilotcfg), "only_changed");
+	remove_deleted = g_object_get_data (G_OBJECT(pilotcfg), "remove_local");
+	adj = g_object_get_data (G_OBJECT(pilotcfg), "no_of_backups");
 
 	if(state->backup_dir)
 		g_free(state->backup_dir);	
diff --git a/conduits/backup/backup_conduit.h b/conduits/backup/backup_conduit.h
index eb67073..dbc358f 100644
--- a/conduits/backup/backup_conduit.h
+++ b/conduits/backup/backup_conduit.h
@@ -48,9 +48,9 @@ typedef struct ConduitCfg {
   pid_t child;
 } ConduitCfg;
 
-#define GET_CONDUIT_CFG(s) ((ConduitCfg*)gtk_object_get_data(GTK_OBJECT(s),OBJ_DATA_CONFIG))
-#define GET_CONDUIT_OLDCFG(s) ((ConduitCfg*)gtk_object_get_data(GTK_OBJECT(s),OBJ_DATA_OLDCONFIG))
-#define GET_CONDUIT_DATA(s) ((ConduitData*)gtk_object_get_data(GTK_OBJECT(s),OBJ_DATA_CONDUIT))
-#define GET_CONDUIT_WINDOW(s) ((GtkWidget*)gtk_object_get_data(GTK_OBJECT(s),OBJ_DATA_CONFIG_WINDOW))
+#define GET_CONDUIT_CFG(s) ((ConduitCfg*)g_object_get_data(G_OBJECT(s),OBJ_DATA_CONFIG))
+#define GET_CONDUIT_OLDCFG(s) ((ConduitCfg*)g_object_get_data(G_OBJECT(s),OBJ_DATA_OLDCONFIG))
+#define GET_CONDUIT_DATA(s) ((ConduitData*)g_object_get_data(G_OBJECT(s),OBJ_DATA_CONDUIT))
+#define GET_CONDUIT_WINDOW(s) ((GtkWidget*)g_object_get_data(G_OBJECT(s),OBJ_DATA_CONFIG_WINDOW))
 
 #endif
diff --git a/conduits/file/gpilot_install_file.c b/conduits/file/gpilot_install_file.c
index 653ad5e..907b621 100644
--- a/conduits/file/gpilot_install_file.c
+++ b/conduits/file/gpilot_install_file.c
@@ -101,7 +101,7 @@ main (int argc, char *argv[])
 	gtk_init (&argc, &argv);
 
 	gpc = GNOME_PILOT_CLIENT (gnome_pilot_client_new ());
-	gtk_object_ref (GTK_OBJECT (gpc));
+	g_object_ref (G_OBJECT (gpc));
 	gtk_object_sink (GTK_OBJECT (gpc));
 	gtk_signal_connect (GTK_OBJECT (gpc),"completed_request", (GtkSignalFunc)gpilotd_request_completed, NULL);
 	gnome_pilot_client_connect_to_daemon (gpc);
diff --git a/gpilotd/gnome-pilot-conduit-backup.gob b/gpilotd/gnome-pilot-conduit-backup.gob
index bc1e6a7..ff796c6 100644
--- a/gpilotd/gnome-pilot-conduit-backup.gob
+++ b/gpilotd/gnome-pilot-conduit-backup.gob
@@ -52,9 +52,9 @@ class Gnome:Pilot:Conduit:Backup from Gnome:Pilot:Conduit {
 
 	public GtkObject*
 	new (GPilotPilot *pilot) {
-		GnomePilotConduitBackup *ret = SELF (gtk_object_new (TYPE_SELF, 
-								     "GnomePilotConduit::pilot", pilot, 
-								     NULL));
+		GnomePilotConduitBackup *ret = SELF (g_object_new (TYPE_SELF, 
+								   "GnomePilotConduit::pilot", pilot, 
+								   NULL));
 		return GTK_OBJECT (ret);
 	}
 
diff --git a/gpilotd/gnome-pilot-conduit-file.gob b/gpilotd/gnome-pilot-conduit-file.gob
index 12b361a..56b7553 100644
--- a/gpilotd/gnome-pilot-conduit-file.gob
+++ b/gpilotd/gnome-pilot-conduit-file.gob
@@ -40,7 +40,7 @@
 class Gnome:Pilot:Conduit:File from Gnome:Pilot:Conduit {
 	public GtkObject*
 	new (GPilotPilot *pilot) {
-		GnomePilotConduitFile *ret = SELF (gtk_object_new (TYPE_SELF, 
+		GnomePilotConduitFile *ret = SELF (g_object_new (TYPE_SELF, 
 								   "GnomePilotConduit::pilot", pilot, 
 								   NULL));
 		return GTK_OBJECT (ret);
diff --git a/gpilotd/gnome-pilot-conduit-standard-abs.c b/gpilotd/gnome-pilot-conduit-standard-abs.c
index 33293c6..311e78d 100644
--- a/gpilotd/gnome-pilot-conduit-standard-abs.c
+++ b/gpilotd/gnome-pilot-conduit-standard-abs.c
@@ -212,7 +212,7 @@ gnome_pilot_conduit_standard_abs_new (char *db_name,
 {
 	GtkObject *retval;
 
-	retval =  gtk_object_new (gnome_pilot_conduit_standard_abs_get_type (),
+	retval =  g_object_new (gnome_pilot_conduit_standard_abs_get_type (),
 				  "GnomePilotConduitStandard::db_name", db_name,
 				  "GnomePilotConduitStandard::creator_id", creator_id,
 				  NULL);
diff --git a/gpilotd/gnome-pilot-conduit-standard-abs.h b/gpilotd/gnome-pilot-conduit-standard-abs.h
index 2bd7823..8f3a06e 100644
--- a/gpilotd/gnome-pilot-conduit-standard-abs.h
+++ b/gpilotd/gnome-pilot-conduit-standard-abs.h
@@ -33,10 +33,10 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define GNOME_TYPE_PILOT_CONDUIT_STANDARD_ABS			(gnome_pilot_conduit_standard_abs_get_type ())
-#define GNOME_PILOT_CONDUIT_STANDARD_ABS(obj)			(GTK_CHECK_CAST ((obj), GNOME_TYPE_PILOT_CONDUIT_STANDARD_ABS, GnomePilotConduitStandardAbs))
-#define GNOME_PILOT_CONDUIT_STANDARD_ABS_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PILOT_CONDUIT_STANDARD_ABS, GnomePilotConduitStandardAbsClass))
-#define GNOME_IS_PILOT_CONDUIT_STANDARD_ABS(obj)			(GTK_CHECK_TYPE ((obj), GNOME_TYPE_PILOT_CONDUIT_STANDARD_ABS))
-#define GNOME_IS_PILOT_CONDUIT_STANDARD_ABS_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), GNOME_TYPE_PILOT_CONDUIT_STANDARD_ABS))
+#define GNOME_PILOT_CONDUIT_STANDARD_ABS(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_PILOT_CONDUIT_STANDARD_ABS, GnomePilotConduitStandardAbs))
+#define GNOME_PILOT_CONDUIT_STANDARD_ABS_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PILOT_CONDUIT_STANDARD_ABS, GnomePilotConduitStandardAbsClass))
+#define GNOME_IS_PILOT_CONDUIT_STANDARD_ABS(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_PILOT_CONDUIT_STANDARD_ABS))
+#define GNOME_IS_PILOT_CONDUIT_STANDARD_ABS_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), GNOME_TYPE_PILOT_CONDUIT_STANDARD_ABS))
 
 enum
 {
diff --git a/gpilotd/gnome-pilot-conduit-standard.gob b/gpilotd/gnome-pilot-conduit-standard.gob
index f3e28cc..488f169 100644
--- a/gpilotd/gnome-pilot-conduit-standard.gob
+++ b/gpilotd/gnome-pilot-conduit-standard.gob
@@ -48,7 +48,7 @@ class Gnome:Pilot:Conduit:Standard from Gnome:Pilot:Conduit {
 
 	public GtkObject*
 	new (char *db_name, guint32 creator_id, GPilotPilot *pilot) {
-		GnomePilotConduitStandard *ret = SELF (gtk_object_new (TYPE_SELF, 
+		GnomePilotConduitStandard *ret = SELF (g_object_new (TYPE_SELF, 
 								       "GnomePilotConduit::pilot", pilot, 
 								       NULL));
 		self_set_creator_id (ret, creator_id);
diff --git a/gpilotd/gnome-pilot-conduit-sync-abs.c b/gpilotd/gnome-pilot-conduit-sync-abs.c
index 7de48c7..960c406 100644
--- a/gpilotd/gnome-pilot-conduit-sync-abs.c
+++ b/gpilotd/gnome-pilot-conduit-sync-abs.c
@@ -280,7 +280,7 @@ gnome_pilot_conduit_sync_abs_new (char *db_name,
 {
 	GnomePilotConduitSyncAbs *retval;
 
-	retval =  GNOME_PILOT_CONDUIT_SYNC_ABS (gtk_object_new (gnome_pilot_conduit_sync_abs_get_type (),
+	retval =  GNOME_PILOT_CONDUIT_SYNC_ABS (g_object_new (gnome_pilot_conduit_sync_abs_get_type (),
 								"GnomePilotConduitStandard::db_name", db_name,
 								"GnomePilotConduitStandard::creator_id", creator_id,
 								NULL));
diff --git a/gpilotd/gnome-pilot-conduit-sync-abs.h b/gpilotd/gnome-pilot-conduit-sync-abs.h
index cbb2113..f87ee12 100644
--- a/gpilotd/gnome-pilot-conduit-sync-abs.h
+++ b/gpilotd/gnome-pilot-conduit-sync-abs.h
@@ -35,10 +35,10 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define GNOME_TYPE_PILOT_CONDUIT_SYNC_ABS			(gnome_pilot_conduit_sync_abs_get_type ())
-#define GNOME_PILOT_CONDUIT_SYNC_ABS(obj)			(GTK_CHECK_CAST ((obj), GNOME_TYPE_PILOT_CONDUIT_SYNC_ABS, GnomePilotConduitSyncAbs))
-#define GNOME_PILOT_CONDUIT_SYNC_ABS_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PILOT_CONDUIT_SYNC_ABS, GnomePilotConduitSyncAbsClass))
-#define GNOME_IS_PILOT_CONDUIT_SYNC_ABS(obj)			(GTK_CHECK_TYPE ((obj), GNOME_TYPE_PILOT_CONDUIT_SYNC_ABS))
-#define GNOME_IS_PILOT_CONDUIT_SYNC_ABS_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), GNOME_TYPE_PILOT_CONDUIT_SYNC_ABS))
+#define GNOME_PILOT_CONDUIT_SYNC_ABS(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_PILOT_CONDUIT_SYNC_ABS, GnomePilotConduitSyncAbs))
+#define GNOME_PILOT_CONDUIT_SYNC_ABS_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PILOT_CONDUIT_SYNC_ABS, GnomePilotConduitSyncAbsClass))
+#define GNOME_IS_PILOT_CONDUIT_SYNC_ABS(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_PILOT_CONDUIT_SYNC_ABS))
+#define GNOME_IS_PILOT_CONDUIT_SYNC_ABS_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), GNOME_TYPE_PILOT_CONDUIT_SYNC_ABS))
 
 typedef enum
 {
diff --git a/gpilotd/gpilot-daemon.c b/gpilotd/gpilot-daemon.c
index baa3d83..b7ffb87 100644
--- a/gpilotd/gpilot-daemon.c
+++ b/gpilotd/gpilot-daemon.c
@@ -2342,7 +2342,7 @@ gpilot_daemon_get_databases_from_cache (GpilotDaemon   *daemon,
                 g_set_error (error,
                              GPILOT_DAEMON_ERROR,
                              GPILOT_DAEMON_ERROR_GENERAL,
-                             "Unknow pilot %s",
+                             "Unknown pilot %s",
                              pilot_name);
                 goto out;
         }
@@ -2357,8 +2357,8 @@ gpilot_daemon_get_databases_from_cache (GpilotDaemon   *daemon,
         (*databases)[num_bases] = NULL;
 
         ret = TRUE;
- out:
         g_strfreev (arr);
+ out:
         return TRUE;
 }
 
@@ -2385,7 +2385,7 @@ gpilot_daemon_get_user_info (GpilotDaemon   *daemon,
         ret = FALSE;
         priv = daemon->priv;
 
-        LOG (("get_user_info(cradle=%s,survival=%d,timeout=%d)",
+        LOG (("get_user_info(cradle=%s,survival=%d,timeout=%lu)",
              cradle, survival, timeout));
 
         req.type = GREQ_GET_USERINFO;
@@ -2396,7 +2396,7 @@ gpilot_daemon_get_user_info (GpilotDaemon   *daemon,
 
         *handle = gpc_queue_store_request (req);
         ret = TRUE;
- out:
+
         return ret;
 }
 
@@ -2425,10 +2425,10 @@ gpilot_daemon_set_user_info (GpilotDaemon   *daemon,
         ret = FALSE;
         priv = daemon->priv;
 
-        LOG (("set_user_info(cradle=%s,survival=%d,timeout=%d",
+        LOG (("set_user_info(cradle=%s,survival=%d,timeout=%lu",
             cradle,survival,timeout));
         LOG (("              device = %s,", cradle));
-        LOG (("              user_id = %d,", uid));
+        LOG (("              user_id = %lu,", uid));
         LOG (("              user    = %s)", username));
 
         *handle = gpc_queue_store_set_userinfo_request (
@@ -2439,7 +2439,7 @@ gpilot_daemon_set_user_info (GpilotDaemon   *daemon,
                         uid,
                         continue_sync);
         ret = TRUE;
- out:
+
         return ret;
 }
 
diff --git a/gpilotd/manager.c b/gpilotd/manager.c
index 7a45317..c89c070 100644
--- a/gpilotd/manager.c
+++ b/gpilotd/manager.c
@@ -521,8 +521,8 @@ conduit_sync_default (GnomePilotConduitStandard *conduit, GnomePilotDBInfo *dbin
 	g_return_val_if_fail (dbinfo!=NULL, -1);
 	g_return_val_if_fail (dbinfo->pu!=NULL, -1);
 
-	conduit_config = gtk_object_get_data (GTK_OBJECT (conduit), GPCC_LABEL);
-	manager = gtk_object_get_data (GTK_OBJECT (conduit), GPCM_LABEL);
+	conduit_config = g_object_get_data (G_OBJECT (conduit), GPCC_LABEL);
+	manager = g_object_get_data (G_OBJECT (conduit), GPCM_LABEL);
 	g_return_val_if_fail (conduit_config!=NULL,-1);
 	if (conduit_config->first_sync_type != GnomePilotConduitSyncTypeNotSet) {
 		const char *conduit_name = gnome_pilot_conduit_management_get_name (manager);
@@ -639,7 +639,7 @@ gpilot_unload_conduit_foreach (GnomePilotConduit *conduit,
 	g_return_if_fail (conduit != NULL);
 	g_return_if_fail (GNOME_IS_PILOT_CONDUIT (conduit));
 	
-	manager = gtk_object_get_data (GTK_OBJECT (conduit), GPCM_LABEL);
+	manager = g_object_get_data (G_OBJECT (conduit), GPCM_LABEL);
 	g_assert (manager!=NULL);
 	/* FIXME: _destroy_conduit doesn't g_module_close... is this an issue ? 
 	 note: the shlib loader in gnome_pilot_conduit_management now closes
@@ -698,11 +698,11 @@ gpilot_load_conduits (GPilotContext *context,
 			continue;
 		}
 		
-		gtk_object_set (GTK_OBJECT (conduit),
+		g_object_set (G_OBJECT (conduit),
 				GNOME_PILOT_CONDUIT_PROP_PROGRESS_STEPPING (context->progress_stepping),
 				NULL);
-		gtk_object_set_data (GTK_OBJECT (conduit), GPCM_LABEL, manager);
-		gtk_object_set_data (GTK_OBJECT (conduit), GPCC_LABEL, conduit_config);
+		g_object_set_data (G_OBJECT (conduit), GPCM_LABEL, manager);
+		g_object_set_data (G_OBJECT (conduit), GPCC_LABEL, conduit_config);
 
 		if (GNOME_IS_PILOT_CONDUIT_BACKUP (conduit)) {
 			*blist = g_list_append (*blist, conduit);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]