Merge branch 'master' into gtk3

2017-01-30 23:45:46 +01:00
parent eb14b15ea5 9117f5f438
commit 16f4731e0b
30 changed files with 437 additions and 333 deletions
--- a/rtgui/splash.cc
+++ b/rtgui/splash.cc
@@ -26,7 +26,6 @@
 extern Glib::ustring creditsPath;
 extern Glib::ustring licensePath;
 extern Glib::ustring versionString;
-extern Glib::ustring versionSuffixString;

 SplashImage::SplashImage ()
 {
@@ -53,10 +52,6 @@ bool SplashImage::on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr)
    int w, h;
    Glib::ustring versionStr(versionString);

-    if (!versionSuffixString.empty()) {
-        versionStr += " " + versionSuffixString;
-    }
-
    version = create_pango_layout (versionStr);
    version->set_text(versionStr);
    version->get_pixel_size (w, h);