changes from 2.X starting in march 2009 through oct 20 2009 (5826 inclusive)

[ardour.git] / gtk2_ardour / editor_ops.cc

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index d4e8f4b54f622d53612588bbb985c15c1d668499..f7fe6e7b4ad74bf95e310eafc66c575817731882 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1555,7 +1555,7 @@ Editor::temporal_zoom (gdouble fpu)
 
        /* XXX this limit is also in ::set_frames_per_unit() */
 
-       if (frames_per_unit <= 2.0 && fpu <= frames_per_unit) {
+       if (frames_per_unit <= 1.0 && fpu <= frames_per_unit) {
                return;
        }
 
@@ -2512,8 +2512,8 @@ Editor::rename_region()
        d.get_vbox()->set_border_width (12);
        d.get_vbox()->pack_start (hbox, false, false);
 
-       d.add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
        d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+       d.add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
 
        d.set_size_request (300, -1);
        d.set_position (Gtk::WIN_POS_MOUSE);