[gnome-pilot] Remove remaining deprecated symbols. #594214.

From: Matthew Charles Davey <mcdavey src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-pilot] Remove remaining deprecated symbols. #594214.
Date: Mon, 9 Aug 2010 08:10:45 +0000 (UTC)
commit 02232c255a1e3e127576917d616a5b7b499d6a0b
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Mon Aug 9 08:45:38 2010 +0100

    Remove remaining deprecated symbols.  #594214.
    
           * GTK_SIGNAL_FUNC, GTK_SIGNAL_OFFSET,
    	 GtkSignalFunc, gtk_signal_connect, gtk_signal_disconnect,
    	 gtk_signal_disconnect_by_data,
    	 gtk_signal_emit, gtk_signal_emit_stop_by_name,
    	 gtk_signal_new, g_strncasecmp
           * gnome-pilot now compiles with G_DISABLE_DEPRECATED,
    	 GNOME_DISABLE_DEPRECATED, GTK_DISABLE_DEPRECATED, and
    	 -Werror.
           * applet/pilot.c: fix broken use of g_file API, so that
    	 drag-and-drop of files to applet panel icon works again.

 ChangeLog                                  |   14 ++
 applet/pilot.c                             |   30 ++--
 capplet/gnome-pilot-assistant.c            |   79 +++++-----
 capplet/gnome-pilot-capplet.c              |   66 ++++----
 capplet/gnome-pilot-cdialog.c              |    4 +-
 capplet/gnome-pilot-ddialog.c              |   12 +-
 capplet/gnome-pilot-pdialog.c              |   19 ++-
 capplet/util.c                             |   10 +-
 conduits/backup/backup_conduit.c           |    8 +-
 conduits/file/gpilot_install_file.c        |    2 +-
 conduits/test/test_conduit.c               |   10 +-
 gpilotd/gnome-pilot-client.gob             |   14 +-
 gpilotd/gnome-pilot-conduit-standard-abs.c |  240 +++++++++++++++++-----------
 gpilotd/gnome-pilot-conduit-sync-abs.c     |  226 ++++++++++++++++-----------
 gpilotd/gpilot-daemon.c                    |    2 +-
 gpilotd/manager.c                          |    6 +-
 16 files changed, 426 insertions(+), 316 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index aae5d6c..4d68c75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,18 @@
 2010-08-07 Matt Davey <mcdavey mrao cam ac uk>
+       * #594214:  Remove remaining deprecated symbols: 
+	GTK_SIGNAL_FUNC, GTK_SIGNAL_OFFSET,
+	GtkSignalFunc, gtk_signal_connect, gtk_signal_disconnect,
+	gtk_signal_disconnect_by_data,
+	gtk_signal_emit, gtk_signal_emit_stop_by_name,
+	gtk_signal_new, g_strncasecmp
+       * gnome-pilot now compiles with G_DISABLE_DEPRECATED,
+	 GNOME_DISABLE_DEPRECATED, GTK_DISABLE_DEPRECATED, and
+	 -Werror.
+       * applet/pilot.c: fix broken use of g_file API, so that
+	 drag-and-drop of files to applet panel icon works again.
+
+
+2010-08-07 Matt Davey <mcdavey mrao cam ac uk>
        * #594214:  Remove GTK_CHECK_CAST, GTK_CHECK_CLASS_CAST,
 		GTK_CHECK_CLASS_TYPE, GTK_CHECK_TYPE, GtkClassInitFunc,
 		GtkObjectInitFunc, GtkTypeInfo, gdk_window_get_colormap,
diff --git a/applet/pilot.c b/applet/pilot.c
index 76aa360..0053bbd 100644
--- a/applet/pilot.c
+++ b/applet/pilot.c
@@ -176,8 +176,8 @@ gpilotd_connect_cb (GnomePilotClient *client,
 		applet->message_buffer       = gtk_text_view_get_buffer(
 				GTK_TEXT_VIEW(applet->message_area));
 
-		gtk_signal_connect (GTK_OBJECT (applet->cancel_button),"clicked",
-				   GTK_SIGNAL_FUNC (cancel_cb),applet);
+		g_signal_connect   (GTK_OBJECT (applet->cancel_button),"clicked",
+				   G_CALLBACK (cancel_cb),applet);
 	} else {
 		gtk_text_buffer_set_text (applet->message_buffer, "", -1);
 	}
@@ -544,15 +544,15 @@ properties_cb (BonoboUIComponent *uic, gpointer user_data, const gchar *verbname
 	entry = get_widget (ui,"exec_entry");
 	if (self->properties.exec_when_clicked)
 		gtk_entry_set_text (GTK_ENTRY (entry), self->properties.exec_when_clicked);
-	gtk_signal_connect (GTK_OBJECT (entry), "focus-out-event",
-			    GTK_SIGNAL_FUNC (exec_on_click_changed_cb),
+	g_signal_connect   (GTK_OBJECT (entry), "focus-out-event",
+			    G_CALLBACK (exec_on_click_changed_cb),
 			    self);
 
   
 	button = get_widget (ui,"notices_button");
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), self->properties.popups);
-	gtk_signal_connect (GTK_OBJECT (button), "toggled",
-			    GTK_SIGNAL_FUNC (toggle_notices_cb),
+	g_signal_connect   (GTK_OBJECT (button), "toggled",
+			    G_CALLBACK (toggle_notices_cb),
 			    self);
 
 	g_signal_connect (GTK_OBJECT (dialog), "response",
@@ -763,7 +763,7 @@ restore_cb (BonoboUIComponent *uic, gpointer user_data, const gchar *verbname)
 			show_dialog (applet, GTK_MESSAGE_WARNING,
 			    _("Restore request failed"));
 		}
-		gtk_signal_disconnect (applet->gpc, id);		
+		g_signal_handler_disconnect (applet->gpc, id);		
 	} else {
 		gtk_widget_destroy (applet->restoreDialog);
 	}	
@@ -1389,8 +1389,8 @@ create_pilot_widgets (GtkWidget *widget, PilotApplet *self)
 	*/
 	self->image = gtk_image_new_from_file (pixmaps[self->curstate]); 
 
-	gtk_signal_connect (GTK_OBJECT (widget), "button-press-event", 
-			    GTK_SIGNAL_FUNC (pilot_clicked_cb), self); 
+	g_signal_connect   (GTK_OBJECT (widget), "button-press-event", 
+			    G_CALLBACK (pilot_clicked_cb), self); 
 
 
 	gtk_widget_show (self->image);   
@@ -1399,11 +1399,11 @@ create_pilot_widgets (GtkWidget *widget, PilotApplet *self)
 
 	self->timeout_handler_id = g_timeout_add (1000,(GSourceFunc)timeout,self); 
 
-	gtk_signal_connect (GTK_OBJECT (widget),"destroy", 
-			    GTK_SIGNAL_FUNC (applet_destroy),self); 
+	g_signal_connect   (GTK_OBJECT (widget),"destroy", 
+			    G_CALLBACK (applet_destroy),self); 
 
-	gtk_signal_connect (GTK_OBJECT (widget),"change_background", 
-			    GTK_SIGNAL_FUNC (applet_back_change),self); 
+	g_signal_connect   (GTK_OBJECT (widget),"change_background", 
+			    G_CALLBACK (applet_back_change),self); 
 
 	/* FIXME */
 	/* XXX change_orient */
@@ -1416,9 +1416,9 @@ create_pilot_widgets (GtkWidget *widget, PilotApplet *self)
 			   GDK_ACTION_COPY); 
 
 
