From: Linus Torvalds Date: Fri, 21 Oct 2011 14:30:36 +0000 (+0300) Subject: Merge branch 'minor-fixes' of git://github.com/dirkhh/subsurface X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=abaed4c2756e8c79f4f529bb960b037adedff3bb;hp=e2f3114254a28d3d0a62bfb21e3a779c7a143a23;p=ext%2Fsubsurface.git 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 --- diff --git a/equipment.c b/equipment.c index 4d90741..5ff8f0f 100644 --- a/equipment.c +++ b/equipment.c @@ -522,7 +522,6 @@ static int edit_cylinder_dialog(int index, cylinder_t *cyl) dive->cylinder[index] = *cyl; mark_divelist_changed(TRUE); flush_divelist(dive); - repaint_dive(); } gtk_widget_destroy(dialog); @@ -561,6 +560,7 @@ static void edit_cb(GtkButton *button, gpointer data) return; set_one_cylinder(index, &cyl, model, &iter); + repaint_dive(); } static void add_cb(GtkButton *button, gpointer data)