FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds 2011-10-21 17:30:36 +03:00
commit abaed4c275
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk-gui.c
View File

@ -558,7 +558,7 @@ static GtkNotebook *create_new_notebook_window(GtkNotebook *source,
gtk_drag_dest_set(notebook, 0, NULL, 0, 0); gtk_drag_dest_set(notebook, 0, NULL, 0, 0);
gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 6); gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 6);
gtk_widget_get_allocation(page, &allocation); 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); gtk_widget_show_all(win);
return GTK_NOTEBOOK(notebook); return GTK_NOTEBOOK(notebook);
@ -989,7 +989,7 @@ void update_progressbar(progressbar_t *progress, double value)
void set_filename(const char *filename) void set_filename(const char *filename)
{ {
if (filename) if (!existing_filename && filename)
existing_filename = strdup(filename); existing_filename = strdup(filename);
return; return;
} }