<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[149187] trunk/dports/multimedia/audacious-plugins</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/149187">149187</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2016-06-04 14:57:58 -0700 (Sat, 04 Jun 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>audacious-plugins: update to 3.7.2 including patchset.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaaudaciouspluginsPortfile">trunk/dports/multimedia/audacious-plugins/Portfile</a></li>
<li><a href="#trunkdportsmultimediaaudaciouspluginsfilespatchacincludem4droplibcswitchfromgnu11toc11diff">trunk/dports/multimedia/audacious-plugins/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff</a></li>
<li><a href="#trunkdportsmultimediaaudaciouspluginsfilespatchbuildsysdiff">trunk/dports/multimedia/audacious-plugins/files/patch-buildsys.diff</a></li>
<li><a href="#trunkdportsmultimediaaudaciouspluginsfilespatchgtk3diff">trunk/dports/multimedia/audacious-plugins/files/patch-gtk3.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaaudaciouspluginsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/audacious-plugins/Portfile (149186 => 149187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-plugins/Portfile        2016-06-04 21:57:47 UTC (rev 149186)
+++ trunk/dports/multimedia/audacious-plugins/Portfile        2016-06-04 21:57:58 UTC (rev 149187)
</span><span class="lines">@@ -8,8 +8,8 @@
</span><span class="cx"> name                audacious-plugins
</span><span class="cx"> 
</span><span class="cx"> # Please keep audacious, audacious-core and audacious-plugins synchronized.
</span><del>-version             3.6.2
-revision            1
</del><ins>+version             3.7.2
+revision            0
</ins><span class="cx"> 
</span><span class="cx"> # FIXME: probably more licenses involved here...
</span><span class="cx"> license             BSD GPL-2+
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx"> 
</span><span class="cx"> master_sites        http://distfiles.audacious-media-player.org
</span><span class="cx"> use_bzip2           yes
</span><del>-checksums           rmd160  5f1a6d8636b4be4239e1262768e2d7b271a6023d \
-                    sha256  e7798936249e1601177503d148a3dd59edd289579f3f1667351eb0ba463642e8
</del><ins>+checksums           rmd160  d0786b32eb5e4ad2a724e0ffa0195e052d0bf41f \
+                    sha256  fcf7488f01781c8f51e0af5cabacdd582b22537a0085f26aa5ca636373f8e1ff
</ins><span class="cx"> 
</span><span class="cx"> universal_variant   no
</span><span class="cx"> 
</span><span class="lines">@@ -61,14 +61,10 @@
</span><span class="cx">                     --disable-gtk \
</span><span class="cx">                     --disable-qt \
</span><span class="cx">                     --with-system-libxml2=no \
</span><del>-                    --enable-xsf \
-                    --enable-psf \
-                    --enable-hotkey \
</del><ins>+                    --disable-hotkey \
</ins><span class="cx">                     --enable-songchange \
</span><span class="cx">                     --enable-neon \
</span><del>-                    --enable-filewriter \
</del><span class="cx">                     --enable-rpath \
</span><del>-                    --enable-lyricwiki \
</del><span class="cx">                     --disable-console \
</span><span class="cx">                     --disable-qtaudio \
</span><span class="cx">                     --disable-pulse \
</span><span class="lines">@@ -81,7 +77,6 @@
</span><span class="cx">                     --disable-aosd-xcomp \
</span><span class="cx">                     --disable-notify \
</span><span class="cx">                     --disable-mpris2 \
</span><del>-                    --disable-adplug \
</del><span class="cx">                     --disable-vorbis \
</span><span class="cx">                     --disable-flacng \
</span><span class="cx">                     --disable-wavpack \
</span><span class="lines">@@ -108,10 +103,6 @@
</span><span class="cx">                     --disable-soxr \
</span><span class="cx">                     --disable-glspectrum \
</span><span class="cx">                     --disable-qtglspectrum \
</span><del>-                    --enable-vtx \
-                    --enable-ladspa \
-                    --enable-blur-scope \
-                    --enable-cairo-spectrum \
</del><span class="cx">                     --disable-mac-media-keys
</span><span class="cx"> 
</span><span class="cx"> default_variants    +full
</span><span class="lines">@@ -144,6 +135,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> variant dbus description {Adds support for GNOME shortcuts and remote control via DBUS} {
</span><ins>+    depends_build-append    path:bin/gdbus-codegen:glib2
</ins><span class="cx">     depends_lib-append      path:lib/pkgconfig/dbus-1.pc:dbus \
</span><span class="cx">                             path:lib/pkgconfig/dbus-glib-1.pc:dbus-glib
</span><span class="cx">     configure.args-replace  --disable-gnomeshortcuts \
</span><span class="lines">@@ -176,28 +168,32 @@
</span><span class="cx">                             --enable-notify
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-# libbinio not ported yet
-#variant adplug description {Adds support for various DOS game sounds} {
-#    depends_lib-append      port:libbinio
-#    configure.args-replace  --disable-adplug \
-#                            --enable-adplug
-#}
</del><ins>+variant filewriter description {Add support for the filewriter output plugin} {
+    configure.args-replace  --disable-filewriter \
+                            --enable-filewriter
+}
</ins><span class="cx"> 
</span><span class="cx"> variant vorbis description {Add support for the OggVorbis audio codec} {
</span><span class="cx">     depends_lib-append      port:libvorbis
</span><span class="cx">     depends_lib-append      port:libogg
</span><span class="cx">     configure.args-replace  --disable-vorbis \
</span><span class="cx">                             --enable-vorbis
</span><del>-    configure.args-replace  --disable-filewriter \
-                            --enable-filewriter
</del><ins>+
+    if {([variant_isset gtk2] || [variant_isset gtk3]) &amp;&amp; [variant_isset filewriter]} {
+        configure.args-replace  --disable-filewriter \
+                                --enable-filewriter
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> variant flac description {Add support for FLAC: Free Lossless Audio Codec} {
</span><span class="cx">     depends_lib-append      port:flac
</span><del>-    configure.args-replace  --disable-filewriter_flac \
-                            --enable-filewriter_flac
</del><span class="cx">     configure.args-replace  --disable-flacng \
</span><span class="cx">                             --enable-flacng
</span><ins>+
+    if {([variant_isset gtk2] || [variant_isset gtk3]) &amp;&amp; [variant_isset filewriter]} {
+        configure.args-replace  --disable-filewriter_flac \
+                                --enable-filewriter_flac
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> variant wavpack description {Add support for wavpack audio compression tools} {
</span><span class="lines">@@ -236,9 +232,9 @@
</span><span class="cx">                             --enable-jack
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-# libsidplayfp not ported yet
</del><ins>+# libsidplayfp not ported yet.
</ins><span class="cx"> #variant sid description {Build with SID (Commodore 64 Audio) support} {
</span><del>-#    depends_lib-append      port:SIDPLAY
</del><ins>+#    depends_lib-append      port:libsidplayfp
</ins><span class="cx"> #    configure.args-replace  --disable-sid \
</span><span class="cx"> #                            --enable-sid
</span><span class="cx"> #}
</span><span class="lines">@@ -275,28 +271,29 @@
</span><span class="cx">                             --enable-cue
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-variant lame description {Add support for writing MP3 files} {
</del><ins>+variant lame requires filewriter description {Add support for writing MP3 files} {
</ins><span class="cx">     depends_lib-append      port:lame
</span><span class="cx">     configure.args-replace  --disable-filewriter_mp3 \
</span><span class="cx">                             --enable-filewriter_mp3
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> variant transform description {Add support for audio transformation, most notably resampling, pitching and speed control} {
</span><del>-    depends_lib-append      port:libsamplerate
-    # enable, if soxr gets ported
-    #                       port:libsoxr
</del><ins>+    depends_lib-append      port:libsamplerate \
+                            port:soxr
</ins><span class="cx">     configure.args-replace  --disable-resample \
</span><span class="cx">                             --enable-resample
</span><span class="cx">     configure.args-replace  --disable-speedpitch \
</span><span class="cx">                             --enable-speedpitch
</span><del>-    #configure.args-replace  --disable-soxr \
-    #                        --enable-soxr
</del><ins>+    configure.args-replace  --disable-soxr \
+                            --enable-soxr
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> variant opengl description {Add support for spectrum visualization via OpenGL} {
</span><del>-    depends_lib-append      path:lib/libGL.dylib:mesa
-    configure.args-replace  --disable-glspectrum \
-                            --enable-glspectrum
</del><ins>+    if {[variant_isset gtk2] || [variant_isset gtk3]} {
+        depends_lib-append      path:lib/libGL.dylib:mesa
+        configure.args-replace  --disable-glspectrum \
+                                --enable-glspectrum
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> variant sdl1 conflicts sdl2 description {Add SDL audio output via libsdl1} {
</span><span class="lines">@@ -319,6 +316,8 @@
</span><span class="cx"> variant qt5 description {Add Qt5 support} {
</span><span class="cx">     PortGroup   qt5 1.0
</span><span class="cx"> 
</span><ins>+    depends_lib-append      port:qt5-qtmultimedia
+
</ins><span class="cx">     configure.args-replace  --disable-qt \
</span><span class="cx">                             --enable-qt
</span><span class="cx"> 
</span><span class="lines">@@ -342,6 +341,8 @@
</span><span class="cx"> 
</span><span class="cx">     configure.args-replace  --disable-gtk \
</span><span class="cx">                             --enable-gtk
</span><ins>+    configure.args-replace  --disable-hotkey \
+                            --enable-hotkey
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> variant gtk3 conflicts gtk2 description {Add GTK3 support} {
</span><span class="lines">@@ -352,11 +353,12 @@
</span><span class="cx"> 
</span><span class="cx">     configure.args-replace  --disable-gtk \
</span><span class="cx">                             --enable-gtk
</span><ins>+    configure.args-replace  --disable-hotkey \
+                            --enable-hotkey
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-variant full requires console mp3 dbus lirc osd osd_composite notifications \
-                      vorbis flac wavpack aac sndfile modplug midi cdaudio \
-                      lastfm mms cue lame transform opengl \
</del><ins>+variant full requires console mp3 dbus lirc wavpack aac sndfile modplug \
+                      midi cdaudio mms cue lame flac transform opengl \
</ins><span class="cx">              description {Build all plugins, except additional sound output plugins and potentially conflicting variants} {}
</span><span class="cx"> 
</span><span class="cx"> if {[variant_isset jack]} {
</span><span class="lines">@@ -372,11 +374,46 @@
</span><span class="cx">     default_variants-append +sdl1 +ffmpeg
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-# Need either one of gtk2 or gtk3. Default to gtk2, which is preferred by upstream.
-if {![variant_isset gtk2] &amp;&amp; ![variant_isset gtk3]} {
</del><ins>+# Need either one of gtk2, gtk3 or Qt5 to have a GUI. Default to gtk2, which is preferred by upstream.
+if {![variant_isset gtk2] &amp;&amp; ![variant_isset gtk3] &amp;&amp; ![variant_isset qt5]} {
</ins><span class="cx">     default_variants-append +gtk2
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+# Add other variants to the &quot;full&quot; set if gtk2 or gtk3 have been enabled.
+if {[variant_isset full] &amp;&amp; ([variant_isset gtk2] || [variant_isset gtk3])} {
+    default_variants-append +filewriter +osd +osd_composite +notifications +lastfm
+}
+
+# OSD only supported with gtk2 or gtk3.
+if {![variant_isset gtk2] &amp;&amp; ![variant_isset gtk3] &amp;&amp; ([variant_isset osd] || [variant_isset osd_composite])} {
+    ui_debug &quot;The osd or osd_composite variants require either the gtk2 or gtk3 variants to be enabled.&quot;
+    error &quot;+osd or +osd_composite require +gtk2 or +gtk3.&quot;
+}
+
+# Notifications only supported with gtk2 or gtk3.
+if {![variant_isset gtk2] &amp;&amp; ![variant_isset gtk3] &amp;&amp; [variant_isset notifications]} {
+    ui_debug &quot;The notifications variant requires either the gtk2 or gtk3 variants to be enabled.&quot;
+    error &quot;+notifications requires +gtk2 or +gtk3.&quot;
+}
+
+# LastFM/scrobbler2 only supported with gtk2 or gtk3.
+if {![variant_isset gtk2] &amp;&amp; ![variant_isset gtk3] &amp;&amp; [variant_isset lastfm]} {
+    ui_debug &quot;The lastfm variant requires either the gtk2 or gtk3 variants to be enabled.&quot;
+    error &quot;+lastfm requires +gtk2 or +gtk3.&quot;
+}
+
+# Filewriter only supported with gtk2 or gtk3.
+if {![variant_isset gtk2] &amp;&amp; ![variant_isset gtk3] &amp;&amp; [variant_isset filewriter]} {
+    ui_debug &quot;The filewriter variant requires either the gtk2 or gtk3 variants to be enabled.&quot;
+    error &quot;+filewriter requires +gtk2 or +gtk3.&quot;
+}
+
+# OpenGL only supported with gtk2, gtk3 or Qt5.
+if {![variant_isset gtk2] &amp;&amp; ![variant_isset gtk3] &amp;&amp; ![variant_isset qt5] &amp;&amp; [variant_isset opengl]} {
+    ui_debug &quot;The opengl variant requires either the gtk2, gtk3 or qt5 variants to be enabled.&quot;
+    error &quot;+opengl requires +gtk2, +gtk3 or +qt5.&quot;
+}
+
</ins><span class="cx"> livecheck.type      regex
</span><span class="cx"> livecheck.url       ${master_sites}
</span><span class="cx"> livecheck.regex     &quot;${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}&quot;
</span></span></pre></div>
<a id="trunkdportsmultimediaaudaciouspluginsfilespatchacincludem4droplibcswitchfromgnu11toc11diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/audacious-plugins/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff (149186 => 149187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-plugins/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff        2016-06-04 21:57:47 UTC (rev 149186)
+++ trunk/dports/multimedia/audacious-plugins/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff        2016-06-04 21:57:58 UTC (rev 149187)
</span><span class="lines">@@ -2,14 +2,14 @@
</span><span class="cx"> +++ acinclude.m4
</span><span class="cx"> @@ -83,8 +83,8 @@ AC_REQUIRE([AC_SYS_LARGEFILE])
</span><span class="cx">  if test &quot;x$GCC&quot; = &quot;xyes&quot;; then
</span><del>-     CFLAGS=&quot;$CFLAGS -std=gnu99 -ffast-math -Wall -pipe&quot;
</del><ins>+     CFLAGS=&quot;$CFLAGS -std=gnu99 -ffast-math -Wall -pipe -Wno-deprecated-declarations&quot;
</ins><span class="cx">      if test &quot;x$HAVE_DARWIN&quot; = &quot;xyes&quot;; then
</span><del>--        CXXFLAGS=&quot;$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe&quot;
</del><ins>+-        CXXFLAGS=&quot;$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations&quot;
</ins><span class="cx"> -        LDFLAGS=&quot;$LDFLAGS -lc++ -stdlib=libc++&quot;
</span><del>-+        CXXFLAGS=&quot;$CXXFLAGS -std=c++11 -ffast-math -Wall -pipe&quot;
</del><ins>++        CXXFLAGS=&quot;$CXXFLAGS -std=c++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations&quot;
</ins><span class="cx"> +        LDFLAGS=&quot;$LDFLAGS&quot;
</span><span class="cx">      else
</span><del>-         CXXFLAGS=&quot;$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe&quot;
</del><ins>+         CXXFLAGS=&quot;$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations&quot;
</ins><span class="cx">      fi
</span><span class="cx"> @@ -101,7 +101,7 @@ if test &quot;x$HAVE_DARWIN&quot; = &quot;xyes&quot;; then
</span><span class="cx">      AC_PROG_OBJCXX
</span></span></pre></div>
<a id="trunkdportsmultimediaaudaciouspluginsfilespatchbuildsysdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/audacious-plugins/files/patch-buildsys.diff (149186 => 149187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-plugins/files/patch-buildsys.diff        2016-06-04 21:57:47 UTC (rev 149186)
+++ trunk/dports/multimedia/audacious-plugins/files/patch-buildsys.diff        2016-06-04 21:57:58 UTC (rev 149187)
</span><span class="lines">@@ -1,6 +1,21 @@
</span><span class="cx"> --- buildsys.mk.in.orig
</span><span class="cx"> +++ buildsys.mk.in
</span><del>-@@ -107,19 +107,24 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
</del><ins>+@@ -1,5 +1,5 @@
+ #
+-#  Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012
++#  Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+ #  Jonathan Schleifer &lt;js@webkeks.org&gt;
+ #
+ #  https://webkeks.org/git/?p=buildsys.git
+@@ -45,6 +45,7 @@ OBJCFLAGS = @OBJCFLAGS@
+ OBJCXXFLAGS = @OBJCXXFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LDFLAGS_RPATH = @LDFLAGS_RPATH@
++LDFLAGS_INSTALL_NAME = @LDFLAGS_INSTALL_NAME@
+ LIBS = @LIBS@
+ PYTHON_FLAGS = @PYTHON_FLAGS@
+ PROG_IMPLIB_NEEDED = @PROG_IMPLIB_NEEDED@
+@@ -107,19 +108,24 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
</ins><span class="cx">  
</span><span class="cx">  MO_FILES = ${LOCALES:.po=.mo}
</span><span class="cx">  
</span><span class="lines">@@ -28,7 +43,7 @@
</span><span class="cx">          for i in $@; do \
</span><span class="cx">                  ${DIR_ENTER}; \
</span><span class="cx">                  ${MAKE} ${MFLAGS} || exit $$?; \
</span><del>-@@ -205,6 +210,7 @@ pre-depend:
</del><ins>+@@ -205,6 +211,7 @@ pre-depend:
</ins><span class="cx">  
</span><span class="cx">  ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
</span><span class="cx">          ${LINK_STATUS}
</span><span class="lines">@@ -36,7 +51,7 @@
</span><span class="cx">          if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
</span><span class="cx">                  ${LINK_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -228,7 +234,8 @@ ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}
</del><ins>+@@ -228,7 +235,8 @@ ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}
</ins><span class="cx">          fi
</span><span class="cx">  
</span><span class="cx">  ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
</span><span class="lines">@@ -46,7 +61,16 @@
</span><span class="cx">          objs=&quot;&quot;; \
</span><span class="cx">          ars=&quot;&quot;; \
</span><span class="cx">          for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
</span><del>-@@ -264,6 +271,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
</del><ins>+@@ -252,7 +260,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
+                 done; \
+                 cd ..; \
+         done; \
+-        if ${LD} -o $@ $$objs ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
++        if ${LD} -o $@ $$objs ${LIB_LDFLAGS} ${LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${LIBS}; then \
+                 ${LINK_OK}; \
+         else \
+                 ${LINK_FAILED}; \
+@@ -264,6 +272,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
</ins><span class="cx">  
</span><span class="cx">  ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
</span><span class="cx">          ${LINK_STATUS}
</span><span class="lines">@@ -54,7 +78,7 @@
</span><span class="cx">          objs=&quot;&quot;; \
</span><span class="cx">          ars=&quot;&quot;; \
</span><span class="cx">          for i in ${PLUGIN_OBJS}; do \
</span><del>-@@ -300,6 +308,7 @@ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
</del><ins>+@@ -300,6 +309,7 @@ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
</ins><span class="cx">  ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
</span><span class="cx">          ${LINK_STATUS}
</span><span class="cx">          rm -f $@
</span><span class="lines">@@ -62,7 +86,7 @@
</span><span class="cx">          objs=&quot;&quot;; \
</span><span class="cx">          ars=&quot;&quot;; \
</span><span class="cx">          for i in ${OBJS} ${OBJS_EXTRA}; do \
</span><del>-@@ -337,6 +346,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
</del><ins>+@@ -337,6 +347,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
</ins><span class="cx">  ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
</span><span class="cx">          ${LINK_STATUS}
</span><span class="cx">          rm -f $@
</span><span class="lines">@@ -70,61 +94,69 @@
</span><span class="cx">          objs=&quot;&quot;; \
</span><span class="cx">          ars=&quot;&quot;; \
</span><span class="cx">          for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
</span><del>-@@ -375,6 +385,8 @@ locales: ${MO_FILES}
</del><ins>+@@ -375,21 +386,27 @@ locales: ${MO_FILES}
</ins><span class="cx">  
</span><span class="cx">  .c.o:
</span><span class="cx">          ${COMPILE_STATUS}
</span><ins>+-        if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</del><ins>++        if ${CC} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -382,6 +394,8 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_FAILED}; \
</ins><span class="cx">          fi
</span><span class="cx">  .c.lib.o:
</span><span class="cx">          ${COMPILE_LIB_STATUS}
</span><ins>+-        if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</del><ins>++        if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_LIB_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -389,6 +403,8 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_LIB_FAILED}; \
</ins><span class="cx">          fi
</span><span class="cx">  .c.plugin.o:
</span><span class="cx">          ${COMPILE_PLUGIN_STATUS}
</span><ins>+-        if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</del><ins>++        if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_PLUGIN_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -397,6 +413,8 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_PLUGIN_FAILED}; \
+@@ -397,21 +414,27 @@ locales: ${MO_FILES}
</ins><span class="cx">  
</span><span class="cx">  .cc.o .cxx.o:
</span><span class="cx">          ${COMPILE_STATUS}
</span><ins>+-        if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</del><ins>++        if ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -404,6 +422,8 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_FAILED}; \
</ins><span class="cx">          fi
</span><span class="cx">  .cc.lib.o .cxx.lib.o:
</span><span class="cx">          ${COMPILE_LIB_STATUS}
</span><ins>+-        if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</del><ins>++        if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_LIB_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -411,6 +431,8 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_LIB_FAILED}; \
</ins><span class="cx">          fi
</span><span class="cx">  .cc.plugin.o .cxx.plugin.o:
</span><span class="cx">          ${COMPILE_PLUGIN_STATUS}
</span><ins>+-        if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</del><ins>++        if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_PLUGIN_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -419,6 +441,8 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_PLUGIN_FAILED}; \
+@@ -419,6 +442,8 @@ locales: ${MO_FILES}
</ins><span class="cx">  
</span><span class="cx">  .d.o:
</span><span class="cx">          ${COMPILE_STATUS}
</span><span class="lines">@@ -133,7 +165,7 @@
</span><span class="cx">          if test x&quot;$(basename ${DC})&quot; = x&quot;dmd&quot;; then \
</span><span class="cx">                  if ${DC} ${DFLAGS} -c -of$@ $&lt;; then \
</span><span class="cx">                          ${COMPILE_OK}; \
</span><del>-@@ -435,6 +459,8 @@ locales: ${MO_FILES}
</del><ins>+@@ -435,6 +460,8 @@ locales: ${MO_FILES}
</ins><span class="cx">  
</span><span class="cx">  .erl.beam:
</span><span class="cx">          ${COMPILE_STATUS}
</span><span class="lines">@@ -142,7 +174,7 @@
</span><span class="cx">          if ${ERLC} ${ERLCFLAGS} -o $@ $&lt;; then \
</span><span class="cx">                  ${COMPILE_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -443,6 +469,8 @@ locales: ${MO_FILES}
</del><ins>+@@ -443,6 +470,8 @@ locales: ${MO_FILES}
</ins><span class="cx">  
</span><span class="cx">  .java.class:
</span><span class="cx">          ${COMPILE_STATUS}
</span><span class="lines">@@ -151,61 +183,69 @@
</span><span class="cx">          if ${JAVAC} ${JAVACFLAGS} $&lt;; then \
</span><span class="cx">                  ${COMPILE_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -451,6 +479,8 @@ locales: ${MO_FILES}
</del><ins>+@@ -451,21 +480,27 @@ locales: ${MO_FILES}
</ins><span class="cx">  
</span><span class="cx">  .m.o:
</span><span class="cx">          ${COMPILE_STATUS}
</span><ins>+-        if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</del><ins>++        if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -458,6 +488,8 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_FAILED}; \
</ins><span class="cx">          fi
</span><span class="cx">  .m.lib.o:
</span><span class="cx">          ${COMPILE_LIB_STATUS}
</span><ins>+-        if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</del><ins>++        if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_LIB_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -465,6 +497,8 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_LIB_FAILED}; \
</ins><span class="cx">          fi
</span><span class="cx">  .m.plugin.o:
</span><span class="cx">          ${COMPILE_PLUGIN_STATUS}
</span><ins>+-        if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</del><ins>++        if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_PLUGIN_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -473,6 +507,8 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_PLUGIN_FAILED}; \
+@@ -473,21 +508,27 @@ locales: ${MO_FILES}
</ins><span class="cx">  
</span><span class="cx">  .mm.o:
</span><span class="cx">          ${COMPILE_STATUS}
</span><ins>+-        if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</del><ins>++        if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -480,6 +516,8 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_FAILED}; \
</ins><span class="cx">          fi
</span><span class="cx">  .mm.lib.o:
</span><span class="cx">          ${COMPILE_LIB_STATUS}
</span><ins>+-        if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</del><ins>++        if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_LIB_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -487,6 +525,8 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_LIB_FAILED}; \
</ins><span class="cx">          fi
</span><span class="cx">  .mm.plugin.o:
</span><span class="cx">          ${COMPILE_PLUGIN_STATUS}
</span><ins>+-        if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</del><ins>++        if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_PLUGIN_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -495,6 +535,8 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_PLUGIN_FAILED}; \
+@@ -495,6 +536,8 @@ locales: ${MO_FILES}
</ins><span class="cx">  
</span><span class="cx">  .po.mo:
</span><span class="cx">          ${COMPILE_STATUS}
</span><span class="lines">@@ -214,7 +254,7 @@
</span><span class="cx">          if ${MSGFMT} -c -o $@ $&lt;; then \
</span><span class="cx">                  ${COMPILE_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -503,6 +545,8 @@ locales: ${MO_FILES}
</del><ins>+@@ -503,6 +546,8 @@ locales: ${MO_FILES}
</ins><span class="cx">  
</span><span class="cx">  .py.pyc:
</span><span class="cx">          ${COMPILE_STATUS}
</span><span class="lines">@@ -223,7 +263,7 @@
</span><span class="cx">          if ${PYTHON} ${PYTHON_FLAGS} -c &quot;import py_compile; py_compile.compile('$&lt;')&quot;; then \
</span><span class="cx">                  ${COMPILE_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -511,7 +555,9 @@ locales: ${MO_FILES}
</del><ins>+@@ -511,7 +556,9 @@ locales: ${MO_FILES}
</ins><span class="cx">  
</span><span class="cx">  .rc.o .rc.lib.o .rc.plugin.o:
</span><span class="cx">          ${COMPILE_STATUS}
</span><span class="lines">@@ -234,58 +274,65 @@
</span><span class="cx">                  ${COMPILE_OK}; \
</span><span class="cx">          else \
</span><span class="cx">                  ${COMPILE_FAILED}; \
</span><del>-@@ -519,6 +565,8 @@ locales: ${MO_FILES}
</del><ins>+@@ -519,21 +566,27 @@ locales: ${MO_FILES}
</ins><span class="cx">  
</span><span class="cx">  .S.o:
</span><span class="cx">          ${COMPILE_STATUS}
</span><ins>+-        if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</del><ins>++        if ${AS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -526,6 +574,8 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_FAILED}; \
</ins><span class="cx">          fi
</span><span class="cx">  .S.lib.o:
</span><span class="cx">          ${COMPILE_LIB_STATUS}
</span><ins>+-        if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</del><ins>++        if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_LIB_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -533,6 +583,8 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_LIB_FAILED}; \
</ins><span class="cx">          fi
</span><span class="cx">  .S.plugin.o:
</span><span class="cx">          ${COMPILE_PLUGIN_STATUS}
</span><ins>+-        if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $&lt;; then \
</del><ins>++        if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_PLUGIN_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -541,6 +593,8 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_PLUGIN_FAILED}; \
+@@ -541,28 +594,34 @@ locales: ${MO_FILES}
</ins><span class="cx">  
</span><span class="cx">  .xpm.o:
</span><span class="cx">          ${COMPILE_STATUS}
</span><ins>+-        if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $&lt;; then \
</del><ins>++        if ${CC} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -548,6 +602,8 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_FAILED}; \
</ins><span class="cx">          fi
</span><span class="cx">  .xpm.lib.o:
</span><span class="cx">          ${COMPILE_LIB_STATUS}
</span><ins>+-        if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $&lt;; then \
</del><ins>++        if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_LIB_OK}; \
</span><span class="cx">          else \
</span><del>-@@ -555,14 +611,16 @@ locales: ${MO_FILES}
</del><ins>+                 ${COMPILE_LIB_FAILED}; \
</ins><span class="cx">          fi
</span><span class="cx">  .xpm.plugin.o:
</span><span class="cx">          ${COMPILE_PLUGIN_STATUS}
</span><ins>+-        if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $&lt;; then \
</ins><span class="cx"> +        in=&quot;$&lt;&quot;; \
</span><span class="cx"> +        out=&quot;$@&quot;; \
</span><del>-         if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $&lt;; then \
</del><ins>++        if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $&lt;; then \
</ins><span class="cx">                  ${COMPILE_PLUGIN_OK}; \
</span><span class="cx">          else \
</span><span class="cx">                  ${COMPILE_PLUGIN_FAILED}; \
</span><span class="lines">@@ -298,7 +345,7 @@
</span><span class="cx">                  ${DIR_ENTER}; \
</span><span class="cx">                  ${MAKE} ${MFLAGS} install || exit $$?; \
</span><span class="cx">                  ${DIR_LEAVE}; \
</span><del>-@@ -643,7 +701,7 @@ install: install-extra
</del><ins>+@@ -643,7 +702,7 @@ install: install-extra
</ins><span class="cx">  install-extra:
</span><span class="cx">  
</span><span class="cx">  uninstall: uninstall-extra
</span><span class="lines">@@ -307,7 +354,7 @@
</span><span class="cx">                  ${DIR_ENTER}; \
</span><span class="cx">                  ${MAKE} ${MFLAGS} uninstall || exit $$?; \
</span><span class="cx">                  ${DIR_LEAVE}; \
</span><del>-@@ -736,7 +794,7 @@ uninstall: uninstall-extra
</del><ins>+@@ -736,7 +795,7 @@ uninstall: uninstall-extra
</ins><span class="cx">  uninstall-extra:
</span><span class="cx">  
</span><span class="cx">  clean:
</span><span class="lines">@@ -316,7 +363,7 @@
</span><span class="cx">                  ${DIR_ENTER}; \
</span><span class="cx">                  ${MAKE} ${MFLAGS} clean || exit $$?; \
</span><span class="cx">                  ${DIR_LEAVE}; \
</span><del>-@@ -753,7 +811,7 @@ clean:
</del><ins>+@@ -753,7 +812,7 @@ clean:
</ins><span class="cx">          done
</span><span class="cx">  
</span><span class="cx">  distclean: clean
</span><span class="lines">@@ -325,7 +372,7 @@
</span><span class="cx">                  ${DIR_ENTER}; \
</span><span class="cx">                  ${MAKE} ${MFLAGS} distclean || exit $$?; \
</span><span class="cx">                  ${DIR_LEAVE}; \
</span><del>-@@ -769,27 +827,39 @@ distclean: clean
</del><ins>+@@ -769,27 +828,39 @@ distclean: clean
</ins><span class="cx">                  fi \
</span><span class="cx">          done
</span><span class="cx">  
</span><span class="lines">@@ -340,7 +387,7 @@
</span><span class="cx"> +        done
</span><span class="cx"> +
</span><span class="cx"> +print-var:
</span><del>-+        echo '${${VAR}}'
</del><ins>++        printf '%s\n' '${${VAR}}'
</ins><span class="cx"> +
</span><span class="cx"> +DIR_ENTER = printf &quot;@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n&quot; &quot;$$i&quot;; cd $$i || exit $$?
</span><span class="cx"> +DIR_LEAVE = printf &quot;@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n&quot; &quot;$$i&quot;; cd .. || exit $$?
</span><span class="lines">@@ -383,23 +430,241 @@
</span><span class="cx"> +
</span><span class="cx"> +.CURDIR ?= .
</span><span class="cx"> +include ${.CURDIR}/.deps
</span><ins>+--- configure.ac.old
++++ configure.ac
+@@ -8,6 +8,8 @@ AC_PREREQ([2.59])
+ AC_INIT([audacious-plugins], [3.7.2])
+ AC_COPYRIGHT([Copyright (C) 2001-2016 Audacious developers and others])

++BUILDSYS_INIT
++
+ AC_DEFINE_UNQUOTED([PACKAGE], &quot;$PACKAGE_NAME&quot;, [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], &quot;$PACKAGE_VERSION&quot;, [Version number of package])

</ins><span class="cx"> --- m4/buildsys.m4.orig
</span><span class="cx"> +++ m4/buildsys.m4
</span><del>-@@ -108,13 +108,13 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
</del><ins>+@@ -1,5 +1,5 @@
+ dnl
+-dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012
++dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+ dnl Jonathan Schleifer &lt;js@webkeks.org&gt;
+ dnl
+ dnl https://webkeks.org/git/?p=buildsys.git
+@@ -21,65 +21,76 @@ dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ dnl POSSIBILITY OF SUCH DAMAGE.
+ dnl

+-AC_CONFIG_COMMANDS_PRE([
+-        AC_SUBST(CC_DEPENDS, $GCC)
+-        AC_SUBST(CXX_DEPENDS, $GXX)
+-        AC_SUBST(OBJC_DEPENDS, $GOBJC)
+-        AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX)
++AC_DEFUN([BUILDSYS_INIT], [
++        AC_CONFIG_COMMANDS_PRE([
++                AC_SUBST(CC_DEPENDS, $GCC)
++                AC_SUBST(CXX_DEPENDS, $GXX)
++                AC_SUBST(OBJC_DEPENDS, $GOBJC)
++                AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX)

+-        AC_PATH_PROG(TPUT, tput)
++                AC_PATH_PROG(TPUT, tput)

+-        AS_IF([test x&quot;$TPUT&quot; != x&quot;&quot;], [
+-                if x=$($TPUT el 2&gt;/dev/null); then
+-                        AC_SUBST(TERM_EL, &quot;$x&quot;)
+-                else
+-                        AC_SUBST(TERM_EL, &quot;$($TPUT ce 2&gt;/dev/null)&quot;)
+-                fi
++                AS_IF([test x&quot;$TPUT&quot; != x&quot;&quot;], [
++                        if x=$($TPUT el 2&gt;/dev/null); then
++                                AC_SUBST(TERM_EL, &quot;$x&quot;)
++                        else
++                                AC_SUBST(TERM_EL, &quot;$($TPUT ce 2&gt;/dev/null)&quot;)
++                        fi

+-                if x=$($TPUT sgr0 2&gt;/dev/null); then
+-                        AC_SUBST(TERM_SGR0, &quot;$x&quot;)
+-                else
+-                        AC_SUBST(TERM_SGR0, &quot;$($TPUT me 2&gt;/dev/null)&quot;)
+-                fi
++                        if x=$($TPUT sgr0 2&gt;/dev/null); then
++                                AC_SUBST(TERM_SGR0, &quot;$x&quot;)
++                        else
++                                AC_SUBST(TERM_SGR0, &quot;$($TPUT me 2&gt;/dev/null)&quot;)
++                        fi

+-                if x=$($TPUT bold 2&gt;/dev/null); then
+-                        AC_SUBST(TERM_BOLD, &quot;$x&quot;)
+-                else
+-                        AC_SUBST(TERM_BOLD, &quot;$($TPUT md 2&gt;/dev/null)&quot;)
+-                fi
++                        if x=$($TPUT bold 2&gt;/dev/null); then
++                                AC_SUBST(TERM_BOLD, &quot;$x&quot;)
++                        else
++                                AC_SUBST(TERM_BOLD, &quot;$($TPUT md 2&gt;/dev/null)&quot;)
++                        fi

+-                if x=$($TPUT setaf 1 2&gt;/dev/null); then
+-                        AC_SUBST(TERM_SETAF1, &quot;$x&quot;)
+-                        AC_SUBST(TERM_SETAF2, &quot;$($TPUT setaf 2 2&gt;/dev/null)&quot;)
+-                        AC_SUBST(TERM_SETAF3, &quot;$($TPUT setaf 3 2&gt;/dev/null)&quot;)
+-                        AC_SUBST(TERM_SETAF4, &quot;$($TPUT setaf 4 2&gt;/dev/null)&quot;)
+-                        AC_SUBST(TERM_SETAF6, &quot;$($TPUT setaf 6 2&gt;/dev/null)&quot;)
+-                else
+-                        AC_SUBST(TERM_SETAF1, &quot;$($TPUT AF 1 2&gt;/dev/null)&quot;)
+-                        AC_SUBST(TERM_SETAF2, &quot;$($TPUT AF 2 2&gt;/dev/null)&quot;)
+-                        AC_SUBST(TERM_SETAF3, &quot;$($TPUT AF 3 2&gt;/dev/null)&quot;)
+-                        AC_SUBST(TERM_SETAF4, &quot;$($TPUT AF 4 2&gt;/dev/null)&quot;)
+-                        AC_SUBST(TERM_SETAF6, &quot;$($TPUT AF 6 2&gt;/dev/null)&quot;)
+-                fi
+-        ], [
+-                AC_SUBST(TERM_EL, '\033\133K')
+-                AC_SUBST(TERM_SGR0, '\033\133m')
+-                AC_SUBST(TERM_BOLD, '\033\1331m')
+-                AC_SUBST(TERM_SETAF1, '\033\13331m')
+-                AC_SUBST(TERM_SETAF2, '\033\13332m')
+-                AC_SUBST(TERM_SETAF3, '\033\13333m')
+-                AC_SUBST(TERM_SETAF4, '\033\13334m')
+-                AC_SUBST(TERM_SETAF6, '\033\13336m')
++                        if x=$($TPUT setaf 1 2&gt;/dev/null); then
++                                AC_SUBST(TERM_SETAF1, &quot;$x&quot;)
++                                AC_SUBST(TERM_SETAF2,
++                                        &quot;$($TPUT setaf 2 2&gt;/dev/null)&quot;)
++                                AC_SUBST(TERM_SETAF3,
++                                        &quot;$($TPUT setaf 3 2&gt;/dev/null)&quot;)
++                                AC_SUBST(TERM_SETAF4,
++                                        &quot;$($TPUT setaf 4 2&gt;/dev/null)&quot;)
++                                AC_SUBST(TERM_SETAF6,
++                                        &quot;$($TPUT setaf 6 2&gt;/dev/null)&quot;)
++                        else
++                                AC_SUBST(TERM_SETAF1,
++                                        &quot;$($TPUT AF 1 2&gt;/dev/null)&quot;)
++                                AC_SUBST(TERM_SETAF2,
++                                        &quot;$($TPUT AF 2 2&gt;/dev/null)&quot;)
++                                AC_SUBST(TERM_SETAF3,
++                                        &quot;$($TPUT AF 3 2&gt;/dev/null)&quot;)
++                                AC_SUBST(TERM_SETAF4,
++                                        &quot;$($TPUT AF 4 2&gt;/dev/null)&quot;)
++                                AC_SUBST(TERM_SETAF6,
++                                        &quot;$($TPUT AF 6 2&gt;/dev/null)&quot;)
++                        fi
++                ], [
++                        AC_SUBST(TERM_EL, '\033\133K')
++                        AC_SUBST(TERM_SGR0, '\033\133m')
++                        AC_SUBST(TERM_BOLD, '\033\1331m')
++                        AC_SUBST(TERM_SETAF1, '\033\13331m')
++                        AC_SUBST(TERM_SETAF2, '\033\13332m')
++                        AC_SUBST(TERM_SETAF3, '\033\13333m')
++                        AC_SUBST(TERM_SETAF4, '\033\13334m')
++                        AC_SUBST(TERM_SETAF6, '\033\13336m')
++                ])
+         ])
+-])

+-AC_CONFIG_COMMANDS_POST([
+-        ${as_echo:=&quot;echo&quot;} ${as_me:=&quot;configure&quot;}&quot;: touching .deps files&quot;
+-        for i in $(find . -name Makefile); do
+-                DEPSFILE=&quot;$(dirname $i)/.deps&quot;
+-                test -f &quot;$DEPSFILE&quot; &amp;&amp; rm &quot;$DEPSFILE&quot;
+-                touch -t 0001010000 &quot;$DEPSFILE&quot;
+-        done
++        AC_CONFIG_COMMANDS_POST([
++                ${as_echo:=&quot;echo&quot;} ${as_me:=&quot;configure&quot;}&quot;: touching .deps files&quot;
++                for i in $(find . -name Makefile); do
++                        DEPSFILE=&quot;$(dirname $i)/.deps&quot;
++                        test -f &quot;$DEPSFILE&quot; &amp;&amp; rm &quot;$DEPSFILE&quot;
++                        touch -t 0001010000 &quot;$DEPSFILE&quot;
++                done
++        ])
+ ])

+ AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
+@@ -108,31 +119,32 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
</ins><span class="cx">          case &quot;$host_os&quot; in
</span><span class="cx">                  darwin*)
</span><span class="cx">                          AC_MSG_RESULT(Darwin)
</span><span class="cx"> -                        LIB_CFLAGS='-fPIC -DPIC -mmacosx-version-min=10.7'
</span><span class="cx"> -                        LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -mmacosx-version-min=10.7 -install_name &quot;${libdir}/$$(i=${SHARED_LIB}; echo $${i%${LIB_SUFFIX}}).${LIB_MAJOR}${LIB_SUFFIX}&quot;'
</span><span class="cx"> +                        LIB_CFLAGS='-fPIC -DPIC'
</span><del>-+                        LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
</del><ins>++                        LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
</ins><span class="cx">                          LIB_PREFIX='lib'
</span><span class="cx">                          LIB_SUFFIX='.dylib'
</span><span class="cx">                          LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
</span><span class="cx"> -                        PLUGIN_CFLAGS='-fPIC -DPIC -mmacosx-version-min=10.7'
</span><span class="cx"> -                        PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup -mmacosx-version-min=10.7'
</span><ins>++                        LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
</ins><span class="cx"> +                        PLUGIN_CFLAGS='-fPIC -DPIC'
</span><span class="cx"> +                        PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup'
</span><span class="cx">                          PLUGIN_SUFFIX='.bundle'
</span><span class="cx">                          INSTALL_LIB='&amp;&amp; ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib &amp;&amp; ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib &amp;&amp; ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
</span><span class="cx">                          UNINSTALL_LIB='&amp;&amp; rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
</span><ins>+                         CLEAN_LIB=''
+                         ;
+-                solaris*)
+-                        AC_MSG_RESULT(Solaris)
+-                        LIB_CFLAGS='-fPIC -DPIC'
+-                        LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}.${LIB_MINOR}'
++                mingw* | cygwin*)
++                        AC_MSG_RESULT(MinGW / Cygwin)
++                        LIB_CFLAGS=''
++                        LIB_LDFLAGS='-shared -Wl,--out-implib,${SHARED_LIB}.a'
+                         LIB_PREFIX='lib'
+-                        LIB_SUFFIX='.so'
++                        LIB_SUFFIX='.dll'
+                         LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
+-                        PLUGIN_CFLAGS='-fPIC -DPIC'
++                        PLUGIN_CFLAGS=''
+                         PLUGIN_LDFLAGS='-shared'
+-                        PLUGIN_SUFFIX='.so'
+-                        INSTALL_LIB='&amp;&amp; ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} &amp;&amp; rm -f ${DESTDIR}${libdir}/$$i &amp;&amp; ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
+-                        UNINSTALL_LIB='&amp;&amp; rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
+-                        CLEAN_LIB=''
++                        PLUGIN_SUFFIX='.dll'
++                        INSTALL_LIB='&amp;&amp; ${MKDIR_P} ${DESTDIR}${bindir} &amp;&amp; ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i &amp;&amp; ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a'
++                        UNINSTALL_LIB='&amp;&amp; rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a'
++                        CLEAN_LIB='${SHARED_LIB}.a'
+                         ;
+                 openbsd* | mirbsd*)
+                         AC_MSG_RESULT(OpenBSD)
+@@ -148,22 +160,22 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
+                         UNINSTALL_LIB='&amp;&amp; rm -f ${DESTDIR}${libdir}/$$i'
+                         CLEAN_LIB=''
+                         ;
+-                cygwin* | mingw*)
+-                        AC_MSG_RESULT(Win32)
+-                        LIB_CFLAGS=''
+-                        LIB_LDFLAGS='-shared -Wl,--out-implib,${SHARED_LIB}.a'
++                solaris*)
++                        AC_MSG_RESULT(Solaris)
++                        LIB_CFLAGS='-fPIC -DPIC'
++                        LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}.${LIB_MINOR}'
+                         LIB_PREFIX='lib'
+-                        LIB_SUFFIX='.dll'
++                        LIB_SUFFIX='.so'
+                         LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
+-                        PLUGIN_CFLAGS=''
++                        PLUGIN_CFLAGS='-fPIC -DPIC'
+                         PLUGIN_LDFLAGS='-shared'
+-                        PLUGIN_SUFFIX='.dll'
+-                        INSTALL_LIB='&amp;&amp; ${MKDIR_P} ${DESTDIR}${bindir} &amp;&amp; ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i &amp;&amp; ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a'
+-                        UNINSTALL_LIB='&amp;&amp; rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a'
+-                        CLEAN_LIB='${SHARED_LIB}.a'
++                        PLUGIN_SUFFIX='.so'
++                        INSTALL_LIB='&amp;&amp; ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} &amp;&amp; rm -f ${DESTDIR}${libdir}/$$i &amp;&amp; ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
++                        UNINSTALL_LIB='&amp;&amp; rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
++                        CLEAN_LIB=''
+                         ;
+                 *)
+-                        AC_MSG_RESULT(GNU)
++                        AC_MSG_RESULT(ELF)
+                         LIB_CFLAGS='-fPIC -DPIC'
+                         LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}'
+                         LIB_PREFIX='lib'
+@@ -183,6 +195,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
+         AC_SUBST(LIB_PREFIX)
+         AC_SUBST(LIB_SUFFIX)
+         AC_SUBST(LDFLAGS_RPATH)
++        AC_SUBST(LDFLAGS_INSTALL_NAME)
+         AC_SUBST(PLUGIN_CFLAGS)
+         AC_SUBST(PLUGIN_LDFLAGS)
+         AC_SUBST(PLUGIN_SUFFIX)
</ins></span></pre></div>
<a id="trunkdportsmultimediaaudaciouspluginsfilespatchgtk3diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/audacious-plugins/files/patch-gtk3.diff (149186 => 149187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-plugins/files/patch-gtk3.diff        2016-06-04 21:57:47 UTC (rev 149186)
+++ trunk/dports/multimedia/audacious-plugins/files/patch-gtk3.diff        2016-06-04 21:57:58 UTC (rev 149187)
</span><span class="lines">@@ -11,19 +11,19 @@
</span><span class="cx">  
</span><span class="cx"> --- configure.ac.old
</span><span class="cx"> +++ configure.ac
</span><del>-@@ -72,7 +72,7 @@ CONTAINER_PLUGINS=&quot;asx asx3 audpl m3u pls xspf&quot;
- TRANSPORT_PLUGINS=&quot;gio&quot;
</del><ins>+@@ -75,7 +75,7 @@ TRANSPORT_PLUGINS=&quot;gio&quot;
</ins><span class="cx">  
</span><span class="cx">  if test &quot;x$USE_GTK&quot; = &quot;xyes&quot; ; then
</span><del>--    GENERAL_PLUGINS=&quot;$GENERAL_PLUGINS alarm albumart delete-files playlist-manager search-tool statusicon&quot;
-+    GENERAL_PLUGINS=&quot;$GENERAL_PLUGINS alarm albumart delete-files playlist-manager search-tool&quot;
</del><ins>+     EFFECT_PLUGINS=&quot;$EFFECT_PLUGINS ladspa&quot;
+-    GENERAL_PLUGINS=&quot;$GENERAL_PLUGINS alarm albumart delete-files lyricwiki playlist-manager search-tool statusicon&quot;
++    GENERAL_PLUGINS=&quot;$GENERAL_PLUGINS alarm albumart delete-files lyricwiki playlist-manager search-tool&quot;
</ins><span class="cx">      GENERAL_PLUGINS=&quot;$GENERAL_PLUGINS gtkui skins&quot;
</span><ins>+     VISUALIZATION_PLUGINS=&quot;$VISUALIZATION_PLUGINS blur_scope cairo-spectrum&quot;
</ins><span class="cx">  fi
</span><ins>+@@ -194,11 +194,11 @@ if test $enable_hotkey = yes -a $USE_GTK != yes ; then
+ fi
</ins><span class="cx">  
</span><del>-@@ -204,11 +204,11 @@ AC_ARG_ENABLE(hotkey,

- have_hotkey=no
- if test &quot;x$enable_hotkey&quot; != &quot;xno&quot;; then
</del><ins>+ if test $enable_hotkey != no -a $USE_GTK = yes ; then
</ins><span class="cx"> -    PKG_CHECK_MODULES(GDKX11, [gdk-x11-2.0],
</span><span class="cx"> +    PKG_CHECK_MODULES(GDKX11, [gdk-x11-3.0],
</span><span class="cx">          [have_hotkey=&quot;yes&quot;
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> +            AC_MSG_ERROR([Cannot find gdk-x11-3.0 development files, but compilation of X11 Global Hotkey plugin has been explicitly requested; please install gdk-x11-3.0 dev files and run configure again])
</span><span class="cx">           fi]
</span><span class="cx">      )
</span><del>- else
-@@ -271,6 +271,17 @@ if test &quot;x$enable_songchange&quot; != &quot;xno&quot;; then
</del><ins>+ fi
+@@ -260,6 +260,21 @@ if test $enable_songchange != no ; then
</ins><span class="cx">      )
</span><span class="cx">  fi
</span><span class="cx">  
</span><span class="lines">@@ -45,22 +45,26 @@
</span><span class="cx"> + [AS_HELP_STRING([--enable-statusicon], [enable X11 Status Icon plugin (default=disabled)])],
</span><span class="cx"> + [have_statusicon=$enableval], [have_statusicon=&quot;no&quot;])
</span><span class="cx"> +
</span><del>-+if test &quot;x$have_statusicon&quot; != &quot;xno&quot;; then
</del><ins>++if test $have_statusicon = yes -a $USE_GTK != yes ; then
++    AC_MSG_ERROR([--enable-statusicon cannot be used without --enable-gtk])
++fi
++
++if test $have_statusicon != no ; then
</ins><span class="cx"> +    GENERAL_PLUGINS=&quot;$GENERAL_PLUGINS statusicon&quot;
</span><span class="cx"> +fi
</span><span class="cx"> +
</span><span class="cx">  dnl *** Audacious OSD plugin (pangocairo-based)
</span><span class="cx">  
</span><span class="cx">  AC_ARG_ENABLE(aosd,
</span><del>-@@ -1170,7 +1181,7 @@ echo &quot;  MPRIS 2 Server:                         $have_mpris2&quot;
- echo &quot;  Playlist Manager:                       $USE_GTK&quot;
- echo &quot;  Search Tool:                            $USE_GTK&quot;
</del><ins>+@@ -1112,7 +1127,7 @@ echo &quot;  Search Tool:                            $USE_GTK&quot;
+ echo &quot;  Search Tool (Qt):                       $USE_QT&quot;
</ins><span class="cx">  echo &quot;  Song Change:                            $have_songchange&quot;
</span><ins>+ echo &quot;  Song Info (Qt):                         $USE_QT&quot;
</ins><span class="cx"> -echo &quot;  Status Icon:                            $USE_GTK&quot;
</span><span class="cx"> +echo &quot;  Status Icon:                            $have_statusicon&quot;
</span><ins>+ echo &quot;  Status Icon (Qt):                       $USE_QT&quot;
</ins><span class="cx">  echo &quot;  Audacious OSD:                          $have_aosd&quot;
</span><span class="cx">  echo &quot;    -&gt; X Composite support:               $have_aosd_xcomp&quot;
</span><del>- echo &quot;  libnotify OSD:                          $have_notify&quot;
</del><span class="cx"> --- src/alarm/interface.cc.old
</span><span class="cx"> +++ src/alarm/interface.cc
</span><span class="cx"> @@ -23,6 +23,10 @@
</span><span class="lines">@@ -68,25 +72,25 @@
</span><span class="cx">  #include &quot;callbacks.h&quot;
</span><span class="cx">  
</span><span class="cx"> +#if GTK_CHECK_VERSION (3, 12, 0)
</span><del>-+    #define gtk_widget_set_margin_right(w, m) gtk_widget_set_margin_end(w, m)
</del><ins>++#define gtk_widget_set_margin_right gtk_widget_set_margin_end
</ins><span class="cx"> +#endif
</span><span class="cx"> +
</span><del>- const char *help[] =
- {
-    N_(&quot;Time\n&quot;
-@@ -169,62 +173,67 @@ GtkWidget *create_config_notebook (void)
</del><ins>+ static const char help_text[] =
+  N_(&quot;Time\n&quot;
+     &quot;  Alarm at:\n&quot;
+@@ -164,62 +168,67 @@ GtkWidget *create_config_notebook ()
</ins><span class="cx">  
</span><span class="cx">      /* Page 1 */
</span><span class="cx">      frame = gtk_frame_new (_(&quot;Time&quot;));
</span><span class="cx"> -    gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
</span><del>--    grid = gtk_table_new (0, 0, FALSE);
</del><ins>+-    grid = gtk_table_new (0, 0, false);
</ins><span class="cx"> -    gtk_table_set_col_spacings (GTK_TABLE (grid), 6);
</span><span class="cx"> -    gtk_table_set_row_spacings (GTK_TABLE (grid), 6);
</span><span class="cx"> -    gtk_container_set_border_width (GTK_CONTAINER (grid), 6);
</span><span class="cx"> +    gtk_container_set_border_width (GTK_CONTAINER (frame), 10);
</span><span class="cx"> +    grid = gtk_grid_new ();
</span><span class="cx"> +    gtk_grid_set_column_spacing (GTK_GRID (grid), 3);
</span><del>-+    gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE);
</del><ins>++    gtk_grid_set_row_homogeneous (GTK_GRID (grid), true);
</ins><span class="cx"> +    gtk_container_set_border_width (GTK_CONTAINER (grid), 5);
</span><span class="cx">  
</span><span class="cx">      label = gtk_label_new (_(&quot;Alarm at (default):&quot;));
</span><span class="lines">@@ -99,8 +103,8 @@
</span><span class="cx">      alarm_h_spin = gtk_spin_button_new (adjustment, 1, 0);
</span><span class="cx">      g_object_set_data (G_OBJECT (notebook), &quot;alarm_h_spin&quot;, alarm_h_spin);
</span><span class="cx">      gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (alarm_h_spin), GTK_UPDATE_IF_VALID);
</span><del>-     gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (alarm_h_spin), TRUE);
-     gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (alarm_h_spin), TRUE);
</del><ins>+     gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (alarm_h_spin), true);
+     gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (alarm_h_spin), true);
</ins><span class="cx"> -    gtk_table_attach (GTK_TABLE (grid), alarm_h_spin, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
</span><span class="cx"> +    gtk_grid_attach (GTK_GRID (grid), alarm_h_spin, 1, 0, 1, 1);
</span><span class="cx">  
</span><span class="lines">@@ -113,8 +117,8 @@
</span><span class="cx">      alarm_m_spin = gtk_spin_button_new (adjustment, 1, 0);
</span><span class="cx">      g_object_set_data (G_OBJECT (notebook), &quot;alarm_m_spin&quot;, alarm_m_spin);
</span><span class="cx">      gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (alarm_m_spin), GTK_UPDATE_IF_VALID);
</span><del>-     gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (alarm_m_spin), TRUE);
-     gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (alarm_m_spin), TRUE);
</del><ins>+     gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (alarm_m_spin), true);
+     gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (alarm_m_spin), true);
</ins><span class="cx"> -    gtk_table_attach (GTK_TABLE (grid), alarm_m_spin, 3, 4, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
</span><span class="cx"> +    gtk_grid_attach (GTK_GRID (grid), alarm_m_spin, 3, 0, 1, 1);
</span><span class="cx">  
</span><span class="lines">@@ -135,8 +139,8 @@
</span><span class="cx">      stop_h_spin = gtk_spin_button_new (adjustment, 1, 0);
</span><span class="cx">      g_object_set_data (G_OBJECT (notebook), &quot;stop_h_spin&quot;, stop_h_spin);
</span><span class="cx">      gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (stop_h_spin), GTK_UPDATE_IF_VALID);
</span><del>-     gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (stop_h_spin), TRUE);
-     gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_h_spin), TRUE);
</del><ins>+     gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (stop_h_spin), true);
+     gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_h_spin), true);
</ins><span class="cx"> -    gtk_table_attach (GTK_TABLE (grid), stop_h_spin, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
</span><span class="cx"> +    gtk_grid_attach (GTK_GRID (grid), stop_h_spin, 1, 1, 1, 1);
</span><span class="cx">  
</span><span class="lines">@@ -150,8 +154,8 @@
</span><span class="cx">      stop_m_spin = gtk_spin_button_new (adjustment, 1, 0);
</span><span class="cx">      g_object_set_data (G_OBJECT (notebook), &quot;stop_m_spin&quot;, stop_m_spin);
</span><span class="cx">      gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (stop_m_spin), GTK_UPDATE_IF_VALID);
</span><del>-     gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (stop_m_spin), TRUE);
-     gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_m_spin), TRUE);
</del><ins>+     gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (stop_m_spin), true);
+     gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_m_spin), true);
</ins><span class="cx"> -    gtk_table_attach (GTK_TABLE (grid), stop_m_spin, 3, 4, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
</span><span class="cx"> +    gtk_grid_attach (GTK_GRID (grid), stop_m_spin, 3, 1, 1, 1);
</span><span class="cx">  
</span><span class="lines">@@ -161,19 +165,19 @@
</span><span class="cx">      gtk_container_add (GTK_CONTAINER (frame), grid);
</span><span class="cx">  
</span><span class="cx">      label = gtk_label_new (_(&quot;Time&quot;));
</span><del>-@@ -233,24 +242,25 @@ GtkWidget *create_config_notebook (void)
</del><ins>+@@ -228,24 +237,25 @@ GtkWidget *create_config_notebook ()
</ins><span class="cx">  
</span><span class="cx">      /* Page 2 */
</span><span class="cx">      frame = gtk_frame_new (_(&quot;Choose the days for the alarm to come on&quot;));
</span><span class="cx"> -    gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
</span><del>--    grid = gtk_table_new (0, 0, FALSE);
</del><ins>+-    grid = gtk_table_new (0, 0, false);
</ins><span class="cx"> -    gtk_table_set_col_spacings (GTK_TABLE (grid), 6);
</span><span class="cx"> -    gtk_table_set_row_spacings (GTK_TABLE (grid), 6);
</span><span class="cx"> -    gtk_container_set_border_width (GTK_CONTAINER (grid), 6);
</span><span class="cx"> +    gtk_container_set_border_width (GTK_CONTAINER (frame), 10);
</span><span class="cx"> +    grid = gtk_grid_new ();
</span><span class="cx"> +    gtk_grid_set_column_spacing (GTK_GRID (grid), 15);
</span><del>-+    gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE);
</del><ins>++    gtk_grid_set_row_homogeneous (GTK_GRID (grid), true);
</ins><span class="cx"> +    gtk_container_set_border_width (GTK_CONTAINER (grid), 5);
</span><span class="cx">  
</span><span class="cx">      label = gtk_label_new (_(&quot;Day&quot;));
</span><span class="lines">@@ -186,19 +190,19 @@
</span><span class="cx">  
</span><span class="cx">      for (i = 0; i &lt; 7; i ++)
</span><span class="cx">      {
</span><del>-         widget[i] = gtk_check_button_new_with_label (weekdays[i]);
</del><ins>+         widget[i] = gtk_check_button_new_with_label (_(weekdays[i]));
</ins><span class="cx">          g_object_set_data (G_OBJECT (notebook), day_cb[i], widget[i]);
</span><del>-         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget[i]), TRUE);
</del><ins>+         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget[i]), true);
</ins><span class="cx"> -        gtk_table_attach (GTK_TABLE (grid), widget[i], 0, 1, i + 1, i + 2, GTK_FILL, GTK_FILL, 0, 0);
</span><span class="cx"> +        gtk_widget_set_valign (widget[i], GTK_ALIGN_CENTER);
</span><span class="cx"> +        gtk_grid_attach (GTK_GRID (grid), widget[i], 0, i + 1, 1, 1);
</span><span class="cx">      }
</span><del>-     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget[6]), FALSE);
</del><ins>+     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget[6]), false);
</ins><span class="cx">  
</span><del>-@@ -259,30 +269,31 @@ GtkWidget *create_config_notebook (void)
</del><ins>+@@ -254,30 +264,31 @@ GtkWidget *create_config_notebook ()
</ins><span class="cx">          checkbutton = gtk_check_button_new_with_label (_(&quot;Default&quot;));
</span><span class="cx">          g_object_set_data (G_OBJECT (notebook), day_def[i], checkbutton);
</span><del>-         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), TRUE);
</del><ins>+         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), true);
</ins><span class="cx"> +        gtk_widget_set_valign (checkbutton, GTK_ALIGN_CENTER);
</span><span class="cx">          g_signal_connect (checkbutton, &quot;toggled&quot;, G_CALLBACK (cb_def[i]), nullptr);
</span><span class="cx"> -        gtk_table_attach (GTK_TABLE (grid), checkbutton, 1, 2, i + 1, i + 2, GTK_FILL, GTK_FILL, 0, 0);
</span><span class="lines">@@ -233,12 +237,12 @@
</span><span class="cx">      }
</span><span class="cx">  
</span><span class="cx">      label = gtk_label_new (_(&quot;Days&quot;));
</span><del>-@@ -291,110 +302,117 @@ GtkWidget *create_config_notebook (void)
</del><ins>+@@ -286,110 +297,117 @@ GtkWidget *create_config_notebook ()
</ins><span class="cx">  
</span><span class="cx">  
</span><span class="cx">      /* Page 3 */
</span><del>--    vbox = gtk_vbox_new (FALSE, 6);
--    hbox = gtk_hbox_new (FALSE, 6);
</del><ins>+-    vbox = gtk_vbox_new (false, 6);
+-    hbox = gtk_hbox_new (false, 6);
</ins><span class="cx"> +    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
</span><span class="cx"> +    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
</span><span class="cx">  
</span><span class="lines">@@ -251,20 +255,20 @@
</span><span class="cx"> +    adjustment = gtk_adjustment_new (120, 0, 3600, 1, 10, 0);
</span><span class="cx">      fading_spin = gtk_spin_button_new (adjustment, 1, 0);
</span><span class="cx">      g_object_set_data (G_OBJECT (notebook), &quot;fading_spin&quot;, fading_spin);
</span><del>-     gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (fading_spin), TRUE);
</del><ins>+     gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (fading_spin), true);
</ins><span class="cx">      gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (fading_spin), GTK_UPDATE_IF_VALID);
</span><span class="cx">      label = gtk_label_new (_(&quot;seconds&quot;));
</span><span class="cx">  
</span><del>--    gtk_box_pack_start (GTK_BOX (hbox), fading_spin, TRUE, TRUE, 0);
--    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
</del><ins>+-    gtk_box_pack_start (GTK_BOX (hbox), fading_spin, true, true, 0);
+-    gtk_box_pack_start (GTK_BOX (hbox), label, false, false, 0);
</ins><span class="cx"> +    gtk_container_add (GTK_CONTAINER (hbox), fading_spin);
</span><del>-+    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 3);
</del><ins>++    gtk_box_pack_start (GTK_BOX (hbox), label, false, false, 3);
</ins><span class="cx">      gtk_container_add (GTK_CONTAINER (frame), hbox);
</span><del>--    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
</del><ins>+-    gtk_box_pack_start (GTK_BOX (vbox), frame, false, false, 0);
</ins><span class="cx"> +    gtk_container_add (GTK_CONTAINER (vbox), frame);
</span><span class="cx">  
</span><span class="cx">      frame = gtk_frame_new (_(&quot;Volume&quot;));
</span><del>--    vbox2 = gtk_vbox_new (FALSE, 6);
</del><ins>+-    vbox2 = gtk_vbox_new (false, 6);
</ins><span class="cx"> -    gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
</span><span class="cx"> -    gtk_container_set_border_width (GTK_CONTAINER (vbox2), 6);
</span><span class="cx"> +    vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
</span><span class="lines">@@ -272,7 +276,7 @@
</span><span class="cx"> +    gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
</span><span class="cx">  
</span><span class="cx">      label = gtk_label_new (_(&quot;Start at&quot;));
</span><del>--    gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0);
</del><ins>+-    gtk_box_pack_start (GTK_BOX (vbox2), label, false, false, 0);
</ins><span class="cx"> +    gtk_widget_set_margin_bottom (label, 2);
</span><span class="cx"> +    gtk_widget_set_halign (label, GTK_ALIGN_START);
</span><span class="cx"> +    gtk_container_add (GTK_CONTAINER (vbox2), label);
</span><span class="lines">@@ -283,21 +287,21 @@
</span><span class="cx">      gtk_scale_set_value_pos (GTK_SCALE (quiet_vol_scale), GTK_POS_RIGHT);
</span><span class="cx">      gtk_scale_set_digits (GTK_SCALE (quiet_vol_scale), 0);
</span><span class="cx">      label = gtk_label_new (&quot;%&quot;);
</span><del>--    hbox2 = gtk_hbox_new (FALSE, 6);
</del><ins>+-    hbox2 = gtk_hbox_new (false, 6);
</ins><span class="cx"> +    hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
</span><del>-     gtk_box_pack_start (GTK_BOX (hbox2), quiet_vol_scale, TRUE, TRUE, 0);
--    gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
--    gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, FALSE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (hbox2), quiet_vol_scale, true, true, 0);
+-    gtk_box_pack_start (GTK_BOX (hbox2), label, false, false, 0);
+-    gtk_box_pack_start (GTK_BOX (vbox2), hbox2, false, false, 0);
</ins><span class="cx"> +    gtk_container_add (GTK_CONTAINER (hbox2), label);
</span><span class="cx"> +    gtk_container_add (GTK_CONTAINER (vbox2), hbox2);
</span><span class="cx">  
</span><span class="cx"> -    separator = gtk_hseparator_new ();
</span><del>--    gtk_box_pack_start (GTK_BOX (vbox2), separator, FALSE, FALSE, 0);
</del><ins>+-    gtk_box_pack_start (GTK_BOX (vbox2), separator, false, false, 0);
</ins><span class="cx"> +    separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
</span><del>-+    gtk_box_pack_start (GTK_BOX (vbox2), separator, FALSE, FALSE, 10);
</del><ins>++    gtk_box_pack_start (GTK_BOX (vbox2), separator, false, false, 10);
</ins><span class="cx">  
</span><span class="cx">      label = gtk_label_new (_(&quot;Final&quot;));
</span><del>--    gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0);
</del><ins>+-    gtk_box_pack_start (GTK_BOX (vbox2), label, false, false, 0);
</ins><span class="cx"> +    gtk_widget_set_margin_bottom (label, 2);
</span><span class="cx"> +    gtk_widget_set_halign (label, GTK_ALIGN_START);
</span><span class="cx"> +    gtk_container_add (GTK_CONTAINER (vbox2), label);
</span><span class="lines">@@ -308,11 +312,11 @@
</span><span class="cx">      gtk_scale_set_value_pos (GTK_SCALE (vol_scale), GTK_POS_RIGHT);
</span><span class="cx">      gtk_scale_set_digits (GTK_SCALE (vol_scale), 0);
</span><span class="cx">      label = gtk_label_new (&quot;%&quot;);
</span><del>--    hbox2 = gtk_hbox_new (FALSE, 6);
</del><ins>+-    hbox2 = gtk_hbox_new (false, 6);
</ins><span class="cx"> +    hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
</span><del>-     gtk_box_pack_start (GTK_BOX (hbox2), vol_scale, TRUE, TRUE, 0);
--    gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
--    gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, FALSE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (hbox2), vol_scale, true, true, 0);
+-    gtk_box_pack_start (GTK_BOX (hbox2), label, false, false, 0);
+-    gtk_box_pack_start (GTK_BOX (vbox2), hbox2, false, false, 0);
</ins><span class="cx"> +    gtk_container_add (GTK_CONTAINER (hbox2), label);
</span><span class="cx"> +    gtk_container_add (GTK_CONTAINER (vbox2), hbox2);
</span><span class="cx">  
</span><span class="lines">@@ -320,11 +324,11 @@
</span><span class="cx"> +    gtk_widget_set_margin_top (current_button, 10);
</span><span class="cx"> +    gtk_widget_set_halign (current_button, GTK_ALIGN_END);
</span><span class="cx">      g_signal_connect (current_button, &quot;clicked&quot;, G_CALLBACK (alarm_current_volume), nullptr);
</span><del>--    gtk_box_pack_start (GTK_BOX (vbox2), current_button, FALSE, FALSE, 0);
</del><ins>+-    gtk_box_pack_start (GTK_BOX (vbox2), current_button, false, false, 0);
</ins><span class="cx"> +    gtk_container_add (GTK_CONTAINER (vbox2), current_button);
</span><span class="cx">  
</span><span class="cx">      gtk_container_add (GTK_CONTAINER (frame), vbox2);
</span><del>--    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
</del><ins>+-    gtk_box_pack_start (GTK_BOX (vbox), frame, false, false, 0);
</ins><span class="cx"> +    gtk_container_add (GTK_CONTAINER (vbox), frame);
</span><span class="cx">  
</span><span class="cx">      label = gtk_label_new (_(&quot;Volume&quot;));
</span><span class="lines">@@ -332,10 +336,10 @@
</span><span class="cx">  
</span><span class="cx">  
</span><span class="cx">      /* Page 4 */
</span><del>--    vbox = gtk_vbox_new (FALSE, 6);
</del><ins>+-    vbox = gtk_vbox_new (false, 6);
</ins><span class="cx"> +    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
</span><span class="cx">      frame = gtk_frame_new (_(&quot;Additional Command&quot;));
</span><del>--    hbox = gtk_hbox_new (FALSE, 6);
</del><ins>+-    hbox = gtk_hbox_new (false, 6);
</ins><span class="cx"> -    gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
</span><span class="cx"> -    gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
</span><span class="cx"> +    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
</span><span class="lines">@@ -345,15 +349,15 @@
</span><span class="cx">      g_object_set_data (G_OBJECT (notebook), &quot;cmd_entry&quot;, cmd_entry);
</span><span class="cx">      cmd_checkb = gtk_check_button_new_with_label (_(&quot;enable&quot;));
</span><span class="cx">      g_object_set_data (G_OBJECT (notebook), &quot;cmd_checkb&quot;, cmd_checkb);
</span><del>-     gtk_box_pack_start (GTK_BOX (hbox), cmd_entry, TRUE, TRUE, 0);
--    gtk_box_pack_start (GTK_BOX (hbox), cmd_checkb, FALSE, FALSE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (hbox), cmd_entry, true, true, 0);
+-    gtk_box_pack_start (GTK_BOX (hbox), cmd_checkb, false, false, 0);
</ins><span class="cx"> +    gtk_container_add (GTK_CONTAINER (hbox), cmd_checkb);
</span><span class="cx">      gtk_container_add (GTK_CONTAINER (frame), hbox);
</span><del>--    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
</del><ins>+-    gtk_box_pack_start (GTK_BOX (vbox), frame, false, false, 0);
</ins><span class="cx"> +    gtk_container_add (GTK_CONTAINER (vbox), frame);
</span><span class="cx">  
</span><span class="cx">      frame = gtk_frame_new (_(&quot;Playlist (optional)&quot;));
</span><del>--    hbox = gtk_hbox_new (FALSE, 6);
</del><ins>+-    hbox = gtk_hbox_new (false, 6);
</ins><span class="cx"> -    gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
</span><span class="cx"> -    gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
</span><span class="cx"> +    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
</span><span class="lines">@@ -365,15 +369,15 @@
</span><span class="cx">      file_chooser_button = gtk_file_chooser_button_new (_(&quot;Select a playlist&quot;), GTK_FILE_CHOOSER_ACTION_OPEN);
</span><span class="cx"> +    gtk_widget_set_valign (file_chooser_button, GTK_ALIGN_CENTER);
</span><span class="cx">      g_signal_connect (file_chooser_button, &quot;file-set&quot;, G_CALLBACK (file_set_cb), playlist_entry);
</span><del>-     gtk_box_pack_start (GTK_BOX (hbox), playlist_entry, TRUE, TRUE, 0);
--    gtk_box_pack_start (GTK_BOX (hbox), file_chooser_button, TRUE, TRUE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (hbox), playlist_entry, true, true, 0);
+-    gtk_box_pack_start (GTK_BOX (hbox), file_chooser_button, true, true, 0);
</ins><span class="cx"> +    gtk_container_add (GTK_CONTAINER (hbox), file_chooser_button);
</span><span class="cx">      gtk_container_add (GTK_CONTAINER (frame), hbox);
</span><del>--    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
</del><ins>+-    gtk_box_pack_start (GTK_BOX (vbox), frame, false, false, 0);
</ins><span class="cx"> +    gtk_container_add (GTK_CONTAINER (vbox), frame);
</span><span class="cx">  
</span><span class="cx">      frame = gtk_frame_new (_(&quot;Reminder&quot;));
</span><del>--    hbox = gtk_hbox_new (FALSE, 6);
</del><ins>+-    hbox = gtk_hbox_new (false, 6);
</ins><span class="cx"> -    gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
</span><span class="cx"> -    gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
</span><span class="cx"> +    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
</span><span class="lines">@@ -383,49 +387,49 @@
</span><span class="cx">      reminder_checkb = gtk_check_button_new_with_label (_(&quot;enable&quot;));
</span><span class="cx">      g_object_set_data (G_OBJECT (notebook), &quot;reminder_text&quot;, reminder_text);
</span><span class="cx">      g_object_set_data (G_OBJECT (notebook), &quot;reminder_cb&quot;, reminder_checkb);
</span><del>-     gtk_box_pack_start (GTK_BOX (hbox), reminder_text, TRUE, TRUE, 0);
--    gtk_box_pack_start (GTK_BOX (hbox), reminder_checkb, FALSE, FALSE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (hbox), reminder_text, true, true, 0);
+-    gtk_box_pack_start (GTK_BOX (hbox), reminder_checkb, false, false, 0);
</ins><span class="cx"> +    gtk_container_add (GTK_CONTAINER (hbox), reminder_checkb);
</span><span class="cx">      gtk_container_add (GTK_CONTAINER (frame), hbox);
</span><del>--    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
</del><ins>+-    gtk_box_pack_start (GTK_BOX (vbox), frame, false, false, 0);
</ins><span class="cx"> +    gtk_container_add (GTK_CONTAINER (vbox), frame);
</span><span class="cx">  
</span><span class="cx">      label = gtk_label_new (_(&quot;Options&quot;));
</span><span class="cx">      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
</span><del>-@@ -402,7 +420,7 @@ GtkWidget *create_config_notebook (void)
</del><ins>+@@ -397,7 +415,7 @@ GtkWidget *create_config_notebook ()
</ins><span class="cx">  
</span><span class="cx">      /* Page 5 */
</span><span class="cx">      frame = gtk_frame_new (_(&quot;What do these options mean?&quot;));
</span><span class="cx"> -    gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
</span><span class="cx"> +    gtk_container_set_border_width (GTK_CONTAINER (frame), 10);
</span><span class="cx">      view = gtk_text_view_new ();
</span><del>-     gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
-     gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
</del><ins>+     gtk_text_view_set_editable (GTK_TEXT_VIEW (view), false);
+     gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), false);
</ins><span class="cx"> --- src/amidi-plug/i_configure-fluidsynth.cc.old
</span><span class="cx"> +++ src/amidi-plug/i_configure-fluidsynth.cc
</span><del>-@@ -216,9 +216,8 @@ void * create_soundfont_list (void)
</del><ins>+@@ -218,9 +218,8 @@ void * create_soundfont_list ()
</ins><span class="cx">              g_strfreev (sffiles);
</span><span class="cx">          }
</span><span class="cx">  
</span><del>--        soundfont_file_hbox = gtk_hbox_new (FALSE, 2);
</del><ins>+-        soundfont_file_hbox = gtk_hbox_new (false, 2);
</ins><span class="cx"> +        soundfont_file_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
</span><span class="cx">          soundfont_file_lv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (soundfont_file_store));
</span><del>--        gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (soundfont_file_lv), TRUE);
</del><ins>+-        gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (soundfont_file_lv), true);
</ins><span class="cx">          g_object_unref (soundfont_file_store);
</span><span class="cx">          soundfont_file_lv_text_rndr = gtk_cell_renderer_text_new();
</span><span class="cx">          soundfont_file_lv_fname_col = gtk_tree_view_column_new_with_attributes (
</span><del>-@@ -241,7 +240,7 @@ void * create_soundfont_list (void)
</del><ins>+@@ -243,7 +242,7 @@ void * create_soundfont_list ()
</ins><span class="cx">          gtk_container_add (GTK_CONTAINER (soundfont_file_lv_sw), soundfont_file_lv);
</span><span class="cx">  
</span><span class="cx">          /* soundfont settings - soundfont files - buttonbox */
</span><del>--        soundfont_file_bbox_vbox = gtk_vbox_new (FALSE, 0);
</del><ins>+-        soundfont_file_bbox_vbox = gtk_vbox_new (false, 0);
</ins><span class="cx"> +        soundfont_file_bbox_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
</span><span class="cx">          soundfont_file_bbox_addbt = gtk_button_new();
</span><span class="cx">          gtk_button_set_image (GTK_BUTTON (soundfont_file_bbox_addbt),
</span><span class="cx">                                gtk_image_new_from_icon_name (&quot;list-add&quot;, GTK_ICON_SIZE_MENU));
</span><span class="cx"> --- src/amidi-plug/i_fileinfo.cc.old
</span><span class="cx"> +++ src/amidi-plug/i_fileinfo.cc
</span><del>-@@ -47,11 +47,14 @@ void i_fileinfo_grid_add_entry (char * field_text, char * value_text,
</del><ins>+@@ -49,11 +49,14 @@ void i_fileinfo_grid_add_entry (char * field_text, char * value_text,
</ins><span class="cx">      GtkWidget * field, *value;
</span><span class="cx">      field = gtk_label_new (field_text);
</span><span class="cx">      gtk_label_set_attributes (GTK_LABEL (field), attrlist);
</span><span class="lines">@@ -444,50 +448,50 @@
</span><span class="cx">  }
</span><span class="cx">  
</span><span class="cx">  
</span><del>-@@ -139,7 +142,7 @@ void i_fileinfo_gui (const char * filename_uri, VFSFile &amp; file)
</del><ins>+@@ -141,7 +144,7 @@ void i_fileinfo_gui (const char * filename_uri, VFSFile &amp; file)
</ins><span class="cx">      g_signal_connect (G_OBJECT (fileinfowin), &quot;destroy&quot;, G_CALLBACK (gtk_widget_destroyed), &amp;fileinfowin);
</span><span class="cx">      gtk_container_set_border_width (GTK_CONTAINER (fileinfowin), 10);
</span><span class="cx">  
</span><del>--    fileinfowin_vbox = gtk_vbox_new (FALSE, 10);
</del><ins>+-    fileinfowin_vbox = gtk_vbox_new (false, 10);
</ins><span class="cx"> +    fileinfowin_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
</span><span class="cx">      gtk_container_add (GTK_CONTAINER (fileinfowin), fileinfowin_vbox);
</span><span class="cx">  
</span><span class="cx">      /* pango attributes */
</span><del>-@@ -151,13 +154,12 @@ void i_fileinfo_gui (const char * filename_uri, VFSFile &amp; file)
</del><ins>+@@ -153,13 +156,12 @@ void i_fileinfo_gui (const char * filename_uri, VFSFile &amp; file)
</ins><span class="cx">  
</span><span class="cx">      /******************
</span><span class="cx">       *** TITLE LINE ***/
</span><del>--    title_hbox = gtk_hbox_new (FALSE, 5);
</del><ins>+-    title_hbox = gtk_hbox_new (false, 5);
</ins><span class="cx"> +    title_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
</span><del>-     gtk_box_pack_start (GTK_BOX (fileinfowin_vbox), title_hbox, FALSE, FALSE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (fileinfowin_vbox), title_hbox, false, false, 0);
</ins><span class="cx">  
</span><span class="cx">      title_icon_pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) amidiplug_xpm_midiicon);
</span><span class="cx">      title_icon_image = gtk_image_new_from_pixbuf (title_icon_pixbuf);
</span><span class="cx">      g_object_unref (title_icon_pixbuf);
</span><span class="cx"> -    gtk_misc_set_alignment (GTK_MISC (title_icon_image), 0, 0);
</span><del>-     gtk_box_pack_start (GTK_BOX (title_hbox), title_icon_image, FALSE, FALSE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (title_hbox), title_icon_image, false, false, 0);
</ins><span class="cx">  
</span><span class="cx">      title_name_f_label = gtk_label_new (_(&quot;Name:&quot;));
</span><del>-@@ -169,12 +171,12 @@ void i_fileinfo_gui (const char * filename_uri, VFSFile &amp; file)
</del><ins>+@@ -171,12 +173,12 @@ void i_fileinfo_gui (const char * filename_uri, VFSFile &amp; file)
</ins><span class="cx">      gtk_widget_set_size_request (GTK_WIDGET (title_name_v_entry), 200, -1);
</span><del>-     gtk_box_pack_start (GTK_BOX (title_hbox), title_name_v_entry, TRUE, TRUE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (title_hbox), title_name_v_entry, true, true, 0);
</ins><span class="cx">  
</span><del>--    fileinfowin_columns_hbox = gtk_hbox_new (FALSE, 2);
</del><ins>+-    fileinfowin_columns_hbox = gtk_hbox_new (false, 2);
</ins><span class="cx"> +    fileinfowin_columns_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
</span><del>-     gtk_box_pack_start (GTK_BOX (fileinfowin_vbox), fileinfowin_columns_hbox, TRUE, TRUE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (fileinfowin_vbox), fileinfowin_columns_hbox, true, true, 0);
</ins><span class="cx">  
</span><span class="cx">      /*********************
</span><span class="cx">       *** MIDI INFO BOX ***/
</span><del>--    midiinfoboxes_vbox = gtk_vbox_new (FALSE, 2);
</del><ins>+-    midiinfoboxes_vbox = gtk_vbox_new (false, 2);
</ins><span class="cx"> +    midiinfoboxes_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
</span><del>-     gtk_box_pack_start (GTK_BOX (fileinfowin_columns_hbox), midiinfoboxes_vbox, FALSE, FALSE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (fileinfowin_columns_hbox), midiinfoboxes_vbox, false, false, 0);
</ins><span class="cx">  
</span><span class="cx">      info_frame_tl = gtk_label_new (&quot;&quot;);
</span><del>-@@ -183,10 +185,10 @@ void i_fileinfo_gui (const char * filename_uri, VFSFile &amp; file)
</del><ins>+@@ -185,10 +187,10 @@ void i_fileinfo_gui (const char * filename_uri, VFSFile &amp; file)
</ins><span class="cx">  
</span><span class="cx">      info_frame = gtk_frame_new (nullptr);
</span><del>-     gtk_box_pack_start (GTK_BOX (midiinfoboxes_vbox), info_frame, TRUE, TRUE, 0);
--    info_grid = gtk_table_new (0, 0, FALSE);
</del><ins>+     gtk_box_pack_start (GTK_BOX (midiinfoboxes_vbox), info_frame, true, true, 0);
+-    info_grid = gtk_table_new (0, 0, false);
</ins><span class="cx"> -    gtk_table_set_row_spacings (GTK_TABLE (info_grid), 2);
</span><span class="cx"> -    gtk_table_set_col_spacings (GTK_TABLE (info_grid), 6);
</span><span class="cx"> -    gtk_container_set_border_width (GTK_CONTAINER (info_grid), 6);
</span><span class="lines">@@ -498,25 +502,25 @@
</span><span class="cx">      gtk_container_add (GTK_CONTAINER (info_frame), info_grid);
</span><span class="cx">      value_gstring = g_string_new (&quot;&quot;);
</span><span class="cx">  
</span><del>-@@ -223,7 +225,7 @@ void i_fileinfo_gui (const char * filename_uri, VFSFile &amp; file)
</del><ins>+@@ -225,7 +227,7 @@ void i_fileinfo_gui (const char * filename_uri, VFSFile &amp; file)
</ins><span class="cx">  
</span><span class="cx">      /**********************************
</span><span class="cx">       *** MIDI COMMENTS/LYRICS BOXES ***/
</span><del>--    miditextboxes_vbox = gtk_vbox_new (FALSE, 2);
</del><ins>+-    miditextboxes_vbox = gtk_vbox_new (false, 2);
</ins><span class="cx"> +    miditextboxes_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
</span><del>-     gtk_box_pack_start (GTK_BOX (fileinfowin_columns_hbox), miditextboxes_vbox, TRUE, TRUE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (fileinfowin_columns_hbox), miditextboxes_vbox, true, true, 0);
</ins><span class="cx">  
</span><span class="cx">      text_frame_tl = gtk_label_new (&quot;&quot;);
</span><del>-@@ -231,7 +233,7 @@ void i_fileinfo_gui (const char * filename_uri, VFSFile &amp; file)
</del><ins>+@@ -233,7 +235,7 @@ void i_fileinfo_gui (const char * filename_uri, VFSFile &amp; file)
</ins><span class="cx">                            _(&quot;&lt;span size=\&quot;smaller\&quot;&gt; MIDI Comments and Lyrics &lt;/span&gt;&quot;));
</span><del>-     gtk_box_pack_start (GTK_BOX (miditextboxes_vbox), text_frame_tl, FALSE, FALSE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (miditextboxes_vbox), text_frame_tl, false, false, 0);
</ins><span class="cx">  
</span><span class="cx"> -    miditextboxes_paned = gtk_vpaned_new ();
</span><span class="cx"> +    miditextboxes_paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
</span><del>-     gtk_box_pack_start (GTK_BOX (miditextboxes_vbox), miditextboxes_paned, TRUE, TRUE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (miditextboxes_vbox), miditextboxes_paned, true, true, 0);
</ins><span class="cx">  
</span><span class="cx">      text_frame = gtk_frame_new (nullptr);
</span><del>-@@ -295,7 +297,7 @@ void i_fileinfo_gui (const char * filename_uri, VFSFile &amp; file)
</del><ins>+@@ -297,7 +299,7 @@ void i_fileinfo_gui (const char * filename_uri, VFSFile &amp; file)
</ins><span class="cx">  
</span><span class="cx">      /**************
</span><span class="cx">       *** FOOTER ***/
</span><span class="lines">@@ -556,7 +560,7 @@
</span><span class="cx"> -  GdkColor gdk_color = {0, (uint16_t) color-&gt;red, (uint16_t) color-&gt;green, (uint16_t) color-&gt;blue};
</span><span class="cx"> -
</span><span class="cx"> -  gtk_color_button_set_color (chooser, &amp; gdk_color);
</span><del>--  gtk_color_button_set_use_alpha (chooser, TRUE);
</del><ins>+-  gtk_color_button_set_use_alpha (chooser, true);
</ins><span class="cx"> -  gtk_color_button_set_alpha (chooser, color-&gt;alpha);
</span><span class="cx"> +  GdkRGBA rgba = {
</span><span class="cx"> +      color-&gt;red / 65535.0,
</span><span class="lines">@@ -565,7 +569,7 @@
</span><span class="cx"> +      color-&gt;alpha / 65535.0
</span><span class="cx"> +  };
</span><span class="cx"> +
</span><del>-+  gtk_color_chooser_set_use_alpha (chooser, TRUE);
</del><ins>++  gtk_color_chooser_set_use_alpha (chooser, true);
</ins><span class="cx"> +  gtk_color_chooser_set_rgba (chooser, &amp; rgba);
</span><span class="cx">  }
</span><span class="cx">  
</span><span class="lines">@@ -586,24 +590,24 @@
</span><span class="cx">    cairo_fill ( cr );
</span><span class="cx"> -  cairo_destroy (cr);
</span><span class="cx">  
</span><del>-   return FALSE;
</del><ins>+   return false;
</ins><span class="cx">  }
</span><span class="cx"> @@ -157,16 +159,16 @@ aosd_ui_configure_position ( aosd_cfg_t * cfg )
</span><span class="cx">    int monitors_num = gdk_screen_get_n_monitors( gdk_screen_get_default() );
</span><span class="cx">    int i = 0;
</span><span class="cx">  
</span><del>--  pos_vbox = gtk_vbox_new( FALSE , 4 );
</del><ins>+-  pos_vbox = gtk_vbox_new( false , 4 );
</ins><span class="cx"> +  pos_vbox = gtk_box_new( GTK_ORIENTATION_VERTICAL , 4 );
</span><span class="cx">    gtk_container_set_border_width( GTK_CONTAINER(pos_vbox) , 6 );
</span><span class="cx">  
</span><span class="cx">    pos_placement_frame = gtk_frame_new( _(&quot;Placement&quot;) );
</span><del>--  pos_placement_hbox = gtk_hbox_new( FALSE , 0 );
</del><ins>+-  pos_placement_hbox = gtk_hbox_new( false , 0 );
</ins><span class="cx"> +  pos_placement_hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 0 );
</span><span class="cx">    gtk_container_set_border_width( GTK_CONTAINER(pos_placement_hbox) , 6 );
</span><span class="cx">    gtk_container_add( GTK_CONTAINER(pos_placement_frame) , pos_placement_hbox );
</span><del>-   gtk_box_pack_start( GTK_BOX(pos_vbox) , pos_placement_frame , FALSE , FALSE , 0 );
</del><ins>+   gtk_box_pack_start( GTK_BOX(pos_vbox) , pos_placement_frame , false , false , 0 );
</ins><span class="cx">  
</span><del>--  pos_placement_grid = gtk_table_new (0, 0, FALSE);
</del><ins>+-  pos_placement_grid = gtk_table_new (0, 0, false);
</ins><span class="cx"> +  pos_placement_grid = gtk_grid_new();
</span><span class="cx">    for ( i = 0 ; i &lt; 9 ; i++ )
</span><span class="cx">    {
</span><span class="lines">@@ -620,15 +624,15 @@
</span><span class="cx"> +    gtk_grid_attach( GTK_GRID(pos_placement_grid) , pos_placement_bt[i] , (i % 3) , (i / 3) , 1 , 1 );
</span><span class="cx">      g_object_set_data( G_OBJECT(pos_placement_bt[i]) , &quot;value&quot; , GINT_TO_POINTER(i+1) );
</span><span class="cx">      if ( cfg-&gt;position.placement == (i+1) )
</span><del>-       gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(pos_placement_bt[i]) , TRUE );
</del><ins>+       gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(pos_placement_bt[i]) , true );
</ins><span class="cx"> @@ -188,38 +189,38 @@ aosd_ui_configure_position ( aosd_cfg_t * cfg )
</span><del>-   gtk_box_pack_start( GTK_BOX(pos_placement_hbox) , pos_placement_grid , FALSE , FALSE , 0 );
</del><ins>+   gtk_box_pack_start( GTK_BOX(pos_placement_hbox) , pos_placement_grid , false , false , 0 );
</ins><span class="cx">    aosd_cb_list.append( pos_placement_grid , aosd_cb_configure_position_placement_commit );
</span><span class="cx">  
</span><del>--  gtk_box_pack_start( GTK_BOX(pos_placement_hbox) , gtk_vseparator_new() , FALSE , FALSE , 6 );
-+  gtk_box_pack_start( GTK_BOX(pos_placement_hbox) , gtk_separator_new(GTK_ORIENTATION_VERTICAL) , FALSE , FALSE , 6 );
</del><ins>+-  gtk_box_pack_start( GTK_BOX(pos_placement_hbox) , gtk_vseparator_new() , false , false , 6 );
++  gtk_box_pack_start( GTK_BOX(pos_placement_hbox) , gtk_separator_new(GTK_ORIENTATION_VERTICAL) , false , false , 6 );
</ins><span class="cx">  
</span><del>--  pos_offset_grid = gtk_table_new (0, 0, FALSE);
</del><ins>+-  pos_offset_grid = gtk_table_new (0, 0, false);
</ins><span class="cx"> -  gtk_table_set_row_spacings( GTK_TABLE(pos_offset_grid) , 4 );
</span><span class="cx"> -  gtk_table_set_col_spacings( GTK_TABLE(pos_offset_grid) , 4 );
</span><span class="cx"> +  pos_offset_grid = gtk_grid_new();
</span><span class="lines">@@ -664,12 +668,12 @@
</span><span class="cx">    gtk_spin_button_set_value( GTK_SPIN_BUTTON(pos_maxsize_width_spinbt) , cfg-&gt;position.maxsize_width );
</span><span class="cx"> -  gtk_table_attach_defaults( GTK_TABLE(pos_offset_grid) , pos_maxsize_width_spinbt , 1 , 2 , 2 , 3 );
</span><span class="cx"> +  gtk_grid_attach( GTK_GRID(pos_offset_grid) , pos_maxsize_width_spinbt , 1 , 2 , 1 , 1 );
</span><del>-   gtk_box_pack_start( GTK_BOX(pos_placement_hbox) , pos_offset_grid , FALSE , FALSE , 0 );
</del><ins>+   gtk_box_pack_start( GTK_BOX(pos_placement_hbox) , pos_offset_grid , false , false , 0 );
</ins><span class="cx">    aosd_cb_list.append( pos_offset_grid , aosd_cb_configure_position_offset_commit );
</span><span class="cx">    aosd_cb_list.append( pos_offset_grid , aosd_cb_configure_position_maxsize_commit );
</span><span class="cx">  
</span><span class="cx">    pos_multimon_frame = gtk_frame_new( _(&quot;Multi-Monitor options&quot;) );
</span><del>--  pos_multimon_hbox = gtk_hbox_new( FALSE , 4 );
</del><ins>+-  pos_multimon_hbox = gtk_hbox_new( false , 4 );
</ins><span class="cx"> +  pos_multimon_hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 4 );
</span><span class="cx">    gtk_container_set_border_width( GTK_CONTAINER(pos_multimon_hbox) , 6 );
</span><span class="cx">    gtk_container_add( GTK_CONTAINER(pos_multimon_frame), pos_multimon_hbox );
</span><span class="lines">@@ -678,20 +682,20 @@
</span><span class="cx">  aosd_ui_configure_animation_timing ( char * label_string )
</span><span class="cx">  {
</span><span class="cx">    GtkWidget *hbox, *desc_label, *spinbt;
</span><del>--  hbox = gtk_hbox_new( FALSE , 4 );
</del><ins>+-  hbox = gtk_hbox_new( false , 4 );
</ins><span class="cx"> +  hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 4 );
</span><span class="cx">    desc_label = gtk_label_new( label_string );
</span><span class="cx">    spinbt = gtk_spin_button_new_with_range( 0 , 99999 , 1 );
</span><del>-   gtk_box_pack_start( GTK_BOX(hbox) , desc_label , FALSE , FALSE , 0 );
</del><ins>+   gtk_box_pack_start( GTK_BOX(hbox) , desc_label , false , false , 0 );
</ins><span class="cx"> @@ -275,10 +276,10 @@ aosd_ui_configure_animation ( aosd_cfg_t * cfg )
</span><span class="cx">    GtkWidget *ani_timing_fadein_widget, *ani_timing_fadeout_widget, *ani_timing_stay_widget;
</span><span class="cx">    GtkSizeGroup *sizegroup;
</span><span class="cx">  
</span><del>--  ani_vbox = gtk_vbox_new( FALSE , 0 );
</del><ins>+-  ani_vbox = gtk_vbox_new( false , 0 );
</ins><span class="cx"> +  ani_vbox = gtk_box_new( GTK_ORIENTATION_VERTICAL , 0 );
</span><span class="cx">    gtk_container_set_border_width( GTK_CONTAINER(ani_vbox) , 6 );
</span><span class="cx">  
</span><del>--  ani_timing_hbox = gtk_hbox_new( FALSE , 0 );
</del><ins>+-  ani_timing_hbox = gtk_hbox_new( false , 0 );
</ins><span class="cx"> +  ani_timing_hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 0 );
</span><span class="cx">    ani_timing_frame = gtk_frame_new( _(&quot;Timing (ms)&quot;) );
</span><span class="cx">    gtk_container_set_border_width( GTK_CONTAINER(ani_timing_hbox) , 6 );
</span><span class="lines">@@ -699,15 +703,15 @@
</span><span class="cx"> @@ -288,12 +289,12 @@ aosd_ui_configure_animation ( aosd_cfg_t * cfg )
</span><span class="cx">    gtk_spin_button_set_value( GTK_SPIN_BUTTON(g_object_get_data(
</span><span class="cx">      G_OBJECT(ani_timing_stay_widget),&quot;spinbt&quot;)) , cfg-&gt;animation.timing_display );
</span><del>-   gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , ani_timing_stay_widget , TRUE , TRUE , 0 );
--  gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , gtk_vseparator_new() , FALSE , FALSE , 4 );
-+  gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , gtk_separator_new(GTK_ORIENTATION_VERTICAL) , FALSE , FALSE , 4 );
</del><ins>+   gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , ani_timing_stay_widget , true , true , 0 );
+-  gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , gtk_vseparator_new() , false , false , 4 );
++  gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , gtk_separator_new(GTK_ORIENTATION_VERTICAL) , false , false , 4 );
</ins><span class="cx">    ani_timing_fadein_widget = aosd_ui_configure_animation_timing( _(&quot;Fade in:&quot;) );
</span><span class="cx">    gtk_spin_button_set_value( GTK_SPIN_BUTTON(g_object_get_data(
</span><span class="cx">      G_OBJECT(ani_timing_fadein_widget),&quot;spinbt&quot;)) , cfg-&gt;animation.timing_fadein );
</span><del>-   gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , ani_timing_fadein_widget , TRUE , TRUE , 0 );
--  gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , gtk_vseparator_new() , FALSE , FALSE , 4 );
-+  gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , gtk_separator_new(GTK_ORIENTATION_VERTICAL) , FALSE , FALSE , 4 );
</del><ins>+   gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , ani_timing_fadein_widget , true , true , 0 );
+-  gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , gtk_vseparator_new() , false , false , 4 );
++  gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , gtk_separator_new(GTK_ORIENTATION_VERTICAL) , false , false , 4 );
</ins><span class="cx">    ani_timing_fadeout_widget = aosd_ui_configure_animation_timing( _(&quot;Fade out:&quot;) );
</span><span class="cx">    gtk_spin_button_set_value( GTK_SPIN_BUTTON(g_object_get_data(
</span><span class="cx">      G_OBJECT(ani_timing_fadeout_widget),&quot;spinbt&quot;)) , cfg-&gt;animation.timing_fadeout );
</span><span class="lines">@@ -737,12 +741,12 @@
</span><span class="cx">    GtkWidget *tex_font_shadow_colorbt[3];
</span><span class="cx">    int i = 0;
</span><span class="cx">  
</span><del>--  tex_vbox = gtk_vbox_new( FALSE , 4 );
</del><ins>+-  tex_vbox = gtk_vbox_new( false , 4 );
</ins><span class="cx"> +  tex_vbox = gtk_box_new( GTK_ORIENTATION_VERTICAL , 4 );
</span><span class="cx">    gtk_container_set_border_width( GTK_CONTAINER(tex_vbox) , 6 );
</span><span class="cx">  
</span><span class="cx">    tex_font_frame = gtk_frame_new( _(&quot;Fonts&quot;) );
</span><del>--  tex_font_grid = gtk_table_new (0, 0, FALSE);
</del><ins>+-  tex_font_grid = gtk_table_new (0, 0, false);
</ins><span class="cx"> +  tex_font_grid = gtk_grid_new();
</span><span class="cx">    gtk_container_set_border_width( GTK_CONTAINER(tex_font_grid) , 6 );
</span><span class="cx"> -  gtk_table_set_row_spacings( GTK_TABLE(tex_font_grid) , 4 );
</span><span class="lines">@@ -753,10 +757,10 @@
</span><span class="cx">    {
</span><span class="cx">      char *label_str = g_strdup_printf( _(&quot;Font %i:&quot;) , i+1 );
</span><span class="cx"> @@ -374,16 +375,17 @@ aosd_ui_configure_text ( aosd_cfg_t * cfg )
</span><del>-     gtk_font_button_set_use_font( GTK_FONT_BUTTON(tex_font_fontbt[i]) , FALSE );
-     gtk_font_button_set_use_size( GTK_FONT_BUTTON(tex_font_fontbt[i]) , FALSE );
</del><ins>+     gtk_font_button_set_use_font( GTK_FONT_BUTTON(tex_font_fontbt[i]) , false );
+     gtk_font_button_set_use_size( GTK_FONT_BUTTON(tex_font_fontbt[i]) , false );
</ins><span class="cx">      gtk_font_button_set_font_name( GTK_FONT_BUTTON(tex_font_fontbt[i]) , cfg-&gt;text.fonts_name[i] );
</span><del>-+    gtk_widget_set_hexpand( tex_font_fontbt[i] , TRUE );
</del><ins>++    gtk_widget_set_hexpand( tex_font_fontbt[i] , true );
</ins><span class="cx">  
</span><span class="cx">      tex_font_colorbt[i] = gtk_color_button_new ();
</span><span class="cx"> -    chooser_set_aosd_color ((GtkColorButton *) tex_font_colorbt[i],
</span><span class="lines">@@ -764,14 +768,14 @@
</span><span class="cx">       &amp; cfg-&gt;text.fonts_color[i]);
</span><span class="cx">  
</span><span class="cx">      tex_font_shadow_togglebt[i] = gtk_toggle_button_new_with_label( _(&quot;Shadow&quot;) );
</span><del>-     gtk_toggle_button_set_mode( GTK_TOGGLE_BUTTON(tex_font_shadow_togglebt[i]) , FALSE );
</del><ins>+     gtk_toggle_button_set_mode( GTK_TOGGLE_BUTTON(tex_font_shadow_togglebt[i]) , false );
</ins><span class="cx">  
</span><span class="cx">      tex_font_shadow_colorbt[i] = gtk_color_button_new ();
</span><span class="cx"> -    chooser_set_aosd_color ((GtkColorButton *) tex_font_shadow_colorbt[i],
</span><span class="cx"> +    chooser_set_aosd_color ((GtkColorChooser *) tex_font_shadow_colorbt[i],
</span><span class="cx">       &amp; cfg-&gt;text.fonts_shadow_color[i]);
</span><span class="cx">  
</span><del>-     gtk_widget_set_sensitive( tex_font_shadow_colorbt[i] , FALSE );
</del><ins>+     gtk_widget_set_sensitive( tex_font_shadow_colorbt[i] , false );
</ins><span class="cx"> @@ -392,11 +394,11 @@ aosd_ui_configure_text ( aosd_cfg_t * cfg )
</span><span class="cx">                        tex_font_shadow_colorbt[i] );
</span><span class="cx">      gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(tex_font_shadow_togglebt[i]) ,
</span><span class="lines">@@ -802,22 +806,22 @@
</span><span class="cx">    GtkWidget *dec_rstyleopts_frame, *dec_rstyleopts_grid;
</span><span class="cx">    int colors_max_num = 0, i = 0;
</span><span class="cx">  
</span><del>--  dec_hbox = gtk_hbox_new( FALSE , 4 );
</del><ins>+-  dec_hbox = gtk_hbox_new( false , 4 );
</ins><span class="cx"> +  dec_hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 4 );
</span><span class="cx">    gtk_container_set_border_width( GTK_CONTAINER(dec_hbox) , 6 );
</span><span class="cx">  
</span><span class="cx">    /* decoration style model
</span><span class="cx"> @@ -495,31 +497,31 @@ aosd_ui_configure_decoration ( aosd_cfg_t * cfg )
</span><del>-   gtk_box_pack_start( GTK_BOX(dec_hbox) , dec_rstyle_lv_frame , FALSE , FALSE , 0 );
</del><ins>+   gtk_box_pack_start( GTK_BOX(dec_hbox) , dec_rstyle_lv_frame , false , false , 0 );
</ins><span class="cx">    aosd_cb_list.append( dec_rstyle_lv , aosd_cb_configure_decoration_style_commit );
</span><span class="cx">  
</span><del>--  dec_rstyle_hbox = gtk_vbox_new( FALSE , 4 );
</del><ins>+-  dec_rstyle_hbox = gtk_vbox_new( false , 4 );
</ins><span class="cx"> +  dec_rstyle_hbox = gtk_box_new( GTK_ORIENTATION_VERTICAL , 4 );
</span><del>-   gtk_box_pack_start( GTK_BOX(dec_hbox) , dec_rstyle_hbox , TRUE , TRUE , 0 );
</del><ins>+   gtk_box_pack_start( GTK_BOX(dec_hbox) , dec_rstyle_hbox , true , true , 0 );
</ins><span class="cx">  
</span><span class="cx">    /* in colors_max_num now there's the maximum number of colors used by decoration styles */
</span><span class="cx">    dec_rstyleopts_frame = gtk_frame_new( _(&quot;Colors&quot;) );
</span><del>--  dec_rstyleopts_grid = gtk_table_new (0, 0, FALSE);
</del><ins>+-  dec_rstyleopts_grid = gtk_table_new (0, 0, false);
</ins><span class="cx"> +  dec_rstyleopts_grid = gtk_grid_new();
</span><span class="cx">    gtk_container_set_border_width( GTK_CONTAINER(dec_rstyleopts_grid) , 6 );
</span><span class="cx"> -  gtk_table_set_row_spacings( GTK_TABLE(dec_rstyleopts_grid) , 4 );
</span><span class="lines">@@ -829,7 +833,7 @@
</span><span class="cx">    {
</span><span class="cx">      GtkWidget *hbox, *label;
</span><span class="cx">      char *label_str = nullptr;
</span><del>--    hbox = gtk_hbox_new( FALSE , 4 );
</del><ins>+-    hbox = gtk_hbox_new( false , 4 );
</ins><span class="cx"> +    hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 4 );
</span><span class="cx">      label_str = g_strdup_printf( _(&quot;Color %i:&quot;) , i+1 );
</span><span class="cx">      label = gtk_label_new( label_str );
</span><span class="lines">@@ -839,18 +843,18 @@
</span><span class="cx"> -    chooser_set_aosd_color ((GtkColorButton *) colorbt, &amp; cfg-&gt;decoration.colors[i]);
</span><span class="cx"> +    chooser_set_aosd_color ((GtkColorChooser *) colorbt, &amp; cfg-&gt;decoration.colors[i]);
</span><span class="cx">  
</span><del>-     gtk_box_pack_start( GTK_BOX(hbox) , label , FALSE , FALSE , 0 );
-     gtk_box_pack_start( GTK_BOX(hbox) , colorbt , FALSE , FALSE , 0 );
</del><ins>+     gtk_box_pack_start( GTK_BOX(hbox) , label , false , false , 0 );
+     gtk_box_pack_start( GTK_BOX(hbox) , colorbt , false , false , 0 );
</ins><span class="cx"> -    gtk_table_attach_defaults( GTK_TABLE(dec_rstyleopts_grid) , hbox , (i % 3) , (i % 3) + 1, (i / 3) , (i / 3) + 1);
</span><span class="cx"> +    gtk_grid_attach( GTK_GRID(dec_rstyleopts_grid) , hbox , (i % 3) , (i / 3) , 1 , 1 );
</span><span class="cx">      g_object_set_data( G_OBJECT(colorbt) , &quot;colnum&quot; , GINT_TO_POINTER(i) );
</span><span class="cx">      aosd_cb_list.append( colorbt , aosd_cb_configure_decoration_color_commit );
</span><span class="cx">    }
</span><span class="cx"> @@ -573,7 +575,7 @@ aosd_ui_configure_trigger ( aosd_cfg_t * cfg )
</span><del>-   gtk_notebook_set_show_tabs( GTK_NOTEBOOK(tri_event_nb) , FALSE );
-   gtk_notebook_set_show_border( GTK_NOTEBOOK(tri_event_nb) , FALSE );
</del><ins>+   gtk_notebook_set_show_tabs( GTK_NOTEBOOK(tri_event_nb) , false );
+   gtk_notebook_set_show_border( GTK_NOTEBOOK(tri_event_nb) , false );
</ins><span class="cx">  
</span><del>--  tri_hbox = gtk_hbox_new( FALSE , 4 );
</del><ins>+-  tri_hbox = gtk_hbox_new( false , 4 );
</ins><span class="cx"> +  tri_hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 4 );
</span><span class="cx">    gtk_container_set_border_width( GTK_CONTAINER(tri_hbox) , 6 );
</span><span class="cx">  
</span><span class="lines">@@ -859,60 +863,60 @@
</span><span class="cx">      gtk_list_store_set( tri_event_store , &amp;iter ,
</span><span class="cx">        0 , _(aosd_trigger_get_name( i )) ,
</span><span class="cx">        1 , i , 2 , i , -1 );
</span><del>--    vbox = gtk_vbox_new( FALSE , 0 );
</del><ins>+-    vbox = gtk_vbox_new( false , 0 );
</ins><span class="cx"> +    vbox = gtk_box_new( GTK_ORIENTATION_VERTICAL , 0 );
</span><span class="cx">      gtk_container_set_border_width( GTK_CONTAINER(vbox) , 6 );
</span><span class="cx">      label = gtk_label_new( _(aosd_trigger_get_desc( i )) );
</span><del>-     gtk_label_set_line_wrap( GTK_LABEL(label) , TRUE );
</del><ins>+     gtk_label_set_line_wrap( GTK_LABEL(label) , true );
</ins><span class="cx">      gtk_label_set_max_width_chars( GTK_LABEL(label), 40 );
</span><span class="cx"> -    gtk_misc_set_alignment( GTK_MISC(label) , 0.0 , 0.0 );
</span><span class="cx"> +    gtk_widget_set_halign( label , GTK_ALIGN_START );
</span><span class="cx">      checkbt = gtk_check_button_new_with_label( _(&quot;Enable trigger&quot;) );
</span><span class="cx">      if ( cfg-&gt;trigger.enabled[i] )
</span><del>-       gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(checkbt) , TRUE );
</del><ins>+       gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(checkbt) , true );
</ins><span class="cx">      else
</span><del>-       gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(checkbt) , FALSE );
-     gtk_box_pack_start( GTK_BOX(vbox) , checkbt , FALSE , FALSE , 0 );
--    gtk_box_pack_start( GTK_BOX(vbox) , gtk_hseparator_new() , FALSE , FALSE , 4 );
-+    gtk_box_pack_start( GTK_BOX(vbox) , gtk_separator_new(GTK_ORIENTATION_HORIZONTAL) , FALSE , FALSE , 4 );
-     gtk_box_pack_start( GTK_BOX(vbox) , label , FALSE , FALSE , 0 );
</del><ins>+       gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(checkbt) , false );
+     gtk_box_pack_start( GTK_BOX(vbox) , checkbt , false , false , 0 );
+-    gtk_box_pack_start( GTK_BOX(vbox) , gtk_hseparator_new() , false , false , 4 );
++    gtk_box_pack_start( GTK_BOX(vbox) , gtk_separator_new(GTK_ORIENTATION_HORIZONTAL) , false , false , 4 );
+     gtk_box_pack_start( GTK_BOX(vbox) , label , false , false , 0 );
</ins><span class="cx">      frame = gtk_frame_new( nullptr );
</span><span class="cx">      gtk_container_add( GTK_CONTAINER(frame) , vbox );
</span><span class="cx"> @@ -699,10 +701,10 @@ aosd_ui_configure_misc ( aosd_cfg_t * cfg )
</span><span class="cx">    GtkWidget *mis_transp_status_frame, *mis_transp_status_hbox;
</span><span class="cx">    GtkWidget *mis_transp_status_img, *mis_transp_status_label;
</span><span class="cx">  
</span><del>--  mis_vbox = gtk_vbox_new( FALSE , 0 );
</del><ins>+-  mis_vbox = gtk_vbox_new( false , 0 );
</ins><span class="cx"> +  mis_vbox = gtk_box_new( GTK_ORIENTATION_VERTICAL , 0 );
</span><span class="cx">    gtk_container_set_border_width( GTK_CONTAINER(mis_vbox) , 6 );
</span><span class="cx">  
</span><del>--  mis_transp_vbox = gtk_vbox_new( FALSE , 0 );
</del><ins>+-  mis_transp_vbox = gtk_vbox_new( false , 0 );
</ins><span class="cx"> +  mis_transp_vbox = gtk_box_new( GTK_ORIENTATION_VERTICAL , 0 );
</span><span class="cx">    mis_transp_frame = gtk_frame_new( _(&quot;Transparency&quot;) );
</span><span class="cx">    gtk_container_set_border_width( GTK_CONTAINER(mis_transp_vbox) , 6 );
</span><span class="cx">    gtk_container_add( GTK_CONTAINER(mis_transp_frame) , mis_transp_vbox );
</span><span class="cx"> @@ -719,16 +721,15 @@ aosd_ui_configure_misc ( aosd_cfg_t * cfg )
</span><del>-   gtk_box_pack_start( GTK_BOX(mis_transp_vbox) , mis_transp_fake_rbt , TRUE , TRUE , 0 );
-   gtk_box_pack_start( GTK_BOX(mis_transp_vbox) , mis_transp_real_rbt , TRUE , TRUE , 0 );
</del><ins>+   gtk_box_pack_start( GTK_BOX(mis_transp_vbox) , mis_transp_fake_rbt , true , true , 0 );
+   gtk_box_pack_start( GTK_BOX(mis_transp_vbox) , mis_transp_real_rbt , true , true , 0 );
</ins><span class="cx">  
</span><del>--  mis_transp_status_hbox = gtk_hbox_new( FALSE , 4 );
</del><ins>+-  mis_transp_status_hbox = gtk_hbox_new( false , 4 );
</ins><span class="cx"> +  mis_transp_status_hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 4 );
</span><span class="cx">    mis_transp_status_frame = gtk_frame_new( nullptr );
</span><span class="cx">    gtk_container_set_border_width( GTK_CONTAINER(mis_transp_status_hbox) , 3 );
</span><span class="cx">    gtk_container_add( GTK_CONTAINER(mis_transp_status_frame) , mis_transp_status_hbox );
</span><del>-   gtk_box_pack_start( GTK_BOX(mis_transp_vbox) , mis_transp_status_frame , TRUE , TRUE , 0 );
</del><ins>+   gtk_box_pack_start( GTK_BOX(mis_transp_vbox) , mis_transp_status_frame , true , true , 0 );
</ins><span class="cx">  
</span><span class="cx">    mis_transp_status_img = gtk_image_new();
</span><span class="cx"> -  gtk_misc_set_alignment( GTK_MISC(mis_transp_status_img) , 0.5 , 0 );
</span><span class="cx">    mis_transp_status_label = gtk_label_new( &quot;&quot; );
</span><span class="cx"> -  gtk_misc_set_alignment( GTK_MISC(mis_transp_status_label) , 0 , 0.5 );
</span><span class="cx"> +  gtk_widget_set_halign( mis_transp_status_label , GTK_ALIGN_START );
</span><del>-   gtk_label_set_line_wrap( GTK_LABEL(mis_transp_status_label) , TRUE );
-   gtk_box_pack_start( GTK_BOX(mis_transp_status_hbox) , mis_transp_status_img , FALSE , FALSE , 0 );
-   gtk_box_pack_start( GTK_BOX(mis_transp_status_hbox) , mis_transp_status_label , TRUE , TRUE , 0 );
</del><ins>+   gtk_label_set_line_wrap( GTK_LABEL(mis_transp_status_label) , true );
+   gtk_box_pack_start( GTK_BOX(mis_transp_status_hbox) , mis_transp_status_img , false , false , 0 );
+   gtk_box_pack_start( GTK_BOX(mis_transp_status_hbox) , mis_transp_status_label , true , true , 0 );
</ins><span class="cx"> --- src/blur_scope/blur_scope.cc.old
</span><span class="cx"> +++ src/blur_scope/blur_scope.cc
</span><del>-@@ -73,13 +73,14 @@ public:
</del><ins>+@@ -71,13 +71,14 @@ public:
</ins><span class="cx">  
</span><span class="cx">  private:
</span><span class="cx">      void resize (int w, int h);
</span><span class="lines">@@ -928,7 +932,7 @@
</span><span class="cx">  
</span><span class="cx">      GtkWidget * area = nullptr;
</span><span class="cx">      int width = 0, height = 0, stride = 0, image_size = 0;
</span><del>-@@ -115,17 +116,22 @@ void BlurScope::resize (int w, int h)
</del><ins>+@@ -113,17 +114,22 @@ void BlurScope::resize (int w, int h)
</ins><span class="cx">      corner = image + stride + 1;
</span><span class="cx">  }
</span><span class="cx">  
</span><span class="lines">@@ -956,8 +960,8 @@
</span><span class="cx">      cairo_destroy (cr);
</span><span class="cx">  }
</span><span class="cx">  
</span><del>-@@ -135,9 +141,9 @@ gboolean BlurScope::configure_event (GtkWidget * widget, GdkEventConfigure * eve
-     return TRUE;
</del><ins>+@@ -133,9 +139,9 @@ gboolean BlurScope::configure_event (GtkWidget * widget, GdkEventConfigure * eve
+     return true;
</ins><span class="cx">  }
</span><span class="cx">  
</span><span class="cx"> -gboolean BlurScope::expose_event (GtkWidget * widget, GdkEventExpose * event, void * user)
</span><span class="lines">@@ -965,19 +969,19 @@
</span><span class="cx">  {
</span><span class="cx"> -    ((BlurScope *) user)-&gt;draw ();
</span><span class="cx"> +    ((BlurScope *) user)-&gt;draw_to_cairo (cr);
</span><del>-     return TRUE;
</del><ins>+     return true;
</ins><span class="cx">  }
</span><span class="cx">  
</span><del>-@@ -147,7 +153,7 @@ void * BlurScope::get_gtk_widget ()
-     gtk_widget_set_size_request (area, D_WIDTH, D_HEIGHT);
-     resize (D_WIDTH, D_HEIGHT);
</del><ins>+@@ -143,7 +149,7 @@ void * BlurScope::get_gtk_widget ()
+ {
+     area = gtk_drawing_area_new ();
</ins><span class="cx">  
</span><span class="cx"> -    g_signal_connect (area, &quot;expose-event&quot;, (GCallback) expose_event, this);
</span><span class="cx"> +    g_signal_connect (area, &quot;draw_cb&quot;, (GCallback) draw_cb, this);
</span><span class="cx">      g_signal_connect (area, &quot;configure-event&quot;, (GCallback) configure_event, this);
</span><span class="cx">      g_signal_connect (area, &quot;destroy&quot;, (GCallback) gtk_widget_destroyed, &amp; area);
</span><span class="cx">  
</span><del>-@@ -216,17 +222,25 @@ void BlurScope::render_mono_pcm (const float * pcm)
</del><ins>+@@ -212,17 +218,25 @@ void BlurScope::render_mono_pcm (const float * pcm)
</ins><span class="cx">  
</span><span class="cx">  static void color_set_cb (GtkWidget * chooser)
</span><span class="cx">  {
</span><span class="lines">@@ -993,12 +997,12 @@
</span><span class="cx"> +    bscope_color = (red &lt;&lt; 16) | (green &lt;&lt; 8) | blue;
</span><span class="cx">  }
</span><span class="cx">  
</span><del>- static void /* GtkWidget */ * bscope_get_color_chooser (void)
</del><ins>+ static void /* GtkWidget */ * bscope_get_color_chooser ()
</ins><span class="cx">  {
</span><span class="cx"> -    GdkColor gdk_color = {0, (uint16_t) ((bscope_color &amp; 0xff0000) &gt;&gt; 8),
</span><span class="cx"> -     (uint16_t) (bscope_color &amp; 0xff00), (uint16_t) ((bscope_color &amp; 0xff) &lt;&lt; 8)};
</span><span class="cx"> -    GtkWidget * chooser = gtk_color_button_new_with_color (&amp; gdk_color);
</span><del>--    gtk_color_button_set_use_alpha ((GtkColorButton *) chooser, FALSE);
</del><ins>+-    gtk_color_button_set_use_alpha ((GtkColorButton *) chooser, false);
</ins><span class="cx"> +    GdkRGBA rgba = {
</span><span class="cx"> +        ((bscope_color &amp; 0xff0000) &gt;&gt; 16) / 255.0,
</span><span class="cx"> +        ((bscope_color &amp; 0xff00) &gt;&gt; 8) / 255.0,
</span><span class="lines">@@ -1012,7 +1016,7 @@
</span><span class="cx">  
</span><span class="cx"> --- src/cairo-spectrum/cairo-spectrum.cc.old
</span><span class="cx"> +++ src/cairo-spectrum/cairo-spectrum.cc
</span><del>-@@ -183,12 +183,29 @@ static void hsv_to_rgb (float h, float s, float v, float * r, float * g, float *
</del><ins>+@@ -184,12 +184,29 @@ static void hsv_to_rgb (float h, float s, float v, float * r, float * g, float *
</ins><span class="cx">      * b = v * (1 - s * (1 - * b));
</span><span class="cx">  }
</span><span class="cx">  
</span><span class="lines">@@ -1022,7 +1026,7 @@
</span><span class="cx"> -    GdkColor * c = (gtk_widget_get_style (widget))-&gt;base + GTK_STATE_SELECTED;
</span><span class="cx"> -    float h, s, v;
</span><span class="cx"> +    static GdkRGBA c;
</span><del>-+    static gboolean valid = FALSE;
</del><ins>++    static gboolean valid = false;
</ins><span class="cx"> +    gfloat h, s, v, n;
</span><span class="cx">  
</span><span class="cx"> -    rgb_to_hsv (c-&gt;red / 65535.0, c-&gt;green / 65535.0, c-&gt;blue / 65535.0, &amp; h, &amp; s, &amp; v);
</span><span class="lines">@@ -1039,14 +1043,14 @@
</span><span class="cx"> +        gtk_style_context_get_background_color (style,
</span><span class="cx"> +         (GtkStateFlags) (GTK_STATE_FLAG_FOCUSED | GTK_STATE_FLAG_SELECTED), &amp; c);
</span><span class="cx"> +        g_object_unref (style);
</span><del>-+        valid = TRUE;
</del><ins>++        valid = true;
</ins><span class="cx"> +    }
</span><span class="cx"> +
</span><span class="cx"> +    rgb_to_hsv (c.red, c.green, c.blue, &amp; h, &amp; s, &amp; v);
</span><span class="cx">  
</span><span class="cx">      if (s &lt; 0.1) /* monochrome theme? use blue instead */
</span><span class="cx">      {
</span><del>-@@ -196,8 +213,9 @@ static void get_color (GtkWidget * widget, int i, float * r, float * g, float *
</del><ins>+@@ -197,8 +214,9 @@ static void get_color (GtkWidget * widget, int i, float * r, float * g, float *
</ins><span class="cx">          s = 0.75;
</span><span class="cx">      }
</span><span class="cx">  
</span><span class="lines">@@ -1058,7 +1062,7 @@
</span><span class="cx">  
</span><span class="cx">      hsv_to_rgb (h, s, v, r, g, b);
</span><span class="cx">  }
</span><del>-@@ -218,7 +236,7 @@ static void draw_visualizer (GtkWidget *widget, cairo_t *cr)
</del><ins>+@@ -219,7 +237,7 @@ static void draw_visualizer (GtkWidget *widget, cairo_t *cr)
</ins><span class="cx">          int x = ((width / bands) * i) + 2;
</span><span class="cx">          float r, g, b;
</span><span class="cx">  
</span><span class="lines">@@ -1067,8 +1071,8 @@
</span><span class="cx">          cairo_set_source_rgb (cr, r, g, b);
</span><span class="cx">          cairo_rectangle (cr, x + 1, height - (bars[i] * height / 40),
</span><span class="cx">           (width / bands) - 1, (bars[i] * height / 40));
</span><del>-@@ -239,14 +257,11 @@ static gboolean configure_event (GtkWidget * widget, GdkEventConfigure * event)
-     return TRUE;
</del><ins>+@@ -240,14 +258,11 @@ static gboolean configure_event (GtkWidget * widget, GdkEventConfigure * event)
+     return true;
</ins><span class="cx">  }
</span><span class="cx">  
</span><span class="cx"> -static gboolean draw_event (GtkWidget * widget)
</span><span class="lines">@@ -1080,10 +1084,10 @@
</span><span class="cx">      draw_visualizer (widget, cr);
</span><span class="cx">  
</span><span class="cx"> -    cairo_destroy (cr);
</span><del>-     return TRUE;
</del><ins>+     return true;
</ins><span class="cx">  }
</span><span class="cx">  
</span><del>-@@ -255,7 +270,7 @@ void * CairoSpectrum::get_gtk_widget ()
</del><ins>+@@ -256,7 +271,7 @@ void * CairoSpectrum::get_gtk_widget ()
</ins><span class="cx">      GtkWidget *area = gtk_drawing_area_new();
</span><span class="cx">      spect_widget = area;
</span><span class="cx">  
</span><span class="lines">@@ -1092,220 +1096,159 @@
</span><span class="cx">      g_signal_connect(area, &quot;configure-event&quot;, (GCallback) configure_event, nullptr);
</span><span class="cx">      g_signal_connect(area, &quot;destroy&quot;, (GCallback) gtk_widget_destroyed, &amp; spect_widget);
</span><span class="cx">  
</span><del>---- src/filewriter/filewriter.cc.old
-+++ src/filewriter/filewriter.cc
-@@ -378,9 +378,9 @@ static void filenamefromfilename_cb(GtkWidget *button, void * data)

- static void * file_configure (void)
- {
--        GtkWidget * configure_vbox = gtk_vbox_new (FALSE, 6);
-+        GtkWidget * configure_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);

--        GtkWidget * fileext_hbox = gtk_hbox_new (FALSE, 5);
-+        GtkWidget * fileext_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-         gtk_box_pack_start(GTK_BOX(configure_vbox), fileext_hbox, FALSE, FALSE, 0);

-         GtkWidget * fileext_label = gtk_label_new (_(&quot;Output file format:&quot;));
-@@ -404,9 +404,9 @@ static void * file_configure (void)
-         gtk_widget_set_sensitive(plugin_button, plugin-&gt;configure != nullptr);
-         gtk_box_pack_end(GTK_BOX(fileext_hbox), plugin_button, FALSE, FALSE, 0);

--        gtk_box_pack_start(GTK_BOX(configure_vbox), gtk_hseparator_new(), FALSE, FALSE, 0);
-+        gtk_box_pack_start(GTK_BOX(configure_vbox), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);

--        GtkWidget * saveplace_hbox = gtk_hbox_new (FALSE, 5);
-+        GtkWidget * saveplace_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-         gtk_container_add(GTK_CONTAINER(configure_vbox), saveplace_hbox);

-         GtkWidget * saveplace1 = gtk_radio_button_new_with_label (nullptr,
-@@ -421,7 +421,7 @@ static void * file_configure (void)

-         gtk_box_pack_start ((GtkBox *) saveplace_hbox, saveplace2, FALSE, FALSE, 0);

--        path_hbox = gtk_hbox_new (FALSE, 5);
-+        path_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
-         gtk_box_pack_start(GTK_BOX(configure_vbox), path_hbox, FALSE, FALSE, 0);

-         GtkWidget * path_label = gtk_label_new (_(&quot;Output file folder:&quot;));
-@@ -436,9 +436,9 @@ static void * file_configure (void)
-         if (save_original)
-             gtk_widget_set_sensitive(path_hbox, FALSE);

--        gtk_box_pack_start(GTK_BOX(configure_vbox), gtk_hseparator_new(), FALSE, FALSE, 0);
-+        gtk_box_pack_start(GTK_BOX(configure_vbox), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);

--        filenamefrom_hbox = gtk_hbox_new (FALSE, 5);
-+        filenamefrom_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
-         gtk_container_add(GTK_CONTAINER(configure_vbox), filenamefrom_hbox);

-         filenamefrom_label = gtk_label_new(_(&quot;Generate file name from:&quot;));
-@@ -463,7 +463,7 @@ static void * file_configure (void)
-         if (filenamefromtags)
-             gtk_widget_set_sensitive(use_suffix_toggle, FALSE);

--        gtk_box_pack_start(GTK_BOX(configure_vbox), gtk_hseparator_new(), FALSE, FALSE, 0);
-+        gtk_box_pack_start(GTK_BOX(configure_vbox), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);

-         prependnumber_toggle = gtk_check_button_new_with_label(_(&quot;Prepend track number to file name&quot;));
-         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prependnumber_toggle), prependnumber);
</del><span class="cx"> --- src/filewriter/mp3.cc.old
</span><span class="cx"> +++ src/filewriter/mp3.cc
</span><del>-@@ -669,10 +669,10 @@ static void mp3_configure(void)
</del><ins>+@@ -563,10 +563,10 @@ void * mp3_configure ()
</ins><span class="cx">  
</span><span class="cx">          /* Quality */
</span><span class="cx">  
</span><del>--        quality_vbox = gtk_vbox_new (FALSE, 5);
</del><ins>+-        quality_vbox = gtk_vbox_new (false, 5);
</ins><span class="cx"> +        quality_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
</span><span class="cx">          gtk_container_set_border_width(GTK_CONTAINER(quality_vbox), 5);
</span><span class="cx">  
</span><del>--        quality_hbox1 = gtk_hbox_new (FALSE, 5);
</del><ins>+-        quality_hbox1 = gtk_hbox_new (false, 5);
</ins><span class="cx"> +        quality_hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
</span><del>-         gtk_box_pack_start(GTK_BOX(quality_vbox), quality_hbox1, FALSE,
-                            FALSE, 0);
</del><ins>+         gtk_box_pack_start(GTK_BOX(quality_vbox), quality_hbox1, false, false, 0);
</ins><span class="cx">  
</span><del>-@@ -684,7 +684,7 @@ static void mp3_configure(void)
-         gtk_box_pack_start(GTK_BOX(quality_hbox1), alg_quality_frame,
-                            FALSE, FALSE, 0);
</del><ins>+         /* Algorithm Quality */
+@@ -574,7 +574,7 @@ void * mp3_configure ()
+         alg_quality_frame = gtk_frame_new(_(&quot;Algorithm Quality:&quot;));
+         gtk_box_pack_start(GTK_BOX(quality_hbox1), alg_quality_frame, true, true, 0);
</ins><span class="cx">  
</span><del>--        alg_quality_hbox = gtk_hbox_new (FALSE, 5);
</del><ins>+-        alg_quality_hbox = gtk_hbox_new (false, 5);
</ins><span class="cx"> +        alg_quality_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
</span><del>-         gtk_container_set_border_width(GTK_CONTAINER(alg_quality_hbox),
-                                        10);
</del><ins>+         gtk_container_set_border_width(GTK_CONTAINER(alg_quality_hbox), 5);
</ins><span class="cx">          gtk_container_add(GTK_CONTAINER(alg_quality_frame),
</span><del>-@@ -708,7 +708,7 @@ static void mp3_configure(void)
-         gtk_box_pack_start(GTK_BOX(quality_hbox1), samplerate_frame, FALSE,
-                            FALSE, 0);
</del><ins>+                           alg_quality_hbox);
+@@ -594,7 +594,7 @@ void * mp3_configure ()
+         samplerate_frame = gtk_frame_new(_(&quot;Output Sample Rate:&quot;));
+         gtk_box_pack_start(GTK_BOX(quality_hbox1), samplerate_frame, true, true, 0);
</ins><span class="cx">  
</span><del>--        samplerate_hbox = gtk_hbox_new (FALSE, 5);
</del><ins>+-        samplerate_hbox = gtk_hbox_new (false, 5);
</ins><span class="cx"> +        samplerate_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
</span><del>-         gtk_container_set_border_width(GTK_CONTAINER(samplerate_hbox), 10);
</del><ins>+         gtk_container_set_border_width(GTK_CONTAINER(samplerate_hbox), 5);
</ins><span class="cx">          gtk_container_add(GTK_CONTAINER(samplerate_frame),
</span><span class="cx">                            samplerate_hbox);
</span><del>-@@ -731,7 +731,7 @@ static void mp3_configure(void)
</del><ins>+@@ -619,7 +619,7 @@ void * mp3_configure ()
</ins><span class="cx">          g_signal_connect (combo, &quot;changed&quot;, (GCallback) samplerate_changed, nullptr);
</span><span class="cx">  
</span><span class="cx">          samplerate_label = gtk_label_new(_(&quot;(Hz)&quot;));
</span><span class="cx"> -        gtk_misc_set_alignment(GTK_MISC(samplerate_label), 0, 0.5);
</span><span class="cx"> +        gtk_widget_set_halign(samplerate_label, GTK_ALIGN_START);
</span><del>-         gtk_box_pack_start(GTK_BOX(samplerate_hbox), samplerate_label,
-                            FALSE, FALSE, 0);
</del><ins>+         gtk_box_pack_start(GTK_BOX(samplerate_hbox), samplerate_label, false, false, 0);
</ins><span class="cx">  
</span><del>-@@ -744,14 +744,14 @@ static void mp3_configure(void)
-                            FALSE, 0);
</del><ins>+         /* Encoder Quality */
+@@ -628,14 +628,14 @@ void * mp3_configure ()
+         gtk_box_pack_start(GTK_BOX(quality_vbox), enc_quality_frame, false, false, 0);
</ins><span class="cx">  
</span><span class="cx">          // vbox sorrounding hbox1 and hbox2
</span><del>--        enc_quality_vbox = gtk_vbox_new (FALSE, 5);
</del><ins>+-        enc_quality_vbox = gtk_vbox_new (false, 5);
</ins><span class="cx"> +        enc_quality_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
</span><del>-         gtk_container_set_border_width(GTK_CONTAINER(enc_quality_vbox), 10);
</del><ins>+         gtk_container_set_border_width(GTK_CONTAINER(enc_quality_vbox), 5);
</ins><span class="cx">  
</span><span class="cx">          // pack vbox to frame
</span><span class="cx">          gtk_container_add(GTK_CONTAINER(enc_quality_frame), enc_quality_vbox);
</span><span class="cx">  
</span><span class="cx">          // hbox1 for bitrate
</span><del>--        hbox1 = gtk_hbox_new (FALSE, 5);
</del><ins>+-        hbox1 = gtk_hbox_new (false, 5);
</ins><span class="cx"> +        hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
</span><span class="cx">          gtk_container_add(GTK_CONTAINER(enc_quality_vbox), hbox1);
</span><span class="cx">  
</span><span class="cx">          // radio 1
</span><del>-@@ -781,7 +781,7 @@ static void mp3_configure(void)
</del><ins>+@@ -664,7 +664,7 @@ void * mp3_configure ()
</ins><span class="cx">          g_signal_connect (combo, &quot;changed&quot;, (GCallback) bitrate_changed, nullptr);
</span><span class="cx">  
</span><span class="cx">          // hbox2 for compression ratio
</span><del>--        hbox2 = gtk_hbox_new (FALSE, 5);
</del><ins>+-        hbox2 = gtk_hbox_new (false, 5);
</ins><span class="cx"> +        hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
</span><span class="cx">          gtk_container_add(GTK_CONTAINER(enc_quality_vbox), hbox2);
</span><span class="cx">  
</span><span class="cx">          // radio 2
</span><del>-@@ -822,7 +822,7 @@ static void mp3_configure(void)
-         gtk_box_pack_start(GTK_BOX(quality_vbox), mode_frame, FALSE, FALSE,
-                            0);
</del><ins>+@@ -703,7 +703,7 @@ void * mp3_configure ()
+         mode_frame = gtk_frame_new(_(&quot;Audio Mode:&quot;));
+         gtk_box_pack_start(GTK_BOX(quality_vbox), mode_frame, false, false, 0);
</ins><span class="cx">  
</span><del>--        mode_hbox = gtk_hbox_new (FALSE, 10);
-+        mode_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
-         gtk_container_set_border_width(GTK_CONTAINER(mode_hbox), 10);
</del><ins>+-        mode_hbox = gtk_hbox_new (false, 5);
++        mode_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
+         gtk_container_set_border_width(GTK_CONTAINER(mode_hbox), 5);
</ins><span class="cx">          gtk_container_add(GTK_CONTAINER(mode_frame), mode_hbox);
</span><span class="cx">  
</span><del>-@@ -847,7 +847,7 @@ static void mp3_configure(void)
-         gtk_box_pack_start(GTK_BOX(quality_vbox), misc_frame, FALSE, FALSE,
-                            0);
</del><ins>+@@ -727,7 +727,7 @@ void * mp3_configure ()
+         misc_frame = gtk_frame_new(_(&quot;Miscellaneous:&quot;));
+         gtk_box_pack_start(GTK_BOX(quality_vbox), misc_frame, false, false, 0);
</ins><span class="cx">  
</span><del>--        misc_vbox = gtk_vbox_new (FALSE, 5);
</del><ins>+-        misc_vbox = gtk_vbox_new (false, 5);
</ins><span class="cx"> +        misc_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
</span><span class="cx">          gtk_container_set_border_width(GTK_CONTAINER(misc_vbox), 5);
</span><span class="cx">          gtk_container_add(GTK_CONTAINER(misc_frame), misc_vbox);
</span><span class="cx">  
</span><del>-@@ -880,7 +880,7 @@ static void mp3_configure(void)
</del><ins>+@@ -758,7 +758,7 @@ void * mp3_configure ()
</ins><span class="cx">  
</span><span class="cx">          /* VBR/ABR */
</span><span class="cx">  
</span><del>--        vbr_vbox = gtk_vbox_new (FALSE, 5);
</del><ins>+-        vbr_vbox = gtk_vbox_new (false, 5);
</ins><span class="cx"> +        vbr_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
</span><span class="cx">          gtk_container_set_border_width(GTK_CONTAINER(vbr_vbox), 5);
</span><span class="cx">  
</span><span class="cx">          /* Toggle VBR */
</span><del>-@@ -889,7 +889,7 @@ static void mp3_configure(void)
-         gtk_box_pack_start(GTK_BOX(vbr_vbox), vbr_toggle, FALSE, FALSE, 2);
</del><ins>+@@ -767,7 +767,7 @@ void * mp3_configure ()
+         gtk_box_pack_start(GTK_BOX(vbr_vbox), vbr_toggle, false, false, 0);
</ins><span class="cx">          g_signal_connect (vbr_toggle, &quot;toggled&quot;, (GCallback) toggle_vbr, nullptr);
</span><span class="cx">  
</span><del>--        vbr_options_vbox = gtk_vbox_new (FALSE, 0);
-+        vbr_options_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
</del><ins>+-        vbr_options_vbox = gtk_vbox_new (false, 5);
++        vbr_options_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
</ins><span class="cx">          gtk_container_add(GTK_CONTAINER(vbr_vbox), vbr_options_vbox);
</span><del>-         gtk_widget_set_sensitive(vbr_options_vbox, FALSE);
</del><ins>+         gtk_widget_set_sensitive(vbr_options_vbox, false);
</ins><span class="cx">  
</span><del>-@@ -900,7 +900,7 @@ static void mp3_configure(void)
-         gtk_box_pack_start(GTK_BOX(vbr_options_vbox), vbr_type_frame,
-                            FALSE, FALSE, 2);
</del><ins>+@@ -776,7 +776,7 @@ void * mp3_configure ()
+         vbr_type_frame = gtk_frame_new(_(&quot;Type:&quot;));
+         gtk_box_pack_start(GTK_BOX(vbr_options_vbox), vbr_type_frame, false, false, 0);
</ins><span class="cx">  
</span><del>--        vbr_type_hbox = gtk_hbox_new (FALSE, 5);
</del><ins>+-        vbr_type_hbox = gtk_hbox_new (false, 5);
</ins><span class="cx"> +        vbr_type_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
</span><span class="cx">          gtk_container_set_border_width(GTK_CONTAINER(vbr_type_hbox), 5);
</span><span class="cx">          gtk_container_add(GTK_CONTAINER(vbr_type_frame), vbr_type_hbox);
</span><span class="cx">  
</span><del>-@@ -933,19 +933,19 @@ static void mp3_configure(void)
-         gtk_box_pack_start(GTK_BOX(vbr_options_vbox), vbr_frame, FALSE,
-                            FALSE, 2);
</del><ins>+@@ -804,16 +804,16 @@ void * mp3_configure ()
+         vbr_frame = gtk_frame_new(_(&quot;VBR Options:&quot;));
+         gtk_box_pack_start(GTK_BOX(vbr_options_vbox), vbr_frame, false, false, 0);
</ins><span class="cx">  
</span><del>--        vbr_options_vbox2 = gtk_vbox_new (FALSE, 5);
</del><ins>+-        vbr_options_vbox2 = gtk_vbox_new (false, 5);
</ins><span class="cx"> +        vbr_options_vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
</span><del>-         gtk_container_set_border_width(GTK_CONTAINER(vbr_options_vbox2),
-                                        5);
</del><ins>+         gtk_container_set_border_width(GTK_CONTAINER(vbr_options_vbox2), 5);
</ins><span class="cx">          gtk_container_add(GTK_CONTAINER(vbr_frame), vbr_options_vbox2);
</span><span class="cx">  
</span><del>--        vbr_options_hbox1 = gtk_hbox_new (FALSE, 5);
</del><ins>+-        vbr_options_hbox1 = gtk_hbox_new (false, 5);
</ins><span class="cx"> +        vbr_options_hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
</span><del>-         gtk_container_set_border_width(GTK_CONTAINER(vbr_options_hbox1),
-                                        5);
</del><span class="cx">          gtk_container_add(GTK_CONTAINER(vbr_options_vbox2),
</span><span class="cx">                            vbr_options_hbox1);
</span><span class="cx">  
</span><span class="cx">          vbr_min_label = gtk_label_new(_(&quot;Minimum bitrate (kbps):&quot;));
</span><span class="cx"> -        gtk_misc_set_alignment(GTK_MISC(vbr_min_label), 0, 0.5);
</span><span class="cx"> +        gtk_widget_set_halign(vbr_min_label, GTK_ALIGN_START);
</span><del>-         gtk_box_pack_start(GTK_BOX(vbr_options_hbox1), vbr_min_label, TRUE,
-                            TRUE, 0);
</del><ins>+         gtk_box_pack_start(GTK_BOX(vbr_options_hbox1), vbr_min_label, false, false, 0);
</ins><span class="cx">  
</span><del>-@@ -964,14 +964,14 @@ static void mp3_configure(void)
-          0);
</del><ins>+         combo = gtk_combo_box_text_new ();
+@@ -831,12 +831,12 @@ void * mp3_configure ()
+         gtk_box_pack_start ((GtkBox *) vbr_options_hbox1, combo, false, false, 0);
</ins><span class="cx">          g_signal_connect (combo, &quot;changed&quot;, (GCallback) vbr_min_changed, nullptr);
</span><span class="cx">  
</span><del>--        vbr_options_hbox2 = gtk_hbox_new (FALSE, 5);
</del><ins>+-        vbr_options_hbox2 = gtk_hbox_new (false, 5);
</ins><span class="cx"> +        vbr_options_hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
</span><del>-         gtk_container_set_border_width(GTK_CONTAINER(vbr_options_hbox2),
-                                        5);
</del><span class="cx">          gtk_container_add(GTK_CONTAINER(vbr_options_vbox2),
</span><span class="cx">                            vbr_options_hbox2);
</span><span class="cx">  
</span><span class="cx">          vbr_max_label = gtk_label_new(_(&quot;Maximum bitrate (kbps):&quot;));
</span><span class="cx"> -        gtk_misc_set_alignment(GTK_MISC(vbr_max_label), 0, 0.5);
</span><span class="cx"> +        gtk_widget_set_halign(vbr_max_label, GTK_ALIGN_START);
</span><del>-         gtk_box_pack_start(GTK_BOX(vbr_options_hbox2), vbr_max_label, TRUE,
-                            TRUE, 0);
</del><ins>+         gtk_box_pack_start(GTK_BOX(vbr_options_hbox2), vbr_max_label, false, false, 0);
</ins><span class="cx">  
</span><del>-@@ -1010,12 +1010,12 @@ static void mp3_configure(void)
-                            FALSE, 2);
-         gtk_widget_set_sensitive(abr_frame, FALSE);
</del><ins>+         combo = gtk_combo_box_text_new ();
+@@ -871,12 +871,12 @@ void * mp3_configure ()
+         gtk_box_pack_start(GTK_BOX(vbr_options_vbox), abr_frame, false, false, 0);
+         gtk_widget_set_sensitive(abr_frame, false);
</ins><span class="cx">  
</span><del>--        abr_hbox = gtk_hbox_new (FALSE, 5);
</del><ins>+-        abr_hbox = gtk_hbox_new (false, 5);
</ins><span class="cx"> +        abr_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
</span><span class="cx">          gtk_container_set_border_width(GTK_CONTAINER(abr_hbox), 5);
</span><span class="cx">          gtk_container_add(GTK_CONTAINER(abr_frame), abr_hbox);
</span><span class="lines">@@ -1313,88 +1256,92 @@
</span><span class="cx">          abr_label = gtk_label_new(_(&quot;Average bitrate (kbps):&quot;));
</span><span class="cx"> -        gtk_misc_set_alignment(GTK_MISC(abr_label), 0, 0.5);
</span><span class="cx"> +        gtk_widget_set_halign(abr_label, GTK_ALIGN_START);
</span><del>-         gtk_box_pack_start(GTK_BOX(abr_hbox), abr_label, TRUE, TRUE, 0);
</del><ins>+         gtk_box_pack_start(GTK_BOX(abr_hbox), abr_label, false, false, 0);
</ins><span class="cx">  
</span><span class="cx">          combo = gtk_combo_box_text_new ();
</span><del>-@@ -1035,14 +1035,14 @@ static void mp3_configure(void)
</del><ins>+@@ -896,12 +896,12 @@ void * mp3_configure ()
</ins><span class="cx">  
</span><span class="cx">          /* Quality Level */
</span><span class="cx">  
</span><del>--        vbr_options_hbox3 = gtk_hbox_new (FALSE, 5);
</del><ins>+-        vbr_options_hbox3 = gtk_hbox_new (false, 5);
</ins><span class="cx"> +        vbr_options_hbox3 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
</span><del>-         gtk_container_set_border_width(GTK_CONTAINER(vbr_options_hbox3),
-                                        5);
</del><span class="cx">          gtk_container_add(GTK_CONTAINER(vbr_options_vbox),
</span><span class="cx">                            vbr_options_hbox3);
</span><span class="cx">  
</span><span class="cx">          vbr_quality_label = gtk_label_new(_(&quot;VBR quality level:&quot;));
</span><span class="cx"> -        gtk_misc_set_alignment(GTK_MISC(vbr_quality_label), 0, 0.5);
</span><span class="cx"> +        gtk_widget_set_halign(vbr_quality_label, GTK_ALIGN_START);
</span><del>-         gtk_box_pack_start(GTK_BOX(vbr_options_hbox3), vbr_quality_label,
-                            TRUE, TRUE, 0);
</del><ins>+         gtk_box_pack_start(GTK_BOX(vbr_options_hbox3), vbr_quality_label, false, false, 0);
</ins><span class="cx">  
</span><del>-@@ -1077,7 +1077,7 @@ static void mp3_configure(void)
</del><ins>+         vbr_quality_adj = (GtkAdjustment *) gtk_adjustment_new (4, 0, 9, 1, 1, 0);
+@@ -933,7 +933,7 @@ void * mp3_configure ()
</ins><span class="cx">  
</span><span class="cx">          /* Tags */
</span><span class="cx">  
</span><del>--        tags_vbox = gtk_vbox_new (FALSE, 5);
</del><ins>+-        tags_vbox = gtk_vbox_new (false, 5);
</ins><span class="cx"> +        tags_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
</span><span class="cx">          gtk_container_set_border_width(GTK_CONTAINER(tags_vbox), 5);
</span><span class="cx">  
</span><span class="cx">          /* Frame Params */
</span><del>-@@ -1088,7 +1088,7 @@ static void mp3_configure(void)
-         gtk_box_pack_start(GTK_BOX(tags_vbox), tags_frames_frame, FALSE,
-                            FALSE, 2);
</del><ins>+@@ -941,7 +941,7 @@ void * mp3_configure ()
+         tags_frames_frame = gtk_frame_new(_(&quot;Frame Parameters:&quot;));
+         gtk_box_pack_start(GTK_BOX(tags_vbox), tags_frames_frame, false, false, 0);
</ins><span class="cx">  
</span><del>--        tags_frames_hbox = gtk_hbox_new (FALSE, 5);
</del><ins>+-        tags_frames_hbox = gtk_hbox_new (false, 5);
</ins><span class="cx"> +        tags_frames_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
</span><span class="cx">          gtk_container_set_border_width(GTK_CONTAINER(tags_frames_hbox), 5);
</span><span class="cx">          gtk_container_add(GTK_CONTAINER(tags_frames_frame),
</span><span class="cx">                            tags_frames_hbox);
</span><del>-@@ -1122,7 +1122,7 @@ static void mp3_configure(void)
-         gtk_box_pack_start(GTK_BOX(tags_vbox), tags_id3_frame, FALSE,
-                            FALSE, 2);
</del><ins>+@@ -972,7 +972,7 @@ void * mp3_configure ()
+         tags_id3_frame = gtk_frame_new(_(&quot;ID3 Parameters:&quot;));
+         gtk_box_pack_start(GTK_BOX(tags_vbox), tags_id3_frame, false, false, 0);
</ins><span class="cx">  
</span><del>--        tags_id3_vbox = gtk_vbox_new (FALSE, 5);
</del><ins>+-        tags_id3_vbox = gtk_vbox_new (false, 5);
</ins><span class="cx"> +        tags_id3_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
</span><span class="cx">          gtk_container_set_border_width(GTK_CONTAINER(tags_id3_vbox), 5);
</span><span class="cx">          gtk_container_add(GTK_CONTAINER(tags_id3_frame), tags_id3_vbox);
</span><span class="cx">  
</span><del>-@@ -1134,7 +1134,7 @@ static void mp3_configure(void)
</del><ins>+@@ -983,7 +983,7 @@ void * mp3_configure ()
</ins><span class="cx">          g_signal_connect (tags_force_id3v2_toggle, &quot;toggled&quot;, (GCallback)
</span><span class="cx">           force_v2_toggle, nullptr);
</span><span class="cx">  
</span><del>--        tags_id3_hbox = gtk_hbox_new (FALSE, 5);
</del><ins>+-        tags_id3_hbox = gtk_hbox_new (false, 5);
</ins><span class="cx"> +        tags_id3_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
</span><span class="cx">          gtk_container_add(GTK_CONTAINER(tags_id3_vbox), tags_id3_hbox);
</span><span class="cx">  
</span><span class="cx">          tags_only_v1_toggle =
</span><span class="cx"> --- src/filewriter/vorbis.cc.old
</span><span class="cx"> +++ src/filewriter/vorbis.cc
</span><del>-@@ -207,17 +207,17 @@ static void vorbis_configure(void)
-         gtk_container_set_border_width(GTK_CONTAINER(quality_frame), 5);
-         gtk_box_pack_start(GTK_BOX(vbox), quality_frame, FALSE, FALSE, 2);
</del><ins>+@@ -188,22 +188,22 @@ static void quality_change(GtkAdjustment *adjustment, void * user_data)
</ins><span class="cx">  
</span><del>--        quality_vbox = gtk_vbox_new (FALSE, 5);
</del><ins>+ void * vorbis_configure ()
+ {
+-        GtkWidget * vbox = gtk_vbox_new (false, 5);
++        GtkWidget * vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);