-	gtk_signal_connect (GTK_OBJECT (self->image), 
+	g_signal_connect   (GTK_OBJECT (self->image), 
 			    "drag_data_received", 
-			    GTK_SIGNAL_FUNC (dnd_drop_internal), 
+			    G_CALLBACK (dnd_drop_internal), 
 			    self); 
 
 	install_popup_menu (self, FALSE);
diff --git a/capplet/gnome-pilot-assistant.c b/capplet/gnome-pilot-assistant.c
index 7865535..87cbe87 100644
--- a/capplet/gnome-pilot-assistant.c
+++ b/capplet/gnome-pilot-assistant.c
@@ -236,12 +236,12 @@ gnome_pilot_assistant_new (GnomePilotClient *gpc)
 	gpd = GNOME_PILOT_ASSISTANT (obj);
 	gpd->priv->gpc = gpc;
 
-	gtk_signal_connect (GTK_OBJECT (gpc), "completed_request",
-			    GTK_SIGNAL_FUNC (gpd_request_completed), gpd);
-	gtk_signal_connect (GTK_OBJECT (gpc), "user_info",
-			    GTK_SIGNAL_FUNC (gpd_userinfo_requested), gpd);
-	gtk_signal_connect (GTK_OBJECT (gpc), "system_info",
-			    GTK_SIGNAL_FUNC (gpd_system_info_requested), gpd);
+	g_signal_connect   (GTK_OBJECT (gpc), "completed_request",
+			    G_CALLBACK (gpd_request_completed), gpd);
+	g_signal_connect   (GTK_OBJECT (gpc), "user_info",
+			    G_CALLBACK (gpd_userinfo_requested), gpd);
+	g_signal_connect   (GTK_OBJECT (gpc), "system_info",
+			    G_CALLBACK (gpd_system_info_requested), gpd);
 
 	return obj;
 }
@@ -399,13 +399,13 @@ init_widgets (GnomePilotAssistant *gpd)
 	priv = gpd->priv;
 
 	/* Main signals */
-	gtk_signal_connect (GTK_OBJECT (priv->assistant), "delete_event",
-	    GTK_SIGNAL_FUNC (gpd_delete_window), gpd);
+	g_signal_connect   (GTK_OBJECT (priv->assistant), "delete_event",
+	    G_CALLBACK (gpd_delete_window), gpd);
 
-	gtk_signal_connect (GTK_OBJECT (priv->assistant), "cancel",
-	    GTK_SIGNAL_FUNC (gpd_canceled), gpd);
-	//	gtk_signal_connect (GTK_OBJECT (priv->assistant), "help",
-	//   GTK_SIGNAL_FUNC (gpd_help), gpd);
+	g_signal_connect   (GTK_OBJECT (priv->assistant), "cancel",
+	    G_CALLBACK (gpd_canceled), gpd);
+	//	g_signal_connect   (GTK_OBJECT (priv->assistant), "help",
+	//   G_CALLBACK (gpd_help), gpd);
 
 
 	/* Page signals */
@@ -416,29 +416,29 @@ init_widgets (GnomePilotAssistant *gpd)
 
 
 	/* Other widget signals */
-	gtk_signal_connect (GTK_OBJECT (priv->device_name),"changed",
-			    GTK_SIGNAL_FUNC (gpd_device_info_check), gpd);
-	gtk_signal_connect (GTK_OBJECT (priv->device_port),"insert-text",
-			    GTK_SIGNAL_FUNC (insert_device_callback), NULL);
-	gtk_signal_connect (GTK_OBJECT (priv->device_network), "toggled",
-			    GTK_SIGNAL_FUNC (network_device_toggled_callback), gpd);
-	gtk_signal_connect (GTK_OBJECT (priv->device_bluetooth), "toggled",
-			    GTK_SIGNAL_FUNC (network_device_toggled_callback), gpd);
-	gtk_signal_connect (GTK_OBJECT (priv->device_port),"changed",
-			    GTK_SIGNAL_FUNC (gpd_device_info_check), gpd);
-
-	gtk_signal_connect (GTK_OBJECT (priv->pilot_info_no),"toggled",
-			    GTK_SIGNAL_FUNC (gpd_pilot_info_button), gpd);
-	gtk_signal_connect (GTK_OBJECT (priv->pilot_username),"insert-text",
-			    GTK_SIGNAL_FUNC (insert_username_callback), NULL);
-	gtk_signal_connect (GTK_OBJECT (priv->pilot_username),"changed",
-			    GTK_SIGNAL_FUNC (gpd_pilot_info_check), gpd);
-	gtk_signal_connect (GTK_OBJECT (priv->pilot_id),"insert-text",
-			    GTK_SIGNAL_FUNC (insert_numeric_callback), NULL);
-	gtk_signal_connect (GTK_OBJECT (priv->pilot_id),"changed",
-			    GTK_SIGNAL_FUNC (gpd_pilot_info_check), gpd);
-	gtk_signal_connect (GTK_OBJECT (priv->pilot_name),"changed",
-			    GTK_SIGNAL_FUNC (gpd_pilot_name_check), gpd);
+	g_signal_connect   (GTK_OBJECT (priv->device_name),"changed",
+			    G_CALLBACK (gpd_device_info_check), gpd);
+	g_signal_connect   (GTK_OBJECT (priv->device_port),"insert-text",
+			    G_CALLBACK (insert_device_callback), NULL);
+	g_signal_connect   (GTK_OBJECT (priv->device_network), "toggled",
+			    G_CALLBACK (network_device_toggled_callback), gpd);
+	g_signal_connect   (GTK_OBJECT (priv->device_bluetooth), "toggled",
+			    G_CALLBACK (network_device_toggled_callback), gpd);
+	g_signal_connect   (GTK_OBJECT (priv->device_port),"changed",
+			    G_CALLBACK (gpd_device_info_check), gpd);
+
+	g_signal_connect   (GTK_OBJECT (priv->pilot_info_no),"toggled",
+			    G_CALLBACK (gpd_pilot_info_button), gpd);
+	g_signal_connect   (GTK_OBJECT (priv->pilot_username),"insert-text",
+			    G_CALLBACK (insert_username_callback), NULL);
+	g_signal_connect   (GTK_OBJECT (priv->pilot_username),"changed",
+			    G_CALLBACK (gpd_pilot_info_check), gpd);
+	g_signal_connect   (GTK_OBJECT (priv->pilot_id),"insert-text",
+			    G_CALLBACK (insert_numeric_callback), NULL);
+	g_signal_connect   (GTK_OBJECT (priv->pilot_id),"changed",
+			    G_CALLBACK (gpd_pilot_info_check), gpd);
+	g_signal_connect   (GTK_OBJECT (priv->pilot_name),"changed",
+			    G_CALLBACK (gpd_pilot_name_check), gpd);
 
 }
 
@@ -610,8 +610,8 @@ gpd_page_prepare (GtkAssistant *assistant, GtkWidget *page,
 		    gpd->priv->page_pilot_two, TRUE);
 		break;
 	case GPD_PAGE_FINISH:
-		gtk_signal_connect (GTK_OBJECT (gpd->priv->assistant), "close",
-		    GTK_SIGNAL_FUNC (gpd_finish_page_finished), gpd);
+		g_signal_connect   (GTK_OBJECT (gpd->priv->assistant), "close",
+		    G_CALLBACK (gpd_finish_page_finished), gpd);
 
 	default:
 		break;
@@ -997,7 +997,8 @@ gpd_destroy (GtkObject *object)
 	gtk_widget_destroy (priv->assistant);
 	g_object_unref (priv->ui);
 
-	gtk_signal_disconnect_by_data (GTK_OBJECT (priv->gpc), object);
+	g_signal_handlers_disconnect_matched (priv->gpc,
+	    G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, object);
 
 	if (GTK_OBJECT_CLASS (parent_class)->destroy)
 		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
@@ -1024,7 +1025,7 @@ network_device_toggled_callback (GtkRadioButton *btn, void *data)
 	}
 	
 	set_widget_visibility_by_type(gpd, type);
-}	
+}
 
 static void
 set_widget_visibility_by_type(GnomePilotAssistant *gpd, int type) {
diff --git a/capplet/gnome-pilot-capplet.c b/capplet/gnome-pilot-capplet.c
index 1c289a3..8cf8e9b 100644
--- a/capplet/gnome-pilot-capplet.c
+++ b/capplet/gnome-pilot-capplet.c
@@ -287,32 +287,32 @@ init_widgets (GnomePilotCapplet *gpcap)
 	priv = gpcap->priv;
 
 	/* Button signals */
-	gtk_signal_connect (GTK_OBJECT (priv->pilots_add), "clicked",
-			    GTK_SIGNAL_FUNC (gpcap_pilots_add), gpcap);
+	g_signal_connect   (GTK_OBJECT (priv->pilots_add), "clicked",
+			    G_CALLBACK (gpcap_pilots_add), gpcap);
 
-	gtk_signal_connect (GTK_OBJECT (priv->pilots_edit), "clicked",
-			    GTK_SIGNAL_FUNC (gpcap_pilots_edit), gpcap);
+	g_signal_connect   (GTK_OBJECT (priv->pilots_edit), "clicked",
+			    G_CALLBACK (gpcap_pilots_edit), gpcap);
 
-	gtk_signal_connect (GTK_OBJECT (priv->pilots_delete), "clicked",
-			    GTK_SIGNAL_FUNC (gpcap_pilots_delete), gpcap);
+	g_signal_connect   (GTK_OBJECT (priv->pilots_delete), "clicked",
+			    G_CALLBACK (gpcap_pilots_delete), gpcap);
 
-	gtk_signal_connect (GTK_OBJECT (priv->devices_add), "clicked",
-			    GTK_SIGNAL_FUNC (gpcap_devices_add), gpcap);
+	g_signal_connect   (GTK_OBJECT (priv->devices_add), "clicked",
+			    G_CALLBACK (gpcap_devices_add), gpcap);
 
-	gtk_signal_connect (GTK_OBJECT (priv->devices_edit), "clicked",
-			    GTK_SIGNAL_FUNC (gpcap_devices_edit), gpcap);
+	g_signal_connect   (GTK_OBJECT (priv->devices_edit), "clicked",
+			    G_CALLBACK (gpcap_devices_edit), gpcap);
 
-	gtk_signal_connect (GTK_OBJECT (priv->devices_delete), "clicked",
-			    GTK_SIGNAL_FUNC (gpcap_devices_delete), gpcap);
+	g_signal_connect   (GTK_OBJECT (priv->devices_delete), "clicked",
+			    G_CALLBACK (gpcap_devices_delete), gpcap);
 
-	gtk_signal_connect (GTK_OBJECT (priv->conduit_enable), "clicked",
-			    GTK_SIGNAL_FUNC (gpcap_conduits_enable), gpcap);
+	g_signal_connect   (GTK_OBJECT (priv->conduit_enable), "clicked",
+			    G_CALLBACK (gpcap_conduits_enable), gpcap);
 
-	gtk_signal_connect (GTK_OBJECT (priv->conduit_disable), "clicked",
-			    GTK_SIGNAL_FUNC (gpcap_conduits_disable), gpcap);
+	g_signal_connect   (GTK_OBJECT (priv->conduit_disable), "clicked",
+			    G_CALLBACK (gpcap_conduits_disable), gpcap);
 
-	gtk_signal_connect (GTK_OBJECT (priv->conduit_settings), "clicked",
-			    GTK_SIGNAL_FUNC (gpcap_conduits_settings), gpcap);
+	g_signal_connect   (GTK_OBJECT (priv->conduit_settings), "clicked",
+			    G_CALLBACK (gpcap_conduits_settings), gpcap);
 
 	/* Row selection signals */
 	g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->pilots_treeview)), "changed",
@@ -325,12 +325,12 @@ init_widgets (GnomePilotCapplet *gpcap)
 			  G_CALLBACK (gpcap_conduits_selection_changed), gpcap);
 
 	/* Popup menu signals */
-	gtk_signal_connect (GTK_OBJECT (priv->pilots_treeview), "button_press_event",
-			    GTK_SIGNAL_FUNC (gpcap_pilots_popup), gpcap);
-	gtk_signal_connect (GTK_OBJECT (priv->devices_treeview), "button_press_event",
-			    GTK_SIGNAL_FUNC (gpcap_devices_popup), gpcap);
-	gtk_signal_connect (GTK_OBJECT (priv->conduit_treeview), "button_press_event",
-			    GTK_SIGNAL_FUNC (gpcap_conduits_popup), gpcap);
+	g_signal_connect   (GTK_OBJECT (priv->pilots_treeview), "button_press_event",
+			    G_CALLBACK (gpcap_pilots_popup), gpcap);
+	g_signal_connect   (GTK_OBJECT (priv->devices_treeview), "button_press_event",
+			    G_CALLBACK (gpcap_devices_popup), gpcap);
+	g_signal_connect   (GTK_OBJECT (priv->conduit_treeview), "button_press_event",
+			    G_CALLBACK (gpcap_conduits_popup), gpcap);
 
 	gtk_widget_show_all (priv->notebook);
 }
@@ -613,8 +613,8 @@ fill_pilots_combo (GnomePilotCapplet *gpcap)
                 tmp = tmp->next;
         }
 
-	gtk_signal_connect (GTK_OBJECT(priv->pilots_combo),"changed",
-		    GTK_SIGNAL_FUNC (gpcap_conduits_choose_pilot),
+	g_signal_connect   (GTK_OBJECT(priv->pilots_combo),"changed",
+		    G_CALLBACK (gpcap_conduits_choose_pilot),
 		    gpcap);
 	gtk_combo_box_set_model (GTK_COMBO_BOX (priv->pilots_combo), GTK_TREE_MODEL(store));
 	gtk_cell_layout_clear(GTK_CELL_LAYOUT(priv->pilots_combo));
@@ -812,9 +812,9 @@ gpcap_pilots_popup (GtkTreeView *treeview, GdkEventButton *event, gpointer user_
 
 	GtkActionEntry entries[] = {
 		{ "Edit", NULL, N_("_Edit this PDA..."), NULL,
-		  N_("Edit the currently selected PDA"), GTK_SIGNAL_FUNC(gpcap_pilots_edit)},
+		  N_("Edit the currently selected PDA"), G_CALLBACK(gpcap_pilots_edit)},
 		{ "Delete", NULL, N_("_Delete this PDA"), NULL,
-		  N_("Delete the currently selected PDA"), GTK_SIGNAL_FUNC(gpcap_pilots_delete)},
+		  N_("Delete the currently selected PDA"), G_CALLBACK(gpcap_pilots_delete)},
 	};
  
 	static const char *ui_description =
@@ -988,9 +988,9 @@ gpcap_devices_popup (GtkTreeView *treeview, GdkEventButton *event, gpointer user
 
 	GtkActionEntry entries[] = {
 		{ "Edit", NULL, N_("_Edit this device..."),  NULL,
-		  N_("Edit the currently selected device"), GTK_SIGNAL_FUNC(gpcap_devices_edit)},
+		  N_("Edit the currently selected device"), G_CALLBACK(gpcap_devices_edit)},
 		{ "Delete", NULL, N_("_Delete this device"), NULL,
-		  N_("Delete the currently selected device"), GTK_SIGNAL_FUNC(gpcap_devices_delete)},
+		  N_("Delete the currently selected device"), G_CALLBACK(gpcap_devices_delete)},
 	};
  
 	static const char *ui_description =
