Moved bonobo includes from the .c to the .h. Include

2001-02-05  Christopher James Lahey  <clahey@ximian.com>

	* evolution-mbox-importer.c, evolution-mbox-importer.h: Moved
	bonobo includes from the .c to the .h.  Include
	evolution-mbox-importer.h in evolution-mbox-importer.c.

	* evolution-outlook-importer.c, evolution-outlook-importer.h:
	Moved bonobo includes from the .c to the .h.  Include
	evolution-outlook-importer.h in evolution-outlook-importer.c.

	* mail-callbacks.c: Include mail-send-recv.h.

	* mail-local.c (mail_local_lookup_folder): Cast local_store to
	CAMEL_STORE.

	* mail-mt.c (mail_msg_cleanup): Make this function static.

	* mail-send-recv.c, mail-send-recv.h: Created mail_send_recv.h.
	Included it in mail-send-recv.c.  Added a #include
	<libgnomeui/gnome-window-icon.h>.
	(mail_send_receive): Added a cast.

	* mail-summary.c (new_folder_cb, removed_folder_cb,
	create_summary_view): Cast the source func in calling g_idle_add.

svn path=/trunk/; revision=8002

10 files changed, 44 insertions, 10 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 907a295f91..78ce6f2e93 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,28 @@
+2001-02-05  Christopher James Lahey  <clahey@ximian.com>
+
+	* evolution-mbox-importer.c, evolution-mbox-importer.h: Moved
+	bonobo includes from the .c to the .h.  Include
+	evolution-mbox-importer.h in evolution-mbox-importer.c.
+
+	* evolution-outlook-importer.c, evolution-outlook-importer.h:
+	Moved bonobo includes from the .c to the .h.  Include
+	evolution-outlook-importer.h in evolution-outlook-importer.c.
+
+	* mail-callbacks.c: Include mail-send-recv.h.
+
+	* mail-local.c (mail_local_lookup_folder): Cast local_store to
+	CAMEL_STORE.
+
+	* mail-mt.c (mail_msg_cleanup): Make this function static.
+
+	* mail-send-recv.c, mail-send-recv.h: Created mail_send_recv.h.
+	Included it in mail-send-recv.c.  Added a #include
+	<libgnomeui/gnome-window-icon.h>.
+	(mail_send_receive): Added a cast.
+
+	* mail-summary.c (new_folder_cb, removed_folder_cb,
+	create_summary_view): Cast the source func in calling g_idle_add.
+
 2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-format.c (try_inline_pgp_sig): New function to handle
diff --git a/mail/evolution-mbox-importer.c b/mail/evolution-mbox-importer.c
index 4fcbc9a684..11ff7bfee6 100644
--- a/mail/evolution-mbox-importer.c
+++ b/mail/evolution-mbox-importer.c
@@ -25,8 +25,7 @@
 #include <config.h>
 #endif
 
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-generic-factory.h>
+#include "evolution-mbox-importer.h"
 
 #include <stdio.h>
 
diff --git a/mail/evolution-mbox-importer.h b/mail/evolution-mbox-importer.h
index bdf4190150..20b56b81eb 100644
--- a/mail/evolution-mbox-importer.h
+++ b/mail/evolution-mbox-importer.h
@@ -24,6 +24,9 @@
 #ifndef _EVOLUTION_MBOX_IMPORTER_H_
 #define _EVOLUTION_MBOX_IMPORTER_H_
 
