[evolution-patches] Resend against HEAD

[Kjartan Maraas <kmaraas broadpark no>]

This is the same as the previous rediffed against HEAD.

Cheers
Kjartan

Index: conduit/address-conduit.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/conduit/address-conduit.c,v
retrieving revision 1.87
diff -u -p -r1.87 address-conduit.c
--- conduit/address-conduit.c	23 Sep 2004 18:50:17 -0000	1.87
+++ conduit/address-conduit.c	29 Sep 2004 20:08:21 -0000
@@ -166,15 +166,15 @@ addrconduit_load_configuration (guint32 
 
 	c->pilot_id = pilot_id;
 	management = gnome_pilot_conduit_management_new ("e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	gtk_object_ref (GTK_OBJECT (management));
+	g_object_ref (G_OBJECT (management));
 	gtk_object_sink (GTK_OBJECT (management));
 	config = gnome_pilot_conduit_config_new (management, pilot_id);
-	gtk_object_ref (GTK_OBJECT (config));
+	g_object_ref (G_OBJECT (config));
 	gtk_object_sink (GTK_OBJECT (config));
 	if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
 		c->sync_type = GnomePilotConduitSyncTypeNotSet;
-	gtk_object_unref (GTK_OBJECT (config));
-	gtk_object_unref (GTK_OBJECT (management));
+	g_object_unref (G_OBJECT (config));
+	g_object_unref (G_OBJECT (management));
 
 	/* Custom settings */
 	gnome_config_push_prefix (prefix);
@@ -305,7 +305,7 @@ e_addr_gui_new (EPilotSettings *ps) 
 		item = gtk_menu_item_new_with_label (items[i]);
 		gtk_widget_show (item);
 		
-		gtk_menu_append (GTK_MENU (menu), item);
+		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 	}
 	gtk_widget_show (menu);
 	gtk_option_menu_set_menu (GTK_OPTION_MENU (gui->default_address), menu);
@@ -1721,33 +1721,33 @@ conduit_get_gpilot_conduit (guint32 pilo
 	g_assert (retval != NULL);
 
 	ctxt = e_addr_context_new (pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "addrconduit_context", ctxt);
+	g_object_set_data (G_OBJECT (retval), "addrconduit_context", ctxt);
 
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
+	g_signal_connect (retval, "pre_sync", (GSignalFunc) pre_sync, ctxt);
+	g_signal_connect (retval, "post_sync", (GSignalFunc) post_sync, ctxt);
 
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
+  	g_signal_connect (retval, "set_pilot_id", (GSignalFunc) set_pilot_id, ctxt);
+  	g_signal_connect (retval, "set_status_cleared", (GSignalFunc) set_status_cleared, ctxt);
 
-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
+  	g_signal_connect (retval, "for_each", (GSignalFunc) for_each, ctxt);
+  	g_signal_connect (retval, "for_each_modified", (GSignalFunc) for_each_modified, ctxt);
+  	g_signal_connect (retval, "compare", (GSignalFunc) compare, ctxt);
 
-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
+  	g_signal_connect (retval, "add_record", (GSignalFunc) add_record, ctxt);
+  	g_signal_connect (retval, "replace_record", (GSignalFunc) replace_record, ctxt);
+  	g_signal_connect (retval, "delete_record", (GSignalFunc) delete_record, ctxt);
+  	g_signal_connect (retval, "archive_record", (GSignalFunc) archive_record, ctxt);
 
-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
+  	g_signal_connect (retval, "match", (GSignalFunc) match, ctxt);
+  	g_signal_connect (retval, "free_match", (GSignalFunc) free_match, ctxt);
 
-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
+  	g_signal_connect (retval, "prepare", (GSignalFunc) prepare, ctxt);
 
 	/* Gui Settings */
-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);
+	g_signal_connect (retval, "create_settings_window", (GSignalFunc) create_settings_window, ctxt);
+	g_signal_connect (retval, "display_settings", (GSignalFunc) display_settings, ctxt);
+	g_signal_connect (retval, "save_settings", (GSignalFunc) save_settings, ctxt);
+	g_signal_connect (retval, "revert_settings", (GSignalFunc) revert_settings, ctxt);
 
 	return GNOME_PILOT_CONDUIT (retval);
 }
@@ -1757,7 +1757,7 @@ conduit_destroy_gpilot_conduit (GnomePil
 { 
 	EAddrConduitContext *ctxt;
 
-	ctxt = gtk_object_get_data (GTK_OBJECT (conduit), 
+	ctxt = g_object_get_data (G_OBJECT (conduit), 
 				    "addrconduit_context");
 
 	e_addr_context_destroy (ctxt);
Index: gui/widgets/e-minicard.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-minicard.c,v
retrieving revision 1.117
diff -u -p -r1.117 e-minicard.c
--- gui/widgets/e-minicard.c	17 May 2004 19:09:40 -0000	1.117
+++ gui/widgets/e-minicard.c	29 Sep 2004 20:08:21 -0000
@@ -410,7 +410,7 @@ e_minicard_dispose (GObject *object)
 	}
 
 	if (e_minicard->list_icon_pixbuf) {
-		gdk_pixbuf_unref (e_minicard->list_icon_pixbuf);
+		g_object_unref (e_minicard->list_icon_pixbuf);
 		e_minicard->list_icon_pixbuf = NULL;
 	}
 
Index: gui/widgets/eab-contact-display.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/eab-contact-display.c,v
retrieving revision 1.16
diff -u -p -r1.16 eab-contact-display.c
--- gui/widgets/eab-contact-display.c	22 Jul 2004 13:18:40 -0000	1.16
+++ gui/widgets/eab-contact-display.c	29 Sep 2004 20:08:21 -0000
@@ -495,7 +495,7 @@ eab_contact_display_render_compact (EABC
 				}
 			}
 
-			gdk_pixbuf_unref (pixbuf);
+			g_object_unref (pixbuf);
 			gtk_html_stream_printf (html_stream, "<img width=\"%d\" height=\"%d\" src=\"internal-contact-photo:\">",
 						calced_width, calced_height);
 			e_contact_photo_free (photo);