Hello community, here is the log from the commit of package cinnamon for openSUSE:Factory checked in at 2018-06-19 12:04:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon (Old) and /work/SRC/openSUSE:Factory/.cinnamon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon" Tue Jun 19 12:04:11 2018 rev:28 rq:617249 version:3.8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon/cinnamon.changes 2018-05-29 16:49:32.329858768 +0200 +++ /work/SRC/openSUSE:Factory/.cinnamon.new/cinnamon.changes 2018-06-19 12:04:12.792807398 +0200 @@ -1,0 +2,25 @@ +Sat Jun 16 15:48:41 UTC 2018 - [email protected] + +- Update to version 3.8.4: + * SettingsWidgets.py: Strip pkexec from standalone module exec + strings when checking for their existence. Simplify the check + as well. + * st-theme-node-drawing,transition.c: Initialise framebuffer + early to check for error. + * cs_startup.py: Do not lose "s" for delay time when editing and + saving an entry. + * tooltips.js: Use ClutterActor's has-pointer property for + timeout callback check. + * network applet: Fix typo with showing access points in certain + instances - caused by 319958f. + * cs_power.py: Eliminate redundant check for screen backlight. + It fails incorrectly. + * systray: Fix skype. + * Revert "network applet: Don't show unmanaged networks in the list." + * cs_power.py: Display a keyboard backlight section on the + brightness. +- Remove cinnamon-no-gksu-requirement.patch. +- Add cinnamon-use-nma.patch: Use NMA instead of NMGtk if + available. + +------------------------------------------------------------------- Old: ---- Cinnamon-3.8.3.tar.gz cinnamon-no-gksu-requirement.patch New: ---- Cinnamon-3.8.4.tar.gz cinnamon-use-nma.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon.spec ++++++ --- /var/tmp/diff_new_pack.op8cqk/_old 2018-06-19 12:04:13.804769825 +0200 +++ /var/tmp/diff_new_pack.op8cqk/_new 2018-06-19 12:04:13.808769677 +0200 @@ -16,12 +16,16 @@ # -%define __requires_exclude typelib\\((Cinnamon|St)\\) %define __provides_exclude typelib\\(.*\\) +%if 0%{?suse_version} >= 1500 +%define __requires_exclude typelib\\((Cinnamon|St|NMGtk)\\) +%else +%define __requires_exclude typelib\\((Cinnamon|St|NMA)\\) +%endif %define _name Cinnamon %define _version 3.8.0 Name: cinnamon -Version: 3.8.3 +Version: 3.8.4 Release: 0 Summary: GNU/Linux Desktop featuring a traditional layout License: GPL-2.0-or-later AND LGPL-2.1-only @@ -38,12 +42,12 @@ Patch2: %{name}-settings-native.patch # PATCH-FIX-OPENSUSE cinnamon-settings-xscreensaver-path.patch boo#960165 [email protected] -- Fix xscreensaver configs path. Patch3: %{name}-settings-xscreensaver-path.patch -# PATCH-FIX-OPENSUSE cinnamon-no-gksu-requirement.patch [email protected] -- Don't require gksu. -Patch4: %{name}-no-gksu-requirement.patch # PATCH-FEATURE-OPENSUSE cinnamon-favourite-applications.patch [email protected] -- Remove mintinstall from favourites and add YaST. -Patch5: %{name}-favourite-applications.patch +Patch4: %{name}-favourite-applications.patch # PATCH-FIX-OPENSUSE cinnamon-fix-typelib-false-positive.patch [email protected] -- Avoid any false positives in typelib detection. -Patch6: %{name}-fix-typelib-false-positive.patch +Patch5: %{name}-fix-typelib-false-positive.patch +# PATCH-FIX-OPENSUSE cinnamon-use-nma.patch [email protected] -- Use NMA instead of NMGtk if available. +Patch6: %{name}-use-nma.patch # PATCH-FIX-OPENSUSE cinnamon-fix-cogl.patch [email protected] -- Fix compilation with Cogl. Patch7: %{name}-fix-cogl.patch # PATCH-FEATURE-OPENSUSE cinnamon-fallback-icewm.patch [email protected] -- Use IceWM as fallback. ++++++ Cinnamon-3.8.3.tar.gz -> Cinnamon-3.8.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.8.3/cinnamon.pot new/Cinnamon-3.8.4/cinnamon.pot --- old/Cinnamon-3.8.3/cinnamon.pot 2018-05-21 14:01:01.000000000 +0200 +++ new/Cinnamon-3.8.4/cinnamon.pot 2018-06-08 12:52:13.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-06 16:12+0100\n" +"POT-Creation-Date: 2018-06-08 11:17+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -39,7 +39,7 @@ msgstr "" #: src/cinnamon-util.c:250 -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:223 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:222 #: files/usr/share/cinnamon/cinnamon-settings/bin/ExtensionCore.py:368 #: files/usr/share/cinnamon/cinnamon-settings/bin/ExtensionCore.py:741 #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py:174 @@ -188,19 +188,19 @@ "\n" msgstr "" -#: js/ui/extension.js:457 +#: js/ui/extension.js:462 msgid "Initializing" msgstr "" -#: js/ui/extension.js:459 +#: js/ui/extension.js:464 msgid "Loaded" msgstr "" -#: js/ui/extension.js:461 +#: js/ui/extension.js:466 msgid "Error" msgstr "" -#: js/ui/extension.js:463 +#: js/ui/extension.js:468 msgid "Out of date" msgstr "" @@ -424,8 +424,8 @@ #: files/usr/share/cinnamon/applets/[email protected]/applet.js:59 #: generate_additional_files.py:27 #: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:46 -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:310 -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:579 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:309 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:578 msgid "System Settings" msgstr "" @@ -786,7 +786,7 @@ msgstr "" #: files/usr/share/cinnamon/applets/[email protected]/applet.js:697 -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:92 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:91 msgid "Bluetooth" msgstr "" @@ -853,64 +853,64 @@ msgid "Network Connections" msgstr "" -#: files/usr/share/cinnamon/applets/[email protected]/applet.js:1962 +#: files/usr/share/cinnamon/applets/[email protected]/applet.js:1957 msgid "Connection failed" msgstr "" -#: files/usr/share/cinnamon/applets/[email protected]/applet.js:1963 +#: files/usr/share/cinnamon/applets/[email protected]/applet.js:1958 msgid "Activation of network connection failed" msgstr "" -#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2248 +#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2243 msgid "Networking is disabled" msgstr "" -#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2264 +#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2259 msgid "No connection" msgstr "" -#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2269 +#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2264 msgid "Connecting to the cellular network..." msgstr "" -#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2273 +#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2268 msgid "Connecting to the wireless network..." msgstr "" -#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2277 +#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2272 msgid "Connecting to the wired network..." msgstr "" -#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2281 +#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2276 msgid "Connecting to the VPN..." msgstr "" -#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2287 +#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2282 msgid "Connecting to the network..." msgstr "" -#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2303 +#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2298 msgid "Connected to the wireless network" msgstr "" -#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2306 +#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2301 msgid "Wireless connection" msgstr "" -#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2322 +#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2317 msgid "Connected to the wired network" msgstr "" +#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2328 #: files/usr/share/cinnamon/applets/[email protected]/applet.js:2333 -#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2338 msgid "Connected to the cellular network" msgstr "" -#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2342 +#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2337 msgid "Connected to the VPN" msgstr "" -#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2348 +#: files/usr/share/cinnamon/applets/[email protected]/applet.js:2343 msgid "Connected to the network" msgstr "" @@ -966,7 +966,7 @@ #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_desklets.py:75 #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py:746 #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:429 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:754 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:758 msgid "Add" msgstr "" @@ -995,7 +995,7 @@ msgstr "" #: files/usr/share/cinnamon/applets/[email protected]/applet.js:49 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:347 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:339 msgid "UPS" msgstr "" @@ -1026,30 +1026,31 @@ msgstr "" #: files/usr/share/cinnamon/applets/[email protected]/applet.js:61 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:445 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:437 msgid "Media player" msgstr "" #: files/usr/share/cinnamon/applets/[email protected]/applet.js:63 #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_accessibility.py:153 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:436 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:428 msgid "Tablet" msgstr "" #: files/usr/share/cinnamon/applets/[email protected]/applet.js:65 #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_desktop.py:59 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:448 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:440 msgid "Computer" msgstr "" #: files/usr/share/cinnamon/applets/[email protected]/applet.js:254 #: files/usr/share/cinnamon/applets/[email protected]/applet.js:532 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:240 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:216 msgid "Brightness" msgstr "" #: files/usr/share/cinnamon/applets/[email protected]/applet.js:255 #: files/usr/share/cinnamon/applets/[email protected]/applet.js:538 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:242 msgid "Keyboard backlight" msgstr "" @@ -1058,7 +1059,7 @@ msgstr "" #: files/usr/share/cinnamon/applets/[email protected]/applet.js:332 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:377 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:369 msgid "Charging" msgstr "" @@ -1101,12 +1102,12 @@ msgstr[1] "" #: files/usr/share/cinnamon/applets/[email protected]/applet.js:349 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:399 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:391 msgid "Fully charged" msgstr "" #: files/usr/share/cinnamon/applets/[email protected]/applet.js:353 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:379 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:371 msgid "Using battery power" msgstr "" @@ -1310,7 +1311,7 @@ #: files/usr/share/cinnamon/applets/[email protected]/applet.js:973 #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_sound.py:609 #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_sound.py:615 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:887 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:891 msgid "Applications" msgstr "" @@ -1366,7 +1367,7 @@ msgstr "" #: files/usr/share/cinnamon/applets/[email protected]/applet.js:67 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:558 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:550 msgid "Lock Screen" msgstr "" @@ -1483,7 +1484,7 @@ msgstr "" #: generate_additional_files.py:40 -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:91 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:90 #: files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py:433 msgid "Users and Groups" msgstr "" @@ -1630,75 +1631,70 @@ #: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:83 #: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:84 -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:85 msgid "Login Window" msgstr "" #: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:83 -msgid "login, mdm, gdm, manager, user, password, startup, switch" -msgstr "" - -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:84 msgid "login, lightdm, mdm, gdm, manager, user, password, startup, switch" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:85 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:84 msgid "login, lightdm, manager, settings, editor" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:86 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:85 msgid "Driver Manager" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:86 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:85 msgid "" "video, driver, wifi, card, hardware, proprietary, nvidia, radeon, nouveau, " "fglrx" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:87 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:86 msgid "Nvidia Settings" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:87 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:86 msgid "video, driver, proprietary, nvidia, settings" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:88 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:87 msgid "Software Sources" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:88 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:87 msgid "ppa, repository, package, source, download" msgstr "" +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:88 #: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:89 -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:90 msgid "Package Management" msgstr "" +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:88 #: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:89 -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:90 msgid "update, install, repository, package, source, download" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:91 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:90 msgid "user, users, account, accounts, group, groups, password" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:92 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:91 msgid "bluetooth, dongle, transfer, mobile" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:93 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:92 msgid "Manage Services and Units" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:93 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:92 msgid "systemd, units, services, systemctl, init" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:213 +#: files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py:212 msgid "Back to all settings" msgstr "" @@ -1708,7 +1704,7 @@ #: files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py:413 #: files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py:617 #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py:751 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:750 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:754 msgid "Cancel" msgstr "" @@ -1864,7 +1860,7 @@ #: files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py:552 #: files/usr/share/cinnamon/cinnamon-menu-editor/cme/MainWindow.py:155 #: files/usr/share/cinnamon/cinnamon-settings/bin/ExtensionCore.py:731 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:771 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:775 #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py:75 msgid "Name" msgstr "" @@ -2250,25 +2246,25 @@ "key) at the same time.\n" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py:912 -#: files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py:985 +#: files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py:906 +#: files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py:979 msgid "_Cancel" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py:913 -#: files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py:986 +#: files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py:907 +#: files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py:980 msgid "_Open" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py:920 +#: files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py:914 msgid "Sound files" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py:982 +#: files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py:976 msgid "Choose an Icon" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py:989 +#: files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py:983 msgid "Image files" msgstr "" @@ -3041,9 +3037,9 @@ #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py:301 #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:16 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:554 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:563 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:569 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:546 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:555 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:561 msgid "Do nothing" msgstr "" @@ -4025,16 +4021,16 @@ #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py:143 #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:12 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:543 #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:551 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:559 msgid "Suspend" msgstr "" #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py:144 #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:14 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:545 #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:553 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:561 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:568 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:560 msgid "Hibernate" msgstr "" @@ -4660,9 +4656,9 @@ msgstr "" #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:13 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:544 #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:552 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:560 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:567 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:559 msgid "Shutdown immediately" msgstr "" @@ -4825,113 +4821,115 @@ msgid "Replaces Suspend with Hybrid Sleep" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:208 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:229 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:235 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:205 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:211 msgid "Power" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:209 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:230 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:237 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:206 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:213 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:282 #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:290 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:298 msgid "Batteries" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:244 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:596 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:220 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:221 msgid "Screen brightness" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:247 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:223 msgid "On battery, dim screen when inactive" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:249 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:225 msgid "Brightness level when inactive" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:251 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:227 msgid "Dim screen after inactive for" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:308 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:243 +msgid "Backlight brightness" +msgstr "" + +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:300 msgid "Devices" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:333 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:325 #, python-format msgid "Caution low UPS, %s remaining" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:335 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:327 #, python-format msgid "Using UPS power - %s remaining" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:341 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:333 msgid "Caution low UPS" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:343 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:335 msgid "Using UPS power" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:367 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:359 #, python-format msgid "Charging - %s until fully charged" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:370 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:362 #, python-format msgid "Caution low battery, %s remaining" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:372 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:364 #, python-format msgid "Using battery power - %s remaining" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:381 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:373 msgid "Charging - fully charged" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:383 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:401 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:375 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:393 msgid "Empty" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:387 -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:451 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:379 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:443 msgid "Battery" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:407 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:399 msgid "Secondary battery" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:427 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:419 msgid "Uninterruptible power supply" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:430 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:422 msgid "Wireless mouse" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:433 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:425 msgid "Wireless Keyboard" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:439 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:431 msgid "Personal digital assistant" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:442 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:434 msgid "Cellphone" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:562 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py:554 msgid "Ask" msgstr "" @@ -5396,59 +5394,60 @@ msgstr "" #: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:703 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:731 #, python-format msgid "%s s" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:753 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:757 msgid "Add Startup Program" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:756 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:760 msgid "Edit Startup Program" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:757 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:761 msgid "Save" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:781 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:785 msgid "Command" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:794 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:798 msgid "Browse..." msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:799 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:803 msgid "Comment" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:809 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:813 msgid "Startup delay" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:832 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:836 msgid "The startup command cannot be empty" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:840 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:844 msgid "The startup command is not valid" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:871 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:875 msgid "Select Command" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:892 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:896 msgid "Search Applications..." msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:926 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:930 msgid "_Close" msgstr "" -#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:927 +#: files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py:931 msgid "Add Application" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.8.3/configure.ac new/Cinnamon-3.8.4/configure.ac --- old/Cinnamon-3.8.3/configure.ac 2018-05-21 14:01:01.000000000 +0200 +++ new/Cinnamon-3.8.4/configure.ac 2018-06-08 12:52:13.000000000 +0200 @@ -1,5 +1,5 @@ AC_PREREQ(2.63) -AC_INIT([cinnamon],[3.8.3],[https://github.com/linuxmint/Cinnamon/issues],[cinnamon]) +AC_INIT([cinnamon],[3.8.4],[https://github.com/linuxmint/Cinnamon/issues],[cinnamon]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([src/cinnamon-global.c]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.8.3/debian/changelog new/Cinnamon-3.8.4/debian/changelog --- old/Cinnamon-3.8.3/debian/changelog 2018-05-21 14:01:01.000000000 +0200 +++ new/Cinnamon-3.8.4/debian/changelog 2018-06-08 12:52:13.000000000 +0200 @@ -1,3 +1,25 @@ +cinnamon (3.8.4) tara; urgency=medium + + [ Michael Webster ] + * SettingsWidgets.py: strip pkexec from standalone module exec strings when checking for their existence. Simplify the check as well. + * st-theme-node-drawing,transition.c: initialize framebuffer early to check for error. + * cs_startup.py: Don't lose 's' for delay time when editing and saving an entry. + * tooltips.js: use ClutterActor's has-pointer property for timeout callback check. + * network applet: Fix typo with showing access points in certain instances - caused by 319958fac2dd9347 + * cs_power.py: Eliminate redundant check for screen backlight. It fails incorrectly. + + [ Clement Lefebvre ] + * systray: Fix skype + * Revert "network applet: Don't show unmanaged networks in the list." + + [ Michael Webster ] + * cs_power.py: Display a keyboard backlight section on the brightness (#7621) + + [ Clement Lefebvre ] + * l10n: Update POT file + + -- Clement Lefebvre <[email protected]> Fri, 08 Jun 2018 11:51:41 +0100 + cinnamon (3.8.3) tara; urgency=medium [ NikoKrause ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.8.3/files/usr/share/cinnamon/applets/[email protected]/applet.js new/Cinnamon-3.8.4/files/usr/share/cinnamon/applets/[email protected]/applet.js --- old/Cinnamon-3.8.3/files/usr/share/cinnamon/applets/[email protected]/applet.js 2018-05-21 14:01:01.000000000 +0200 +++ new/Cinnamon-3.8.4/files/usr/share/cinnamon/applets/[email protected]/applet.js 2018-06-08 12:52:13.000000000 +0200 @@ -1549,7 +1549,7 @@ item_aps = this._activeNetwork.accessPoints; } - this._activeConnectionItem = new NMNetworkMenuItem(active_aps, + this._activeConnectionItem = new NMNetworkMenuItem(item_aps, undefined, { reactive: false }); } else{ @@ -1946,11 +1946,6 @@ // already seen, not adding again return; } - - if (device.state === NetworkManager.DeviceState.UNMANAGED) { - return; - } - let wrapperClass = this._dtypes[device.get_device_type()]; if (wrapperClass) { let wrapper = new wrapperClass(this._client, device, this._connections); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.8.3/files/usr/share/cinnamon/applets/[email protected]/applet.js new/Cinnamon-3.8.4/files/usr/share/cinnamon/applets/[email protected]/applet.js --- old/Cinnamon-3.8.3/files/usr/share/cinnamon/applets/[email protected]/applet.js 2018-05-21 14:01:01.000000000 +0200 +++ new/Cinnamon-3.8.4/files/usr/share/cinnamon/applets/[email protected]/applet.js 2018-06-08 12:52:13.000000000 +0200 @@ -341,12 +341,18 @@ } icon._rolePosition = position; - if (this._scaleMode) { - this._resizeStatusItem(role, icon); - } else { - icon.set_pivot_point(0.5, 0.5); - icon.set_scale((DEFAULT_ICON_SIZE * global.ui_scale) / icon.width, - (DEFAULT_ICON_SIZE * global.ui_scale) / icon.height); + if (["skypeforlinux"].indexOf(role) != -1) { + icon.set_size(16, 16); + global.log("Resize " + role + " with hardcoded size (" + icon.get_width() + "x" + icon.get_height() + "px)"); + } + else { + if (this._scaleMode) { + this._resizeStatusItem(role, icon); + } else { + icon.set_pivot_point(0.5, 0.5); + icon.set_scale((DEFAULT_ICON_SIZE * global.ui_scale) / icon.width, + (DEFAULT_ICON_SIZE * global.ui_scale) / icon.height); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.8.3/files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py new/Cinnamon-3.8.4/files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py --- old/Cinnamon-3.8.3/files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py 2018-05-21 14:01:01.000000000 +0200 +++ new/Cinnamon-3.8.4/files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py 2018-06-08 12:52:13.000000000 +0200 @@ -203,16 +203,10 @@ self.category = category def process (self): - name = self.name.replace("gksudo ", "") - name = name.replace("gksu ", "") + name = self.name.replace("pkexec ", "") name = name.split()[0] - for path in os.environ["PATH"].split(os.pathsep): - path = path.strip('"') - exe_file = os.path.join(path, name) - if os.path.isfile(exe_file) and os.access(exe_file, os.X_OK): - return True - return False + return GLib.find_program_in_path(name) is not None def walk_directories(dirs, filter_func, return_directories=False): # If return_directories is False: returns a list of valid subdir names diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.8.3/files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py new/Cinnamon-3.8.4/files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py --- old/Cinnamon-3.8.3/files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py 2018-05-21 14:01:01.000000000 +0200 +++ new/Cinnamon-3.8.4/files/usr/share/cinnamon/cinnamon-settings/modules/cs_power.py 2018-06-08 12:52:13.000000000 +0200 @@ -186,32 +186,6 @@ self.build_battery_page() self.csd_power_proxy.connect("g-properties-changed", self.build_battery_page) - primary_output = None - try: - screen = CinnamonDesktop.RRScreen.new(Gdk.Screen.get_default()) - outputs = CinnamonDesktop.RRScreen.list_outputs(screen) - for output in outputs: - if (output.is_connected() and output.is_laptop()): - try: - # Try to get the backlight info, if it fails just move on (we used to rely on output.get_backlight_min() and output.get_backlight_max() but these aren't reliable) - output.get_backlight() - primary_output = output - break - except: - pass - except Exception as detail: - print("Failed to query backlight information in cs_power module: %s" % detail) - - if primary_output is None: - if self.show_battery_page: - self.sidePage.add_widget(self.sidePage.stack) - self.sidePage.stack.add_titled(power_page, "power", _("Power")) - self.sidePage.stack.add_titled(self.battery_page, "batteries", _("Batteries")) - else: - - self.sidePage.add_widget(power_page) - return - proxy = Gio.DBusProxy.new_sync( Gio.bus_get_sync(Gio.BusType.SESSION, None), Gio.DBusProxyFlags.NONE, @@ -223,7 +197,9 @@ try: brightness = proxy.GetPercentage() - except: + except GLib.Error as e: + print("Power module brightness page not available: %s" % e.message) + if self.show_battery_page: self.sidePage.add_widget(self.sidePage.stack) self.sidePage.stack.add_titled(power_page, "power", _("Power")) @@ -242,7 +218,7 @@ size_group = Gtk.SizeGroup(mode=Gtk.SizeGroupMode.HORIZONTAL) section = page.add_section(_("Screen brightness")) - section.add_row(BrightnessSlider(section, proxy)) + section.add_row(BrightnessSlider(section, proxy, _("Screen brightness"))) section.add_row(GSettingsSwitch(_("On battery, dim screen when inactive"), CSD_SCHEMA, "idle-dim-battery")) @@ -250,6 +226,22 @@ section.add_reveal_row(GSettingsComboBox(_("Dim screen after inactive for"), CSD_SCHEMA, "idle-dim-time", IDLE_DELAY_OPTIONS, valtype=int, size_group=size_group), CSD_SCHEMA, "idle-dim-battery") + proxy = Gio.DBusProxy.new_sync(Gio.bus_get_sync(Gio.BusType.SESSION, None), + Gio.DBusProxyFlags.NONE, + None, + "org.cinnamon.SettingsDaemon.Power", + "/org/cinnamon/SettingsDaemon/Power", + "org.cinnamon.SettingsDaemon.Power.Keyboard", + None) + + try: + brightness = proxy.GetPercentage() + except GLib.Error as e: + print("Power module no keyboard backlight: %s" % e.message) + else: + section = page.add_section(_("Keyboard backlight")) + section.add_row(BrightnessSlider(section, proxy, _("Backlight brightness"))) + def build_battery_page(self, *args): self.aliases = {} @@ -582,7 +574,7 @@ class BrightnessSlider(SettingsWidget): step = 5 - def __init__(self, section, proxy): + def __init__(self, section, proxy, label): super(BrightnessSlider, self).__init__() self.set_orientation(Gtk.Orientation.VERTICAL) self.set_spacing(0) @@ -593,7 +585,7 @@ hbox = Gtk.Box() - self.label = Gtk.Label.new(_("Screen brightness")) + self.label = Gtk.Label.new(label) self.label.set_halign(Gtk.Align.CENTER) self.min_label= Gtk.Label() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.8.3/files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py new/Cinnamon-3.8.4/files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py --- old/Cinnamon-3.8.3/files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py 2018-05-21 14:01:01.000000000 +0200 +++ new/Cinnamon-3.8.4/files/usr/share/cinnamon/cinnamon-settings/modules/cs_startup.py 2018-06-08 12:52:13.000000000 +0200 @@ -700,7 +700,7 @@ label = Gtk.Label(_("Delay")) self.delay_box.pack_start(label, False, False, 0) self.delay_time_label = Gtk.Label() - self.delay_time_label.set_text(_("%s s") % delay_time_markup) + self.delay_time_label.set_markup(_("%s s") % delay_time_markup) self.delay_time_label.get_style_context().add_class("dim-label") self.delay_box.pack_start(self.delay_time_label, False, False, 0) grid.attach_next_to(self.delay_box, self.desc_box, Gtk.PositionType.RIGHT, 1, 1) @@ -728,7 +728,7 @@ self.name_label.set_markup("<b>{}</b>".format(name_markup)) self.comment_label.set_markup("<small>{}</small>".format(comment_markup)) - self.delay_time_label.set_markup(delay_time_markup) + self.delay_time_label.set_markup(_("%s s") % delay_time_markup) self.delay_box.set_visible(delay_time_markup != "0") def on_switch_activated(self, switch, gparam): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.8.3/js/ui/tooltips.js new/Cinnamon-3.8.4/js/ui/tooltips.js --- old/Cinnamon-3.8.3/js/ui/tooltips.js 2018-05-21 14:01:01.000000000 +0200 +++ new/Cinnamon-3.8.4/js/ui/tooltips.js 2018-06-08 12:52:13.000000000 +0200 @@ -121,13 +121,7 @@ _onHideTimerComplete: function() { this._hideTimer = null; - let [abs_x, abs_y, mods] = global.get_pointer(); - let box = this.item.get_allocation_box(); - - let [success, x, y] = this.item.get_parent().transform_stage_point(abs_x, abs_y); - - if ((x < box.x1) || (x > box.x2) || - (y < box.y1) || (y > box.y2)) { + if (!this.item.has_pointer) { this._hide(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.8.3/src/st/st-theme-node-drawing.c new/Cinnamon-3.8.4/src/st/st-theme-node-drawing.c --- old/Cinnamon-3.8.3/src/st/st-theme-node-drawing.c 2018-05-21 14:01:01.000000000 +0200 +++ new/Cinnamon-3.8.4/src/st/st-theme-node-drawing.c 2018-06-08 12:52:13.000000000 +0200 @@ -1460,6 +1460,7 @@ else if (node->background_color.alpha > 0 || has_border) { CoglHandle buffer, offscreen; + CoglError *error = NULL; int texture_width = ceil (width); int texture_height = ceil (height); @@ -1467,9 +1468,14 @@ texture_height, COGL_TEXTURE_NO_SLICING, COGL_PIXEL_FORMAT_ANY); + if (buffer == NULL) + { + return; + } + offscreen = cogl_offscreen_new_with_texture (buffer); - if (offscreen != COGL_INVALID_HANDLE) + if (cogl_framebuffer_allocate (COGL_FRAMEBUFFER (offscreen), &error)) { ClutterActorBox box = { 0, 0, width, height }; cogl_framebuffer_orthographic (offscreen, 0, 0, @@ -1483,6 +1489,14 @@ node->box_shadow_material = _st_create_shadow_pipeline (box_shadow_spec, buffer); } + else + { + if (error) + { + cogl_error_free (error); + } + } + cogl_handle_unref (buffer); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.8.3/src/st/st-theme-node-transition.c new/Cinnamon-3.8.4/src/st/st-theme-node-transition.c --- old/Cinnamon-3.8.3/src/st/st-theme-node-transition.c 2018-05-21 14:01:01.000000000 +0200 +++ new/Cinnamon-3.8.4/src/st/st-theme-node-transition.c 2018-06-08 12:52:13.000000000 +0200 @@ -217,6 +217,7 @@ { StThemeNodeTransitionPrivate *priv = transition->priv; guint width, height; + CoglError *error = NULL; /* template material to avoid unnecessary shader compilation */ static CoglHandle material_template = COGL_INVALID_HANDLE; @@ -241,19 +242,36 @@ COGL_TEXTURE_NO_SLICING, COGL_PIXEL_FORMAT_ANY); - g_return_val_if_fail (priv->old_texture != COGL_INVALID_HANDLE, FALSE); - g_return_val_if_fail (priv->new_texture != COGL_INVALID_HANDLE, FALSE); + if (priv->old_texture == COGL_INVALID_HANDLE) + return FALSE; + if (priv->new_texture == COGL_INVALID_HANDLE) + return FALSE; if (priv->old_offscreen) cogl_handle_unref (priv->old_offscreen); + priv->old_offscreen = cogl_offscreen_new_with_texture (priv->old_texture); + if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->old_offscreen), &error)) + { + cogl_object_unref (priv->old_offscreen); + g_clear_pointer (&error, cogl_error_free); + priv->old_offscreen = COGL_INVALID_HANDLE; + return FALSE; + } + if (priv->new_offscreen) cogl_handle_unref (priv->new_offscreen); + priv->new_offscreen = cogl_offscreen_new_with_texture (priv->new_texture); - g_return_val_if_fail (priv->old_offscreen != COGL_INVALID_HANDLE, FALSE); - g_return_val_if_fail (priv->new_offscreen != COGL_INVALID_HANDLE, FALSE); + if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->new_offscreen), &error)) + { + cogl_object_unref (priv->new_offscreen); + g_clear_pointer (&error, cogl_error_free); + priv->new_offscreen = COGL_INVALID_HANDLE; + return FALSE; + } if (priv->material == NULL) { ++++++ cinnamon-use-nma.patch ++++++ --- a/js/misc/modemManager.js +++ b/js/misc/modemManager.js @@ -2,7 +2,12 @@ const Gio = imports.gi.Gio; const Lang = imports.lang; -const NMGtk = imports.gi.NMGtk; +let NMA; +try { + NMA = imports.gi.NMA; +} catch(e) { + NMA = imports.gi.NMGtk; +} const Signals = imports.signals; // _getMobileProvidersDatabase: @@ -14,7 +19,7 @@ let _mpd; function _getMobileProvidersDatabase() { if (_mpd == null) { try { - _mpd = new NMGtk.MobileProvidersDatabase(); + _mpd = new NMA.MobileProvidersDatabase(); _mpd.init(null); } catch (e) { log(e.message);