+#include <bonobo/bonobo-object.h>
+#include <bonobo/bonobo-generic-factory.h>
+
 #define MBOX_FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory"
 
 BonoboObject *mbox_factory_fn (BonoboGenericFactory *_factory,
diff --git a/mail/evolution-outlook-importer.c b/mail/evolution-outlook-importer.c
index 47f88aceb8..35fa2e7315 100644
--- a/mail/evolution-outlook-importer.c
+++ b/mail/evolution-outlook-importer.c
@@ -26,8 +26,7 @@
 #include <config.h>
 #endif
 
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-generic-factory.h>
+#include "evolution-outlook-importer.h"
 
 #include <stdio.h>
 
diff --git a/mail/evolution-outlook-importer.h b/mail/evolution-outlook-importer.h
index 4a469f0072..75515d2972 100644
--- a/mail/evolution-outlook-importer.h
+++ b/mail/evolution-outlook-importer.h
@@ -24,6 +24,9 @@
 #ifndef _EVOLUTION_OUTLOOK_IMPORTER_H_
 #define _EVOLUTION_OUTLOOK_IMPORTER_H_
 
+#include <bonobo/bonobo-object.h>
+#include <bonobo/bonobo-generic-factory.h>
+
 #define OUTLOOK_FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory"
 
 BonoboObject *outlook_factory_fn (BonoboGenericFactory *_factory,
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 0a5bac46ed..e40cd3b82c 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -39,6 +39,7 @@
 #include "mail-tools.h"
 #include "mail-ops.h"
 #include "mail-local.h"
+#include "mail-send-recv.h"
 #include "mail-vfolder.h"
 #include "folder-browser.h"
 #include "subscribe-dialog.h"
diff --git a/mail/mail-local.c b/mail/mail-local.c
index 96e8b6c037..1559418a83 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -959,7 +959,7 @@ mail_local_lookup_folder (const char *name,
 								   "file:/",
 								   CAMEL_PROVIDER_STORE, NULL);
 
-	return get_folder (local_store, name, 0, ev);
+	return get_folder (CAMEL_STORE(local_store), name, 0, ev);
 }
 
 void
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 103ddc0de6..c481d6c715 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -216,7 +216,7 @@ mail_msg_received(EThread *e, EMsg *msg, void *data)
 		m->ops->receive_msg(m);
 }
 
-void mail_msg_cleanup(void)
+static void mail_msg_cleanup(void)
 {
 	e_thread_destroy(mail_thread_queued);
 	e_thread_destroy(mail_thread_new);
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 87b5cebedf..b9f1f70316 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -20,6 +20,9 @@
  *
  */
 
+#include "config.h"
+#include "mail-send-recv.h"
+
 #include <stdio.h>
 #include <string.h>
 
@@ -43,6 +46,7 @@
 #include <gtk/gtk.h>
 #include <libgnomeui/gnome-stock.h>
 #include <libgnomeui/gnome-dialog.h>
+#include <libgnomeui/gnome-window-icon.h>
 
 /* send/receive email */
 
@@ -521,7 +525,7 @@ void mail_send_receive(void)
 	   smtp one. */
 	data = build_dialogue(sources, outbox_folder, account->transport->url);
 	scan = data->infos;
-	gd = data->gd;
+	gd = GTK_WIDGET(data->gd);
 	gtk_signal_connect((GtkObject *)gd, "destroy", gtk_widget_destroyed, &gd);
 	while (scan) {
 		struct _send_info *info = scan->data;
diff --git a/mail/mail-summary.c b/mail/mail-summary.c
index dbe3151d21..bc04f19532 100644
--- a/mail/mail-summary.c
+++ b/mail/mail-summary.c
@@ -440,7 +440,7 @@ new_folder_cb (EvolutionStorageListener *listener,
 	g_print ("New folder: %s\n", path);
 
 	if (summary->idle == 0)
-		summary->idle = g_idle_add (idle_check, summary);
+		summary->idle = g_idle_add ((GSourceFunc) idle_check, summary);
 }
 
 static void
@@ -451,7 +451,7 @@ removed_folder_cb (EvolutionStorageListener *listener,
 	g_print ("Removed folder: %s\n", path);
 
 	if (summary->idle == 0)
-		summary->idle = g_idle_add (idle_check, summary);
+		summary->idle = g_idle_add ((GSourceFunc) idle_check, summary);
 }
 #endif
 
@@ -523,7 +523,7 @@ create_summary_view (ExecutiveSummaryComponentFactory *_factory,
 #endif
 	
 	if (summary->idle == 0)
-		summary->idle = g_idle_add (idle_check, summary);
+		summary->idle = g_idle_add ((GSourceFunc) idle_check, summary);
 
 	return component;
 }