Merge from default. Hope I did it right...

rtgui/thumbbrowserbase.cc

@@ -185,7 +185,6 @@ void ThumbBrowserBase::arrangeFiles () {
         int availWidth = internal.get_width();
         // initial number of columns
         int numOfCols = 0;
-        int currColNum = 0;
         int colsWidth = 0;
         for (int i=0; i<N; i++)
             if (!fd[i]->filtered && colsWidth + fd[i]->getMinimalWidth() <= availWidth) {
@@ -327,7 +326,7 @@ void ThumbBrowserBase::buttonPressed (int x, int y, int button, GdkEventType typ
         doubleClicked (selected[0]);
     else if (button==1 && type==GDK_BUTTON_PRESS) {
         if (fileDescr && state & GDK_SHIFT_MASK) {
-            if (selected.size()==0) {
+            if (selected.empty()) {
                 selected.push_back (fileDescr);
                 fileDescr->selected = true;
                 lastClicked = fileDescr;
@@ -473,7 +472,7 @@ void ThumbBrowserBase::redraw () {
 
 void ThumbBrowserBase::zoomChanged (bool zoomIn) {
 
-    int newHeight;
+    int newHeight=0;
     int i=0;
     int optThumbSize=getCurrentThumbSize();
     if (zoomIn)