aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog12
-rw-r--r--shell/e-shell-importer.c34
-rw-r--r--shell/e-shell-startup-wizard.c4
3 files changed, 20 insertions, 30 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 56a8088934..ab6626f6a2 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,15 @@
+2001-09-14 Iain Holmes <iain@ximian.com>
+
+ * e-shell-importer.c (start_import): Only check for local path if the
+ folderpath != NULL.
+
+ * e-shell-startup-wizard.c (prepare_importer_page): Remove GTK_CLIST
+ cast.
+
+2001-09-12 Iain Holmes <iain@ximian.com>
+
+ * evolution-wizard.c: Remove spewage.
+
2001-09-14 Ettore Perazzoli <ettore@ximian.com>
* e-shell-importer.c (start_import): Removed unused variable.
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index a419091198..55145ff962 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -357,9 +357,12 @@ start_import (const char *folderpath,
/* Only allow importing to /local */
localpath = "/" E_LOCAL_STORAGE_NAME "/";
- if (strncmp (folderpath, localpath, strlen (localpath))) {
- e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("You may only import to local folders"));
- return;
+ if (folderpath != NULL) {
+ if (strncmp (folderpath, localpath, strlen (localpath))) {
+ e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
+ _("You may only import to local folders"));
+ return;
+ }
}
if (iid == NULL || strcmp (iid, "Automatic") == 0) {
@@ -637,13 +640,6 @@ import_druid_finish (GnomeDruidPage *page,
ImportData *data)
{
GtkWidget *folder;
-#if 0
- char *filename;
- char *iid;
-
- filename = g_strdup (gtk_entry_get_text (GTK_ENTRY (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (data->filepage->filename)))));
- iid = g_strdup (data->choosen_iid);
-#endif
folder = e_shell_folder_selection_dialog_new (data->shell,
_("Select folder"),
@@ -658,24 +654,6 @@ import_druid_finish (GnomeDruidPage *page,
gtk_widget_hide (data->dialog);
gtk_widget_show (folder);
-#if 0
- gnome_dialog_close_hides (GNOME_DIALOG (folder), TRUE);
- switch (gnome_dialog_run (GNOME_DIALOG (folder))) {
- case 0:
- case 2:
- foldername = e_shell_folder_selection_dialog_get_selected_path (E_SHELL_FOLDER_SELECTION_DIALOG (folder));
- g_print ("Folder name: %s", foldername);
- start_import (foldername, filename, iid);
- /* Fall through */
-
- default:
- gtk_widget_destroy (folder);
- break;
- }
-
- g_free (filename);
- g_free (iid);
-#endif
}
static gboolean
diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c
index b5e8e05bd8..d875540502 100644
--- a/shell/e-shell-startup-wizard.c
+++ b/shell/e-shell-startup-wizard.c
@@ -273,7 +273,7 @@ do_import (SWData *data)
CORBA_Environment ev;
GList *l, *selected = NULL;
- for (l = GTK_CLIST (data->import_page->importers); l; l = l->next) {
+ for (l = data->import_page->importers; l; l = l->next) {
IntelligentImporterData *importer_data;
SelectedImporterData *sid;
char *iid;
@@ -576,7 +576,7 @@ prepare_importer_page (GnomeDruidPage *page,
int running = 0;
if (data->import_page->prepared == TRUE) {
- return;
+ return TRUE;
}
dialog = gnome_message_box_new (_("Please wait...\nScanning for existing setups"), GNOME_MESSAGE_BOX_INFO, NULL);