Merge branch 'minor-fixes' of git://github.com/dirkhh/subsurface

* 'minor-fixes' of git://github.com/dirkhh/subsurface:
  Fix "Keep window size for new notebook pages" to not set minimum size
  Make the first filename on the command line the default filename

1 files changed, 2 insertions, 2 deletions

diff --git a/gtk-gui.c b/gtk-gui.c
index 351e7b9f4..39703ff60 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -558,7 +558,7 @@ static GtkNotebook *create_new_notebook_window(GtkNotebook *source,
 	gtk_drag_dest_set(notebook, 0, NULL, 0, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 6);
 	gtk_widget_get_allocation(page, &allocation);
-	gtk_widget_set_size_request(notebook, allocation.width, allocation.height);
+	gtk_window_set_default_size(GTK_WINDOW(win), allocation.width, allocation.height);
 
 	gtk_widget_show_all(win);
 	return GTK_NOTEBOOK(notebook);
@@ -989,7 +989,7 @@ void update_progressbar(progressbar_t *progress, double value)
 
 void set_filename(const char *filename)
 {
-	if (filename)
+	if (!existing_filename && filename)
 		existing_filename = strdup(filename);
 	return;
 }