diff -Nru gnome-shell-extension-appindicator-18.04.1/appIndicator.js gnome-shell-extension-appindicator-22/appIndicator.js --- gnome-shell-extension-appindicator-18.04.1/appIndicator.js 2018-03-26 17:46:39.000000000 +0000 +++ gnome-shell-extension-appindicator-22/appIndicator.js 2017-10-23 14:27:00.000000000 +0000 @@ -28,7 +28,7 @@ const Signals = imports.signals const DBusMenu = Extension.imports.dbusMenu; -var IconCache = Extension.imports.iconCache; +const IconCache = Extension.imports.iconCache; const Util = Extension.imports.util; const Interfaces = Extension.imports.interfaces; @@ -39,7 +39,7 @@ HARDWARE: 'Hardware' }; -var SNIStatus = { +const SNIStatus = { PASSIVE: 'Passive', ACTIVE: 'Active', NEEDS_ATTENTION: 'NeedsAttention' @@ -49,7 +49,7 @@ * the AppIndicator class serves as a generic container for indicator information and functions common * for every displaying implementation (IndicatorMessageSource and IndicatorStatusIcon) */ -var AppIndicator = new Lang.Class({ +const AppIndicator = new Lang.Class({ Name: 'AppIndicator', _init: function(bus_name, object) { @@ -215,7 +215,7 @@ }); Signals.addSignalMethods(AppIndicator.prototype); -var IconActor = new Lang.Class({ +const IconActor = new Lang.Class({ Name: 'AppIndicatorIconActor', Extends: Shell.Stack, GTypeName: Util.WORKAROUND_RELOAD_TYPE_REGISTER('AppIndicatorIconActor'), @@ -227,7 +227,7 @@ this.height = icon_size * scale_factor this._indicator = indicator - this._iconSize = icon_size + this._iconSize = icon_size * scale_factor this._iconCache = new IconCache.IconCache() this._mainIcon = new St.Bin() @@ -335,8 +335,6 @@ }, _createIconFromPixmap: function(iconSize, iconPixmapArray) { - let scale_factor = St.ThemeContext.get_for_stage(global.stage).scale_factor; - iconSize = iconSize * scale_factor // the pixmap actually is an array of pixmaps with different sizes // we use the one that is smaller or equal the iconSize diff -Nru gnome-shell-extension-appindicator-18.04.1/dbusMenu.js gnome-shell-extension-appindicator-22/dbusMenu.js --- gnome-shell-extension-appindicator-18.04.1/dbusMenu.js 2018-03-26 17:46:10.000000000 +0000 +++ gnome-shell-extension-appindicator-22/dbusMenu.js 2017-10-23 14:27:00.000000000 +0000 @@ -667,7 +667,7 @@ * * Something like a mini-god-object */ -var Client = new Lang.Class({ +const Client = new Lang.Class({ Name: 'DbusMenuClient', _init: function(busName, path) { diff -Nru gnome-shell-extension-appindicator-18.04.1/debian/changelog gnome-shell-extension-appindicator-22/debian/changelog --- gnome-shell-extension-appindicator-18.04.1/debian/changelog 2018-03-27 07:26:22.000000000 +0000 +++ gnome-shell-extension-appindicator-22/debian/changelog 2018-05-07 21:37:59.000000000 +0000 @@ -1,36 +1,5 @@ -gnome-shell-extension-appindicator (18.04.1) bionic; urgency=medium +gnome-shell-extension-appindicator (22-1) unstable; urgency=medium - * Rebase on latest upstream with those fixes: - - Fix icons vertically stretched on HDPI screen - - Fix warnings from GNOME Shell 3.26 + * Initial release (Closes: #898144) - -- Didier Roche Tue, 27 Mar 2018 09:26:22 +0200 - -gnome-shell-extension-appindicator (18.04) bionic; urgency=medium - - * Rebase on latest upstream release: - - Fix icon are too small with some tray icons such as Telegram - (LP: #1730406) - - Fix warning with latest GJS. - - -- Didier Roche Thu, 16 Nov 2017 15:40:48 +0100 - -gnome-shell-extension-appindicator (17.10.2) artful; urgency=medium - - * Fix icons from qt applications disappearing after screen lock/sleep. - Thanks Marco (LP: #1712866) - - -- Didier Roche Mon, 23 Oct 2017 10:15:12 +0200 - -gnome-shell-extension-appindicator (17.10.1) artful; urgency=medium - - * Fix telegram icon not scaled is not properly scaled on hidpi setups. - Thanks Andrea (LP: #1720143) - - -- Didier Roche Thu, 05 Oct 2017 10:29:46 +0200 - -gnome-shell-extension-appindicator (17.10) artful; urgency=medium - - * Initial release of appindicator extension. - - -- Didier Roche Tue, 22 Aug 2017 08:51:13 +0200 + -- Matteo F. Vescovi Mon, 07 May 2018 23:37:59 +0200 diff -Nru gnome-shell-extension-appindicator-18.04.1/debian/compat gnome-shell-extension-appindicator-22/debian/compat --- gnome-shell-extension-appindicator-18.04.1/debian/compat 2018-03-26 17:47:19.000000000 +0000 +++ gnome-shell-extension-appindicator-22/debian/compat 2018-05-07 20:58:05.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru gnome-shell-extension-appindicator-18.04.1/debian/control gnome-shell-extension-appindicator-22/debian/control --- gnome-shell-extension-appindicator-18.04.1/debian/control 2018-03-26 17:47:19.000000000 +0000 +++ gnome-shell-extension-appindicator-22/debian/control 2018-05-07 21:08:52.000000000 +0000 @@ -1,16 +1,29 @@ Source: gnome-shell-extension-appindicator Section: gnome Priority: optional -Maintainer: Ubuntu Desktop team -Build-Depends: debhelper (>= 10), -Standards-Version: 4.0.0 -Homepage: https://github.com/ubuntu/gnome-shell-extension-appindicator/tree/ubuntu +Maintainer: Debian GNOME Maintainers +Uploaders: Matteo F. Vescovi +Build-Depends: + debhelper (>= 11) +Standards-Version: 4.1.4 +Homepage: https://github.com/ubuntu/gnome-shell-extension-appindicator +Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extension-appindicator +Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extension-appindicator.git Package: gnome-shell-extension-appindicator Architecture: all -Depends: ${shlibs:Depends}, - ${misc:Depends}, -Description: App indicators for GNOME Shell - Support app indicators in top panel, as the default Ubuntu experience. +Depends: + ${shlibs:Depends}, + ${misc:Depends} +Description: AppIndicator/KStatusNotifierItem support for GNOME Shell + This extension integrates Ubuntu AppIndicators and KStatusNotifierItems + (KDE's blessed successor of the systray) into GNOME Shell. . - System update of KStatusNotifierItem/AppIndicator extension. + Features: + . + - show indicator icons in the panel + - reveal indicator menus upon click + - double clicking an icon will activate the application window + (if implemented by the indicator) + - middle mouse click an icon to send a 'SecondaryActivate' event + to the application. Support needs to be implemented in the application diff -Nru gnome-shell-extension-appindicator-18.04.1/debian/copyright gnome-shell-extension-appindicator-22/debian/copyright --- gnome-shell-extension-appindicator-18.04.1/debian/copyright 2018-03-26 17:47:19.000000000 +0000 +++ gnome-shell-extension-appindicator-22/debian/copyright 2018-05-07 20:58:05.000000000 +0000 @@ -6,6 +6,12 @@ Copyright: 2011 Giovanni Campagna 2013-2014 Jonas Kümmerlin License: GPL-2+ + +Files: debian/* +Copyright: 2018 Matteo F. Vescovi +License: GPL-2+ + +License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -21,4 +27,3 @@ . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - diff -Nru gnome-shell-extension-appindicator-18.04.1/debian/docs gnome-shell-extension-appindicator-22/debian/docs --- gnome-shell-extension-appindicator-18.04.1/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ gnome-shell-extension-appindicator-22/debian/docs 2018-05-07 20:58:05.000000000 +0000 @@ -0,0 +1,2 @@ +AUTHORS.md +README.md diff -Nru gnome-shell-extension-appindicator-18.04.1/debian/gbp.conf gnome-shell-extension-appindicator-22/debian/gbp.conf --- gnome-shell-extension-appindicator-18.04.1/debian/gbp.conf 2018-03-26 17:47:19.000000000 +0000 +++ gnome-shell-extension-appindicator-22/debian/gbp.conf 2018-05-07 20:58:05.000000000 +0000 @@ -1,2 +1,3 @@ [DEFAULT] -debian-branch = ubuntu +debian-branch = debian/master +upstream-branch = master diff -Nru gnome-shell-extension-appindicator-18.04.1/debian/install gnome-shell-extension-appindicator-22/debian/install --- gnome-shell-extension-appindicator-18.04.1/debian/install 1970-01-01 00:00:00.000000000 +0000 +++ gnome-shell-extension-appindicator-22/debian/install 2018-05-07 20:58:05.000000000 +0000 @@ -0,0 +1,3 @@ +*.js usr/share/gnome-shell/extensions/ubuntu-appindicators@ubuntu.com/ +metadata.json usr/share/gnome-shell/extensions/ubuntu-appindicators@ubuntu.com/ +interfaces-xml/ usr/share/gnome-shell/extensions/ubuntu-appindicators@ubuntu.com/ diff -Nru gnome-shell-extension-appindicator-18.04.1/debian/patches/01-Add_3.28_support.patch gnome-shell-extension-appindicator-22/debian/patches/01-Add_3.28_support.patch --- gnome-shell-extension-appindicator-18.04.1/debian/patches/01-Add_3.28_support.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-shell-extension-appindicator-22/debian/patches/01-Add_3.28_support.patch 2018-05-07 20:59:51.000000000 +0000 @@ -0,0 +1,15 @@ +Author: Matteo F. Vescovi +Description: Add support for GNOME Shell 3.28 +Date: 2018-05-07 + +diff --git a/metadata.json b/metadata.json +index aee011a..fff5934 100644 +--- a/metadata.json ++++ b/metadata.json +@@ -1,5 +1,5 @@ + { +- "shell-version": ["3.16", "3.17.91", "3.18", "3.20", "3.22", "3.24", "3.26"], ++ "shell-version": ["3.16", "3.17.91", "3.18", "3.20", "3.22", "3.24", "3.26", "3.28"], + "uuid": "appindicatorsupport@rgcjonas.gmail.com", + "name": "KStatusNotifierItem/AppIndicator Support", + "description": "Adds KStatusNotifierItem support to the Shell", diff -Nru gnome-shell-extension-appindicator-18.04.1/debian/patches/02-Fix_metadata.patch gnome-shell-extension-appindicator-22/debian/patches/02-Fix_metadata.patch --- gnome-shell-extension-appindicator-18.04.1/debian/patches/02-Fix_metadata.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-shell-extension-appindicator-22/debian/patches/02-Fix_metadata.patch 2018-05-07 21:00:43.000000000 +0000 @@ -0,0 +1,19 @@ +Author: Matteo F. Vescovi +Description: Fix metadata.json to reflect real ownership +Forwarded: https://github.com/Ubuntu/gnome-shell-extension-appindicator/pull/122 +Date: 2018-05-07 + +diff --git a/metadata.json b/metadata.json +index aee011a..84ae2b0 100644 +--- a/metadata.json ++++ b/metadata.json +@@ -1,7 +1,7 @@ + { + "shell-version": ["3.16", "3.17.91", "3.18", "3.20", "3.22", "3.24", "3.26", "3.28"], +- "uuid": "appindicatorsupport@rgcjonas.gmail.com", ++ "uuid": "ubuntu-appindicators@ubuntu.com", + "name": "KStatusNotifierItem/AppIndicator Support", + "description": "Adds KStatusNotifierItem support to the Shell", +- "url": "https://github.com/rgcjonas/gnome-shell-extension-appindicator" ++ "url": "https://github.com/ubuntu/gnome-shell-extension-appindicator" + } diff -Nru gnome-shell-extension-appindicator-18.04.1/debian/patches/series gnome-shell-extension-appindicator-22/debian/patches/series --- gnome-shell-extension-appindicator-18.04.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ gnome-shell-extension-appindicator-22/debian/patches/series 2018-05-07 21:05:17.000000000 +0000 @@ -0,0 +1,2 @@ +01-Add_3.28_support.patch +02-Fix_metadata.patch diff -Nru gnome-shell-extension-appindicator-18.04.1/debian/rules gnome-shell-extension-appindicator-22/debian/rules --- gnome-shell-extension-appindicator-18.04.1/debian/rules 2018-03-26 17:47:19.000000000 +0000 +++ gnome-shell-extension-appindicator-22/debian/rules 2018-05-07 20:58:05.000000000 +0000 @@ -1,16 +1,6 @@ #!/usr/bin/make -f -#export DH_VERBOSE = 1 %: dh $@ -# we only copy the files in .install override_dh_auto_build: - - -dest = debian/gnome-shell-extension-appindicator/usr/share/gnome-shell/extensions/ubuntu-appindicators@ubuntu.com -override_dh_install: - mkdir -p $(dest) - for f in *.js *.json interfaces-xml; do \ - cp -rp $$f $(dest)/; \ - done diff -Nru gnome-shell-extension-appindicator-18.04.1/debian/source/format gnome-shell-extension-appindicator-22/debian/source/format --- gnome-shell-extension-appindicator-18.04.1/debian/source/format 2018-03-26 17:47:19.000000000 +0000 +++ gnome-shell-extension-appindicator-22/debian/source/format 2018-05-07 20:58:05.000000000 +0000 @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) diff -Nru gnome-shell-extension-appindicator-18.04.1/debian/watch gnome-shell-extension-appindicator-22/debian/watch --- gnome-shell-extension-appindicator-18.04.1/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-shell-extension-appindicator-22/debian/watch 2018-05-07 20:58:05.000000000 +0000 @@ -0,0 +1,3 @@ +version=4 +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/gnome-shell-extension-appindicator-$1\.tar\.gz/ \ +https://github.com/ubuntu/gnome-shell-extension-appindicator/tags .*/v?(\d\S+)\.tar\.gz diff -Nru gnome-shell-extension-appindicator-18.04.1/.gitignore gnome-shell-extension-appindicator-22/.gitignore --- gnome-shell-extension-appindicator-18.04.1/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ gnome-shell-extension-appindicator-22/.gitignore 2017-10-23 14:27:00.000000000 +0000 @@ -0,0 +1 @@ +build diff -Nru gnome-shell-extension-appindicator-18.04.1/iconCache.js gnome-shell-extension-appindicator-22/iconCache.js --- gnome-shell-extension-appindicator-18.04.1/iconCache.js 2018-03-26 17:46:10.000000000 +0000 +++ gnome-shell-extension-appindicator-22/iconCache.js 2017-10-23 14:27:00.000000000 +0000 @@ -28,7 +28,7 @@ // The presence of an inUse property set to true on the icon will extend the lifetime. // how to use: see IconCache.add, IconCache.get -var IconCache = new Lang.Class({ +const IconCache = new Lang.Class({ Name: 'IconCache', LIFETIME_TIMESPAN: 5000, //5s diff -Nru gnome-shell-extension-appindicator-18.04.1/indicatorStatusIcon.js gnome-shell-extension-appindicator-22/indicatorStatusIcon.js --- gnome-shell-extension-appindicator-18.04.1/indicatorStatusIcon.js 2018-03-26 17:46:39.000000000 +0000 +++ gnome-shell-extension-appindicator-22/indicatorStatusIcon.js 2017-10-23 14:27:00.000000000 +0000 @@ -31,7 +31,7 @@ /* * IndicatorStatusIcon implements an icon in the system status area */ -var IndicatorStatusIcon = new Lang.Class({ +const IndicatorStatusIcon = new Lang.Class({ Name: 'IndicatorStatusIcon', Extends: PanelMenu.Button, @@ -40,7 +40,7 @@ this._indicator = indicator; - this._iconBox = new AppIndicator.IconActor(indicator, Panel.PANEL_ICON_SIZE + 6); + this._iconBox = new AppIndicator.IconActor(indicator, Panel.PANEL_ICON_SIZE + 2); if (!this._box) // Gnome Shell 3.10 this.actor.add_actor(this._box = new St.BoxLayout()); diff -Nru gnome-shell-extension-appindicator-18.04.1/interfaces.js gnome-shell-extension-appindicator-22/interfaces.js --- gnome-shell-extension-appindicator-18.04.1/interfaces.js 2018-03-26 17:46:10.000000000 +0000 +++ gnome-shell-extension-appindicator-22/interfaces.js 2017-10-23 14:27:00.000000000 +0000 @@ -14,10 +14,10 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -var StatusNotifierItem = loadInterfaceXml("StatusNotifierItem.xml") +const StatusNotifierItem = loadInterfaceXml("StatusNotifierItem.xml") const Properties = loadInterfaceXml("Properties.xml") -var StatusNotifierWatcher = loadInterfaceXml("StatusNotifierWatcher.xml") -var DBusMenu = loadInterfaceXml("DBusMenu.xml") +const StatusNotifierWatcher = loadInterfaceXml("StatusNotifierWatcher.xml") +const DBusMenu = loadInterfaceXml("DBusMenu.xml") // loads a xml file into an in-memory string function loadInterfaceXml(filename) { diff -Nru gnome-shell-extension-appindicator-18.04.1/metadata.json gnome-shell-extension-appindicator-22/metadata.json --- gnome-shell-extension-appindicator-18.04.1/metadata.json 2018-03-26 17:47:19.000000000 +0000 +++ gnome-shell-extension-appindicator-22/metadata.json 2017-10-23 14:27:00.000000000 +0000 @@ -1,11 +1,7 @@ { - "name": "Ubuntu AppIndicators", - "version": "17.10", - "description": "Support app indicators in top panel, as the default Ubuntu experience. System update of KStatusNotifierItem/AppIndicator extension.", - "uuid": "ubuntu-appindicators@ubuntu.com", - "url": "https://github.com/ubuntu/gnome-shell-extension-appindicator", - "shell-version": [ - "3.24", - "3.26" - ] + "shell-version": ["3.16", "3.17.91", "3.18", "3.20", "3.22", "3.24", "3.26"], + "uuid": "appindicatorsupport@rgcjonas.gmail.com", + "name": "KStatusNotifierItem/AppIndicator Support", + "description": "Adds KStatusNotifierItem support to the Shell", + "url": "https://github.com/rgcjonas/gnome-shell-extension-appindicator" } diff -Nru gnome-shell-extension-appindicator-18.04.1/statusNotifierWatcher.js gnome-shell-extension-appindicator-22/statusNotifierWatcher.js --- gnome-shell-extension-appindicator-18.04.1/statusNotifierWatcher.js 2018-03-26 17:46:10.000000000 +0000 +++ gnome-shell-extension-appindicator-22/statusNotifierWatcher.js 2017-10-23 14:27:00.000000000 +0000 @@ -43,7 +43,7 @@ /* * The StatusNotifierWatcher class implements the StatusNotifierWatcher dbus object */ -var StatusNotifierWatcher = new Lang.Class({ +const StatusNotifierWatcher = new Lang.Class({ Name: 'StatusNotifierWatcher', _init: function() { diff -Nru gnome-shell-extension-appindicator-18.04.1/util.js gnome-shell-extension-appindicator-22/util.js --- gnome-shell-extension-appindicator-18.04.1/util.js 2018-03-26 17:46:10.000000000 +0000 +++ gnome-shell-extension-appindicator-22/util.js 2017-10-23 14:27:00.000000000 +0000 @@ -62,7 +62,7 @@ return unique; } -var traverseBusNames = function(bus, cancellable, callback) { +const traverseBusNames = function(bus, cancellable, callback) { if (typeof bus === "undefined" || !bus) bus = Gio.DBus.session; @@ -89,7 +89,7 @@ }); } -var introspectBusObject = function(bus, name, cancellable, filterFunction, targetCallback, path) { +const introspectBusObject = function(bus, name, cancellable, filterFunction, targetCallback, path) { if (typeof path === "undefined" || !path) path = "/"; @@ -121,7 +121,7 @@ }); } -var dbusNodeImplementsInterfaces = function(node_info, interfaces) { +const dbusNodeImplementsInterfaces = function(node_info, interfaces) { if (!(node_info instanceof Gio.DBusNodeInfo) || !Array.isArray(interfaces)) return false; @@ -173,7 +173,7 @@ * or * Util.connectSmart(srcOb, 'signal', function() { ... }) */ -var connectSmart = function() { +const connectSmart = function() { if (arguments.length == 4) return connectSmart4A.apply(null, arguments) else @@ -183,7 +183,7 @@ /** * Helper class for logging stuff */ -var Logger = { +const Logger = { _log: function(prefix, message) { global.log("[AppIndicatorSupport-"+prefix+"] "+message) }, @@ -210,7 +210,7 @@ * * Will append the given name with a number to distinguish code loaded later from the last loaded version */ -var WORKAROUND_RELOAD_TYPE_REGISTER = function(name) { +const WORKAROUND_RELOAD_TYPE_REGISTER = function(name) { return 'Gjs_' + name + '__' + global['--appindicator-loaded-count'] }