Merge branch 'master' of http://www.geeqie.org/git/geeqie

diff --combined src/layout.c
index d06ad32,9f381f6..d2cc2c5
--- 1/src/layout.c
--- 2/src/layout.c
+++ b/src/layout.c
@@@ -63,7 -63,7 +63,7 @@@
  #define TOOLWINDOW_DEF_HEIGHT 450
  
  #define PROGRESS_WIDTH 150
- #define ZOOM_LABEL_WIDTH 64
+ #define ZOOM_LABEL_WIDTH 120
  
  #define PANE_DIVIDER_SIZE 10
  
@@@ -2641,7 -2641,6 +2641,7 @@@ void layout_write_config(LayoutWindow *
  
        WRITE_SEPARATOR();
        layout_toolbar_write_config(lw, TOOLBAR_MAIN, outstr, indent + 1);
 +      layout_toolbar_write_config(lw, TOOLBAR_STATUS, outstr, indent + 1);
  
        WRITE_NL(); WRITE_STRING("</layout>");
  }