[evolution-patches] Cleanups of deprecated functions for the mail component

[Kjartan Maraas <kmaraas broadpark no>]

Same again for the mail component.

Cheers
Kjartan

Index: em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.86
diff -u -p -r1.86 em-folder-view.c
--- em-folder-view.c	20 Sep 2004 05:59:54 -0000	1.86
+++ em-folder-view.c	29 Sep 2004 20:16:01 -0000
@@ -1038,7 +1038,7 @@ emfv_popup(EMFolderView *emfv, GdkEvent 
 		gc = gdk_gc_new(((GtkWidget *)emfv)->window);
 		gdk_gc_set_foreground(gc, &colour);
 		gdk_draw_rectangle(pixmap, gc, TRUE, 0, 0, 16, 16);
-		gdk_gc_unref(gc);
+		g_object_unref(gc);
 
 		item->image = gtk_image_new_from_pixmap(pixmap, NULL);
 		gtk_widget_show(item->image);
Index: em-popup.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-popup.c,v
retrieving revision 1.28
diff -u -p -r1.28 em-popup.c
--- em-popup.c	20 Sep 2004 05:59:55 -0000	1.28
+++ em-popup.c	29 Sep 2004 20:16:02 -0000
@@ -62,6 +62,8 @@
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
+#include <libgnomevfs/gnome-vfs-mime.h>
+
 #include <gal/util/e-util.h>
 
 static void emp_standard_menu_factory(EPopup *emp, void *data);
Index: mail-account-gui.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-account-gui.c,v
retrieving revision 1.174
diff -u -p -r1.174 mail-account-gui.c
--- mail-account-gui.c	20 Sep 2004 05:59:55 -0000	1.174
+++ mail-account-gui.c	29 Sep 2004 20:16:02 -0000
@@ -2102,7 +2102,6 @@ mail_account_gui_setup (MailAccountGui *
 				
 				/* Just using string length is probably good enough,
 				   as we only use the width of the widget, not the string */
-				/*width = gdk_string_width (font, at->name);*/
 				width = strlen(at->name) * 14;
 				if (width > max_width) {
 					max_authname = at->name;
Index: importers/elm-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/elm-importer.c,v
retrieving revision 1.10
diff -u -p -r1.10 elm-importer.c
--- importers/elm-importer.c	13 Feb 2004 10:14:30 -0000	1.10
+++ importers/elm-importer.c	29 Sep 2004 20:16:02 -0000
@@ -416,9 +416,9 @@ create_checkboxes_control (ElmImporter *
 	hbox = gtk_vbox_new (FALSE, 2);
 
 	importer->mail = gtk_check_button_new_with_label (_("Mail"));
-	gtk_signal_connect (GTK_OBJECT (importer->mail), "toggled",
-			    GTK_SIGNAL_FUNC (checkbox_toggle_cb),
-			    &importer->do_mail);
+	g_signal_connect (importer->mail, "toggled",
+			  G_CALLBACK (checkbox_toggle_cb),
+			  &importer->do_mail);
 
 	gtk_box_pack_start (GTK_BOX (hbox), importer->mail, FALSE, FALSE, 0);
 
Index: importers/pine-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/pine-importer.c,v
retrieving revision 1.14
diff -u -p -r1.14 pine-importer.c
--- importers/pine-importer.c	20 May 2004 01:17:29 -0000	1.14
+++ importers/pine-importer.c	29 Sep 2004 20:16:02 -0000
@@ -472,14 +472,14 @@ create_checkboxes_control (PineImporter 
 	hbox = gtk_hbox_new (FALSE, 2);
 
 	importer->mail = gtk_check_button_new_with_label (_("Mail"));
-	gtk_signal_connect (GTK_OBJECT (importer->mail), "toggled",
-			    GTK_SIGNAL_FUNC (checkbox_toggle_cb),
-			    &importer->do_mail);
+	g_signal_connect (importer->mail, "toggled",
+			  G_CALLBACK (checkbox_toggle_cb),
+			  &importer->do_mail);
 
 	importer->address = gtk_check_button_new_with_label (_("Addressbook"));
-	gtk_signal_connect (GTK_OBJECT (importer->address), "toggled",
-			    GTK_SIGNAL_FUNC (checkbox_toggle_cb),
-			    &importer->do_address);
+	g_signal_connect (importer->address, "toggled",
+			  G_CALLBACK (checkbox_toggle_cb),
+			  &importer->do_address);
 
 	gtk_box_pack_start (GTK_BOX (hbox), importer->mail, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (hbox), importer->address, FALSE, FALSE, 0);