Commit 63221d33 authored by Simon McVittie's avatar Simon McVittie

New upstream version 0~git20171229

parents 2a8abe53 d7bc1ab3
commit d7bc1ab3c4db85034aa3aef14f6ef7e3127c6798
Merge: 7102e73 01dec94
Author: Jean-Philippe Braun <eon@patapon.info>
Date: 2017-12-29 12:46:40 +0100
Merge pull request #112 from qunxyz/master
fixed #67 Caffeine causes gnome-session-quit time out in GNOME 3.20
commit 01dec944fe1638266a185b71d27faf6ad0319db8
Author: Gordon Yau <qunxyz@gmail.com>
Date: 2017-12-27 16:26:42 +0800
fixed #67 Caffeine causes gnome-session-quit time out in GNOME 3.20
commit 7102e732b104d097336ada89e6c99a9cc32f7d2b
Author: Jean-Philippe Braun <eon@patapon.info>
Date: 2017-11-30 11:24:23 +0100
Update README
commit ee36f176744200f1b1931f6afb955297784d6589
Merge: 1a5c2a2 6e3d141
Author: Jean-Philippe Braun <eon@patapon.info>
Date: 2017-11-30 11:21:24 +0100
Merge pull request #106 from AlexGluck/master
Update Russian translation
commit 1a5c2a2099b26c8202394b064c0bd2ff79745ddc
Merge: ce0d0d4 c674878
Author: Jean-Philippe Braun <eon@patapon.info>
Date: 2017-11-30 11:19:53 +0100
Merge pull request #111 from dffischer/master
GNOME Shell 3.26 compatibility
commit c6748789286620f83116821444a64b0ca049a6d6
Author: XZS <d.f.fischer@web.de>
Date: 2017-11-25 18:44:50 +0100
Update README about compatibility
commit da4b8ff378961ec0ae8b2060030cc0351c5240e6
Author: XZS <d.f.fischer@web.de>
Date: 2017-11-24 18:41:31 +0100
Declare compatible to Shell version 3.26
It seems to work as well with the newest version as it did with previous
ones, so compatibility can be announced.
commit 6f1b83c27752e1bd95588a7f1667db25a6059832
Author: XZS <d.f.fischer@web.de>
Date: 2017-11-23 18:39:30 +0100
Indent meta data JSON
Spreading the array content over multiple lines does not only improve
readability as it grows, but also allows to more easily spot isolated
changes in a diff view.
commit 6e3d141263cb9bf2c9894103493aefb40e434fdb
Author: Alex Gluck <alexgluck@bk.ru>
Date: 2017-07-30 15:54:42 +0300
Update Russian translation
commit ce0d0d4d3a9fed4b35b82cf59609a00502862271
Merge: 6d0f105 e730a92
Author: Jean-Philippe Braun <eon@patapon.info>
......
# gnome-shell-extension-caffeine
# This extension is not maintained anymore, it also suffer from a nasty bug #67. New maintainers are welcome!
## gnome-shell-extension-caffeine
Fill the cup to inhibit auto suspend and screensaver.
This extension supports gnome-shell 3.4 to 3.22.
This extension supports gnome-shell 3.4 to 3.26.
Use the gnome-shell-before-3.10 branch for gnome shell 3.4, 3.6 and 3.8.
......
......@@ -57,6 +57,9 @@ const DBusSessionManagerIface = '<node>\
<method name="Uninhibit">\
<arg type="u" direction="in" />\
</method>\
<method name="GetInhibitors">\
<arg type="ao" direction="out" />\
</method>\
<signal name="InhibitorAdded">\
<arg type="o" direction="out" />\
</signal>\
......@@ -200,25 +203,28 @@ const Caffeine = new Lang.Class({
},
_inhibitorAdded: function(proxy, sender, [object]) {
let inhibitor = new DBusSessionManagerInhibitorProxy(Gio.DBus.session,
this._sessionManager.GetInhibitorsRemote(Lang.bind(this, function([inhibitors]){
for(var i in inhibitors) {
let inhibitor = new DBusSessionManagerInhibitorProxy(Gio.DBus.session,
'org.gnome.SessionManager',
object);
// Is the new inhibitor Caffeine ?
inhibitor.GetAppIdRemote(Lang.bind(this, function(app_id) {
if (app_id != '' && app_id == this._last_app) {
if (this._last_app == 'user')
this._settings.set_boolean(USER_ENABLED_KEY, true);
this._apps.push(this._last_app);
this._cookies.push(this._last_cookie);
this._objects.push(object);
this._last_app = "";
this._last_cookie = "";
if (this._state === false) {
this._state = true;
this._icon.icon_name = EnabledIcon;
if (this._settings.get_boolean(SHOW_NOTIFICATIONS_KEY) && !this.inFullscreen)
Main.notify(_("Auto suspend and screensaver disabled"));
}
inhibitors[i]);
inhibitor.GetAppIdRemote(Lang.bind(this, function(app_id) {
if (app_id != '' && app_id == this._last_app) {
if (this._last_app == 'user')
this._settings.set_boolean(USER_ENABLED_KEY, true);
this._apps.push(this._last_app);
this._cookies.push(this._last_cookie);
this._objects.push(object);
this._last_app = "";
this._last_cookie = "";
if (this._state === false) {
this._state = true;
this._icon.icon_name = EnabledIcon;
if (this._settings.get_boolean(SHOW_NOTIFICATIONS_KEY) && !this.inFullscreen)
Main.notify(_("Auto suspend and screensaver disabled"));
}
}
}));
}
}));
},
......
......@@ -3,8 +3,8 @@ msgstr ""
"Project-Id-Version: gnome-shell-extension-caffeine\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-08 21:38+0800\n"
"PO-Revision-Date: 2013-01-23 18:19-0300\n"
"Last-Translator: Demetri0 <d3i0@ya.ru>\n"
"PO-Revision-Date: 2017-07-30 15:53+0300\n"
"Last-Translator: Alex Gluck <alexgluck@bk.ru>\n"
"Language-Team: Russian\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
......@@ -14,7 +14,7 @@ msgstr ""
"X-Poedit-Basepath: .\n"
"Plural-Forms: nplurals=2; plural=(n>1);\n"
"X-Poedit-SourceCharset: UTF-8\n"
"X-Generator: Poedit 1.5.4\n"
"X-Generator: Poedit 2.0.2\n"
"X-Poedit-SearchPath-0: ../../..\n"
#: extension.js:220
......@@ -36,7 +36,7 @@ msgstr "Включать при работе приложений в полно
#: prefs.js:80
msgid "Restore state across reboots"
msgstr ""
msgstr "Восстанавливать после перезагрузки"
#: prefs.js:96
msgid "Enable notifications"
......@@ -59,40 +59,36 @@ msgid "Add"
msgstr "Добавить"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:6
#, fuzzy
msgid "Application list"
msgstr "Добавить приложение"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:7
msgid ""
"A list of strings, each containing an application id (desktop file name)"
msgstr ""
msgid "A list of strings, each containing an application id (desktop file name)"
msgstr "Список строк, содержащих название программы (включая файлы .desktop)"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:11
msgid "Store caffeine user state"
msgstr ""
msgstr "Сохранять пользовательский выбор"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:16
msgid "Restore caffeine state"
msgstr ""
msgstr "Восстанавливать значения приложения"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:21
msgid "Show indicator"
msgstr ""
msgstr "Показывать значок"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:22
#, fuzzy
msgid "Show the indicator on the top panel"
msgstr "Отображать значёк Caffeine на панели"
msgstr "Отображать значок Caffeine на панели"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:26
#, fuzzy
msgid "Show notifications"
msgstr "Включить уведомления"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:27
msgid "Show notifications when enabled/disabled"
msgstr ""
msgstr "Показывать уведомление когда включено/выключено"
#~ msgid "Caffeine enabled"
#~ msgstr "Caffeine включен"
......
{
"shell-version": ["3.10", "3.11", "3.12", "3.13", "3.14", "3.16", "3.18", "3.20", "3.22", "3.24"],
"uuid": "caffeine@patapon.info",
"name": "Caffeine",
"settings-schema": "org.gnome.shell.extensions.caffeine",
"gettext-domain": "gnome-shell-extension-caffeine",
"description": "Disable the screensaver and auto suspend",
"url": "https://github.com/eonpatapon/gnome-shell-extension-caffeine"
"shell-version": [
"3.10",
"3.11",
"3.12",
"3.13",
"3.14",
"3.16",
"3.18",
"3.20",
"3.22",
"3.24",
"3.26"
],
"uuid": "caffeine@patapon.info",
"name": "Caffeine",
"settings-schema": "org.gnome.shell.extensions.caffeine",
"gettext-domain": "gnome-shell-extension-caffeine",
"description": "Disable the screensaver and auto suspend",
"url": "https://github.com/eonpatapon/gnome-shell-extension-caffeine"
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment