Labels patch fix.

- Old labels wrapping patch caused bugs in Zenity message dialogs.

3 files changed, 7 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 592348138bfd..91a3a85defe6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gtk3-mushrooms
 	pkgdesc = GTK3 patched for classic desktops like MATE/XFCE (see README).
 	pkgver = 3.22.30
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/TomaszGasior/gtk3-mushrooms
 	arch = x86_64
 	license = LGPL
@@ -80,7 +80,7 @@ pkgbase = gtk3-mushrooms
 	sha256sums = f0c8cbccab2bc9743075135bd5fa74f28dca722e8e723cf46e0dfa2b004a3791
 	sha256sums = 7b987cc9bd7ca9722bfb881b30b082c0d7409e3cd68592f5e7a1f401d73e7672
 	sha256sums = 99b12d7af7efc6a014e6afcab1ee82ea0feb0b5a4e9bbd663d1c45354cd34f2b
-	sha256sums = 68046c503f59a3a4eab0bb3dd7b6dd4e006206c3f9adc18898f4302cc4e70a44
+	sha256sums = 7a604d453beb9c425b8ed4a60b5e9435c3f4ee10438490641c0ade448401306a
 	sha256sums = d4d27ccc5735ee1d2c8483da659ded3a05e9d33b3fe41d8ed77495e9ec38be96
 	sha256sums = ba3dc10e116edc96e53867953bfa00d408fcc6ec55913553669be90bea5ad90d
 	sha256sums = 37e3278dd33542b706eb9e1db56997b194a7e2f1fd729a8511369387a74b22bd
diff --git a/PKGBUILD b/PKGBUILD
index 9814e16e6531..21d29e531016 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ __arch_pkg_commit="fbcc57e8a97827926b6624bb8bc570f675c7188d"
 
 pkgname=gtk3-mushrooms
 pkgver=3.22.30
-pkgrel=4
+pkgrel=5
 pkgdesc="GTK3 patched for classic desktops like MATE/XFCE (see README)."
 url="https://github.com/TomaszGasior/gtk3-mushrooms"
 conflicts=(gtk3 gtk3-print-backends)
@@ -81,7 +81,7 @@ sha256sums=(
 	"f0c8cbccab2bc9743075135bd5fa74f28dca722e8e723cf46e0dfa2b004a3791"
 	"7b987cc9bd7ca9722bfb881b30b082c0d7409e3cd68592f5e7a1f401d73e7672"
 	"99b12d7af7efc6a014e6afcab1ee82ea0feb0b5a4e9bbd663d1c45354cd34f2b"
-	"68046c503f59a3a4eab0bb3dd7b6dd4e006206c3f9adc18898f4302cc4e70a44"
+	"7a604d453beb9c425b8ed4a60b5e9435c3f4ee10438490641c0ade448401306a"
 	"d4d27ccc5735ee1d2c8483da659ded3a05e9d33b3fe41d8ed77495e9ec38be96"
 	"ba3dc10e116edc96e53867953bfa00d408fcc6ec55913553669be90bea5ad90d"
 	"37e3278dd33542b706eb9e1db56997b194a7e2f1fd729a8511369387a74b22bd"
diff --git a/fixes__labels-wrapping.patch b/fixes__labels-wrapping.patch
index 6cc18e037585..290cc2ae037f 100644
--- a/fixes__labels-wrapping.patch
+++ b/fixes__labels-wrapping.patch
@@ -12,10 +12,10 @@ diff --color -U 5 -r -Z -B ./org/gtk/gtklabel.c ./mod/gtk/gtklabel.c
 +    {
 +      gint default_window_width;
 +      gtk_window_get_default_size (GTK_WINDOW (toplevel), &default_window_width, NULL);
-+      if (default_window_width == -1 && priv->max_width_chars == -1)
-+        priv->max_width_chars = 52;
++      if (default_window_width == -1 && priv->max_width_chars == -1 && priv->ellipsize == PANGO_ELLIPSIZE_NONE)
++        priv->max_width_chars = 56;
 +    }
- 
+
    /* "width-chars" Hard-coded minimum width:
     *    - minimum size should be MAX (width-chars, strlen ("..."));
     *    - natural size should be MAX (width-chars, strlen (priv->text));