Compile fixes

svn path=/trunk/; revision=12172

mail/ChangeLog

@@ -1,3 +1,7 @@
+2001-08-17  Iain Holmes  <iain@ximian.com>
+
+	* importers/evolution-mbox-importer.c (load_file_fn): Fix warnings.
+
 2001-08-17  JP Rosevear  <jpr@ximian.com>
 
 	* component-factory.c (owner_set_cb): don't init the config here

mail/importers/evolution-mbox-importer.c

@@ -41,6 +41,8 @@
 #include "mail/mail-importer.h"
 #include "mail-tools.h"
 
+#include "e-util/e-path.h"
+
 #define IMPORTER_DEBUG
 #ifdef IMPORTER_DEBUG
 #define IN g_print ("=====> %s (%d)\n", __FUNCTION__, __LINE__)
@@ -236,8 +238,8 @@ load_file_fn (EvolutionImporter *eimporter,
 	if (folderpath == NULL || *folderpath == '\0') {
 		importer->folder = mail_tool_get_local_inbox (NULL);
 	} else {
-		char *parent;
-		const char *name, *fullpath, *homedir, *tmp;
+		char *parent, *tmp, *fullpath;
+		const char *name, *homedir;
 		BonoboListener *listener;
 		CamelException *ex;
 		

shell/e-shell-folder-selection-dialog.c

@@ -116,6 +116,10 @@ folder_creation_dialog_result_cb (EShell *shell,
 	dialog = E_SHELL_FOLDER_SELECTION_DIALOG (data);
 	priv = dialog->priv;
 
+	if (priv == NULL) {
+		return;
+	}
+
 	if (result == E_SHELL_FOLDER_CREATION_DIALOG_RESULT_SUCCESS)
 		e_storage_set_view_set_current_folder (E_STORAGE_SET_VIEW (priv->storage_set_view),
 						       path);

shell/e-shell-startup-wizard.c

@@ -318,6 +318,8 @@ finish_func (GnomeDruidPage *page,
 	data->cancel = FALSE;
 	gtk_widget_destroy (data->dialog);
 	gtk_main_quit ();
+
+	return TRUE;
 }
 
 static void
@@ -480,9 +482,9 @@ make_timezone_page (SWData *data)
 	page->page = glade_xml_get_widget (data->wizard, "timezone-page");
 	g_return_val_if_fail (page->page != NULL, NULL);
 
-	page->vbox = GNOME_DRUID_PAGE_STANDARD (page->page)->vbox;
+	page->vbox = GTK_WIDGET (GNOME_DRUID_PAGE_STANDARD (page->page)->vbox);
 
-	page->etd = e_timezone_dialog_new ();
+	page->etd = GTK_OBJECT (e_timezone_dialog_new ());
 	e_timezone_dialog_reparent (page->etd, page->vbox);
 
 	return page;

shell/e-shell.c

@@ -979,7 +979,6 @@ e_shell_construct (EShell *shell,
 		e_shortcuts_add_default_group (priv->shortcuts);
 	
 	g_free (shortcut_path);
-	
 	return E_SHELL_CONSTRUCT_RESULT_OK;
 }
 

widgets/misc/Makefile.am

@@ -6,6 +6,7 @@ INCLUDES =					\
 	-I$(top_srcdir)/widgets/shortcut-bar	\
 	$(EXTRA_GNOME_CFLAGS)			\
 	-DMAP_DIR=\""$(datadir)/images/evolution"\"	\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DG_LOG_DOMAIN=__FILE__
 
 noinst_LIBRARIES =	\