Cast this fucntion pointer.

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

	* e-shell-view-menu.c (file_verbs): Cast this fucntion pointer.

	* e-storage-set-view.c (ETABLE_SPEC): Turn on horizontal scrolling
	here.

	* evolution-shell-component.c
	(impl_ShellComponent_async_copy_folder): Commented out this unused
	function.

	* evolution-storage.c (storage_gtk_to_corba_result): Removed an
	unused variable here.

	* importer/importer.c: Include gal/widets/e-gui-utils.h.

svn path=/trunk/; revision=8269

6 files changed, 21 insertions, 4 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index a7376eb691..3621b3585b 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,19 @@
+2001-02-17  Christopher James Lahey  <clahey@ximian.com>
+
+	* e-shell-view-menu.c (file_verbs): Cast this fucntion pointer.
+
+	* e-storage-set-view.c (ETABLE_SPEC): Turn on horizontal scrolling
+	here.
+
+	* evolution-shell-component.c
+	(impl_ShellComponent_async_copy_folder): Commented out this unused
+	function.
+
+	* evolution-storage.c (storage_gtk_to_corba_result): Removed an
+	unused variable here.
+
+	* importer/importer.c: Include gal/widets/e-gui-utils.h.
+
 2001-02-14  Dan Winship  <danw@ximian.com>
 
 	* Evolution-Storage.idl: add asyncCreateFolder and
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index dbfcb42217..4238aa5b9e 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -448,7 +448,7 @@ BonoboUIVerb new_verbs [] = {
 };
 
 BonoboUIVerb file_verbs [] = {
-	BONOBO_UI_VERB ("FileImporter", show_import_wizard),
+	BONOBO_UI_VERB ("FileImporter", (BonoboUIVerbFn) show_import_wizard),
 	BONOBO_UI_VERB ("FileGoToFolder", command_goto_folder),
 	BONOBO_UI_VERB ("FileCreateFolder", command_create_folder),
 	BONOBO_UI_VERB ("FileClose", command_close),
diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c
index da8669d075..e31a5e6700 100644
--- a/shell/e-storage-set-view.c
+++ b/shell/e-storage-set-view.c
@@ -45,7 +45,7 @@ static char *list [] = {
 };
 #endif
 
-#define ETABLE_SPEC "<ETableSpecification no-headers=\"true\" selection-mode=\"single\" cursor-mode=\"line\" draw-grid=\"true\"> \
+#define ETABLE_SPEC "<ETableSpecification no-headers=\"true\" selection-mode=\"single\" cursor-mode=\"line\" draw-grid=\"true\" horizontal-scrolling=\"true\"> \
   <ETableColumn model_col=\"0\" _title=\"Folder\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"render_tree\" compare=\"string\"/> \
 	<ETableState>                   			       \
 		<column source=\"0\"/>     			       \
diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c
index b35e85c7c7..d5588d6973 100644
--- a/shell/evolution-shell-component.c
+++ b/shell/evolution-shell-component.c
@@ -267,6 +267,7 @@ impl_ShellComponent_async_remove_folder (PortableServer_Servant servant,
 	(* priv->remove_folder_fn) (shell_component, physical_uri, listener, priv->closure);
 }
 
+#if 0
 static void
 impl_ShellComponent_async_copy_folder (PortableServer_Servant servant,
 				       const GNOME_Evolution_ShellComponentListener listener,
@@ -297,6 +298,7 @@ impl_ShellComponent_async_copy_folder (PortableServer_Servant servant,
 				  listener,
 				  priv->closure);
 }
+#endif
 
 static void
 impl_ShellComponent_populate_folder_context_menu (PortableServer_Servant servant,
diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c
index dd9387715d..bf02c19110 100644
--- a/shell/evolution-storage.c
+++ b/shell/evolution-storage.c
@@ -252,8 +252,6 @@ impl_Storage__get_name (PortableServer_Servant servant,
 static GNOME_Evolution_Storage_Result
 storage_gtk_to_corba_result (EvolutionStorageResult result)
 {
-	GNOME_Evolution_Storage_Result corba_result;
-
 	switch (result) {
 	case EVOLUTION_STORAGE_OK:
 		return GNOME_Evolution_Storage_OK;
diff --git a/shell/importer/importer.c b/shell/importer/importer.c
index 9dac21c524..b664be7379 100644
--- a/shell/importer/importer.c
+++ b/shell/importer/importer.c
@@ -34,6 +34,7 @@
 #include <glade/glade.h>
 #include <gtkhtml/gtkhtml.h>
 #include <e-util/e-html-utils.h>
+#include <gal/widgets/e-gui-utils.h>
 
 #include "importer.h"
 #include "GNOME_Evolution_Importer.h"