@@ -1215,11 +1215,11 @@ gpcap_conduits_popup (GtkTreeView *treeview, GdkEventButton *event, gpointer use
 
 	GtkActionEntry entries[] = {
 		{ "Enable", NULL, N_("_Enable this conduit"), NULL,
-		  N_("Disable the currently selected conduit"), GTK_SIGNAL_FUNC(gpcap_conduits_enable)},
+		  N_("Disable the currently selected conduit"), G_CALLBACK(gpcap_conduits_enable)},
 		{ "Disable", NULL, N_("_Disable this conduit"), NULL,
-		  N_("Enable the currently selected conduit"), GTK_SIGNAL_FUNC(gpcap_conduits_disable)},
+		  N_("Enable the currently selected conduit"), G_CALLBACK(gpcap_conduits_disable)},
 		{ "Settings", NULL, N_("_Settings..."), NULL,
-		  N_("Modify the currently selected conduit's settings"), GTK_SIGNAL_FUNC(gpcap_conduits_settings)},
+		  N_("Modify the currently selected conduit's settings"), G_CALLBACK(gpcap_conduits_settings)},
 	};
 
 	static const char *ui_description =
diff --git a/capplet/gnome-pilot-cdialog.c b/capplet/gnome-pilot-cdialog.c
index 31b5c67..faee6de 100644
--- a/capplet/gnome-pilot-cdialog.c
+++ b/capplet/gnome-pilot-cdialog.c
@@ -182,8 +182,8 @@ init_widgets (GnomePilotCDialog *gpcd)
 	
 	priv = gpcd->priv;
 
-	gtk_signal_connect (GTK_OBJECT (priv->sync_actions), "changed",
-	    GTK_SIGNAL_FUNC (gpcd_action_activated), gpcd);
+	g_signal_connect (GTK_OBJECT (priv->sync_actions), "changed",
+	    G_CALLBACK (gpcd_action_activated), gpcd);
 }
 
 static void
diff --git a/capplet/gnome-pilot-ddialog.c b/capplet/gnome-pilot-ddialog.c
index 092c66f..67052b4 100644
--- a/capplet/gnome-pilot-ddialog.c
+++ b/capplet/gnome-pilot-ddialog.c
@@ -254,12 +254,12 @@ init_widgets (GnomePilotDDialog *gpdd)
 
 	priv = gpdd->priv;
 
-	gtk_signal_connect (GTK_OBJECT (priv->device_port),"insert-text",
-			    GTK_SIGNAL_FUNC (insert_device_callback), NULL);
-	gtk_signal_connect (GTK_OBJECT (priv->device_bluetooth), "toggled",
-			    GTK_SIGNAL_FUNC (network_device_toggled_callback), gpdd);
-	gtk_signal_connect (GTK_OBJECT (priv->device_network), "toggled",
-			    GTK_SIGNAL_FUNC (network_device_toggled_callback), gpdd);
+	g_signal_connect (GTK_OBJECT (priv->device_port),"insert-text",
+			    G_CALLBACK (insert_device_callback), NULL);
+	g_signal_connect (GTK_OBJECT (priv->device_bluetooth), "toggled",
+			    G_CALLBACK (network_device_toggled_callback), gpdd);
+	g_signal_connect (GTK_OBJECT (priv->device_network), "toggled",
+			    G_CALLBACK (network_device_toggled_callback), gpdd);
 }
 
 static void
diff --git a/capplet/gnome-pilot-pdialog.c b/capplet/gnome-pilot-pdialog.c
index 5ee0ff7..b175814 100644
--- a/capplet/gnome-pilot-pdialog.c
+++ b/capplet/gnome-pilot-pdialog.c
@@ -282,17 +282,17 @@ init_widgets (GnomePilotPDialog *gppd)
 	priv = gppd->priv;
 
 	/* Button signals */
-	gtk_signal_connect (GTK_OBJECT (priv->pilot_get), "clicked",
-			    GTK_SIGNAL_FUNC (gppd_pilot_get), gppd);
+	g_signal_connect (GTK_OBJECT (priv->pilot_get), "clicked",
+			    G_CALLBACK (gppd_pilot_get), gppd);
 
-	gtk_signal_connect (GTK_OBJECT (priv->pilot_send), "clicked",
-			    GTK_SIGNAL_FUNC (gppd_pilot_send), gppd);
+	g_signal_connect (GTK_OBJECT (priv->pilot_send), "clicked",
+			    G_CALLBACK (gppd_pilot_send), gppd);
 	
 	/* Other widget signals */
-	gtk_signal_connect (GTK_OBJECT (priv->pilot_username),"insert-text",
-			    GTK_SIGNAL_FUNC (insert_username_callback), NULL);
-	gtk_signal_connect (GTK_OBJECT (priv->pilot_id),"insert-text",
-			    GTK_SIGNAL_FUNC (insert_numeric_callback), NULL);
+	g_signal_connect (GTK_OBJECT (priv->pilot_username),"insert-text",
+			    G_CALLBACK (insert_username_callback), NULL);
+	g_signal_connect (GTK_OBJECT (priv->pilot_id),"insert-text",
+			    G_CALLBACK (insert_numeric_callback), NULL);
 }
 
 static void
@@ -553,7 +553,8 @@ gppd_destroy (GtkObject *object)
 	gtk_widget_destroy (priv->dialog);
 	g_object_unref (G_OBJECT (priv->ui));
 
-	gtk_signal_disconnect_by_data (GTK_OBJECT (priv->gpc), object);
+	g_signal_handlers_disconnect_matched (priv->gpc,
+	    G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, object);
 	
 	if (GTK_OBJECT_CLASS (parent_class)->destroy)
 		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
diff --git a/capplet/util.c b/capplet/util.c
index 69bb966..9ff3e4b 100644
--- a/capplet/util.c
+++ b/capplet/util.c
@@ -362,7 +362,7 @@ insert_numeric_callback (GtkEditable *editable, const gchar *text,
 	
 	for (i =0; i<len; i++) {
 		if (!isdigit (text[i])) {
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (editable), "insert_text");
+			g_signal_stop_emission_by_name (GTK_OBJECT (editable), "insert_text");
 			return;
 		}
 	}
