Add a typecast.

	* evolution-storage-set-view-factory.c
	(evolution_storage_set_view_factory_new_view): Add a typecast.

	* e-storage-set-view.c (popup_folder_menu): Move variable
	declarations into the #if 0 to kill warnings.
	(populate_folder_context_menu_with_common_items,
	folder_context_menu_activate_cb): Move these into #if 0 too.

	* e-shell.c: Add prototype.

	* e-shell-view.c (storage_set_view_box_map_cb):
	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct):
	Remove unused variables.

	* e-setup.c: Fix warning caused by e-util -> gal migration.

svn path=/trunk/; revision=5945

7 files changed, 25 insertions, 6 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 65f61b4097..053b4942e7 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,21 @@
+2000-10-16  Dan Winship  <danw@helixcode.com>
+
+	* evolution-storage-set-view-factory.c
+	(evolution_storage_set_view_factory_new_view): Add a typecast.
+
+	* e-storage-set-view.c (popup_folder_menu): Move variable
+	declarations into the #if 0 to kill warnings.
+	(populate_folder_context_menu_with_common_items,
+	folder_context_menu_activate_cb): Move these into #if 0 too.
+
+	* e-shell.c: Add prototype.
+
+	* e-shell-view.c (storage_set_view_box_map_cb): 
+	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct):
+	Remove unused variables.
+
+	* e-setup.c: Fix warning caused by e-util -> gal migration.
+
 2000-10-11  Iain Holmes  <iain@helixcode.com>
 
 	* e-setup.c (check_evolution_directory): Check if there are any
diff --git a/shell/e-setup.c b/shell/e-setup.c
index bdbb227abe..4e261dd808 100644
--- a/shell/e-setup.c
+++ b/shell/e-setup.c
@@ -30,7 +30,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-#include "e-util/e-gui-utils.h"
+#include <gal/widgets/e-gui-utils.h>
 
 #include "e-setup.h"
 
diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c
index 11c6232973..7a51e77ad3 100644
--- a/shell/e-shell-folder-title-bar.c
+++ b/shell/e-shell-folder-title-bar.c
@@ -357,7 +357,6 @@ void
 e_shell_folder_title_bar_construct (EShellFolderTitleBar *folder_title_bar)
 {
 	EShellFolderTitleBarPrivate *priv;
-	GtkRequisition button_requisition;
 	GtkWidget *button_hbox;
 	GtkWidget *widget;
 
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index b9c34f7abb..244eace3ab 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -219,8 +219,6 @@ storage_set_view_box_map_cb (GtkWidget *widget,
 {
 	EShellView *shell_view;
 	EShellViewPrivate *priv;
-	GtkWidget *horizontal_scrollbar;
-	GtkWidget *vertical_scrollbar;
 
 	shell_view = E_SHELL_VIEW (data);
 	priv = shell_view->priv;
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 71405b89ed..1875ba3a44 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -48,6 +48,8 @@
 
 #include "e-shell.h"
 
+static gboolean save_settings_for_views (EShell *shell);
+
 
 #define PARENT_TYPE BONOBO_OBJECT_TYPE
 static BonoboObjectClass *parent_class = NULL;
diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c
index 71023f75b1..36afb0388b 100644
--- a/shell/e-storage-set-view.c
+++ b/shell/e-storage-set-view.c
@@ -199,6 +199,7 @@ get_pixbuf_for_folder (EStorageSetView *storage_set_view,
 /* FIXME: This should be moved somewhere else, so that also the sortcut code
    can share it.  */
 
+#if 0
 static void
 folder_context_menu_activate_cb (BonoboUIHandler *uih,
 				 void *data,
@@ -225,18 +226,19 @@ populate_folder_context_menu_with_common_items (EStorageSetView *storage_set_vie
 					 folder_context_menu_activate_cb,
 					 storage_set_view);
 }
+#endif
 
 static void
 popup_folder_menu (EStorageSetView *storage_set_view,
 		   GdkEventButton *event)
 {
+#if 0
 	EvolutionShellComponentClient *handler;
 	EStorageSetViewPrivate *priv;
 	EFolderTypeRegistry *folder_type_registry;
 	BonoboUIHandler *uih;
 	EFolder *folder;
 
-#if 0	
 	priv = storage_set_view->priv;
 
 	uih = bonobo_ui_handler_new ();
diff --git a/shell/evolution-storage-set-view-factory.c b/shell/evolution-storage-set-view-factory.c
index 9528cf729f..93359def10 100644
--- a/shell/evolution-storage-set-view-factory.c
+++ b/shell/evolution-storage-set-view-factory.c
@@ -47,7 +47,7 @@ evolution_storage_set_view_factory_new_view (EShell *shell)
 	storage_set_view = e_storage_set_view_new (storage_set);
 	gtk_widget_show (storage_set_view);
 
-	storage_set_view_interface = evolution_storage_set_view_new (storage_set_view);
+	storage_set_view_interface = evolution_storage_set_view_new (E_STORAGE_SET_VIEW (storage_set_view));
 	if (storage_set_view_interface == NULL) {
 		gtk_widget_destroy (storage_set_view);
 		return NULL;