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/recentbrowser.cc
+++ b/rtgui/recentbrowser.cc
@@ -22,7 +22,7 @@

 using namespace rtengine;

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

    recentDirs = Gtk::manage (new MyComboBoxText ());
@@ -46,8 +46,8 @@ void RecentBrowser::selectionChanged ()

    Glib::ustring sel = recentDirs->get_active_text ();

-    if (sel != "" && listener) {
-        listener->selectDir (sel);
+    if (!sel.empty() && selectDir) {
+        selectDir (sel);
    }
 }