@@ -379,7 +379,7 @@ insert_username_callback (GtkEditable *editable, const gchar *text,
 	if (*position == 0 && len > 0) {
 		utf8_char = g_utf8_get_char_validated (text, -1);
 		if (!g_unichar_isalpha (utf8_char)) {
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (editable), "insert_text");
+			g_signal_stop_emission_by_name (GTK_OBJECT (editable), "insert_text");
 		}
 	} else {
 		gchar *p = (char *) text; 
@@ -387,7 +387,7 @@ insert_username_callback (GtkEditable *editable, const gchar *text,
 		while (p && *p) {
 			utf8_char = g_utf8_get_char_validated (p, -1);
 			if (!g_unichar_isalnum (utf8_char) && !g_unichar_isspace (utf8_char)) {
-				gtk_signal_emit_stop_by_name (GTK_OBJECT (editable), 
+				g_signal_stop_emission_by_name (GTK_OBJECT (editable), 
 							     "insert_text");
 			}
 			p = g_utf8_find_next_char (p, NULL);
@@ -410,13 +410,13 @@ insert_device_callback (GtkEditable *editable, const gchar *text,
 		    && text[0]!='u'
 #endif
 		    ) {
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (editable), "insert_text");
+			g_signal_stop_emission_by_name (GTK_OBJECT (editable), "insert_text");
 			return;
 		} 
 	} else {
 		for (i =0;i<len;i++)
 			if (!(isalnum (text[i]) || text[i]=='/' || text[i]==':')) {
-				gtk_signal_emit_stop_by_name (GTK_OBJECT (editable), "insert_text");
+				g_signal_stop_emission_by_name (GTK_OBJECT (editable), "insert_text");
 				return;
 			}
 	}
diff --git a/conduits/backup/backup_conduit.c b/conduits/backup/backup_conduit.c
index a9001f4..0d6e83a 100644
--- a/conduits/backup/backup_conduit.c
+++ b/conduits/backup/backup_conduit.c
@@ -858,13 +858,13 @@ insert_dir_callback (GtkEditable *editable, const gchar *text,
 	curname = gtk_entry_get_text(GTK_ENTRY(editable));
 	if (*curname == '\0' && len > 0) {
 		if (isspace(text[0])) {
-			gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text");
+			g_signal_stop_emission_by_name (GTK_OBJECT(editable), "insert_text");
 			return;
 		}
 	} else {
 		for (i=0; i<len; i++) {
 			if (isspace(text[i])) {
-				gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), 
+				g_signal_stop_emission_by_name (GTK_OBJECT(editable), 
 							     "insert_text");
 				return;
 			}
@@ -896,8 +896,8 @@ static GtkWidget
 	gtk_entry_set_max_length(GTK_ENTRY(entry), 128);
 	g_object_set_data (G_OBJECT(vbox), "dir", entry);
 	gtk_table_attach_defaults(GTK_TABLE(table), entry, 1, 2, 0, 1);
-	gtk_signal_connect(GTK_OBJECT(entry), "insert_text",
-			   GTK_SIGNAL_FUNC(insert_dir_callback),
+	g_signal_connect(GTK_OBJECT(entry), "insert_text",
+			   G_CALLBACK(insert_dir_callback),
 			   NULL);
 
 	gtk_label_set_mnemonic_widget (GTK_LABEL(label), entry);
diff --git a/conduits/file/gpilot_install_file.c b/conduits/file/gpilot_install_file.c
index 782533b..84dd5bc 100644
--- a/conduits/file/gpilot_install_file.c
+++ b/conduits/file/gpilot_install_file.c
@@ -102,7 +102,7 @@ main (int argc, char *argv[])
 
 	gpc = GNOME_PILOT_CLIENT (gnome_pilot_client_new ());
 	g_object_ref_sink (G_OBJECT (gpc));
-	gtk_signal_connect (GTK_OBJECT (gpc),"completed_request", (GtkSignalFunc)gpilotd_request_completed, NULL);
+	g_signal_connect (GTK_OBJECT (gpc),"completed_request", G_CALLBACK(gpilotd_request_completed), NULL);
 	gnome_pilot_client_connect_to_daemon (gpc);
 
 	if (pilot_arg!=NULL) {
diff --git a/conduits/test/test_conduit.c b/conduits/test/test_conduit.c
index e3c51c8..191032c 100644
--- a/conduits/test/test_conduit.c
+++ b/conduits/test/test_conduit.c
@@ -84,11 +84,11 @@ conduit_get_gpilot_conduit(guint32 pilotId)
 	retval = gnome_pilot_conduit_standard_new ("MailDB",0x6d61696c, NULL);
 	g_assert(retval != NULL);
 
-	gtk_signal_connect(retval, "copy_from_pilot", (GtkSignalFunc)copy_from_pilot, NULL);
-	gtk_signal_connect(retval, "copy_to_pilot", (GtkSignalFunc)copy_to_pilot, NULL);
-	gtk_signal_connect(retval, "merge_to_pilot", (GtkSignalFunc)merge_to_pilot, NULL);
-	gtk_signal_connect(retval, "merge_from_pilot", (GtkSignalFunc)merge_from_pilot, NULL);
-	gtk_signal_connect(retval, "synchronize", (GtkSignalFunc)synchronize, NULL);
+	g_signal_connect(retval, "copy_from_pilot", G_CALLBACK(copy_from_pilot), NULL);
+	g_signal_connect(retval, "copy_to_pilot", G_CALLBACK(copy_to_pilot), NULL);
+	g_signal_connect(retval, "merge_to_pilot", G_CALLBACK(merge_to_pilot), NULL);
+	g_signal_connect(retval, "merge_from_pilot", G_CALLBACK(merge_from_pilot), NULL);
+	g_signal_connect(retval, "synchronize", G_CALLBACK(synchronize), NULL);
 
 	return GNOME_PILOT_CONDUIT(retval); 
 }
diff --git a/gpilotd/gnome-pilot-client.gob b/gpilotd/gnome-pilot-client.gob
index a9af673..b9cd7ed 100644
--- a/gpilotd/gnome-pilot-client.gob
+++ b/gpilotd/gnome-pilot-client.gob
@@ -677,7 +677,7 @@ class Gnome:Pilot:Client from Gtk:Object {
 		gboolean res;
 		gboolean file_copied = FALSE;
 		gchar   *filename;
-		GError  *error;
+		GError  *error = NULL;
 
 		g_return_val_if_fail (self->proxy != NULL, GPILOTD_ERR_NOT_CONNECTED);
 		/* g_message ("Installing %s to %s", infile, pilot_name); */
@@ -703,22 +703,26 @@ class Gnome:Pilot:Client from Gtk:Object {
 				   strncmp (infile, "file:/", 6)!=0);
 			*/
 
-			if (infile[0] != '/' && strncmp (infile, "file:/", 6)!=0) {
+			if (strncmp (infile, "file:/", 6) == 0)
+			{
+				infile_with_path = g_strdup (infile);
+				src_gfile = g_file_new_for_uri (infile_with_path);
+			} else if (infile[0] != '/') {
 				/* gio needs the file with path */
 				if (getcwd (pwd, 127) == NULL)
 					goto error;
 				infile_with_path = g_strdup_printf ("%s/%s", pwd, infile);
+				src_gfile = g_file_new_for_path	(infile_with_path);
 			} else {
 				infile_with_path = g_strdup (infile);
+				src_gfile = g_file_new_for_path	(infile_with_path);
 			}
 
-			src_gfile = g_file_new_for_path (infile_with_path);
+
 			dest_gfile = g_file_new_for_uri (filename_uri);
 
-			/*
 			g_message ("from : \"%s\"", infile_with_path);
 			g_message ("to   : \"%s\"", filename_uri);
-			*/
 
 			result = g_file_copy (src_gfile, dest_gfile,
 						     copy_options,
diff --git a/gpilotd/gnome-pilot-conduit-standard-abs.c b/gpilotd/gnome-pilot-conduit-standard-abs.c
index 311e78d..3a8e52c 100644
--- a/gpilotd/gnome-pilot-conduit-standard-abs.c
+++ b/gpilotd/gnome-pilot-conduit-standard-abs.c
@@ -232,132 +232,164 @@ gnome_pilot_conduit_standard_abs_class_init (GnomePilotConduitStandardAbsClass *
 	parent_class = g_type_class_peek (gnome_pilot_conduit_standard_get_type ());
 
 	pilot_conduit_standard_abs_signals[MATCH_RECORD] =
-		gtk_signal_new ("match_record",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitStandardAbsClass, match_record),
+		g_signal_new   ("match_record",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitStandardAbsClass, match_record),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER_POINTER,
-				GTK_TYPE_INT, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
+				G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
 	pilot_conduit_standard_abs_signals[FREE_MATCH] =
-		gtk_signal_new ("free_match",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitStandardAbsClass, free_match),
+		g_signal_new   ("free_match",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitStandardAbsClass, free_match),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
+				G_TYPE_INT, 1, G_TYPE_POINTER);
 
 	pilot_conduit_standard_abs_signals[ARCHIVE_LOCAL] =
-		gtk_signal_new ("archive_local",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitStandardAbsClass, archive_local),
+		g_signal_new   ("archive_local",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitStandardAbsClass, archive_local),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
+				G_TYPE_INT, 1, G_TYPE_POINTER);
 
 	pilot_conduit_standard_abs_signals[ARCHIVE_REMOTE] =
-		gtk_signal_new ("archive_remote",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitStandardAbsClass, archive_remote),
+		g_signal_new   ("archive_remote",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitStandardAbsClass, archive_remote),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER_POINTER,
-				GTK_TYPE_INT, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
+				G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
 	pilot_conduit_standard_abs_signals[STORE_REMOTE] =
-		gtk_signal_new ("store_remote",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitStandardAbsClass, store_remote),
+		g_signal_new   ("store_remote",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitStandardAbsClass, store_remote),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
+				G_TYPE_INT, 1, G_TYPE_POINTER);
 
 	pilot_conduit_standard_abs_signals[ITERATE] =
-		gtk_signal_new ("iterate",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitStandardAbsClass, iterate),
+		g_signal_new   ("iterate",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitStandardAbsClass, iterate),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
+				G_TYPE_INT, 1, G_TYPE_POINTER);
 
 	pilot_conduit_standard_abs_signals[ITERATE_SPECIFIC] =
-		gtk_signal_new ("iterate_specific",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitStandardAbsClass, iterate_specific),
+		g_signal_new   ("iterate_specific",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitStandardAbsClass, iterate_specific),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER_INT_INT,
-				GTK_TYPE_INT, 3, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_INT);
+				G_TYPE_INT, 3, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT);
 
 	pilot_conduit_standard_abs_signals[PURGE] =
-		gtk_signal_new ("purge",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitStandardAbsClass, purge),
+		g_signal_new   ("purge",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitStandardAbsClass, purge),
+				NULL,
+				NULL,
 				gp_marshal_INT__NONE,
-				GTK_TYPE_INT, 0);
+				G_TYPE_INT, 0);
 
 	pilot_conduit_standard_abs_signals[SET_STATUS] =
-		gtk_signal_new ("set_status",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitStandardAbsClass, set_status),
+		g_signal_new   ("set_status",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitStandardAbsClass, set_status),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER_INT,
-				GTK_TYPE_INT, 2, GTK_TYPE_POINTER, GTK_TYPE_INT);
+				G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_INT);
 
 	pilot_conduit_standard_abs_signals[SET_PILOT_ID] =
