Fixes for GNOME 3.38. Closes #68

indicator.js

@@ -72,7 +72,7 @@ class IndicatorMailMenuItem extends PopupMenu.PopupBaseMenuItem {
 
 		if (showDates) {
 			this._dateLabel = new St.Label({ text: Util.formatTime(new Date(datetime * 1000)), style_class: 'mailnag-date-label' });
-			hbox2.add(this._dateLabel, { expand: true, x_fill: false, x_align: St.Align.END });
+			hbox2.add(this._dateLabel, { y_expand: true, x_expand: false, x_align: St.Align.END });
 		}
 
 		this._closeButton = new St.Button({ reactive: true, can_focus: true, visible: false, track_hover: true });
@@ -96,8 +96,8 @@ class IndicatorMailMenuItem extends PopupMenu.PopupBaseMenuItem {
 			this._iconBin = new St.Bin({ style_class: 'avatar',
 								   style: 'background-image: url("%s")'.format(avatarFile),
 								   width: avatarSize, height: avatarSize,
-								   x_fill: true,
-								   y_fill: true });
+								   x_expand: true,
+								   y_expand: true });
 			hbox.add(this._iconBin);
 		} else {
 			/*hbox.add(new St.Icon({ icon_name: 'avatar-default', 
@@ -166,7 +166,7 @@ class MailnagIndicator extends PanelMenu.Button {
 			icon_name: INDICATOR_ICON,
 			style_class: 'system-status-icon'});
 
-		this._iconBin = new St.Bin({ child: this._icon, x_fill: false, y_fill: false });
+		this._iconBin = new St.Bin({ child: this._icon, x_expand: false, y_expand: false });
 
 		this._counterLabel = new St.Label({ text: "0",
 											x_align: Clutter.ActorAlign.CENTER,
@@ -366,7 +366,7 @@ class MailnagIndicator extends PanelMenu.Button {
 				let bin = new St.Bin({ style_class: 'overflow-badge', child: new St.Label( { text: str } ) });
 
 				hbox.add(label);
-				hbox.add(bin, { expand: true, x_fill: false, x_align: St.Align.END });
+				hbox.add(bin, { y_expand: true, x_expand: false, x_align: St.Align.END });
 				item.actor.add_child(hbox);
 			} else {
 				item.actor.add_child(label);

metadata.json

@@ -1,5 +1,5 @@
 {
-	"shell-version": ["3.36"],
+	"shell-version": ["3.36", "3.38"],
 	"uuid": "[email protected]",
 	"settings-schema": "org.gnome.shell.extensions.mailnag",
 	"gettext-domain": "mailnag-gnome-shell",

opts.js

@@ -1,6 +1,6 @@
 /* Mailnag - GNOME-Shell extension frontend
 *
-* Copyright 2016, 2019 Patrick Ulbrich <[email protected]>
+* Copyright 2016, 2019, 2020 Patrick Ulbrich <[email protected]>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 * MA 02110-1301, USA.
 */
 
-const ACTION_FLAGS = {
+var ACTION_FLAGS = {
 	NONE				: 0,
 	MARK_ALL_AS_READ	: 1,
 	CHECK_FOR_MAIL		: 2,