+         /* quality options */
+         quality_frame = gtk_frame_new(_(&quot;Quality&quot;));
+         gtk_box_pack_start(GTK_BOX(vbox), quality_frame, false, false, 0);

+-        quality_vbox = gtk_vbox_new (false, 5);
</ins><span class="cx"> +        quality_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
</span><del>-         gtk_container_set_border_width(GTK_CONTAINER(quality_vbox), 10);
</del><ins>+         gtk_container_set_border_width(GTK_CONTAINER(quality_vbox), 5);
</ins><span class="cx">          gtk_container_add(GTK_CONTAINER(quality_frame), quality_vbox);
</span><span class="cx">  
</span><span class="cx">          /* quality option: vbr level */
</span><del>--        quality_hbox1 = gtk_hbox_new (FALSE, 5);
</del><ins>+-        quality_hbox1 = gtk_hbox_new (false, 5);
</ins><span class="cx"> +        quality_hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
</span><del>-         gtk_container_set_border_width(GTK_CONTAINER(quality_hbox1), 10);
</del><span class="cx">          gtk_container_add(GTK_CONTAINER(quality_vbox), quality_hbox1);
</span><span class="cx">  
</span><span class="cx">          quality_label = gtk_label_new(_(&quot;Quality level (0 - 10):&quot;));
</span><span class="cx"> -        gtk_misc_set_alignment(GTK_MISC(quality_label), 0, 0.5);
</span><span class="cx"> +        gtk_widget_set_halign(quality_label, GTK_ALIGN_START);
</span><del>-         gtk_box_pack_start(GTK_BOX(quality_hbox1), quality_label, TRUE, TRUE, 0);
</del><ins>+         gtk_box_pack_start(GTK_BOX(quality_hbox1), quality_label, false, false, 0);
</ins><span class="cx">  
</span><span class="cx">          quality_adj = (GtkAdjustment *) gtk_adjustment_new (5, 0, 10, 0.1, 1, 0);
</span><span class="cx"> --- src/gl-spectrum/gl-spectrum.cc.old
</span><span class="cx"> +++ src/gl-spectrum/gl-spectrum.cc
</span><del>-@@ -246,7 +246,7 @@ static void draw_bars ()
</del><ins>+@@ -245,7 +245,7 @@ static void draw_bars ()
</ins><span class="cx">      glPopMatrix ();
</span><span class="cx">  }
</span><span class="cx">  
</span><span class="lines">@@ -1411,19 +1358,19 @@
</span><span class="cx"> +    g_signal_connect (s_widget, &quot;draw&quot;, (GCallback) draw_cb, nullptr);
</span><span class="cx">      g_signal_connect (s_widget, &quot;realize&quot;, (GCallback) widget_realized, nullptr);
</span><span class="cx">      g_signal_connect (s_widget, &quot;destroy&quot;, (GCallback) widget_destroyed, nullptr);
</span><del>- 
</del><ins>+     g_signal_connect (s_widget, &quot;configure-event&quot;, (GCallback) widget_resize, nullptr);
</ins><span class="cx"> --- src/gtkui/columns.cc.old
</span><span class="cx"> +++ src/gtkui/columns.cc
</span><del>-@@ -294,7 +294,7 @@ void * pw_col_create_chooser ()
</del><ins>+@@ -299,7 +299,7 @@ void * pw_col_create_chooser ()
</ins><span class="cx">              avail.append (i, false);
</span><span class="cx">      }
</span><span class="cx">  
</span><span class="cx"> -    GtkWidget * hbox = gtk_hbox_new (false, 6);
</span><span class="cx"> +    GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
</span><del>-     gtk_widget_set_size_request (hbox, -1, 160);
</del><ins>+     gtk_widget_set_size_request (hbox, -1, audgui_get_dpi () * 5 / 4);
</ins><span class="cx">  
</span><span class="cx">      GtkWidget * scroll = gtk_scrolled_window_new (nullptr, nullptr);
</span><del>-@@ -308,7 +308,7 @@ void * pw_col_create_chooser ()
</del><ins>+@@ -313,7 +313,7 @@ void * pw_col_create_chooser ()
</ins><span class="cx">      audgui_list_add_column (avail_list, _(&quot;Available columns&quot;), 0, G_TYPE_STRING, -1);
</span><span class="cx">      gtk_container_add ((GtkContainer *) scroll, avail_list);
</span><span class="cx">  
</span><span class="lines">@@ -1440,7 +1387,7 @@
</span><span class="cx">      g_return_val_if_fail (! layout, nullptr);
</span><span class="cx"> -    layout = gtk_alignment_new (0, 0, 1, 1);
</span><span class="cx"> -    gtk_alignment_set_padding ((GtkAlignment *) layout, 3, 3, 3, 3);
</span><del>-+    layout = gtk_frame_new (NULL);
</del><ins>++    layout = gtk_frame_new (nullptr);
</ins><span class="cx"> +    gtk_frame_set_shadow_type ((GtkFrame *) layout, GTK_SHADOW_NONE);
</span><span class="cx"> +    gtk_container_set_border_width ((GtkContainer *) layout, 3);
</span><span class="cx">      NULL_ON_DESTROY (layout);
</span><span class="lines">@@ -1464,7 +1411,7 @@
</span><span class="cx">      gtk_container_add ((GtkContainer *) ebox, label);
</span><span class="cx">  
</span><span class="cx">      gtk_box_pack_start ((GtkBox *) vbox, widget, true, true, 0);
</span><del>-@@ -229,10 +230,13 @@ static gboolean restore_size_cb (RestoreSizeData * d)
</del><ins>+@@ -228,10 +229,13 @@ static void restore_size_cb (GtkPaned * paned, GdkRectangle *, RestoreSizeData *
</ins><span class="cx">  
</span><span class="cx">  static GtkWidget * paned_new (bool vertical, bool after, int w, int h)
</span><span class="cx">  {
</span><span class="lines">@@ -1483,7 +1430,7 @@
</span><span class="cx">  
</span><span class="cx"> --- src/gtkui/ui_gtk.cc.old
</span><span class="cx"> +++ src/gtkui/ui_gtk.cc
</span><del>-@@ -794,14 +794,16 @@ bool GtkUI::init ()
</del><ins>+@@ -781,15 +781,17 @@ bool GtkUI::init ()
</ins><span class="cx">      accel = gtk_accel_group_new ();
</span><span class="cx">      gtk_window_add_accel_group ((GtkWindow *) window, accel);
</span><span class="cx">  
</span><span class="lines">@@ -1497,12 +1444,13 @@
</span><span class="cx">  
</span><span class="cx">      toolbar = gtk_toolbar_new ();
</span><span class="cx">      gtk_toolbar_set_style ((GtkToolbar *) toolbar, GTK_TOOLBAR_ICONS);
</span><ins>+     gtk_toolbar_set_show_arrow ((GtkToolbar *) toolbar, false);
</ins><span class="cx"> +    GtkStyleContext * context = gtk_widget_get_style_context (toolbar);
</span><span class="cx"> +    gtk_style_context_add_class (context, GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
</span><span class="cx">      gtk_box_pack_start ((GtkBox *) vbox_outer, toolbar, false, false, 0);
</span><span class="cx">  
</span><span class="cx">      /* search button */
</span><del>-@@ -827,12 +829,13 @@ bool GtkUI::init ()
</del><ins>+@@ -817,12 +819,13 @@ bool GtkUI::init ()
</ins><span class="cx">      gtk_tool_item_set_expand (boxitem1, true);
</span><span class="cx">      gtk_toolbar_insert ((GtkToolbar *) toolbar, boxitem1, -1);
</span><span class="cx">  
</span><span class="lines">@@ -1513,12 +1461,12 @@
</span><span class="cx"> -    slider = gtk_hscale_new (nullptr);
</span><span class="cx"> +    slider = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, nullptr);
</span><span class="cx">      gtk_scale_set_draw_value ((GtkScale *) slider, false);
</span><del>-     gtk_widget_set_size_request (slider, 120, -1);
</del><ins>+     gtk_widget_set_size_request (slider, audgui_get_dpi () * 5 / 4, -1);
</ins><span class="cx"> +    gtk_widget_set_valign (slider, GTK_ALIGN_CENTER);
</span><span class="cx">      gtk_widget_set_can_focus (slider, false);
</span><span class="cx">      gtk_box_pack_start ((GtkBox *) box1, slider, true, true, 6);
</span><span class="cx">  
</span><del>-@@ -854,7 +857,7 @@ bool GtkUI::init ()
</del><ins>+@@ -844,7 +847,7 @@ bool GtkUI::init ()
</ins><span class="cx">      GtkToolItem * boxitem2 = gtk_tool_item_new ();
</span><span class="cx">      gtk_toolbar_insert ((GtkToolbar *) toolbar, boxitem2, -1);
</span><span class="cx">  
</span><span class="lines">@@ -1527,7 +1475,7 @@
</span><span class="cx">      gtk_container_add ((GtkContainer *) boxitem2, box2);
</span><span class="cx">  
</span><span class="cx">      volume = gtk_volume_button_new ();
</span><del>-@@ -874,7 +877,7 @@ bool GtkUI::init ()
</del><ins>+@@ -864,7 +867,7 @@ bool GtkUI::init ()
</ins><span class="cx">      GtkWidget * layout = layout_new ();
</span><span class="cx">      gtk_box_pack_start ((GtkBox *) vbox_outer, layout, true, true, 0);
</span><span class="cx">  
</span><span class="lines">@@ -1536,7 +1484,7 @@
</span><span class="cx">      layout_add_center (vbox);
</span><span class="cx">  
</span><span class="cx">      ui_playlist_notebook_new ();
</span><del>-@@ -969,15 +972,13 @@ void GtkUI::cleanup ()
</del><ins>+@@ -947,15 +950,13 @@ void GtkUI::cleanup ()
</ins><span class="cx">  
</span><span class="cx">  static void menu_position_cb (GtkMenu * menu, int * x, int * y, int * push, void * button)
</span><span class="cx">  {
</span><span class="lines">@@ -1555,7 +1503,7 @@
</span><span class="cx">  
</span><span class="cx"> --- src/gtkui/ui_infoarea.cc.old
</span><span class="cx"> +++ src/gtkui/ui_infoarea.cc
</span><del>-@@ -232,12 +232,29 @@ static void hsv_to_rgb (float h, float s, float v, float * r, float * g,
</del><ins>+@@ -240,12 +240,29 @@ static void hsv_to_rgb (float h, float s, float v, float * r, float * g,
</ins><span class="cx">      * b = v * (1 - s * (1 - * b));
</span><span class="cx">  }
</span><span class="cx">  
</span><span class="lines">@@ -1565,7 +1513,7 @@
</span><span class="cx"> -    GdkColor * c = (gtk_widget_get_style (widget))-&gt;base + GTK_STATE_SELECTED;
</span><span class="cx"> -    float h, s, v;
</span><span class="cx"> +    static GdkRGBA c;
</span><del>-+    static gboolean valid = FALSE;
</del><ins>++    static gboolean valid = false;
</ins><span class="cx"> +
</span><span class="cx"> +    if (! valid)
</span><span class="cx"> +    {
</span><span class="lines">@@ -1580,7 +1528,7 @@
</span><span class="cx"> +        gtk_style_context_get_background_color (style,
</span><span class="cx"> +         (GtkStateFlags) (GTK_STATE_FLAG_FOCUSED | GTK_STATE_FLAG_SELECTED), &amp; c);
</span><span class="cx"> +        g_object_unref (style);
</span><del>-+        valid = TRUE;
</del><ins>++        valid = true;
</ins><span class="cx"> +    }
</span><span class="cx">  
</span><span class="cx"> -    rgb_to_hsv (c-&gt;red / 65535.0, c-&gt;green / 65535.0, c-&gt;blue / 65535.0, &amp; h, &amp; s, &amp; v);
</span><span class="lines">@@ -1588,8 +1536,8 @@
</span><span class="cx"> +    rgb_to_hsv (c.red, c.green, c.blue, &amp; h, &amp; s, &amp; v);
</span><span class="cx">  
</span><span class="cx">      if (s &lt; 0.1) /* monochrome theme? use blue instead */
</span><del>-     {
-@@ -251,10 +268,8 @@ static void get_color (GtkWidget * widget, int i, float * r, float * g, float *
</del><ins>+         h = 5;
+@@ -256,10 +273,8 @@ static void get_color (GtkWidget * widget, int i, float * r, float * g, float *
</ins><span class="cx">      hsv_to_rgb (h, s, v, r, g, b);
</span><span class="cx">  }
</span><span class="cx">  
</span><span class="lines">@@ -1601,16 +1549,16 @@
</span><span class="cx">      clear (widget, cr);
</span><span class="cx">  
</span><span class="cx">      for (int i = 0; i &lt; VIS_BANDS; i++)
</span><del>-@@ -264,7 +279,7 @@ static int expose_vis_cb (GtkWidget * widget, GdkEventExpose * event)
-         int m = aud::min (VIS_CENTER + vis.bars[i], HEIGHT);
</del><ins>+@@ -269,7 +284,7 @@ static int expose_vis_cb (GtkWidget * widget, GdkEventExpose * event)
+         int m = aud::min (VIS_CENTER + v, HEIGHT);
</ins><span class="cx">  
</span><span class="cx">          float r, g, b;
</span><span class="cx"> -        get_color (widget, i, &amp; r, &amp; g, &amp; b);
</span><span class="cx"> +        get_color (i, &amp; r, &amp; g, &amp; b);
</span><span class="cx">  
</span><span class="cx">          cairo_set_source_rgb (cr, r, g, b);
</span><del>-         cairo_rectangle (cr, x, t, 6, VIS_CENTER - t);
-@@ -275,7 +290,6 @@ static int expose_vis_cb (GtkWidget * widget, GdkEventExpose * event)
</del><ins>+         cairo_rectangle (cr, x, VIS_CENTER - v, BAND_WIDTH, v);
+@@ -280,7 +295,6 @@ static int expose_vis_cb (GtkWidget * widget, GdkEventExpose * event)
</ins><span class="cx">          cairo_fill (cr);
</span><span class="cx">      }
</span><span class="cx">  
</span><span class="lines">@@ -1618,7 +1566,7 @@
</span><span class="cx">      return true;
</span><span class="cx">  }
</span><span class="cx">  
</span><del>-@@ -326,16 +340,15 @@ static void draw_title (cairo_t * cr)
</del><ins>+@@ -335,16 +349,15 @@ static void draw_title (cairo_t * cr)
</ins><span class="cx">           0.7, 0.7, area-&gt;last_alpha, &quot;9&quot;, area-&gt;last_album);
</span><span class="cx">  }
</span><span class="cx">  
</span><span class="lines">@@ -1626,7 +1574,7 @@
</span><span class="cx"> +static gboolean draw_cb (GtkWidget * widget, cairo_t * cr)
</span><span class="cx">  {
</span><span class="cx"> -    cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (widget));
</span><del>-+    g_return_val_if_fail (area, FALSE);
</del><ins>++    g_return_val_if_fail (area, false);
</ins><span class="cx">  
</span><span class="cx">      clear (widget, cr);
</span><span class="cx">  
</span><span class="lines">@@ -1637,7 +1585,7 @@
</span><span class="cx">      return true;
</span><span class="cx">  }
</span><span class="cx">  
</span><del>-@@ -480,7 +493,7 @@ void ui_infoarea_show_vis (bool show)
</del><ins>+@@ -472,7 +485,7 @@ void ui_infoarea_show_vis (bool show)
</ins><span class="cx">          gtk_widget_set_size_request (vis.widget, VIS_WIDTH + 2 * SPACING, HEIGHT);
</span><span class="cx">          gtk_box_pack_start ((GtkBox *) area-&gt;box, vis.widget, false, false, 0);
</span><span class="cx">  
</span><span class="lines">@@ -1646,15 +1594,15 @@
</span><span class="cx">          gtk_widget_show (vis.widget);
</span><span class="cx">  
</span><span class="cx">          aud_visualizer_add (&amp; vis);
</span><del>-@@ -530,13 +543,13 @@ GtkWidget * ui_infoarea_new ()
-     g_return_val_if_fail (! area, nullptr);
-     area = new UIInfoArea ();
</del><ins>+@@ -519,13 +532,13 @@ GtkWidget * ui_infoarea_new ()
+     compute_sizes ();
</ins><span class="cx">  
</span><ins>+     area = new UIInfoArea ();
</ins><span class="cx"> -    area-&gt;box = gtk_hbox_new (false, 0);
</span><span class="cx"> +    area-&gt;box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
</span><span class="cx">  
</span><span class="cx">      area-&gt;main = gtk_drawing_area_new ();
</span><del>-     gtk_widget_set_size_request (area-&gt;main, ICON_SIZE + 2 * SPACING, HEIGHT);
</del><ins>+     gtk_widget_set_size_request (area-&gt;main, HEIGHT, HEIGHT);
</ins><span class="cx">      gtk_box_pack_start ((GtkBox *) area-&gt;box, area-&gt;main, true, true, 0);
</span><span class="cx">  
</span><span class="cx"> -    g_signal_connect (area-&gt;main, &quot;expose-event&quot;, (GCallback) expose_cb, nullptr);
</span><span class="lines">@@ -1664,15 +1612,15 @@
</span><span class="cx">      hook_associate (&quot;playback ready&quot;, (HookFunction) ui_infoarea_playback_start, nullptr);
</span><span class="cx"> --- src/gtkui/ui_playlist_notebook.cc.old
</span><span class="cx"> +++ src/gtkui/ui_playlist_notebook.cc
</span><del>-@@ -48,6 +48,7 @@ void apply_column_widths (GtkWidget * treeview)
</del><ins>+@@ -47,6 +47,7 @@ void apply_column_widths (GtkWidget * treeview)
</ins><span class="cx">      {
</span><span class="cx">          GtkTreeViewColumn * col = gtk_tree_view_get_column ((GtkTreeView *) treeview, i);
</span><span class="cx">          gtk_tree_view_column_set_fixed_width (col, pw_col_widths[pw_cols[i]]);
</span><del>-+        gtk_tree_view_column_set_expand (col, FALSE);
</del><ins>++        gtk_tree_view_column_set_expand (col, false);
</ins><span class="cx">      }
</span><span class="cx">  }
</span><span class="cx">  
</span><del>-@@ -110,14 +111,6 @@ static void close_button_cb (GtkWidget * button, void * id)
</del><ins>+@@ -103,14 +104,6 @@ static void close_button_cb (GtkWidget * button, void * id)
</ins><span class="cx">      audgui_confirm_playlist_delete (aud_playlist_by_unique_id (GPOINTER_TO_INT (id)));
</span><span class="cx">  }
</span><span class="cx">  
</span><span class="lines">@@ -1687,7 +1635,7 @@
</span><span class="cx">  static GtkWidget * make_close_button (GtkWidget * ebox, int list)
</span><span class="cx">  {
</span><span class="cx">      GtkWidget * button = gtk_button_new ();
</span><del>-@@ -130,19 +123,22 @@ static GtkWidget * make_close_button (GtkWidget * ebox, int list)
</del><ins>+@@ -123,19 +116,22 @@ static GtkWidget * make_close_button (GtkWidget * ebox, int list)
</ins><span class="cx">      g_signal_connect (button, &quot;clicked&quot;, (GCallback) close_button_cb,
</span><span class="cx">       GINT_TO_POINTER (aud_playlist_get_unique_id (list)));
</span><span class="cx">  
</span><span class="lines">@@ -1723,7 +1671,7 @@
</span><span class="cx">  
</span><span class="cx">      gtk_widget_show (button);
</span><span class="cx">  
</span><del>-@@ -304,7 +300,7 @@ void ui_playlist_notebook_create_tab (int playlist)
</del><ins>+@@ -295,7 +291,7 @@ void ui_playlist_notebook_create_tab (int playlist)
</ins><span class="cx">      GtkWidget * ebox = gtk_event_box_new ();
</span><span class="cx">      gtk_event_box_set_visible_window ((GtkEventBox *) ebox, false);
</span><span class="cx">  
</span><span class="lines">@@ -1749,7 +1697,7 @@
</span><span class="cx">      }
</span><span class="cx">  
</span><span class="cx">      controls-&gt;combobox = gtk_combo_box_text_new();
</span><del>-+    gtk_widget_set_hexpand(controls-&gt;combobox, TRUE);
</del><ins>++    gtk_widget_set_hexpand(controls-&gt;combobox, true);
</ins><span class="cx">      for (i=0;i&lt;EVENT_MAX;i++)
</span><span class="cx">      {
</span><span class="cx">          gtk_combo_box_text_append_text((GtkComboBoxText *) controls-&gt;combobox, _(event_desc[i]));
</span><span class="lines">@@ -1761,9 +1709,9 @@
</span><span class="cx">  
</span><span class="cx">      controls-&gt;keytext = gtk_entry_new ();
</span><span class="cx"> -    gtk_table_attach_defaults (GTK_TABLE (grid), controls-&gt;keytext, 1, 2, row, row + 1);
</span><del>-+    gtk_widget_set_hexpand (controls-&gt;keytext, TRUE);
</del><ins>++    gtk_widget_set_hexpand (controls-&gt;keytext, true);
</ins><span class="cx"> +    gtk_grid_attach (GTK_GRID (grid), controls-&gt;keytext, 1, row, 1, 1);
</span><del>-     gtk_editable_set_editable(GTK_EDITABLE(controls-&gt;keytext), FALSE);
</del><ins>+     gtk_editable_set_editable(GTK_EDITABLE(controls-&gt;keytext), false);
</ins><span class="cx">  
</span><span class="cx">  
</span><span class="cx"> @@ -351,7 +353,7 @@ KeyControls* add_event_controls(KeyControls* list,
</span><span class="lines">@@ -1787,20 +1735,20 @@
</span><span class="cx">  
</span><span class="cx">      ungrab_keys();
</span><span class="cx">  
</span><del>--    main_vbox = gtk_vbox_new (FALSE, 4);
</del><ins>+-    main_vbox = gtk_vbox_new (false, 4);
</ins><span class="cx"> +    main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
</span><span class="cx">  
</span><span class="cx"> -    alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
</span><del>--    gtk_box_pack_start (GTK_BOX (main_vbox), alignment, FALSE, TRUE, 0);
</del><ins>+-    gtk_box_pack_start (GTK_BOX (main_vbox), alignment, false, true, 0);
</ins><span class="cx"> -    gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 4, 0, 0, 0);
</span><del>--    hbox = gtk_hbox_new (FALSE, 2);
</del><ins>+-    hbox = gtk_hbox_new (false, 2);
</ins><span class="cx"> -    gtk_container_add (GTK_CONTAINER (alignment), hbox);
</span><span class="cx"> +    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
</span><del>-+    gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0);
</del><ins>++    gtk_box_pack_start (GTK_BOX (main_vbox), hbox, false, true, 0);
</ins><span class="cx">      image = gtk_image_new_from_icon_name (&quot;dialog-information&quot;, GTK_ICON_SIZE_DIALOG);
</span><del>-     gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (hbox), image, false, true, 0);
</ins><span class="cx">      label = gtk_label_new (_(&quot;Press a key combination inside a text field.\nYou can also bind mouse buttons.&quot;));
</span><del>-     gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (hbox), label, true, true, 0);
</ins><span class="cx"> -    gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
</span><span class="cx"> +    gtk_widget_set_halign (label, GTK_ALIGN_START);
</span><span class="cx">  
</span><span class="lines">@@ -1808,13 +1756,13 @@
</span><span class="cx">      gtk_label_set_markup (GTK_LABEL (label), _(&quot;Hotkeys:&quot;));
</span><span class="cx"> @@ -398,27 +396,23 @@ void *make_config_widget ()
</span><span class="cx">      gtk_frame_set_label_widget (GTK_FRAME (frame), label);
</span><del>-     gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (main_vbox), frame, true, true, 0);
</ins><span class="cx">      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
</span><span class="cx"> -    alignment = gtk_alignment_new (0, 0, 1, 0);
</span><span class="cx"> -    gtk_container_add (GTK_CONTAINER (frame), alignment);
</span><span class="cx"> -    gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 3, 3, 3, 3);
</span><span class="cx">  
</span><del>--    grid = gtk_table_new (0, 0, FALSE);
</del><ins>+-    grid = gtk_table_new (0, 0, false);
</ins><span class="cx"> -    gtk_table_set_col_spacings (GTK_TABLE (grid), 2);
</span><span class="cx"> -    gtk_container_add (GTK_CONTAINER (alignment), grid);
</span><span class="cx"> +    grid = gtk_grid_new ();
</span><span class="lines">@@ -1844,13 +1792,13 @@
</span><span class="cx">      add_event_controls(current_controls, grid, i, &amp;temphotkey);
</span><span class="cx">  
</span><span class="cx">  
</span><del>--    hbox = gtk_hbox_new (FALSE, 0);
</del><ins>+-    hbox = gtk_hbox_new (false, 0);
</ins><span class="cx"> +    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
</span><del>-     gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (main_vbox), hbox, false, true, 0);
</ins><span class="cx">  
</span><span class="cx"> -    button_box = gtk_hbutton_box_new ();
</span><span class="cx"> +    button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
</span><del>-     gtk_box_pack_start (GTK_BOX (hbox), button_box, FALSE, TRUE, 0);
</del><ins>+     gtk_box_pack_start (GTK_BOX (hbox), button_box, false, true, 0);
</ins><span class="cx">      gtk_button_box_set_layout (GTK_BUTTON_BOX (button_box), GTK_BUTTONBOX_START);
</span><span class="cx">      gtk_box_set_spacing (GTK_BOX (button_box), 4);
</span><span class="cx"> @@ -520,9 +514,9 @@ static void clear_keyboard (GtkWidget *widget, void * data)
</span><span class="lines">@@ -1868,7 +1816,7 @@
</span><span class="cx">              g_object_unref(c-&gt;keytext);
</span><span class="cx"> --- src/ladspa/plugin.cc.old
</span><span class="cx"> +++ src/ladspa/plugin.cc
</span><del>-@@ -33,6 +33,10 @@
</del><ins>+@@ -34,6 +34,10 @@
</ins><span class="cx">  
</span><span class="cx">  #include &quot;plugin.h&quot;
</span><span class="cx">  
</span><span class="lines">@@ -1879,29 +1827,29 @@
</span><span class="cx">  const char * const LADSPAHost::defaults[] = {
</span><span class="cx">   &quot;plugin_count&quot;, &quot;0&quot;,
</span><span class="cx">   nullptr};
</span><del>-@@ -423,7 +427,7 @@ static void configure_plugin (LoadedPlugin &amp; loaded)
</del><ins>+@@ -424,7 +428,7 @@ static void configure_plugin (LoadedPlugin &amp; loaded)
</ins><span class="cx">      {
</span><span class="cx">          ControlData &amp; control = plugin.controls[i];
</span><span class="cx">  
</span><del>--        GtkWidget * hbox = gtk_hbox_new (FALSE, 6);
</del><ins>+-        GtkWidget * hbox = gtk_hbox_new (false, 6);
</ins><span class="cx"> +        GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
</span><span class="cx">          gtk_box_pack_start ((GtkBox *) vbox, hbox, 0, 0, 0);
</span><span class="cx">  
</span><span class="cx">          if (control.is_toggle)
</span><del>-@@ -469,10 +473,10 @@ static void configure_selected ()

- static void * make_config_widget ()
</del><ins>+@@ -472,10 +476,10 @@ static void * make_config_widget ()
</ins><span class="cx">  {
</span><del>--    GtkWidget * vbox = gtk_vbox_new (FALSE, 6);
</del><ins>+     int dpi = audgui_get_dpi ();

+-    GtkWidget * vbox = gtk_vbox_new (false, 6);
</ins><span class="cx"> +    GtkWidget * vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
</span><del>-     gtk_widget_set_size_request (vbox, 480, 360);
</del><ins>+     gtk_widget_set_size_request (vbox, 5 * dpi, 4 * dpi);
</ins><span class="cx">  
</span><del>--    GtkWidget * hbox = gtk_hbox_new (FALSE, 6);
</del><ins>+-    GtkWidget * hbox = gtk_hbox_new (false, 6);
</ins><span class="cx"> +    GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
</span><span class="cx">      gtk_box_pack_start ((GtkBox *) vbox, hbox, 0, 0, 0);
</span><span class="cx">  
</span><span class="cx">      GtkWidget * label = gtk_label_new (_(&quot;Module paths:&quot;));
</span><del>-@@ -483,17 +487,17 @@ static void * make_config_widget ()
</del><ins>+@@ -486,17 +490,17 @@ static void * make_config_widget ()
</ins><span class="cx">       _(&quot;&lt;small&gt;Separate multiple paths with a colon.\n&quot;
</span><span class="cx">       &quot;These paths are searched in addition to LADSPA_PATH.\n&quot;
</span><span class="cx">       &quot;After adding new paths, press Enter to scan for new plugins.&lt;/small&gt;&quot;));
</span><span class="lines">@@ -1914,54 +1862,63 @@
</span><span class="cx">      GtkWidget * entry = gtk_entry_new ();
</span><span class="cx">      gtk_box_pack_start ((GtkBox *) hbox, entry, 1, 1, 0);
</span><span class="cx">  
</span><del>--    hbox = gtk_hbox_new (FALSE, 6);
</del><ins>+-    hbox = gtk_hbox_new (false, 6);
</ins><span class="cx"> +    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
</span><span class="cx">      gtk_box_pack_start ((GtkBox *) vbox, hbox, 1, 1, 0);
</span><span class="cx">  
</span><del>--    GtkWidget * vbox2 = gtk_vbox_new (FALSE, 6);
</del><ins>+-    GtkWidget * vbox2 = gtk_vbox_new (false, 6);
</ins><span class="cx"> +    GtkWidget * vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
</span><span class="cx">      gtk_box_pack_start ((GtkBox *) hbox, vbox2, 1, 1, 0);
</span><span class="cx">  
</span><span class="cx">      label = gtk_label_new (_(&quot;Available plugins:&quot;));
</span><del>-@@ -506,13 +510,13 @@ static void * make_config_widget ()
</del><ins>+@@ -509,13 +513,13 @@ static void * make_config_widget ()
</ins><span class="cx">      plugin_list = create_plugin_list ();
</span><span class="cx">      gtk_container_add ((GtkContainer *) scrolled, plugin_list);
</span><span class="cx">  
</span><del>--    GtkWidget * hbox2 = gtk_hbox_new (FALSE, 6);
</del><ins>+-    GtkWidget * hbox2 = gtk_hbox_new (false, 6);
</ins><span class="cx"> +    GtkWidget * hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
</span><span class="cx">      gtk_box_pack_start ((GtkBox *) vbox2, hbox2, 0, 0, 0);
</span><span class="cx">  
</span><span class="cx">      GtkWidget * enable_button = gtk_button_new_with_label (_(&quot;Enable&quot;));
</span><span class="cx">      gtk_box_pack_end ((GtkBox *) hbox2, enable_button, 0, 0, 0);
</span><span class="cx">  
</span><del>--    vbox2 = gtk_vbox_new (FALSE, 6);
</del><ins>+-    vbox2 = gtk_vbox_new (false, 6);
</ins><span class="cx"> +    vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
</span><span class="cx">      gtk_box_pack_start ((GtkBox *) hbox, vbox2, 1, 1, 0);
</span><span class="cx">  
</span><span class="cx">      label = gtk_label_new (_(&quot;Enabled plugins:&quot;));
</span><del>-@@ -525,7 +529,7 @@ static void * make_config_widget ()
</del><ins>+@@ -528,7 +532,7 @@ static void * make_config_widget ()
</ins><span class="cx">      loaded_list = create_loaded_list ();
</span><span class="cx">      gtk_container_add ((GtkContainer *) scrolled, loaded_list);
</span><span class="cx">  
</span><del>--    hbox2 = gtk_hbox_new (FALSE, 6);
</del><ins>+-    hbox2 = gtk_hbox_new (false, 6);
</ins><span class="cx"> +    hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
</span><span class="cx">      gtk_box_pack_start ((GtkBox *) vbox2, hbox2, 0, 0, 0);
</span><span class="cx">  
</span><span class="cx">      GtkWidget * disable_button = gtk_button_new_with_label (_(&quot;Disable&quot;));
</span><span class="cx"> --- src/lyricwiki/lyricwiki.cc.old
</span><span class="cx"> +++ src/lyricwiki/lyricwiki.cc
</span><del>-@@ -296,7 +296,7 @@ static GtkWidget *build_widget(void)
-     scrollview = gtk_scrolled_window_new(nullptr, nullptr);
-     gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollview), GTK_SHADOW_IN);
-     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollview), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
--    vbox = gtk_vbox_new (FALSE, 10);
-+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
</del><ins>+@@ -339,7 +339,7 @@ static GtkWidget * build_widget ()
+     GtkWidget * scrollview = gtk_scrolled_window_new (nullptr, nullptr);
+     gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) scrollview, GTK_SHADOW_IN);
+     gtk_scrolled_window_set_policy ((GtkScrolledWindow *) scrollview, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+-    GtkWidget * vbox = gtk_vbox_new (false, 6);
++    GtkWidget * vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
</ins><span class="cx">  
</span><del>-     gtk_container_add(GTK_CONTAINER(scrollview), textview);
</del><ins>+     gtk_container_add ((GtkContainer *) scrollview, (GtkWidget *) textview);
+     gtk_box_pack_start ((GtkBox *) vbox, scrollview, true, true, 0);
+@@ -350,7 +350,7 @@ static GtkWidget * build_widget ()
+     gtk_text_buffer_create_tag (textbuffer, &quot;size_x_large&quot;, &quot;scale&quot;, PANGO_SCALE_X_LARGE, nullptr);
+     gtk_text_buffer_create_tag (textbuffer, &quot;style_italic&quot;, &quot;style&quot;, PANGO_STYLE_ITALIC, nullptr);
</ins><span class="cx">  
</span><ins>+-    GtkWidget * hbox = gtk_hbox_new (false, 6);
++    GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+     gtk_box_pack_start ((GtkBox *) vbox, hbox, false, false, 0);

+     edit_button = gtk_button_new_with_mnemonic (_(&quot;Edit lyrics ...&quot;));
</ins><span class="cx"> --- src/playlist-manager/playlist-manager.cc.old
</span><span class="cx"> +++ src/playlist-manager/playlist-manager.cc
</span><del>-@@ -218,7 +218,7 @@ static void destroy_cb (GtkWidget * window)
</del><ins>+@@ -213,7 +213,7 @@ static void destroy_cb (GtkWidget * window)
</ins><span class="cx">  
</span><span class="cx">  void * PlaylistManager::get_gtk_widget ()
</span><span class="cx">  {
</span><span class="lines">@@ -1970,26 +1927,26 @@
</span><span class="cx">  
</span><span class="cx">      /* ListView */
</span><span class="cx">      GtkWidget * playman_pl_lv = audgui_list_new (&amp; callbacks, nullptr, aud_playlist_count ());
</span><del>-@@ -240,7 +240,7 @@ void * PlaylistManager::get_gtk_widget ()
</del><ins>+@@ -235,7 +235,7 @@ void * PlaylistManager::get_gtk_widget ()
</ins><span class="cx">      gtk_box_pack_start ((GtkBox *) playman_vbox, playman_pl_lv_sw, true, true, 0);
</span><span class="cx">  
</span><span class="cx">      /* ButtonBox */
</span><span class="cx"> -    GtkWidget * playman_button_hbox = gtk_hbox_new (false, 6);
</span><span class="cx"> +    GtkWidget * playman_button_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
</span><del>-     GtkWidget * new_button = audgui_button_new (_(&quot;_New&quot;), &quot;document-new&quot;, new_cb, nullptr);
</del><ins>+     GtkWidget * new_button = audgui_button_new (_(&quot;_New&quot;), &quot;document-new&quot;,
+      (AudguiCallback) aud_playlist_new, nullptr);
</ins><span class="cx">      GtkWidget * delete_button = audgui_button_new (_(&quot;_Remove&quot;), &quot;edit-delete&quot;, delete_cb, nullptr);
</span><del>-     GtkWidget * rename_button = audgui_button_new (_(&quot;Ren_ame&quot;), &quot;insert-text&quot;, rename_cb, nullptr);
</del><span class="cx"> --- src/scrobbler2/config_window.cc.old
</span><span class="cx"> +++ src/scrobbler2/config_window.cc
</span><span class="cx"> @@ -167,11 +167,11 @@ static void *config_status_checker () {
</span><span class="cx">      GtkWidget *details_box;
</span><span class="cx">      GtkWidget *additional_details_box;
</span><span class="cx">  
</span><del>--    config_box              = gtk_vbox_new (FALSE, 15);
--    permission_box          = gtk_hbox_new (FALSE, 0);
</del><ins>+-    config_box              = gtk_vbox_new (false, 15);
+-    permission_box          = gtk_hbox_new (false, 0);
</ins><span class="cx"> -    buttons_box             = gtk_vbutton_box_new ();
</span><del>--    details_box             = gtk_vbox_new (FALSE, 0);
--    additional_details_box  = gtk_hbox_new (FALSE, 7);
</del><ins>+-    details_box             = gtk_vbox_new (false, 0);
+-    additional_details_box  = gtk_hbox_new (false, 7);
</ins><span class="cx"> +    config_box              = gtk_box_new(GTK_ORIENTATION_VERTICAL,  15);
</span><span class="cx"> +    permission_box          = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
</span><span class="cx"> +    buttons_box             = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);
</span><span class="lines">@@ -2007,14 +1964,14 @@
</span><span class="cx"> +    gtk_widget_set_halign(details_label_second, GTK_ALIGN_CENTER);
</span><span class="cx">  
</span><span class="cx">      gtk_widget_hide(url_button);
</span><del>-     gtk_widget_set_no_show_all(url_button, TRUE);
</del><ins>+     gtk_widget_set_no_show_all(url_button, true);
</ins><span class="cx"> --- src/search-tool/search-tool.cc.old
</span><span class="cx"> +++ src/search-tool/search-tool.cc
</span><del>-@@ -677,11 +677,11 @@ static void refresh_cb (GtkButton * button, GtkWidget * chooser)
</del><ins>+@@ -675,11 +675,11 @@ static void refresh_cb (GtkButton * button, GtkWidget * chooser)
</ins><span class="cx">  
</span><span class="cx">  void * SearchTool::get_gtk_widget ()
</span><span class="cx">  {
</span><del>--    GtkWidget * vbox = gtk_vbox_new (FALSE, 6);
</del><ins>+-    GtkWidget * vbox = gtk_vbox_new (false, 6);
</ins><span class="cx"> +    GtkWidget * vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
</span><span class="cx">  
</span><span class="cx">      entry = gtk_entry_new ();
</span><span class="lines">@@ -2022,341 +1979,318 @@
</span><span class="cx"> -    (void) _(&quot;Search library&quot;);  // translated string is used in GTK3 branch
</span><span class="cx"> +    gtk_entry_set_placeholder_text ((GtkEntry *) entry, _(&quot;Search library&quot;));
</span><span class="cx">      g_signal_connect (entry, &quot;destroy&quot;, (GCallback) gtk_widget_destroyed, &amp; entry);
</span><del>-     gtk_box_pack_start ((GtkBox *) vbox, entry, FALSE, FALSE, 0);
</del><ins>+     gtk_box_pack_start ((GtkBox *) vbox, entry, false, false, 0);
</ins><span class="cx">  
</span><del>-@@ -717,7 +717,7 @@ void * SearchTool::get_gtk_widget ()
-     gtk_widget_set_no_show_all (stats_label, TRUE);
-     gtk_box_pack_start ((GtkBox *) vbox, stats_label, FALSE, FALSE, 0);
</del><ins>+@@ -716,7 +716,7 @@ void * SearchTool::get_gtk_widget ()
+     gtk_widget_set_no_show_all (stats_label, true);
+     gtk_box_pack_start ((GtkBox *) vbox, stats_label, false, false, 0);
</ins><span class="cx">  
</span><del>--    GtkWidget * hbox = gtk_hbox_new (FALSE, 6);
</del><ins>+-    GtkWidget * hbox = gtk_hbox_new (false, 6);
</ins><span class="cx"> +    GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
</span><del>-     gtk_box_pack_end ((GtkBox *) vbox, hbox, FALSE, FALSE, 0);
</del><ins>+     gtk_box_pack_end ((GtkBox *) vbox, hbox, false, false, 0);
</ins><span class="cx">  
</span><span class="cx">      GtkWidget * chooser = gtk_file_chooser_button_new (_(&quot;Choose Folder&quot;),
</span><del>---- src/skins/draw-compat.h.old
-+++ src/skins/draw-compat.h
-@@ -27,22 +27,15 @@
- static void widget_realized (GtkWidget * w)
- {
-     GdkWindow * window = gtk_widget_get_window (w);
--    gdk_window_set_back_pixmap (window, nullptr, FALSE);
-+    gdk_window_set_background_pattern (window, nullptr);
- }

--#define DRAW_SIGNAL &quot;expose-event&quot;
--#define DRAW_FUNC_BEGIN(n) static int n (GtkWidget * wid, GdkEventExpose * ev) { \
-- cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (wid));
--#define DRAW_FUNC_END cairo_destroy (cr); \
-- return TRUE; }
--
--/* We set None as the background pixmap in order to avoid flickering.  Setting
-- * a blank GtkStyle prevents GTK 2.x from overriding this. */
-+#define DRAW_SIGNAL &quot;draw&quot;
-+#define DRAW_FUNC_BEGIN(n) static gboolean n (GtkWidget * wid, cairo_t * cr) { \
-+ g_return_val_if_fail (wid &amp;&amp; cr, FALSE);
-+#define DRAW_FUNC_END return FALSE; }

- #define DRAW_CONNECT(w,f) do { \
--    GtkStyle * style = gtk_style_new (); \
--    gtk_widget_set_style (w, style); \
--    g_object_unref (style); \
-     g_signal_connect (w, &quot;realize&quot;, (GCallback) widget_realized, nullptr); \
-     g_signal_connect (w, DRAW_SIGNAL, (GCallback) f, nullptr); \
-  } while (0);
</del><span class="cx"> --- src/skins/menus.cc.old
</span><span class="cx"> +++ src/skins/menus.cc
</span><del>-@@ -290,7 +290,7 @@ static void position_menu (GtkMenu * menu, int * x, int * y, gboolean * push_in,
</del><ins>+@@ -319,7 +319,7 @@ static void position_menu (GtkMenu * menu, int * x, int * y, gboolean * push_in,
</ins><span class="cx">      audgui_get_monitor_geometry (gtk_widget_get_screen ((GtkWidget *) menu), pos-&gt;x, pos-&gt;y, &amp; geom);
</span><span class="cx">  
</span><span class="cx">      GtkRequisition request;
</span><span class="cx"> -    gtk_widget_size_request ((GtkWidget *) menu, &amp; request);
</span><del>-+    gtk_widget_get_preferred_size ((GtkWidget *) menu, NULL, &amp; request);
</del><ins>++    gtk_widget_get_preferred_size ((GtkWidget *) menu, nullptr, &amp; request);
</ins><span class="cx">  
</span><span class="cx">      if (pos-&gt;leftward)
</span><span class="cx">          * x = aud::max (pos-&gt;x - request.width, geom.x);
</span><del>---- src/skins/preset-list.cc.old
-+++ src/skins/preset-list.cc
-@@ -259,7 +259,7 @@ static GtkWidget * equalizerwin_create_list_window
</del><ins>+--- src/skins/search-select.cc.old
++++ src/skins/search-select.cc
+@@ -76,39 +76,43 @@ void action_playlist_search_and_select ()
+      _(&quot;Cancel&quot;), GTK_RESPONSE_REJECT, _(&quot;Search&quot;), GTK_RESPONSE_ACCEPT, nullptr);
</ins><span class="cx">  
</span><del>-     audgui_destroy_on_escape (* window);

--    vbox = gtk_vbox_new (FALSE, 10);
-+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
-     gtk_container_add(GTK_CONTAINER(*window), vbox);

-     scrolled_window = gtk_scrolled_window_new(nullptr, nullptr);
-@@ -299,7 +299,7 @@ static GtkWidget * equalizerwin_create_list_window
-         gtk_box_pack_start(GTK_BOX(vbox), *entry, FALSE, FALSE, 0);
-     }

--    bbox = gtk_hbutton_box_new();
-+    bbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-     gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-     gtk_box_set_spacing(GTK_BOX(bbox), 5);
-     gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
---- src/skins/ui_playlist.cc.old
-+++ src/skins/ui_playlist.cc
-@@ -221,40 +221,45 @@ playlistwin_select_search(void)
-       _(&quot;Cancel&quot;) , GTK_RESPONSE_REJECT , _(&quot;Search&quot;) , GTK_RESPONSE_ACCEPT , nullptr );

