diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-04-07 09:08:49 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-04-07 09:08:49 -0700 |
| commit | 387dbe510f14ac5590075544431bbedf1e44fb2f (patch) | |
| tree | a20b4b7fd4686e5bdb060d015580ea70fa31478c /gtk-gui.c | |
| parent | eba62d3cf138854625ec95b75bdd55a35e5217a0 (diff) | |
| parent | 07c08eafac3eccc9b7360011fd9a19904160351c (diff) | |
| download | subsurface-387dbe510f14ac5590075544431bbedf1e44fb2f.tar.gz | |
Merge branch 'cleanup-from-Qt-branch' of github.com:henrik242/subsurface
Diffstat (limited to 'gtk-gui.c')
| -rw-r--r-- | gtk-gui.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -321,7 +321,8 @@ static void file_open(GtkWidget *w, gpointer data) GError *error = NULL; filename = fn_glist->data; - parse_file(filename, &error, TRUE); + parse_file(filename, &error); + set_filename(filename, TRUE); if (error != NULL) { report_error(error); @@ -2204,7 +2205,7 @@ static GtkWidget *dive_profile_widget(void) static void do_import_file(gpointer data, gpointer user_data) { GError *error = NULL; - parse_file(data, &error, FALSE); + parse_file((const char *)data, &error); if (error != NULL) { |