-		gtk_signal_new ("set_pilot_id",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitStandardAbsClass, set_pilot_id),
+		g_signal_new   ("set_pilot_id",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitStandardAbsClass, set_pilot_id),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER_INT,
-				GTK_TYPE_INT, 2, GTK_TYPE_POINTER, GTK_TYPE_INT);
+				G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_INT);
 
 	pilot_conduit_standard_abs_signals[COMPARE] =
-		gtk_signal_new ("compare",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitStandardAbsClass, compare),
+		g_signal_new   ("compare",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitStandardAbsClass, compare),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER_POINTER,
-				GTK_TYPE_INT, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
+				G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
 	pilot_conduit_standard_abs_signals[COMPARE_BACKUP] =
-		gtk_signal_new ("compare_backup",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitStandardAbsClass, compare_backup),
+		g_signal_new   ("compare_backup",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitStandardAbsClass, compare_backup),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER_POINTER,
-				GTK_TYPE_INT, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
+				G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
 	pilot_conduit_standard_abs_signals[FREE_TRANSMIT] =
-		gtk_signal_new ("free_transmit",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitStandardAbsClass, free_transmit),
+		g_signal_new   ("free_transmit",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitStandardAbsClass, free_transmit),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER_POINTER,
-				GTK_TYPE_INT, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
+				G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
 	pilot_conduit_standard_abs_signals[DELETE_ALL] =
-		gtk_signal_new ("delete_all",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitStandardAbsClass, delete_all),
+		g_signal_new   ("delete_all",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitStandardAbsClass, delete_all),
+				NULL,
+				NULL,
 				gp_marshal_INT__NONE,
-				GTK_TYPE_INT, 0);
+				G_TYPE_INT, 0);
 
 	pilot_conduit_standard_abs_signals[TRANSMIT] =
-		gtk_signal_new ("transmit",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitStandardAbsClass, transmit),
+		g_signal_new   ("transmit",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitStandardAbsClass, transmit),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER_POINTER,
-				GTK_TYPE_INT, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
+				G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
 	pilot_conduit_standard_abs_signals[PRE_SYNC] =
-		gtk_signal_new ("pre_sync",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitStandardAbsClass, pre_sync),
+		g_signal_new   ("pre_sync",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitStandardAbsClass, pre_sync),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
+				G_TYPE_INT, 1, G_TYPE_POINTER);
 
 	conduit_standard_class->copy_to_pilot = gnome_pilot_conduit_standard_real_copy_to_pilot;
 	conduit_standard_class->copy_from_pilot = gnome_pilot_conduit_standard_real_copy_from_pilot;
@@ -679,8 +711,9 @@ gnome_pilot_conduit_standard_abs_match_record (GnomePilotConduitStandardAbs *con
 	g_return_val_if_fail (conduit != NULL, -1);
 	g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [MATCH_RECORD],
+			 0,
 			 local,
 			 remote,
 			 &retval);
@@ -697,8 +730,9 @@ gnome_pilot_conduit_standard_abs_free_match (GnomePilotConduitStandardAbs *condu
 	g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
 
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [FREE_MATCH],
+			 0,
 			 local,
 			 &retval);
 	return retval;
@@ -713,8 +747,9 @@ gnome_pilot_conduit_standard_abs_archive_local (GnomePilotConduitStandardAbs *co
 	g_return_val_if_fail (conduit != NULL, -1);
 	g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [ARCHIVE_LOCAL],
+			 0,
 			 local,
 			 &retval);
 	return retval;
@@ -730,8 +765,9 @@ gnome_pilot_conduit_standard_abs_archive_remote (GnomePilotConduitStandardAbs *c
 	g_return_val_if_fail (conduit != NULL, -1);
 	g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [ARCHIVE_REMOTE],
+			 0,
 			 local,
 			 remote,
 			 &retval);
@@ -747,8 +783,9 @@ gnome_pilot_conduit_standard_abs_store_remote (GnomePilotConduitStandardAbs *con
 	g_return_val_if_fail (conduit != NULL, -1);
 	g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [STORE_REMOTE],
+			 0,
 			 remote,
 			 &retval);
 	return retval;
@@ -764,8 +801,9 @@ gnome_pilot_conduit_standard_abs_iterate (GnomePilotConduitStandardAbs *conduit,
 	g_return_val_if_fail (conduit != NULL, -1);
 	g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [ITERATE],
+			 0,
 			 local,
 			 &retval);
 	return retval;
@@ -782,8 +820,9 @@ gnome_pilot_conduit_standard_abs_iterate_specific (GnomePilotConduitStandardAbs
 	g_return_val_if_fail (conduit != NULL, -1);
 	g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [ITERATE_SPECIFIC],
+			 0,
 			 local,
 			 flag,
 			 archived,
@@ -799,8 +838,9 @@ gnome_pilot_conduit_standard_abs_purge (GnomePilotConduitStandardAbs *conduit)
 	g_return_val_if_fail (conduit != NULL, -1);
 	g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [PURGE],
+			 0,
 			 &retval);
 	return retval;
 }
@@ -815,8 +855,9 @@ gnome_pilot_conduit_standard_abs_set_status (GnomePilotConduitStandardAbs *condu
 	g_return_val_if_fail (conduit != NULL, -1);
 	g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [SET_STATUS],
+			 0,
 			 local,
 			 status,
 			 &retval);
@@ -834,8 +875,9 @@ gnome_pilot_conduit_standard_abs_set_pilot_id (GnomePilotConduitStandardAbs *con
 	g_return_val_if_fail (conduit != NULL, -1);
 	g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [SET_PILOT_ID],
+			 0,
 			 local,
 			 id,
 			 &retval);
@@ -852,8 +894,9 @@ gnome_pilot_conduit_standard_abs_compare (GnomePilotConduitStandardAbs *conduit,
 	g_return_val_if_fail (conduit != NULL, -1);
 	g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [COMPARE],
+			 0,
 			 local,
 			 remote,
 			 &retval);
@@ -870,8 +913,9 @@ gnome_pilot_conduit_standard_abs_compare_backup (GnomePilotConduitStandardAbs *c
 	g_return_val_if_fail (conduit != NULL, -1);
 	g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [COMPARE_BACKUP],
+			 0,
 			 local,
 			 remote,
 			 &retval);
@@ -888,8 +932,9 @@ gnome_pilot_conduit_standard_abs_free_transmit (GnomePilotConduitStandardAbs *co
 	g_return_val_if_fail (conduit != NULL, -1);
 	g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [FREE_TRANSMIT],
+			 0,
 			 local,
 			 remote,
 			 &retval);
@@ -905,8 +950,9 @@ gnome_pilot_conduit_standard_abs_delete_all (GnomePilotConduitStandardAbs *condu
 	g_return_val_if_fail (conduit != NULL, -1);
 	g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [DELETE_ALL],
+			 0,
 			 &retval);
 	return retval;
 }
@@ -921,8 +967,9 @@ gnome_pilot_conduit_standard_abs_transmit (GnomePilotConduitStandardAbs *conduit
 	g_return_val_if_fail (conduit != NULL, -1);
 	g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [TRANSMIT],
+			 0,
 			 local,
 			 remote,
 			 &retval);
@@ -939,8 +986,9 @@ gnome_pilot_conduit_standard_abs_pre_sync (GnomePilotConduitStandardAbs *conduit
 	g_return_val_if_fail (dbinfo != NULL, -1);
 	g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [PRE_SYNC],
+			 0,
 			 dbinfo,
 			 &retval);
 	return retval;
diff --git a/gpilotd/gnome-pilot-conduit-sync-abs.c b/gpilotd/gnome-pilot-conduit-sync-abs.c
index 960c406..eef71b3 100644
--- a/gpilotd/gnome-pilot-conduit-sync-abs.c
+++ b/gpilotd/gnome-pilot-conduit-sync-abs.c
@@ -140,118 +140,146 @@ gnome_pilot_conduit_sync_abs_class_init (GnomePilotConduitSyncAbsClass *klass)
 	parent_class = g_type_class_peek (gnome_pilot_conduit_standard_get_type ());
 
 	pilot_conduit_sync_abs_signals[PRE_SYNC] =
-		gtk_signal_new ("pre_sync",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitSyncAbsClass, pre_sync),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
+		g_signal_new   ("pre_sync",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitSyncAbsClass, pre_sync),
+				NULL,
+				NULL,
+				gp_marshal_INT__POINTER,
+				G_TYPE_INT, 1, G_TYPE_POINTER);
 
 	pilot_conduit_sync_abs_signals[POST_SYNC] =
-		gtk_signal_new ("post_sync",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitSyncAbsClass, post_sync),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
+		g_signal_new   ("post_sync",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitSyncAbsClass, post_sync),
+				NULL,
+				NULL,
+				gp_marshal_INT__POINTER,
+				G_TYPE_INT, 1, G_TYPE_POINTER);
 
 
 	pilot_conduit_sync_abs_signals[SET_PILOT_ID] =
-		gtk_signal_new ("set_pilot_id",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitSyncAbsClass, set_pilot_id),
+		g_signal_new   ("set_pilot_id",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitSyncAbsClass, set_pilot_id),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER_INT,
-				GTK_TYPE_INT, 2, GTK_TYPE_POINTER, GTK_TYPE_INT);
+				G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_INT);
 
 
 	pilot_conduit_sync_abs_signals[SET_STATUS_CLEARED] =
-		gtk_signal_new ("set_status_cleared",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitSyncAbsClass, set_status_cleared),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
+		g_signal_new   ("set_status_cleared",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitSyncAbsClass, set_status_cleared),
+				NULL,
+				NULL,
+				gp_marshal_INT__POINTER,
+				G_TYPE_INT, 1, G_TYPE_POINTER);
 
 	pilot_conduit_sync_abs_signals[FOR_EACH] =
-		gtk_signal_new ("for_each",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitSyncAbsClass, for_each),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
+		g_signal_new   ("for_each",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitSyncAbsClass, for_each),
+				NULL,
+				NULL,
+				gp_marshal_INT__POINTER,
+				G_TYPE_INT, 1, G_TYPE_POINTER);
 
 	pilot_conduit_sync_abs_signals[FOR_EACH_MODIFIED] =
-		gtk_signal_new ("for_each_modified",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitSyncAbsClass, for_each_modified),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
+		g_signal_new   ("for_each_modified",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitSyncAbsClass, for_each_modified),
+				NULL,
+				NULL,
+				gp_marshal_INT__POINTER,
+				G_TYPE_INT, 1, G_TYPE_POINTER);
 
 	pilot_conduit_sync_abs_signals[COMPARE] =
-		gtk_signal_new ("compare",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitSyncAbsClass, compare),
+		g_signal_new   ("compare",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitSyncAbsClass, compare),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER_POINTER,
-				GTK_TYPE_INT, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
+				G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
 	pilot_conduit_sync_abs_signals[ADD_RECORD] =
-		gtk_signal_new ("add_record",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitSyncAbsClass, add_record),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
+		g_signal_new   ("add_record",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitSyncAbsClass, add_record),
+				NULL,
+				NULL,
+				gp_marshal_INT__POINTER,
+				G_TYPE_INT, 1, G_TYPE_POINTER);
 
 	pilot_conduit_sync_abs_signals[REPLACE_RECORD] =
-		gtk_signal_new ("replace_record",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitSyncAbsClass, replace_record),
+		g_signal_new   ("replace_record",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitSyncAbsClass, replace_record),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER_POINTER,
-				GTK_TYPE_INT, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
+				G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
 	pilot_conduit_sync_abs_signals[DELETE_RECORD] =
-		gtk_signal_new ("delete_record",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitSyncAbsClass, delete_record),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
+		g_signal_new   ("delete_record",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitSyncAbsClass, delete_record),
+				NULL,
+				NULL,
+				gp_marshal_INT__POINTER,
+				G_TYPE_INT, 1, G_TYPE_POINTER);
 
 	pilot_conduit_sync_abs_signals[ARCHIVE_RECORD] =
-		gtk_signal_new ("archive_record",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitSyncAbsClass, archive_record),
+		g_signal_new   ("archive_record",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitSyncAbsClass, archive_record),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER_BOOL,
-				GTK_TYPE_INT, 2, GTK_TYPE_POINTER, GTK_TYPE_BOOL);
+				G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_BOOLEAN);
 
 	pilot_conduit_sync_abs_signals[MATCH] =
-		gtk_signal_new ("match",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitSyncAbsClass, match),
+		g_signal_new   ("match",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitSyncAbsClass, match),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER_POINTER,
-				GTK_TYPE_INT, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
+				G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
 	pilot_conduit_sync_abs_signals[FREE_MATCH] =
-		gtk_signal_new ("free_match",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitSyncAbsClass, free_match),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
+		g_signal_new   ("free_match",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitSyncAbsClass, free_match),
+				NULL,
+				NULL,
+				gp_marshal_INT__POINTER,
+				G_TYPE_INT, 1, G_TYPE_POINTER);
 
 	pilot_conduit_sync_abs_signals[PREPARE] =
-		gtk_signal_new ("prepare",
-				GTK_RUN_LAST,
-				GTK_CLASS_TYPE (object_class),
-				GTK_SIGNAL_OFFSET (GnomePilotConduitSyncAbsClass, prepare),
+		g_signal_new   ("prepare",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (GnomePilotConduitSyncAbsClass, prepare),
+				NULL,
+				NULL,
 				gp_marshal_INT__POINTER_POINTER,
-				GTK_TYPE_INT, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
+				G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
 	conduit_standard_class->copy_to_pilot = gnome_pilot_conduit_standard_real_copy_to_pilot;
 	conduit_standard_class->copy_from_pilot = gnome_pilot_conduit_standard_real_copy_from_pilot;
@@ -640,8 +668,9 @@ gnome_pilot_conduit_sync_abs_pre_sync (SyncHandler *sh, int dbhandle, int *slow)
 	
 	dlp_ReadOpenDBInfo (dbinfo->pilot_socket, dbinfo->db_handle, &conduit->total_records);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_sync_abs_signals [PRE_SYNC],
+			 0,
 			 dbinfo,
 			 &retval);
 
@@ -660,8 +689,9 @@ gnome_pilot_conduit_sync_abs_post_sync (SyncHandler *sh, int dbhandle)
 	conduit = ((gp_closure *)sh->data)->conduit;
 	dbinfo = ((gp_closure *)sh->data)->dbinfo;
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_sync_abs_signals [POST_SYNC],
+			 0,
 			 dbinfo,
 			 &retval);
 	return retval;
@@ -678,8 +708,9 @@ gnome_pilot_conduit_sync_abs_set_pilot_id (SyncHandler *sh, DesktopRecord *dr, r
 	gdr = (GnomePilotDesktopRecord *)dr;
 	sync_abs_fill_gdr (gdr);
 	
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_sync_abs_signals [SET_PILOT_ID],
+			 0,
 			 gdr, id, &retval);
 	
 	sync_abs_fill_dr (gdr);
@@ -698,8 +729,9 @@ gnome_pilot_conduit_sync_abs_set_status_cleared (SyncHandler *sh, DesktopRecord
 	gdr = (GnomePilotDesktopRecord *)dr;
 	sync_abs_fill_gdr (gdr);
 	
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_sync_abs_signals [SET_STATUS_CLEARED],
+			 0,
 			 gdr, &retval);
 	
 	sync_abs_fill_dr (gdr);
@@ -716,8 +748,9 @@ gnome_pilot_conduit_sync_abs_for_each (SyncHandler *sh, DesktopRecord **dr)
 
 	conduit = ((gp_closure *)sh->data)->conduit;
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_sync_abs_signals [FOR_EACH],
+			 0,
 			 &gdr, &retval);
 
 	if (gdr != NULL)
@@ -737,8 +770,9 @@ gnome_pilot_conduit_sync_abs_for_each_modified (SyncHandler *sh, DesktopRecord *
 
 	conduit = ((gp_closure *)sh->data)->conduit;
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_sync_abs_signals [FOR_EACH_MODIFIED],
+			 0,
 			 &gdr, &retval);
 
 	if (gdr != NULL)
@@ -762,8 +796,9 @@ gnome_pilot_conduit_sync_abs_compare (SyncHandler *sh, PilotRecord *pr, DesktopR
 	gdr = (GnomePilotDesktopRecord *)dr;
 	sync_abs_fill_gdr (gdr);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_sync_abs_signals [COMPARE],
+			 0,
 			 gdr, gpr, &retval);
 
 	g_free (gpr);
@@ -781,8 +816,9 @@ gnome_pilot_conduit_sync_abs_add_record (SyncHandler *sh, PilotRecord *pr)
 	conduit = ((gp_closure *)sh->data)->conduit;
 	gpr = sync_abs_pr_to_gpr (pr);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_sync_abs_signals [ADD_RECORD],
+			 0,
 			 gpr, &retval);
 
 	g_free (gpr);
@@ -803,8 +839,9 @@ gnome_pilot_conduit_sync_abs_replace_record (SyncHandler *sh, DesktopRecord *dr,
 	sync_abs_fill_gdr (gdr);
 	gpr = sync_abs_pr_to_gpr (pr);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_sync_abs_signals [REPLACE_RECORD],
+			 0,
 			 gdr, gpr, &retval);
 
 	g_free (gpr);
@@ -823,8 +860,9 @@ gnome_pilot_conduit_sync_abs_delete_record (SyncHandler *sh, DesktopRecord *dr)
 	gdr = (GnomePilotDesktopRecord *)dr;
 	sync_abs_fill_gdr (gdr);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_sync_abs_signals [DELETE_RECORD],
+			 0,
 			 gdr, &retval);
 
 	return retval;
@@ -841,8 +879,9 @@ gnome_pilot_conduit_sync_abs_archive_record (SyncHandler *sh, DesktopRecord *dr,
 	gdr = (GnomePilotDesktopRecord *)dr;
 	sync_abs_fill_gdr (gdr);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_sync_abs_signals [ARCHIVE_RECORD],
+			 0,
 			 gdr, archive ? TRUE : FALSE, &retval);
 
 	sync_abs_fill_dr (gdr);
@@ -861,8 +900,9 @@ gnome_pilot_conduit_sync_abs_match (SyncHandler *sh, PilotRecord *pr, DesktopRec
 	conduit = ((gp_closure *)sh->data)->conduit;
 	gpr = sync_abs_pr_to_gpr (pr);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_sync_abs_signals [MATCH],
+			 0,
 			 gpr, &gdr, &retval);
 
 	if (gdr != NULL)
@@ -886,8 +926,9 @@ gnome_pilot_conduit_sync_abs_free_match (SyncHandler *sh, DesktopRecord *dr)
 	gdr = (GnomePilotDesktopRecord *)dr;
 	sync_abs_fill_gdr (gdr);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_sync_abs_signals [FREE_MATCH],
+			 0,
 			 gdr, &retval);
 
 	return retval;
@@ -906,8 +947,9 @@ gnome_pilot_conduit_sync_abs_prepare (SyncHandler *sh, DesktopRecord *dr, PilotR
 	sync_abs_fill_gdr (gdr);
 	gpr = sync_abs_pr_to_gpr (pr);
 
-	gtk_signal_emit (GTK_OBJECT (conduit),
+	g_signal_emit   (GTK_OBJECT (conduit),
 			 pilot_conduit_sync_abs_signals [PREPARE],
+			 0,
 			 gdr, gpr, &retval);
 
 	*pr = sync_abs_gpr_to_pr (gpr);
diff --git a/gpilotd/gpilot-daemon.c b/gpilotd/gpilot-daemon.c
index b7ffb87..8e371c6 100644
--- a/gpilotd/gpilot-daemon.c
+++ b/gpilotd/gpilot-daemon.c
@@ -1052,7 +1052,7 @@ known_usb_device(gchar *match_str)
 {
 	int i;
 	for (i = 0; i < vendor_product_ids->len; i++) {
-		if (!g_strncasecmp (match_str, 
+		if (!g_ascii_strncasecmp (match_str, 
 			vendor_product_ids->pdata[i], 
 			strlen (vendor_product_ids->pdata[i])))
 			return i;
diff --git a/gpilotd/manager.c b/gpilotd/manager.c
index c89c070..53bcd27 100644
--- a/gpilotd/manager.c
+++ b/gpilotd/manager.c
@@ -248,9 +248,9 @@ set_callbacks (gboolean set, GnomePilotConduit *conduit, gchar *pilot_name)
 				   __FILE__,__LINE__);
 		}
 		
-		gtk_signal_disconnect (GTK_OBJECT (conduit), progress_h);
-		gtk_signal_disconnect (GTK_OBJECT (conduit), error_h);
-		gtk_signal_disconnect (GTK_OBJECT (conduit), message_h);
+		g_signal_handler_disconnect (GTK_OBJECT (conduit), progress_h);
+		g_signal_handler_disconnect (GTK_OBJECT (conduit), error_h);
+		g_signal_handler_disconnect (GTK_OBJECT (conduit), message_h);
 		progress_h = 0;
 		error_h    = 0;
 		message_h  = 0;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]