Added #include <e-summary-callbacks.h>. (destroy_prefs_cb): Added a cast.

2000-12-12  Christopher James Lahey  <clahey@helixcode.com>

	* component/e-summary-callbacks.c: Added #include
	<e-summary-callbacks.h>.
	(destroy_prefs_cb): Added a cast.
	(configure_summary): Added a cast.

	* component/e-summary-callbacks.h: Added #include "e-summary.h"

	* component/e-summary-url.c (e_summary_url_click): Removed an
	unused variable.

	* component/e-summary-util.c: Added #include <e-summary-util.h>

	* component/e-summary.c: Added #include <gtkhtml/htmlselection.h>.
	(e_summary_queue_rebuild): Added a cast.

	* component/main.c: Added #include <glade/glade.h>.

	* test-service/main.c: Changed some variable types to make casting
	easier.

	* test-service/rdf-summary.c: Changed some variable types to make
	casting easier.

svn path=/trunk/; revision=6953

6 files changed, 10 insertions, 5 deletions

diff --git a/executive-summary/component/e-summary-callbacks.c b/executive-summary/component/e-summary-callbacks.c
index 03ea56805c..09072990d5 100644
--- a/executive-summary/component/e-summary-callbacks.c
+++ b/executive-summary/component/e-summary-callbacks.c
@@ -31,6 +31,7 @@
 
 #include <liboaf/liboaf.h>
 #include <glade/glade.h>
+#include <e-summary-callbacks.h>
 
 #include "e-summary.h"
 
@@ -128,7 +129,7 @@ static void
 destroy_prefs_cb (GtkObject *object,
 		  PropertyData *data)
 {
-	gtk_object_unref (data->xml);
+	gtk_object_unref (GTK_OBJECT(data->xml));
 	g_free (data);
 }
 
@@ -191,7 +192,7 @@ configure_summary (GtkWidget *widget,
 	data->xml = glade_xml_new (EVOLUTION_GLADEDIR
 				   "/executive-summary-config.glade", NULL);
 	prefs = glade_xml_get_widget (data->xml, "summaryprefs");
-	data->box = prefs;
+	data->box = GNOME_PROPERTY_BOX(prefs);
 	html_page = glade_xml_get_widget (data->xml, "htmlpage");
 
 	if (esummary->prefs->page != NULL)
diff --git a/executive-summary/component/e-summary-callbacks.h b/executive-summary/component/e-summary-callbacks.h
index 3d42adca26..6b908d694c 100644
--- a/executive-summary/component/e-summary-callbacks.h
+++ b/executive-summary/component/e-summary-callbacks.h
@@ -1,6 +1,8 @@
 #ifndef __E_SUMMARY_CALLBACKS_H__
 #define __E_SUMMARY_CALLBACKS_H__
 
+#include "e-summary.h"
+
 void embed_service (GtkWidget *widget,
 		    ESummary *esummary);
 void new_mail (GtkWidget *widget,
diff --git a/executive-summary/component/e-summary-url.c b/executive-summary/component/e-summary-url.c
index ae218cf7c8..c3be19ab78 100644
--- a/executive-summary/component/e-summary-url.c
+++ b/executive-summary/component/e-summary-url.c
@@ -462,8 +462,6 @@ e_summary_url_click (GtkWidget *widget,
 
 		num_pages = Bonobo_PropertyControl__get_pageCount (window->propertycontrol, &ev);
 		for (i = 0; i < num_pages; i++) {
-			char *pagename;
-
 			control = Bonobo_PropertyControl_getControl (window->propertycontrol, i, &ev);
 			if (ev._major != CORBA_NO_EXCEPTION) {
 				g_warning ("Unable to get property control.");
diff --git a/executive-summary/component/e-summary-util.c b/executive-summary/component/e-summary-util.c
index 52f4994185..78731a6b3e 100644
--- a/executive-summary/component/e-summary-util.c
+++ b/executive-summary/component/e-summary-util.c
@@ -21,6 +21,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <e-summary-util.h>
+
 #include <gnome.h>
 
 char *
diff --git a/executive-summary/component/e-summary.c b/executive-summary/component/e-summary.c
index 3454e37f83..f2281e4b06 100644
--- a/executive-summary/component/e-summary.c
+++ b/executive-summary/component/e-summary.c
@@ -32,6 +32,7 @@
 #include <gtkhtml/gtkhtml-embedded.h>
 #include <gtkhtml/gtkhtml-stream.h>
 #include <gtkhtml/htmlengine.h>
+#include <gtkhtml/htmlselection.h>
 
 #include <gal/util/e-util.h>
 #include <gal/widgets/e-gui-utils.h>
@@ -617,7 +618,7 @@ e_summary_queue_rebuild (ESummary *esummary)
 	if (priv->idle != 0)
 		return;
 
-	priv->idle = g_idle_add (e_summary_rebuild_page, esummary);
+	priv->idle = g_idle_add ((GSourceFunc) e_summary_rebuild_page, esummary);
 }
 
 static void
diff --git a/executive-summary/component/main.c b/executive-summary/component/main.c
index 0c36a9866e..3e29b5f337 100644
--- a/executive-summary/component/main.c
+++ b/executive-summary/component/main.c
@@ -27,6 +27,7 @@
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-object-directory.h>
 #include <liboaf/liboaf.h>
+#include <glade/glade.h>
 
 #ifdef GTKHTML_HAVE_GCONF
 #include <gconf/gconf.h>