Fix current frequency display & support Gnome 3.26

metadata.json

@@ -1,18 +1,11 @@
 {
 	"localedir":"/usr/local/share/locale",
 	"shell-version": [
-	"3.10",
-	"3.12",
-	"3.14",
-	"3.16",
-	"3.18",
-	"3.20",
-	"3.22",
-	"3.24"
-	], 
-	"uuid": "cpupower@mko-sl.de", 
+		"3.10", "3.12", "3.14", "3.16", "3.18", "3.20", "3.22", "3.24", "3.26"
+	],
+	"uuid": "cpupower@mko-sl.de",
 	"name": "CPU Power Manager",
-	"url": "https://github.com/martin31821/cpupower", 
+	"url": "https://github.com/martin31821/cpupower",
 	"description": "Manage Intel_pstate CPU Frequency scaling driver",
 	"schema": "org.gnome.shell.extensions.cpupower"
 }

src/baseindicator.js

@@ -41,7 +41,7 @@ const Me = ExtensionUtils.getCurrentExtension();
 const Convenience = Me.imports.src.convenience;
 const SETTINGS_ID = 'org.gnome.shell.extensions.cpupower';
 
-const CPUFreqBaseIndicator = new Lang.Class({
+var CPUFreqBaseIndicator = new Lang.Class({
     Name: 'cpupower.CPUFreqBaseIndicator',
     Extends: PanelMenu.Button,
     Abstract: true,

src/indicator.js

@@ -50,7 +50,7 @@ const EXTENSIONDIR = Me.dir.get_path();
 const CPUFREQCTL = EXTENSIONDIR + '/src/cpufreqctl';
 const PKEXEC = GLib.find_program_in_path('pkexec');
 
-const CPUFreqIndicator = new Lang.Class({
+var CPUFreqIndicator = new Lang.Class({
     Name: 'cpupower.CPUFreqIndicator',
     Extends: CPUFreqBaseIndicator,
 
@@ -64,15 +64,15 @@ const CPUFreqIndicator = new Lang.Class({
         // read the last-settings file.
         if(!GLib.file_test(EXTENSIONDIR + '/.last-settings', GLib.FileTest.EXISTS))
         {
-            let result = GLib.spawn_command_line_sync(CPUFREQCTL + ' turbo get', this.out);
+            let result = GLib.spawn_command_line_sync(CPUFREQCTL + ' turbo get');
             let returnCode = result[1];
             this.isTurboBoostActive = returnCode;
 
-            result = GLib.spawn_command_line_sync(CPUFREQCTL + ' min get', this.out);
+            result = GLib.spawn_command_line_sync(CPUFREQCTL + ' min get');
             returnCode = result[1];
             this.minVal = returnCode;
 
-            result = GLib.spawn_command_line_sync(CPUFREQCTL + ' max get', this.out);
+            result = GLib.spawn_command_line_sync(CPUFREQCTL + ' max get');
             returnCode = result[1];
             this.maxVal = returnCode;
         }
@@ -89,6 +89,19 @@ const CPUFreqIndicator = new Lang.Class({
                 this._updateTurbo(true);
             }
         }
+
+        let result = GLib.spawn_command_line_sync(CPUFREQCTL + ' turbo get');
+        let returnCode = result[1];
+        this.isTurboBoostActive = returnCode;
+
+        result = GLib.spawn_command_line_sync(CPUFREQCTL + ' min get');
+        returnCode = result[1];
+        this.minVal = returnCode;
+
+        result = GLib.spawn_command_line_sync(CPUFREQCTL + ' max get');
+        returnCode = result[1];
+        this.maxVal = returnCode;
+
         this.parent();
     },
 
@@ -250,7 +263,7 @@ const CPUFreqIndicator = new Lang.Class({
     _updateFile: function()
     {
         let cmd = Math.floor(this.minVal) + '\n' + Math.floor(this.maxVal) + '\n' + (this.isTurboBoostActive ? 'true':'false') + '\n';
-        let path = EXTENSIONDIR + '/.last-settings';
+		let path = EXTENSIONDIR + '/.last-settings';
         GLib.file_set_contents(path, cmd);
     },
 
@@ -306,21 +319,25 @@ const CPUFreqIndicator = new Lang.Class({
 
     _updateFreq: function()
     {
+        let cpufreq = 0, cpucount = 0;
         let lines = Shell.get_file_contents_utf8_sync('/proc/cpuinfo').split('\n');
         for(let i = 0; i < lines.length; i++)
         {
             let line = lines[i];
 
             if(line.search(/cpu mhz/i) < 0)
                 continue;
-            this.cpufreq = parseInt(line.substring(line.indexOf(':') + 2));
-            this.imCurrentLabel.set_text(this._getCurFreq());
-            if(this.lblActive)
-                this.lbl.set_text(this._getCurFreq());
-            else
-                this.lbl.set_text('');
-            break;
+
+			let f = Shell.get_file_contents_utf8_sync('/sys/devices/system/cpu/cpu' + cpucount++ + '/cpufreq/scaling_cur_freq');
+			cpufreq += parseInt(f / 1024);
         }
+		this.cpufreq = (cpufreq / cpucount)
+		this.imCurrentLabel.set_text(this._getCurFreq());
+		if(this.lblActive)
+			this.lbl.set_text(this._getCurFreq());
+		else
+			this.lbl.set_text('');
+
         return true;
     },
 

src/notinstalled.js

@@ -41,7 +41,7 @@ const SETTINGS_ID = 'org.gnome.shell.extensions.cpupower';
 const Gettext = imports.gettext.domain('gnome-shell-extension-cpupower');
 const _ = Gettext.gettext;
 
-const NotInstalledIndicator = new Lang.Class({
+var NotInstalledIndicator = new Lang.Class({
     Name: 'cpupower.CPUFreqNotInstalledIndicator',
     Extends: CPUFreqBaseIndicator,
 

src/preferences.js

@@ -44,7 +44,7 @@ const EXTENSIONDIR = Me.dir.get_path();
 const GLADE_FILE = EXTENSIONDIR + "/data/cpupower-preferences.glade";
 const SETTINGS_SCHEMA = 'org.gnome.shell.extensions.cpupower';
 
-const CPUPowerPreferences = new Lang.Class({
+var CPUPowerPreferences = new Lang.Class({
     Name: 'cpupower.Preferences',
 
     _init: function()

src/profile.js

@@ -32,7 +32,7 @@ const GenerateUUID = function ()
     return Math.floor(1 + Math.random() * 0xFFFFFFFE).toString();
 };
 
-const CPUFreqProfile = new Lang.Class({
+var CPUFreqProfile = new Lang.Class({
     Name: 'cpupower.CPUFreqProfile',
 
     _init: function()

src/profilebutton.js

@@ -32,7 +32,7 @@ const PopupMenu = imports.ui.popupMenu;
 
 const DEFAULT_EMPTY_NAME = 'No name';
 
-const CPUFreqProfileButton = new Lang.Class({
+var CPUFreqProfileButton = new Lang.Class({
     Name: 'cpupower.CPUFreqProfileButton',
     Extends: PopupMenu.PopupMenuItem,
 

src/unsupported.js

@@ -39,7 +39,7 @@ const Gettext = imports.gettext.domain('gnome-shell-extension-cpupower');
 const _ = Gettext.gettext;
 
 
-const UnsupportedIndicator = new Lang.Class({
+var UnsupportedIndicator = new Lang.Class({
     Name: 'cpupower.CPUFreqUnsupportedIndicator',
     Extends: CPUFreqBaseIndicator,