synced with master (merged master into gtk3)

2015-10-17 16:23:10 +02:00
parent d8e4709458 26b5d4f25e
commit 35775f3b3f
98 changed files with 6601 additions and 1473 deletions
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -283,6 +283,10 @@ int main(int argc, char **argv)
            simpleEditor = true;
        }

+    if (options.theme.empty()) {
+        options.theme = "21-Gray-Gray";
+    }
+
    Gtk::Main m(&argc, &argv);

    Glib::ustring icon_path = Glib::build_filename(argv0, "images");