diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 20 | ||||
| -rw-r--r-- | shell/e-local-storage.c | 19 | ||||
| -rw-r--r-- | shell/e-shell-importer.c | 25 | ||||
| -rw-r--r-- | shell/e-shell-startup-wizard.c | 11 |
4 files changed, 34 insertions, 41 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index b4ea2c6e87..c5d1b47603 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,23 @@ +2003-02-05 Not Zed <NotZed@Ximian.com> + + * e-shell-startup-wizard.c (start_importers): re-enable. + (prepare_importer_page): re-enable importer code. + + * e-shell-importer.c (druid_finish_button_change): removed, since + its not such a hack to change anymore. Dunno how to get an icon + on it tho, without a stock button. + (show_import_wizard): Change the apply button to "Import" here. + +2003-01-28 Not Zed <NotZed@Ximian.com> + + * e-local-storage.c (create_folder_directory): We can't use + pointer arithmetic with g_path_get_*, so adjust code accordingly. + +2003-01-16 Not Zed <NotZed@Ximian.com> + + * e-shell-startup-wizard.c (e_shell_startup_wizard_create): Hook + onto finish instead of next on the last page. + 2003-01-28 Ettore Perazzoli <ettore@ximian.com> * Makefile.am ($(SELECT_NAMES_IDL_GENERATED_C)): No need for the diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c index 4de766b09e..3b5d3fa86a 100644 --- a/shell/e-local-storage.c +++ b/shell/e-local-storage.c @@ -342,7 +342,7 @@ create_folder_directory (ELocalStorage *local_storage, { EStorage *storage; ELocalStoragePrivate *priv; - char *folder_name; + char *parent_path; char *physical_path; storage = E_STORAGE (local_storage); @@ -351,17 +351,16 @@ create_folder_directory (ELocalStorage *local_storage, *physical_path_return = NULL; g_assert (g_path_is_absolute (path)); - folder_name = g_path_get_basename (path); + parent_path = g_path_get_dirname(path); - if (folder_name != path + 1) { + if (strlen(parent_path) > 1) { char *subfolders_directory_physical_path; - char *parent_path; - + char *parent; + /* Create the `subfolders' subdirectory under the parent. */ - - parent_path = g_strndup (path, folder_name - path); - subfolders_directory_physical_path = e_path_to_physical (priv->base_path, parent_path); - g_free (parent_path); + parent = alloca(strlen(parent_path)+2); + sprintf(parent, "%s/", parent_path); + subfolders_directory_physical_path = e_path_to_physical (priv->base_path, parent); if (! g_file_test (subfolders_directory_physical_path, G_FILE_TEST_EXISTS)) { if (mkdir (subfolders_directory_physical_path, 0700) == -1) { @@ -372,7 +371,7 @@ create_folder_directory (ELocalStorage *local_storage, g_free (subfolders_directory_physical_path); } - g_free (folder_name); + g_free (parent_path); physical_path = e_path_to_physical (priv->base_path, path); diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index f035161ace..aca476673c 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -1173,28 +1173,6 @@ next_intelligent_page (GnomeDruidPage *page, return TRUE; } -/* Hack to change the Finish button */ -static void -druid_finish_button_change (GnomeDruid *druid) -{ - GtkWidget *button = druid->finish; - GtkWidget *hbox = GTK_BIN (button)->child, *hbox2; - GtkBoxChild *child; - GtkWidget *label; - - /* Get the second item from the children list */ - hbox2 = ((GtkBoxChild *)GTK_BOX (hbox)->children->data)->widget; - - g_return_if_fail (GTK_IS_BOX (hbox2)); - child = (GtkBoxChild *)g_list_nth_data (GTK_BOX (hbox2)->children, 0); - label = child->widget; - - /* Safety check :) */ - g_return_if_fail (GTK_IS_LABEL (label)); - - gtk_label_set_text (GTK_LABEL (label), _("Import")); -} - static void dialog_weak_notify (void *data, GObject *where_the_dialog_was) @@ -1232,7 +1210,8 @@ show_import_wizard (BonoboUIComponent *component, g_signal_connect (data->druid, "cancel", G_CALLBACK (import_druid_cancel), data); - druid_finish_button_change (GNOME_DRUID (data->druid)); + gtk_button_set_label((GtkButton *)((GnomeDruid *)data->druid)->finish, _("Import")); + data->start = GNOME_DRUID_PAGE_EDGE (glade_xml_get_widget (data->wizard, "page0")); data->typedialog = glade_xml_get_widget (data->wizard, "page1"); diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c index ead8c2d1eb..3213f64009 100644 --- a/shell/e-shell-startup-wizard.c +++ b/shell/e-shell-startup-wizard.c @@ -262,7 +262,6 @@ free_importers (SWData *data) static void start_importers (GList *p) { -#if 0 CORBA_Environment ev; for (; p; p = p->next) { @@ -276,7 +275,6 @@ start_importers (GList *p) } CORBA_exception_free (&ev); } -#endif } static void @@ -667,18 +665,15 @@ prepare_importer_page (GnomeDruidPage *page, table = gtk_table_new (g_list_length (importers), 2, FALSE); for (l = importers; l; l = l->next) { -#if 0 GtkWidget *label; CORBA_Environment ev; gboolean can_run; char *str; -#endif IntelligentImporterData *id; - + id = g_new0 (IntelligentImporterData, 1); id->iid = g_strdup (l->data); -#if 0 /* FIXME */ CORBA_exception_init (&ev); id->object = bonobo_activation_activate_from_id ((char *) id->iid, 0, NULL, &ev); if (BONOBO_EX (&ev)) { @@ -762,6 +757,7 @@ prepare_importer_page (GnomeDruidPage *page, id->widget = bonobo_widget_new_control_from_objref (id->control, CORBA_OBJECT_NIL); gtk_widget_show (id->widget); } else { + printf("no control\n"); id->widget = gtk_label_new (""); gtk_widget_show (id->widget); } @@ -783,7 +779,6 @@ prepare_importer_page (GnomeDruidPage *page, gtk_box_pack_start (GTK_BOX (data->import_page->vbox), table, FALSE, FALSE, 0); -#endif } if (running == 0) { @@ -884,7 +879,7 @@ e_shell_startup_wizard_create (void) data->finish = glade_xml_get_widget (data->wizard, "done-page"); g_return_val_if_fail (data->start != NULL, FALSE); g_return_val_if_fail (data->finish != NULL, FALSE); - g_signal_connect (data->finish, "next", G_CALLBACK (finish_func), data); + g_signal_connect (data->finish, "finish", G_CALLBACK (finish_func), data); make_mail_dialog_pages (data); g_return_val_if_fail (data->mailer != CORBA_OBJECT_NIL, TRUE); |