Merge branch 'master' into gtk3

2016-01-11 00:54:25 +01:00
parent a4d49ee5f2 5ff270bf51
commit a54dd81b1a
69 changed files with 1940 additions and 1001 deletions
--- a/rtgui/placesbrowser.cc
+++ b/rtgui/placesbrowser.cc
@@ -23,7 +23,7 @@
 #include "guiutils.h"
 #include "rtimage.h"

-PlacesBrowser::PlacesBrowser () : listener (NULL)
+PlacesBrowser::PlacesBrowser ()
 {

    scrollw = Gtk::manage (new Gtk::ScrolledWindow ());
@@ -296,8 +296,8 @@ void PlacesBrowser::selectionChanged ()
                    drives[i]->poll_for_media ();
                    break;
                }
-        } else if (listener) {
-            listener->selectDir (iter->get_value (placesColumns.root));
+        } else if (selectDir) {
+            selectDir (iter->get_value (placesColumns.root));
        }
    }
 }