</del><span class="cx">      /* help text and logo */
</span><del>--    searchdlg_hbox = gtk_hbox_new (FALSE, 6);
-+    searchdlg_hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 4 );
-     searchdlg_logo = gtk_image_new_from_icon_name( &quot;edit-find&quot; , GTK_ICON_SIZE_DIALOG );
-     searchdlg_helptext = gtk_label_new( _(&quot;Select entries in playlist by filling one or more &quot;
-       &quot;fields. Fields use regular expressions syntax, case-insensitive. If you don't know how &quot;
-       &quot;regular expressions work, simply insert a literal portion of what you're searching for.&quot;) );
-+    gtk_label_set_max_width_chars( GTK_LABEL(searchdlg_helptext), 70 );
-     gtk_label_set_line_wrap( GTK_LABEL(searchdlg_helptext) , TRUE );
-     gtk_box_pack_start( GTK_BOX(searchdlg_hbox) , searchdlg_logo , FALSE , FALSE , 0 );
-     gtk_box_pack_start( GTK_BOX(searchdlg_hbox) , searchdlg_helptext , FALSE , FALSE , 0 );
</del><ins>+-    GtkWidget * hbox = gtk_hbox_new (false, 6);
++    GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+     GtkWidget * logo = gtk_image_new_from_icon_name (&quot;edit-find&quot;, GTK_ICON_SIZE_DIALOG);
+     GtkWidget * helptext = gtk_label_new (_(&quot;Select entries in playlist by filling one or more &quot;
+      &quot;fields. Fields use regular expressions syntax, case-insensitive. If you don't know how &quot;
+      &quot;regular expressions work, simply insert a literal portion of what you're searching for.&quot;));
++    gtk_label_set_max_width_chars ((GtkLabel *) helptext, 70);
+     gtk_label_set_line_wrap ((GtkLabel *) helptext, true);
+     gtk_box_pack_start ((GtkBox *) hbox, logo, false, false, 0);
+     gtk_box_pack_start ((GtkBox *) hbox, helptext, false, false, 0);
</ins><span class="cx">  
</span><span class="cx">      /* title */
</span><del>-     searchdlg_label_title = gtk_label_new( _(&quot;Title:&quot;) );
--    gtk_misc_set_alignment ((GtkMisc *) searchdlg_label_title, 1, 0.5);
-     searchdlg_entry_title = gtk_entry_new();
-+    gtk_widget_set_hexpand( searchdlg_entry_title , TRUE );
-+    gtk_widget_set_halign( searchdlg_label_title , GTK_ALIGN_START );
-     g_signal_connect( searchdlg_entry_title , &quot;key-press-event&quot; ,
-       G_CALLBACK(playlistwin_select_search_kp_cb) , searchdlg_win );
</del><ins>+     GtkWidget * label_title = gtk_label_new (_(&quot;Title:&quot;));
+-    gtk_misc_set_alignment ((GtkMisc *) label_title, 1, 0.5);
+     GtkWidget * entry_title = gtk_entry_new ();
++    gtk_widget_set_hexpand (entry_title, true);
++    gtk_widget_set_halign (label_title, GTK_ALIGN_START);
+     g_signal_connect (entry_title, &quot;key-press-event&quot;, (GCallback) search_kp_cb, dialog);
</ins><span class="cx">  
</span><span class="cx">      /* album */
</span><del>-     searchdlg_label_album= gtk_label_new( _(&quot;Album:&quot;) );
--    gtk_misc_set_alignment ((GtkMisc *) searchdlg_label_album, 1, 0.5);
-     searchdlg_entry_album= gtk_entry_new();
-+    gtk_widget_set_hexpand( searchdlg_entry_album , TRUE );
-+    gtk_widget_set_halign( searchdlg_label_album , GTK_ALIGN_START );
-     g_signal_connect( searchdlg_entry_album , &quot;key-press-event&quot; ,
-       G_CALLBACK(playlistwin_select_search_kp_cb) , searchdlg_win );
</del><ins>+     GtkWidget * label_album = gtk_label_new (_(&quot;Album:&quot;));
+-    gtk_misc_set_alignment ((GtkMisc *) label_album, 1, 0.5);
+     GtkWidget * entry_album = gtk_entry_new ();
++    gtk_widget_set_hexpand (entry_album, true);
++    gtk_widget_set_halign (label_album, GTK_ALIGN_START);
+     g_signal_connect (entry_album, &quot;key-press-event&quot;, (GCallback) search_kp_cb, dialog);
</ins><span class="cx">  
</span><span class="cx">      /* artist */
</span><del>-     searchdlg_label_performer = gtk_label_new( _(&quot;Artist:&quot;) );
--    gtk_misc_set_alignment ((GtkMisc *) searchdlg_label_performer, 1, 0.5);
-     searchdlg_entry_performer = gtk_entry_new();
-+    gtk_widget_set_hexpand( searchdlg_entry_performer , TRUE );
-+    gtk_widget_set_halign( searchdlg_label_performer , GTK_ALIGN_START );
-     g_signal_connect( searchdlg_entry_performer , &quot;key-press-event&quot; ,
-       G_CALLBACK(playlistwin_select_search_kp_cb) , searchdlg_win );
</del><ins>+     GtkWidget * label_performer = gtk_label_new (_(&quot;Artist:&quot;));
+-    gtk_misc_set_alignment ((GtkMisc *) label_performer, 1, 0.5);
+     GtkWidget * entry_performer = gtk_entry_new ();
++    gtk_widget_set_hexpand (entry_performer, true);
++    gtk_widget_set_halign (label_performer, GTK_ALIGN_START);
+     g_signal_connect (entry_performer, &quot;key-press-event&quot;, (GCallback) search_kp_cb, dialog);
</ins><span class="cx">  
</span><span class="cx">      /* file name */
</span><del>-     searchdlg_label_file_name = gtk_label_new( _(&quot;File Name:&quot;) );
--    gtk_misc_set_alignment ((GtkMisc *) searchdlg_label_file_name, 1, 0.5);
-     searchdlg_entry_file_name = gtk_entry_new();
-+    gtk_widget_set_hexpand( searchdlg_entry_file_name , TRUE );
-+    gtk_widget_set_halign( searchdlg_label_file_name , GTK_ALIGN_START );
-     g_signal_connect( searchdlg_entry_file_name , &quot;key-press-event&quot; ,
-       G_CALLBACK(playlistwin_select_search_kp_cb) , searchdlg_win );
</del><ins>+     GtkWidget * label_file_name = gtk_label_new (_(&quot;File Name:&quot;));
+-    gtk_misc_set_alignment ((GtkMisc *) label_file_name, 1, 0.5);
+     GtkWidget * entry_file_name = gtk_entry_new ();
+-    g_signal_connect (entry_file_name, &quot;key-press-event&quot;,
+-     (GCallback) search_kp_cb, dialog);
++    gtk_widget_set_hexpand (entry_file_name, true);
++    gtk_widget_set_halign (label_file_name, GTK_ALIGN_START);
++    g_signal_connect (entry_file_name, &quot;key-press-event&quot;, (GCallback) search_kp_cb, dialog);
</ins><span class="cx">  
</span><del>-@@ -274,21 +279,22 @@ playlistwin_select_search(void)
-       G_CALLBACK(playlistwin_select_search_cbt_cb) , searchdlg_checkbt_autoenqueue );
</del><ins>+     /* some options that control behaviour */
+     GtkWidget * checkbt_clearprevsel = gtk_check_button_new_with_label (
+@@ -127,21 +131,22 @@ void action_playlist_search_and_select ()
+      (GCallback) search_cbt_cb, checkbt_autoenqueue);
</ins><span class="cx">  
</span><del>-     /* place fields in searchdlg_grid */
--    searchdlg_grid = gtk_table_new (0, 0, FALSE);
--    gtk_table_set_row_spacings (GTK_TABLE (searchdlg_grid), 6);
--    gtk_table_set_col_spacings (GTK_TABLE (searchdlg_grid), 6);
--    gtk_table_attach_defaults (GTK_TABLE (searchdlg_grid), searchdlg_hbox, 0, 2, 0, 1);
--    gtk_table_attach (GTK_TABLE (searchdlg_grid), searchdlg_label_title, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
--    gtk_table_attach_defaults (GTK_TABLE (searchdlg_grid), searchdlg_entry_title, 1, 2, 1, 2);
--    gtk_table_attach (GTK_TABLE (searchdlg_grid), searchdlg_label_album, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
--    gtk_table_attach_defaults (GTK_TABLE (searchdlg_grid), searchdlg_entry_album, 1, 2, 2, 3);
--    gtk_table_attach (GTK_TABLE (searchdlg_grid), searchdlg_label_performer, 0, 1, 3, 4, GTK_FILL, GTK_FILL, 0, 0);
--    gtk_table_attach_defaults (GTK_TABLE (searchdlg_grid), searchdlg_entry_performer, 1, 2, 3, 4);
--    gtk_table_attach (GTK_TABLE (searchdlg_grid), searchdlg_label_file_name, 0, 1, 4, 5, GTK_FILL, GTK_FILL, 0, 0);
--    gtk_table_attach_defaults (GTK_TABLE (searchdlg_grid), searchdlg_entry_file_name, 1, 2, 4, 5);
--    gtk_table_attach_defaults (GTK_TABLE (searchdlg_grid), searchdlg_checkbt_clearprevsel, 0, 2, 5, 6);
--    gtk_table_attach_defaults (GTK_TABLE (searchdlg_grid), searchdlg_checkbt_autoenqueue, 0, 2, 6, 7);
--    gtk_table_attach_defaults (GTK_TABLE (searchdlg_grid), searchdlg_checkbt_newplaylist, 0, 2, 7, 8);
-+    searchdlg_grid = gtk_grid_new();
-+    gtk_grid_set_row_spacing( GTK_GRID(searchdlg_grid) , 2 );
-+    gtk_widget_set_margin_bottom( searchdlg_hbox , 8 );
-+    gtk_widget_set_margin_top( searchdlg_checkbt_clearprevsel , 8 );
-+    gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_hbox , 0 , 0 , 2 , 1 );
-+    gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_label_title , 0 , 1 , 1 , 1 );
-+    gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_entry_title , 1 , 1 , 1 , 1 );
-+    gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_label_album , 0 , 2 , 1 , 1 );
-+    gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_entry_album , 1 , 2 , 1 , 1 );
-+    gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_label_performer , 0 , 3 , 1 , 1 );
-+    gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_entry_performer , 1 , 3 , 1 , 1 );
-+    gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_label_file_name , 0 , 4 , 1 , 1 );
-+    gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_entry_file_name , 1 , 4 , 1 , 1 );
-+    gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_checkbt_clearprevsel , 0 , 5 , 2 , 1 );
-+    gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_checkbt_autoenqueue , 0 , 6 , 2 , 1 );
-+    gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_checkbt_newplaylist , 0 , 7 , 2 , 1 );
</del><ins>+     /* place fields in grid */
+-    GtkTable * grid = (GtkTable *) gtk_table_new (0, 0, false);
+-    gtk_table_set_row_spacings (grid, 6);
+-    gtk_table_set_col_spacings (grid, 6);
+-    gtk_table_attach_defaults (grid, hbox, 0, 2, 0, 1);
+-    gtk_table_attach (grid, label_title, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+-    gtk_table_attach_defaults (grid, entry_title, 1, 2, 1, 2);
+-    gtk_table_attach (grid, label_album, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+-    gtk_table_attach_defaults (grid, entry_album, 1, 2, 2, 3);
+-    gtk_table_attach (grid, label_performer, 0, 1, 3, 4, GTK_FILL, GTK_FILL, 0, 0);
+-    gtk_table_attach_defaults (grid, entry_performer, 1, 2, 3, 4);
+-    gtk_table_attach (grid, label_file_name, 0, 1, 4, 5, GTK_FILL, GTK_FILL, 0, 0);
+-    gtk_table_attach_defaults (grid, entry_file_name, 1, 2, 4, 5);
+-    gtk_table_attach_defaults (grid, checkbt_clearprevsel, 0, 2, 5, 6);
+-    gtk_table_attach_defaults (grid, checkbt_autoenqueue, 0, 2, 6, 7);
+-    gtk_table_attach_defaults (grid, checkbt_newplaylist, 0, 2, 7, 8);
++    GtkGrid * grid = (GtkGrid *) gtk_grid_new ();
++    gtk_grid_set_row_spacing (grid, 2);
++    gtk_widget_set_margin_bottom (hbox, 8);
++    gtk_widget_set_margin_top (checkbt_clearprevsel, 8);
++    gtk_grid_attach (grid, hbox, 0, 0, 2, 1);
++    gtk_grid_attach (grid, label_title, 0, 1, 1, 1);
++    gtk_grid_attach (grid, entry_title, 1, 1, 1, 1);
++    gtk_grid_attach (grid, label_album, 0, 2, 1, 1);
++    gtk_grid_attach (grid, entry_album, 1, 2, 1, 1);
++    gtk_grid_attach (grid, label_performer, 0, 3, 1, 1);
++    gtk_grid_attach (grid, entry_performer, 1, 3, 1, 1);
++    gtk_grid_attach (grid, label_file_name, 0, 4, 1, 1);
++    gtk_grid_attach (grid, entry_file_name, 1, 4, 1, 1);
++    gtk_grid_attach (grid, checkbt_clearprevsel, 0, 5, 2, 1);
++    gtk_grid_attach (grid, checkbt_autoenqueue, 0, 6, 2, 1);
++    gtk_grid_attach (grid, checkbt_newplaylist, 0, 7, 2, 1);
</ins><span class="cx">  
</span><del>-     gtk_container_set_border_width( GTK_CONTAINER(searchdlg_grid) , 5 );
-     gtk_container_add ( GTK_CONTAINER(gtk_dialog_get_content_area
---- src/skins/ui_skin.cc.old
-+++ src/skins/ui_skin.cc
-@@ -517,7 +517,7 @@ skin_load_nolock(Skin * skin, const char * path, gboolean force)
-         return FALSE;
-     }
</del><ins>+     gtk_container_set_border_width ((GtkContainer *) grid, 5);
+     gtk_container_add ((GtkContainer *) gtk_dialog_get_content_area
+--- src/skins/skinselector.cc.old
++++ src/skins/skinselector.cc
+@@ -190,6 +190,11 @@ static void skin_view_on_cursor_changed (GtkTreeView * treeview)
+     GtkTreeIter iter;
</ins><span class="cx">  
</span><del>--    GdkRegion * masks[SKIN_MASK_COUNT];
-+    cairo_region_t * masks[SKIN_MASK_COUNT];
-     skin_load_masks (skin, skin_path, masks);
-     window_set_shapes (mainwin, masks[SKIN_MASK_MAIN], masks[SKIN_MASK_MAIN_SHADE]);
-     window_set_shapes (equalizerwin, masks[SKIN_MASK_EQ], masks[SKIN_MASK_EQ_SHADE]);
---- src/skins/ui_skin.h.old
-+++ src/skins/ui_skin.h
-@@ -198,7 +198,7 @@ void skin_draw_mainwin_titlebar (cairo_t * cr, gboolean shaded, gboolean focus);
- /* ui_skin_load_ini.c */
- void skin_load_hints (Skin * skin, const char * path);
- void skin_load_pl_colors (Skin * skin, const char * path);
--void skin_load_masks (Skin * skin, const char * path, GdkRegion * masks[SKIN_MASK_COUNT]);
-+void skin_load_masks (Skin * skin, const char * path, cairo_region_t * masks[SKIN_MASK_COUNT]);
</del><ins>+     auto selection = gtk_tree_view_get_selection (treeview);
++
++    /* workaround for Gnome bug #679291 */
++    if (! selection)
++        return;
++
+     if (! gtk_tree_selection_get_selected (selection, &amp; model, &amp; iter))
+         return;
</ins><span class="cx">  
</span><del>- static inline void set_cairo_color (cairo_t * cr, uint32_t c)
</del><ins>+@@ -206,7 +211,6 @@ void skin_view_realize (GtkTreeView * treeview)
</ins><span class="cx">  {
</span><del>---- src/skins/ui_skin_load_ini.cc.old
-+++ src/skins/ui_skin_load_ini.cc
-@@ -248,7 +248,7 @@ private:
-     }
- };
</del><ins>+     gtk_widget_show_all ((GtkWidget *) treeview);
</ins><span class="cx">  
</span><del>--static GdkRegion * skin_create_mask (const GArray * num,
-+static cairo_region_t * skin_create_mask (const GArray * num,
-  const GArray * point, int width, int height)
- {
-     if (! num || ! point)
-@@ -257,7 +257,7 @@ static GdkRegion * skin_create_mask (const GArray * num,
-     width *= config.scale;
-     height *= config.scale;
</del><ins>+-    gtk_tree_view_set_rules_hint (treeview, true);
+     gtk_tree_view_set_headers_visible (treeview, false);
</ins><span class="cx">  
</span><del>--    GdkRegion * mask = nullptr;
-+    cairo_region_t * mask = nullptr;
</del><ins>+     GtkListStore * store = gtk_list_store_new (SKIN_VIEW_N_COLS, GDK_TYPE_PIXBUF,
+--- src/skins/view.cc.old
++++ src/skins/view.cc
+@@ -245,13 +245,13 @@ void view_apply_show_remaining ()
+     mainwin_update_song_info ();
+ }
</ins><span class="cx">  
</span><del>-     unsigned j = 0;
-     for (unsigned i = 0; i &lt; num-&gt;len; i ++)
-@@ -281,12 +281,12 @@ static GdkRegion * skin_create_mask (const GArray * num,
</del><ins>+-static GdkRegion * scale_mask (const Index&lt;GdkRectangle&gt; &amp; mask, int scale)
++static cairo_region_t * scale_mask (const Index&lt;GdkRectangle&gt; &amp; mask, int scale)
+ {
+-    GdkRegion * region = nullptr;
++    cairo_region_t * region = nullptr;
</ins><span class="cx">  
</span><del>-         if (xmax &gt; xmin &amp;&amp; ymax &gt; ymin)
-         {
--            GdkRectangle rect = {xmin, ymin, xmax - xmin, ymax - ymin};
-+            cairo_rectangle_int_t rect = {xmin, ymin, xmax - xmin, ymax - ymin};
</del><ins>+     for (auto &amp; rect : mask)
+     {
+-        GdkRectangle scaled = {
++        cairo_rectangle_int_t scaled = {
+             rect.x * scale,
+             rect.y * scale,
+             rect.width * scale,
+@@ -259,9 +259,9 @@ static GdkRegion * scale_mask (const Index&lt;GdkRectangle&gt; &amp; mask, int scale)
+         };
</ins><span class="cx">  
</span><del>-             if (mask)
--                gdk_region_union_with_rect (mask, &amp; rect);
-+                cairo_region_union_rectangle (mask, &amp; rect);
-             else
--                mask = gdk_region_rectangle (&amp; rect);
-+                mask = cairo_region_create_rectangle (&amp; rect);
-         }
</del><ins>+         if (region)
+-            gdk_region_union_with_rect (region, &amp; scaled);
++            cairo_region_union_rectangle (region, &amp; scaled);
+         else
+-            region = gdk_region_rectangle (&amp; scaled);
++            region = cairo_region_create_rectangle (&amp; scaled);
+     }
</ins><span class="cx">  
</span><del>-         j += n_points * 2;
-@@ -295,7 +295,7 @@ static GdkRegion * skin_create_mask (const GArray * num,
-     return mask;
- }

--void skin_load_masks (Skin * skin, const char * path, GdkRegion * masks[SKIN_MASK_COUNT])
-+void skin_load_masks (Skin * skin, const char * path, cairo_region_t * masks[SKIN_MASK_COUNT])
</del><ins>+     return region;
+--- src/skins/widget.cc.old
++++ src/skins/widget.cc
+@@ -55,7 +55,7 @@ void Widget::set_drawable (GtkWidget * widget)
</ins><span class="cx">  {
</span><del>-     int sizes[SKIN_MASK_COUNT][2] = {
-         {skin-&gt;properties.mainwin_width, skin-&gt;properties.mainwin_height},
---- src/skins/ui_skinned_window.cc.old
-+++ src/skins/ui_skinned_window.cc
-@@ -27,7 +27,7 @@
- typedef struct {
-     void (* draw) (GtkWidget * window, cairo_t * cr);
-     GtkWidget * normal, * shaded;
--    GdkRegion * shape, * sshape;
-+    cairo_region_t * shape, * sshape;
-     gboolean is_shaded, is_moving;
- } WindowData;
</del><ins>+     m_drawable = widget;
+     g_signal_connect (widget, &quot;realize&quot;, (GCallback) Widget::realize_cb, this);
+-    g_signal_connect (widget, &quot;expose-event&quot;, (GCallback) Widget::draw_cb, this);
++    g_signal_connect (widget, &quot;draw&quot;, (GCallback) Widget::draw_cb, this);
</ins><span class="cx">  
</span><del>-@@ -43,7 +43,7 @@ static void window_apply_shape (GtkWidget * window)
</del><ins>+     if (! m_widget)
+     {
+@@ -98,28 +98,30 @@ void Widget::add_drawable (int width, int height)

+ void Widget::draw_now ()
</ins><span class="cx">  {
</span><del>-     WindowData * data = (WindowData *) g_object_get_data ((GObject *) window, &quot;windowdata&quot;);
-     g_return_if_fail (data);
--    
</del><ins>+-    if (m_drawable &amp;&amp; gtk_widget_is_drawable (m_drawable))
+-        draw_cb (m_drawable, nullptr, this);
+-}
++    if (! m_drawable || ! gtk_widget_is_drawable (m_drawable))
++        return;

+-gboolean Widget::draw_cb (GtkWidget * widget, GdkEventExpose * event, Widget * me)
+-{
+-    cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (widget));
++    cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (m_drawable));

+-    if (! gtk_widget_get_has_window (widget))
++    if (! gtk_widget_get_has_window (m_drawable))
+     {
+         GtkAllocation alloc;
+-        gtk_widget_get_allocation (widget, &amp; alloc);
++        gtk_widget_get_allocation (m_drawable, &amp; alloc);
+         cairo_translate (cr, alloc.x, alloc.y);
+         cairo_rectangle (cr, 0, 0, alloc.width, alloc.height);
+         cairo_clip (cr);
+     }

++    draw_cb (m_drawable, cr, this);
</ins><span class="cx"> +
</span><del>-     gdk_window_shape_combine_region (gtk_widget_get_window (window),
-      data-&gt;is_shaded ? data-&gt;sshape : data-&gt;shape, 0, 0);
</del><ins>++    cairo_destroy (cr);
++}
++
++gboolean Widget::draw_cb (GtkWidget * widget, cairo_t * cr, Widget * me)
++{
+     if (me-&gt;m_scale != 1)
+         cairo_scale (cr, me-&gt;m_scale, me-&gt;m_scale);

+     me-&gt;draw (cr);
+-
+-    cairo_destroy (cr);
+     return false;
</ins><span class="cx">  }
</span><del>-@@ -106,9 +106,9 @@ static void window_destroy (GtkWidget * window)
-     g_object_unref (data-&gt;shaded);
</del><ins>+--- src/skins/widget.h.old
++++ src/skins/widget.h
+@@ -68,7 +68,7 @@ private:
+     static void realize_cb (GtkWidget * widget, Widget * me)
+         { me-&gt;realize (); }
</ins><span class="cx">  
</span><del>-     if (data-&gt;shape)
--        gdk_region_destroy (data-&gt;shape);
-+        cairo_region_destroy (data-&gt;shape);
-     if (data-&gt;sshape)
--        gdk_region_destroy (data-&gt;sshape);
-+        cairo_region_destroy (data-&gt;sshape);
</del><ins>+-    static gboolean draw_cb (GtkWidget * widget, GdkEventExpose * event, Widget * me);
++    static gboolean draw_cb (GtkWidget * widget, cairo_t * cr, Widget * me);
</ins><span class="cx">  
</span><del>-     g_free (data);
- }
-@@ -168,19 +168,19 @@ void window_set_size (GtkWidget * window, int w, int h)
-     dock_set_size (window, w, h);
- }
</del><ins>+     static gboolean keypress_cb (GtkWidget * widget, GdkEventKey * event, Widget * me)
+         { return me-&gt;keypress (event); }
+--- src/skins/window.cc.old
++++ src/skins/window.cc
+@@ -33,7 +33,6 @@ void Window::apply_shape ()
</ins><span class="cx">  
</span><del>--void window_set_shapes (GtkWidget * window, GdkRegion * shape, GdkRegion * sshape)
-+void window_set_shapes (GtkWidget * window, cairo_region_t * shape, cairo_region_t * sshape)
</del><ins>+ void Window::realize ()
</ins><span class="cx">  {
</span><del>-     WindowData * data = (WindowData *) g_object_get_data ((GObject *) window, &quot;windowdata&quot;);
-     g_return_if_fail (data);
</del><ins>+-    gdk_window_set_back_pixmap (gtk_widget_get_window (gtk ()), nullptr, false);
+     apply_shape ();
+ }
</ins><span class="cx">  
</span><del>-     if (data-&gt;shape)
--        gdk_region_destroy (data-&gt;shape);
-+        cairo_region_destroy (data-&gt;shape);
-     if (data-&gt;sshape)
--        gdk_region_destroy (data-&gt;sshape);
-+        cairo_region_destroy (data-&gt;sshape);
</del><ins>+@@ -44,11 +43,11 @@ bool Window::button_press (GdkEventButton * event)
+         return false;
</ins><span class="cx">  
</span><del>-     data-&gt;shape = shape;
-     data-&gt;sshape = sshape;
--    
-+
-     if (gtk_widget_get_realized (window))
-         window_apply_shape (window);
- }
-@@ -205,7 +205,7 @@ void window_set_shaded (GtkWidget * window, gboolean shaded)
-     }
</del><ins>+     if (m_is_moving)
+-        return true;
++        return false;
</ins><span class="cx">  
</span><del>-     data-&gt;is_shaded = shaded;
--    
-+
-     if (gtk_widget_get_realized (window))
-         window_apply_shape (window);
</del><ins>+     dock_move_start (m_id, event-&gt;x_root, event-&gt;y_root);
+     m_is_moving = true;
+-    return true;
++    return false;
</ins><span class="cx">  }
</span><del>---- src/skins/ui_skinned_window.h.old
-+++ src/skins/ui_skinned_window.h
-@@ -27,7 +27,7 @@
- GtkWidget * window_new (int * x, int * y, int w, int h, gboolean main,
-  gboolean shaded, void (* draw) (GtkWidget * window, cairo_t * cr));
- void window_set_size (GtkWidget * window, int w, int h);
--void window_set_shapes (GtkWidget * window, GdkRegion * shape, GdkRegion * sshape);
-+void window_set_shapes (GtkWidget * window, cairo_region_t * shape, cairo_region_t * sshape);
- void window_set_shaded (GtkWidget * window, gboolean shaded);
- void window_put_widget (GtkWidget * window, gboolean shaded, GtkWidget * widget,
-  int x, int y);
---- src/skins/ui_skinselector.cc.old
-+++ src/skins/ui_skinselector.cc
-@@ -339,6 +339,10 @@ skin_view_on_cursor_changed(GtkTreeView * treeview,
</del><span class="cx">  
</span><del>-     selection = gtk_tree_view_get_selection(treeview);
</del><ins>+ bool Window::button_release (GdkEventButton * event)
+@@ -57,16 +56,16 @@ bool Window::button_release (GdkEventButton * event)
+         return false;
</ins><span class="cx">  
</span><del>-+    /* workaround for Gnome bug #679291 */
-+    if (! selection)
-+        return;
-+
-     if (!gtk_tree_selection_get_selected(selection, &amp;model, &amp;iter))
-         return;
</del><ins>+     m_is_moving = false;
+-    return true;
++    return false;
+ }
</ins><span class="cx">  
</span><del>-@@ -366,7 +370,6 @@ skin_view_realize(GtkTreeView * treeview)
</del><ins>+ bool Window::motion (GdkEventMotion * event)
+ {
+     if (! m_is_moving)
+-        return true;
++        return false;
</ins><span class="cx">  
</span><del>-     gtk_widget_show_all(GTK_WIDGET(treeview));
</del><ins>+     dock_move (event-&gt;x_root, event-&gt;y_root);
+-    return true;
++    return false;
+ }
</ins><span class="cx">  
</span><del>--    gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), TRUE);
-     gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
</del><ins>+ bool Window::close ()
+@@ -108,12 +107,6 @@ Window::Window (int id, int * x, int * y, int w, int h, bool shaded) :
+      GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK);
+     gtk_window_add_accel_group ((GtkWindow *) window, menu_get_accel_group ());
</ins><span class="cx">  
</span><del>-     store = gtk_list_store_new(SKIN_VIEW_N_COLS, GDK_TYPE_PIXBUF,
---- src/song_change/song_change.cc.old
-+++ src/song_change/song_change.cc
-@@ -334,7 +334,7 @@ static void * custom_warning (void)
-     GtkWidget *bbox_hbox;
-     char * temp;
</del><ins>+-    /* We set None as the background pixmap in order to avoid flickering.
+-     * Setting a blank GtkStyle prevents GTK 2.x from overriding this. */
+-    GtkStyle * style = gtk_style_new ();
+-    gtk_widget_set_style (window, style);
+-    g_object_unref (style);
+-
+     set_input (window);
+     set_drawable (window);
+     set_scale (config.scale);
+@@ -144,7 +137,7 @@ void Window::resize (int w, int h)
+     dock_set_size (m_id, w, h);
+ }
</ins><span class="cx">  
</span><del>--    bbox_hbox = gtk_hbox_new (FALSE, 6);
-+    bbox_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
</del><ins>+-void Window::set_shapes (GdkRegion * shape, GdkRegion * sshape)
++void Window::set_shapes (cairo_region_t * shape, cairo_region_t * sshape)
+ {
+     m_shape.capture (shape);
+     m_sshape.capture (sshape);
+--- src/skins/window.h.old
++++ src/skins/window.h
+@@ -40,7 +40,7 @@ public:
+     ~Window ();
</ins><span class="cx">  
</span><del>-     cmd_warn_img = gtk_image_new_from_icon_name(&quot;dialog-warning&quot;, GTK_ICON_SIZE_MENU);
-     gtk_box_pack_start(GTK_BOX(bbox_hbox), cmd_warn_img, FALSE, FALSE, 0);
</del><ins>+     void resize (int w, int h);
+-    void set_shapes (GdkRegion * shape, GdkRegion * sshape);
++    void set_shapes (cairo_region_t * shape, cairo_region_t * sshape);
+     bool is_shaded () { return m_is_shaded; }
+     void set_shaded (bool shaded);
+     void put_widget (bool shaded, Widget * widget, int x, int y);
+@@ -68,7 +68,7 @@ private:
+     bool m_is_shaded = false;
+     bool m_is_moving = false;
+     GtkWidget * m_normal = nullptr, * m_shaded = nullptr;
+-    SmartPtr&lt;GdkRegion, gdk_region_destroy&gt; m_shape, m_sshape;
++    SmartPtr&lt;cairo_region_t, cairo_region_destroy&gt; m_shape, m_sshape;
+ };

+ void dock_add_window (int id, Window * window, int * x, int * y, int w, int h);
</ins></span></pre>
</div>
</div>

</body>
</html>