Commit d5a5f222 authored by Jody Goldberg's avatar Jody Goldberg

missed files

parent 2d9dce82
......@@ -36,11 +36,13 @@ Jody:
* Fix printing.
* Fix object import from XL.
* Quicky insert image item.
* Tidy drag and Drop
* Fix dateToUnix
* Some touchups to bonobo build
* cleanup autoconf
* apply some pending japanese patches
* Tidy drag and Drop.
* Fix dateToUnix.
* Some touchups to bonobo build.
* cleanup autoconf.
* apply some pending japanese patches.
* Improve HIG compliance.
* Start support for filter importing.
Jon Kre:
* Enable bonobo
......
/* vim: set sw=8: */
/*
* gui-file.c:
*
......@@ -123,10 +124,9 @@ gui_file_import (WorkbookControlGUI *wbcg)
fo = g_list_nth_data (importers, gnumeric_option_menu_get_selected_index (omenu));
file_name = gtk_file_selection_get_filename (fsel);
if (fo != NULL) {
(void) wb_view_open_custom (wb_control_view (WORKBOOK_CONTROL (wbcg)),
WORKBOOK_CONTROL (wbcg), fo, file_name, TRUE);
}
if (fo != NULL)
wb_view_open (file_name, WORKBOOK_CONTROL (wbcg), TRUE, fo);
gtk_object_destroy (GTK_OBJECT (fsel));
g_list_free (importers);
}
......@@ -326,8 +326,8 @@ gui_file_open (WorkbookControlGUI *wbcg)
}
if (gnumeric_dialog_file_selection (wbcg, fsel))
(void) wb_view_open (wb_control_view (wbc), wbc,
gtk_file_selection_get_filename (fsel), TRUE);
wb_view_open (gtk_file_selection_get_filename (fsel),
wbc, TRUE, NULL);
gtk_widget_destroy (GTK_WIDGET (fsel));
}
......
......@@ -29,9 +29,8 @@
static void
file_history_cmd (GtkWidget *widget, WorkbookControlGUI *wbcg)
{
gchar *filename = gtk_object_get_data (GTK_OBJECT (widget), UGLY_GNOME_UI_KEY);
(void) wb_view_open (wb_control_view (WORKBOOK_CONTROL (wbcg)),
WORKBOOK_CONTROL (wbcg), filename, TRUE);
char *filename = gtk_object_get_data (GTK_OBJECT (widget), UGLY_GNOME_UI_KEY);
wb_view_open (filename, WORKBOOK_CONTROL (wbcg), TRUE, NULL);
}
#else
......@@ -42,10 +41,9 @@ file_history_cmd (BonoboUIComponent *uic, WorkbookControlGUI *wbcg, const char *
char *filename = bonobo_ui_component_get_prop (wbcg->uic, fullpath,
"tip", NULL);
g_free (fullpath);
(void) wb_view_open (wb_control_view (WORKBOOK_CONTROL (wbcg)),
WORKBOOK_CONTROL (wbcg), filename, TRUE);
wb_view_open (filename, WORKBOOK_CONTROL (wbcg), TRUE, NULL);
g_free (filename);
g_free (fullpath);
}
#endif
......
......@@ -81,7 +81,7 @@ workbook_persist_file_load (BonoboPersistFile *ps, const CORBA_char *filename,
{
WorkbookView *wbv = closure;
return wb_view_open (wbv, /* FIXME */ NULL, filename, FALSE) ? 0 : -1;
return wb_view_open (filename, /* FIXME */ NULL, FALSE, NULL) ? 0 : -1;
}
static int
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment