Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cinnamon-settings-daemon for
openSUSE:Factory checked in at 2021-06-22 20:44:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-settings-daemon.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-settings-daemon"
Tue Jun 22 20:44:55 2021 rev:26 rq:900447 version:5.0.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-settings-daemon/cinnamon-settings-daemon.changes
2021-01-21 21:57:31.169860381 +0100
+++
/work/SRC/openSUSE:Factory/.cinnamon-settings-daemon.new.2625/cinnamon-settings-daemon.changes
2021-06-22 20:44:58.146825083 +0200
@@ -1,0 +2,21 @@
+Fri Jun 11 05:53:48 UTC 2021 - Paolo Stivanin <i...@paolostivanin.com>
+
+- Update to version 5.0.1.
+ * csd-power-manager.c: Remove percentage from mouse and keyboard
+ 'warning' notifications.
+ * csd-power-manager.c: Make sure to propagate the icon and/or state
+ properties immediately when they change.
+ * power/gpm-common.c: Prefer more specific battery level icons if
+ they're available in the theme.
+ * gpm-common.c: Adjust thresholds for battery-level icon changes.
+ * datetime: use full path for d-bus service Exec
+ * build: Add missing defines. Fix optional wacom build.
+ Make build options behave consistently.
+ * csd-xrandr-manager.c: Fix some build warnings.
+ * csd-power-manager.c: Manage idle activation of cinnamon-screensaver
+ instead of making the screensaver itself handle it.
+ * wacom: Fix a crash from assertion failures
+ * csd-power-manager.c: Remove percentage from non-battery
+ critical notifications.
+
+-------------------------------------------------------------------
Old:
----
cinnamon-settings-daemon-4.8.5.tar.gz
New:
----
cinnamon-settings-daemon-5.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.vhYNfi/_old 2021-06-22 20:44:58.734825731 +0200
+++ /var/tmp/diff_new_pack.vhYNfi/_new 2021-06-22 20:44:58.734825731 +0200
@@ -17,13 +17,14 @@
Name: cinnamon-settings-daemon
-Version: 4.8.5
+Version: 5.0.1
Release: 0
Summary: The settings Daemon for the Cinnamon Desktop
License: GPL-2.0-or-later AND LGPL-2.1-only
Group: System/GUI/Other
URL: https://github.com/linuxmint/cinnamon-settings-daemon
Source:
https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+BuildRequires: cmake
BuildRequires: cups-devel
BuildRequires: docutils
BuildRequires: fdupes
@@ -51,10 +52,12 @@
BuildRequires: pkgconfig(libpulse-mainloop-glib)
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libsystemd)
+BuildRequires: pkgconfig(libwacom)
BuildRequires: pkgconfig(libxklavier)
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(polkit-gobject-1)
BuildRequires: pkgconfig(upower-glib)
+BuildRequires: pkgconfig(xorg-wacom)
BuildRequires: pkgconfig(xtst)
Recommends: %{name}-lang
Recommends: colord
++++++ cinnamon-settings-daemon-4.8.5.tar.gz ->
cinnamon-settings-daemon-5.0.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.5/cinnamon-settings-daemon.pot
new/cinnamon-settings-daemon-5.0.1/cinnamon-settings-daemon.pot
--- old/cinnamon-settings-daemon-4.8.5/cinnamon-settings-daemon.pot
2021-01-14 00:02:29.000000000 +0100
+++ new/cinnamon-settings-daemon-5.0.1/cinnamon-settings-daemon.pot
2021-06-10 15:04:01.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 15:35+0100\n"
+"POT-Creation-Date: 2021-06-02 15:46+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
@@ -253,38 +253,38 @@
msgid "_Unmount"
msgstr ""
-#: plugins/color/csd-color-manager.c:1836
+#: plugins/color/csd-color-manager.c:1837
msgid "Color"
msgstr ""
-#: plugins/color/csd-color-manager.c:1841
+#: plugins/color/csd-color-manager.c:1842
msgid "Recalibrate now"
msgstr ""
-#: plugins/color/csd-color-manager.c:1884
+#: plugins/color/csd-color-manager.c:1885
msgid "Recalibration required"
msgstr ""
-#: plugins/color/csd-color-manager.c:1896
+#: plugins/color/csd-color-manager.c:1897
#, c-format
msgid "The display '%s' should be recalibrated soon."
msgstr ""
-#: plugins/color/csd-color-manager.c:1905
+#: plugins/color/csd-color-manager.c:1906
#, c-format
msgid "The printer '%s' should be recalibrated soon."
msgstr ""
-#: plugins/color/csd-color-manager.c:2229
-#: plugins/color/csd-color-manager.c:2245
+#: plugins/color/csd-color-manager.c:2230
+#: plugins/color/csd-color-manager.c:2246
msgid "Cinnamon Settings Daemon Color Plugin"
msgstr ""
-#: plugins/color/csd-color-manager.c:2231
+#: plugins/color/csd-color-manager.c:2232
msgid "Color calibration device added"
msgstr ""
-#: plugins/color/csd-color-manager.c:2247
+#: plugins/color/csd-color-manager.c:2248
msgid "Color calibration device removed"
msgstr ""
@@ -378,7 +378,7 @@
msgid "Examine..."
msgstr ""
-#: plugins/keyboard/csd-keyboard-xkb.c:89
+#: plugins/keyboard/csd-keyboard-xkb.c:87
#, c-format
msgid ""
"Error activating XKB configuration.\n"
@@ -391,229 +391,225 @@
" <b>%s</b>"
msgstr ""
-#: plugins/keyboard/csd-keyboard-xkb.c:258
+#: plugins/keyboard/csd-keyboard-xkb.c:256
msgid "_Layouts"
msgstr ""
-#: plugins/keyboard/csd-keyboard-xkb.c:264
+#: plugins/keyboard/csd-keyboard-xkb.c:262
msgid "Show _Keyboard Layout..."
msgstr ""
-#: plugins/keyboard/csd-keyboard-xkb.c:271
+#: plugins/keyboard/csd-keyboard-xkb.c:269
msgid "Region and Language Settings"
msgstr ""
-#: plugins/power/csd-power-manager.c:1077
+#: plugins/power/csd-power-manager.c:1085
msgid "UPS Discharging"
msgstr ""
-#: plugins/power/csd-power-manager.c:1082
+#: plugins/power/csd-power-manager.c:1090
#, c-format
msgid "%s of UPS backup power remaining"
msgstr ""
-#: plugins/power/csd-power-manager.c:1103
-#: plugins/power/csd-power-manager.c:1323
-#: plugins/power/csd-power-manager.c:1503
-#: plugins/power/csd-power-manager.c:1652
+#: plugins/power/csd-power-manager.c:1111
+#: plugins/power/csd-power-manager.c:1331
+#: plugins/power/csd-power-manager.c:1509
+#: plugins/power/csd-power-manager.c:1658
msgid "Power"
msgstr ""
-#: plugins/power/csd-power-manager.c:1235
+#: plugins/power/csd-power-manager.c:1243
msgid "Battery low"
msgstr ""
-#: plugins/power/csd-power-manager.c:1238
+#: plugins/power/csd-power-manager.c:1246
msgid "Laptop battery low"
msgstr ""
-#: plugins/power/csd-power-manager.c:1245
+#: plugins/power/csd-power-manager.c:1253
#, c-format
msgid "Approximately %s remaining (%.0f%%)"
msgstr ""
-#: plugins/power/csd-power-manager.c:1250
+#: plugins/power/csd-power-manager.c:1258
msgid "UPS low"
msgstr ""
-#: plugins/power/csd-power-manager.c:1256
+#: plugins/power/csd-power-manager.c:1264
#, c-format
msgid "Approximately %s of remaining UPS backup power (%.0f%%)"
msgstr ""
-#: plugins/power/csd-power-manager.c:1261
-#: plugins/power/csd-power-manager.c:1426
+#: plugins/power/csd-power-manager.c:1269
+#: plugins/power/csd-power-manager.c:1434
msgid "Mouse battery low"
msgstr ""
-#: plugins/power/csd-power-manager.c:1264
-#, c-format
-msgid "Wireless mouse is low in power (%.0f%%)"
+#: plugins/power/csd-power-manager.c:1272
+msgid "Wireless mouse is low in power"
msgstr ""
-#: plugins/power/csd-power-manager.c:1268
-#: plugins/power/csd-power-manager.c:1434
+#: plugins/power/csd-power-manager.c:1276
+#: plugins/power/csd-power-manager.c:1441
msgid "Keyboard battery low"
msgstr ""
-#: plugins/power/csd-power-manager.c:1271
-#, c-format
-msgid "Wireless keyboard is low in power (%.0f%%)"
+#: plugins/power/csd-power-manager.c:1279
+msgid "Wireless keyboard is low in power"
msgstr ""
-#: plugins/power/csd-power-manager.c:1275
-#: plugins/power/csd-power-manager.c:1443
+#: plugins/power/csd-power-manager.c:1283
+#: plugins/power/csd-power-manager.c:1449
msgid "PDA battery low"
msgstr ""
-#: plugins/power/csd-power-manager.c:1278
+#: plugins/power/csd-power-manager.c:1286
#, c-format
msgid "PDA is low in power (%.0f%%)"
msgstr ""
-#: plugins/power/csd-power-manager.c:1282
-#: plugins/power/csd-power-manager.c:1453
-#: plugins/power/csd-power-manager.c:1463
+#: plugins/power/csd-power-manager.c:1290
+#: plugins/power/csd-power-manager.c:1459
+#: plugins/power/csd-power-manager.c:1469
msgid "Cell phone battery low"
msgstr ""
-#: plugins/power/csd-power-manager.c:1285
+#: plugins/power/csd-power-manager.c:1293
#, c-format
msgid "Cell phone is low in power (%.0f%%)"
msgstr ""
-#: plugins/power/csd-power-manager.c:1289
+#: plugins/power/csd-power-manager.c:1297
msgid "Media player battery low"
msgstr ""
-#: plugins/power/csd-power-manager.c:1292
+#: plugins/power/csd-power-manager.c:1300
#, c-format
msgid "Media player is low in power (%.0f%%)"
msgstr ""
-#: plugins/power/csd-power-manager.c:1296
-#: plugins/power/csd-power-manager.c:1472
+#: plugins/power/csd-power-manager.c:1304
+#: plugins/power/csd-power-manager.c:1478
msgid "Tablet battery low"
msgstr ""
-#: plugins/power/csd-power-manager.c:1299
+#: plugins/power/csd-power-manager.c:1307
#, c-format
msgid "Tablet is low in power (%.0f%%)"
msgstr ""
-#: plugins/power/csd-power-manager.c:1303
-#: plugins/power/csd-power-manager.c:1481
+#: plugins/power/csd-power-manager.c:1311
+#: plugins/power/csd-power-manager.c:1487
msgid "Attached computer battery low"
msgstr ""
-#: plugins/power/csd-power-manager.c:1306
+#: plugins/power/csd-power-manager.c:1314
#, c-format
msgid "Attached computer is low in power (%.0f%%)"
msgstr ""
-#: plugins/power/csd-power-manager.c:1340
+#: plugins/power/csd-power-manager.c:1348
msgid "Battery is low"
msgstr ""
-#: plugins/power/csd-power-manager.c:1382
+#: plugins/power/csd-power-manager.c:1390
msgid "Battery critically low"
msgstr ""
-#: plugins/power/csd-power-manager.c:1385
-#: plugins/power/csd-power-manager.c:1568
+#: plugins/power/csd-power-manager.c:1393
+#: plugins/power/csd-power-manager.c:1574
msgid "Laptop battery critically low"
msgstr ""
-#: plugins/power/csd-power-manager.c:1394
+#: plugins/power/csd-power-manager.c:1402
msgid "Plug in your AC adapter to avoid losing data."
msgstr ""
-#: plugins/power/csd-power-manager.c:1398
+#: plugins/power/csd-power-manager.c:1406
msgid "Computer will suspend very soon unless it is plugged in."
msgstr ""
-#: plugins/power/csd-power-manager.c:1402
+#: plugins/power/csd-power-manager.c:1410
msgid "Computer will hibernate very soon unless it is plugged in."
msgstr ""
-#: plugins/power/csd-power-manager.c:1406
+#: plugins/power/csd-power-manager.c:1414
msgid "Computer will shutdown very soon unless it is plugged in."
msgstr ""
-#: plugins/power/csd-power-manager.c:1414
-#: plugins/power/csd-power-manager.c:1604
+#: plugins/power/csd-power-manager.c:1422
+#: plugins/power/csd-power-manager.c:1610
msgid "UPS critically low"
msgstr ""
-#: plugins/power/csd-power-manager.c:1420
+#: plugins/power/csd-power-manager.c:1428
#, c-format
msgid ""
"Approximately %s of remaining UPS power (%.0f%%). Restore AC power to your "
"computer to avoid losing data."
msgstr ""
-#: plugins/power/csd-power-manager.c:1429
-#, c-format
+#: plugins/power/csd-power-manager.c:1437
msgid ""
-"Wireless mouse is very low in power (%.0f%%). This device will soon stop "
-"functioning if not charged."
+"Wireless mouse is very low in power. This device will soon stop functioning "
+"if not charged."
msgstr ""
-#: plugins/power/csd-power-manager.c:1437
-#, c-format
+#: plugins/power/csd-power-manager.c:1444
msgid ""
-"Wireless keyboard is very low in power (%.0f%%). This device will soon stop "
+"Wireless keyboard is very low in power. This device will soon stop "
"functioning if not charged."
msgstr ""
-#: plugins/power/csd-power-manager.c:1446
+#: plugins/power/csd-power-manager.c:1452
#, c-format
msgid ""
"PDA is very low in power (%.0f%%). This device will soon stop functioning if "
"not charged."
msgstr ""
-#: plugins/power/csd-power-manager.c:1456
+#: plugins/power/csd-power-manager.c:1462
#, c-format
msgid ""
"Cell phone is very low in power (%.0f%%). This device will soon stop "
"functioning if not charged."
msgstr ""
-#: plugins/power/csd-power-manager.c:1466
+#: plugins/power/csd-power-manager.c:1472
#, c-format
msgid ""
"Media player is very low in power (%.0f%%). This device will soon stop "
"functioning if not charged."
msgstr ""
-#: plugins/power/csd-power-manager.c:1475
+#: plugins/power/csd-power-manager.c:1481
#, c-format
msgid ""
"Tablet is very low in power (%.0f%%). This device will soon stop functioning "
"if not charged."
msgstr ""
-#: plugins/power/csd-power-manager.c:1484
+#: plugins/power/csd-power-manager.c:1490
#, c-format
msgid ""
"Attached computer is very low in power (%.0f%%). The device will soon "
"shutdown if not charged."
msgstr ""
-#: plugins/power/csd-power-manager.c:1521
-#: plugins/power/csd-power-manager.c:1531
-#: plugins/power/csd-power-manager.c:1667
+#: plugins/power/csd-power-manager.c:1527
+#: plugins/power/csd-power-manager.c:1537
+#: plugins/power/csd-power-manager.c:1673
msgid "Battery is critically low"
msgstr ""
-#: plugins/power/csd-power-manager.c:1576
+#: plugins/power/csd-power-manager.c:1582
msgid ""
"The battery is below the critical level and this computer will <b>power-off</"
"b> when the battery becomes completely empty."
msgstr ""
-#: plugins/power/csd-power-manager.c:1582
+#: plugins/power/csd-power-manager.c:1588
msgid ""
"The battery is below the critical level and this computer is about to "
"suspend.\n"
@@ -621,42 +617,42 @@
"suspended state."
msgstr ""
-#: plugins/power/csd-power-manager.c:1589
+#: plugins/power/csd-power-manager.c:1595
msgid ""
"The battery is below the critical level and this computer is about to "
"hibernate."
msgstr ""
-#: plugins/power/csd-power-manager.c:1594
+#: plugins/power/csd-power-manager.c:1600
msgid ""
"The battery is below the critical level and this computer is about to "
"shutdown."
msgstr ""
-#: plugins/power/csd-power-manager.c:1612
+#: plugins/power/csd-power-manager.c:1618
msgid ""
"UPS is below the critical level and this computer will <b>power-off</b> when "
"the UPS becomes completely empty."
msgstr ""
-#: plugins/power/csd-power-manager.c:1618
+#: plugins/power/csd-power-manager.c:1624
msgid ""
"UPS is below the critical level and this computer is about to hibernate."
msgstr ""
-#: plugins/power/csd-power-manager.c:1623
+#: plugins/power/csd-power-manager.c:1629
msgid "UPS is below the critical level and this computer is about to shutdown."
msgstr ""
-#: plugins/power/csd-power-manager.c:2209
+#: plugins/power/csd-power-manager.c:2218
msgid "Lid has been opened"
msgstr ""
-#: plugins/power/csd-power-manager.c:2354
+#: plugins/power/csd-power-manager.c:2363
msgid "Lid has been closed"
msgstr ""
-#: plugins/power/csd-power-manager.c:4270
+#: plugins/power/csd-power-manager.c:4284
msgid "Power Manager"
msgstr ""
@@ -695,406 +691,406 @@
msgstr[0] ""
msgstr[1] ""
-#: plugins/power/gpm-common.c:319
+#: plugins/power/gpm-common.c:358
#, c-format
msgid "provides %s laptop runtime"
msgstr ""
-#: plugins/power/gpm-common.c:330
+#: plugins/power/gpm-common.c:369
#, c-format
msgid "%s %s remaining"
msgstr ""
-#: plugins/power/gpm-common.c:351 plugins/power/gpm-common.c:368
+#: plugins/power/gpm-common.c:390 plugins/power/gpm-common.c:407
#, c-format
msgid "%s %s until charged"
msgstr ""
-#: plugins/power/gpm-common.c:358
+#: plugins/power/gpm-common.c:397
#, c-format
msgid "provides %s battery runtime"
msgstr ""
-#: plugins/power/gpm-common.c:449
+#: plugins/power/gpm-common.c:488
msgid "Product:"
msgstr ""
-#: plugins/power/gpm-common.c:453 plugins/power/gpm-common.c:456
-#: plugins/power/gpm-common.c:459 plugins/power/gpm-common.c:462
+#: plugins/power/gpm-common.c:492 plugins/power/gpm-common.c:495
+#: plugins/power/gpm-common.c:498 plugins/power/gpm-common.c:501
msgid "Status:"
msgstr ""
-#: plugins/power/gpm-common.c:453
+#: plugins/power/gpm-common.c:492
msgid "Missing"
msgstr ""
-#: plugins/power/gpm-common.c:456 plugins/power/gpm-common.c:741
+#: plugins/power/gpm-common.c:495 plugins/power/gpm-common.c:780
msgid "Charged"
msgstr ""
-#: plugins/power/gpm-common.c:459 plugins/power/gpm-common.c:729
+#: plugins/power/gpm-common.c:498 plugins/power/gpm-common.c:768
msgid "Charging"
msgstr ""
-#: plugins/power/gpm-common.c:462 plugins/power/gpm-common.c:733
+#: plugins/power/gpm-common.c:501 plugins/power/gpm-common.c:772
msgid "Discharging"
msgstr ""
-#: plugins/power/gpm-common.c:467
+#: plugins/power/gpm-common.c:506
msgid "Percentage charge:"
msgstr ""
-#: plugins/power/gpm-common.c:471
+#: plugins/power/gpm-common.c:510
msgid "Vendor:"
msgstr ""
-#: plugins/power/gpm-common.c:476
+#: plugins/power/gpm-common.c:515
msgid "Technology:"
msgstr ""
-#: plugins/power/gpm-common.c:480
+#: plugins/power/gpm-common.c:519
msgid "Serial number:"
msgstr ""
-#: plugins/power/gpm-common.c:484
+#: plugins/power/gpm-common.c:523
msgid "Model:"
msgstr ""
-#: plugins/power/gpm-common.c:489
+#: plugins/power/gpm-common.c:528
msgid "Charge time:"
msgstr ""
-#: plugins/power/gpm-common.c:495
+#: plugins/power/gpm-common.c:534
msgid "Discharge time:"
msgstr ""
-#: plugins/power/gpm-common.c:502
+#: plugins/power/gpm-common.c:541
msgid "Excellent"
msgstr ""
-#: plugins/power/gpm-common.c:504
+#: plugins/power/gpm-common.c:543
msgid "Good"
msgstr ""
-#: plugins/power/gpm-common.c:506
+#: plugins/power/gpm-common.c:545
msgid "Fair"
msgstr ""
-#: plugins/power/gpm-common.c:508
+#: plugins/power/gpm-common.c:547
msgid "Poor"
msgstr ""
-#: plugins/power/gpm-common.c:512
+#: plugins/power/gpm-common.c:551
msgid "Capacity:"
msgstr ""
-#: plugins/power/gpm-common.c:518 plugins/power/gpm-common.c:543
+#: plugins/power/gpm-common.c:557 plugins/power/gpm-common.c:582
msgid "Current charge:"
msgstr ""
-#: plugins/power/gpm-common.c:524
+#: plugins/power/gpm-common.c:563
msgid "Last full charge:"
msgstr ""
-#: plugins/power/gpm-common.c:530 plugins/power/gpm-common.c:548
+#: plugins/power/gpm-common.c:569 plugins/power/gpm-common.c:587
msgid "Design charge:"
msgstr ""
-#: plugins/power/gpm-common.c:535
+#: plugins/power/gpm-common.c:574
msgid "Charge rate:"
msgstr ""
-#: plugins/power/gpm-common.c:567
+#: plugins/power/gpm-common.c:606
msgid "AC adapter"
msgid_plural "AC adapters"
msgstr[0] ""
msgstr[1] ""
-#: plugins/power/gpm-common.c:571
+#: plugins/power/gpm-common.c:610
msgid "Laptop battery"
msgid_plural "Laptop batteries"
msgstr[0] ""
msgstr[1] ""
-#: plugins/power/gpm-common.c:575
+#: plugins/power/gpm-common.c:614
msgid "UPS"
msgid_plural "UPSs"
msgstr[0] ""
msgstr[1] ""
-#: plugins/power/gpm-common.c:579
+#: plugins/power/gpm-common.c:618
msgid "Monitor"
msgid_plural "Monitors"
msgstr[0] ""
msgstr[1] ""
-#: plugins/power/gpm-common.c:583
+#: plugins/power/gpm-common.c:622
msgid "Mouse"
msgid_plural "Mice"
msgstr[0] ""
msgstr[1] ""
-#: plugins/power/gpm-common.c:587
+#: plugins/power/gpm-common.c:626
msgid "Keyboard"
msgid_plural "Keyboards"
msgstr[0] ""
msgstr[1] ""
-#: plugins/power/gpm-common.c:591
+#: plugins/power/gpm-common.c:630
msgid "PDA"
msgid_plural "PDAs"
msgstr[0] ""
msgstr[1] ""
-#: plugins/power/gpm-common.c:595
+#: plugins/power/gpm-common.c:634
msgid "Cell phone"
msgid_plural "Cell phones"
msgstr[0] ""
msgstr[1] ""
-#: plugins/power/gpm-common.c:599
+#: plugins/power/gpm-common.c:638
msgid "Media player"
msgid_plural "Media players"
msgstr[0] ""
msgstr[1] ""
-#: plugins/power/gpm-common.c:603
+#: plugins/power/gpm-common.c:642
msgid "Tablet"
msgid_plural "Tablets"
msgstr[0] ""
msgstr[1] ""
-#: plugins/power/gpm-common.c:607
+#: plugins/power/gpm-common.c:646
msgid "Computer"
msgid_plural "Computers"
msgstr[0] ""
msgstr[1] ""
-#: plugins/power/gpm-common.c:612
+#: plugins/power/gpm-common.c:651
msgid "Game controller"
msgid_plural "Game controllers"
msgstr[0] ""
msgstr[1] ""
-#: plugins/power/gpm-common.c:616
+#: plugins/power/gpm-common.c:655
msgid "Unknown device"
msgid_plural "Unknown devices"
msgstr[0] ""
msgstr[1] ""
-#: plugins/power/gpm-common.c:687
+#: plugins/power/gpm-common.c:726
msgid "Lithium Ion"
msgstr ""
-#: plugins/power/gpm-common.c:691
+#: plugins/power/gpm-common.c:730
msgid "Lithium Polymer"
msgstr ""
-#: plugins/power/gpm-common.c:695
+#: plugins/power/gpm-common.c:734
msgid "Lithium Iron Phosphate"
msgstr ""
-#: plugins/power/gpm-common.c:699
+#: plugins/power/gpm-common.c:738
msgid "Lead acid"
msgstr ""
-#: plugins/power/gpm-common.c:703
+#: plugins/power/gpm-common.c:742
msgid "Nickel Cadmium"
msgstr ""
-#: plugins/power/gpm-common.c:707
+#: plugins/power/gpm-common.c:746
msgid "Nickel metal hydride"
msgstr ""
-#: plugins/power/gpm-common.c:711
+#: plugins/power/gpm-common.c:750
msgid "Unknown technology"
msgstr ""
-#: plugins/power/gpm-common.c:737
+#: plugins/power/gpm-common.c:776
msgid "Empty"
msgstr ""
-#: plugins/power/gpm-common.c:745
+#: plugins/power/gpm-common.c:784
msgid "Waiting to charge"
msgstr ""
-#: plugins/power/gpm-common.c:749
+#: plugins/power/gpm-common.c:788
msgid "Waiting to discharge"
msgstr ""
-#: plugins/power/gpm-common.c:753
+#: plugins/power/gpm-common.c:792
msgid "Unknown"
msgstr ""
-#: plugins/power/gpm-common.c:782
+#: plugins/power/gpm-common.c:821
msgid "Laptop battery not present"
msgstr ""
-#: plugins/power/gpm-common.c:786
+#: plugins/power/gpm-common.c:825
msgid "Laptop battery is charging"
msgstr ""
-#: plugins/power/gpm-common.c:790
+#: plugins/power/gpm-common.c:829
msgid "Laptop battery is discharging"
msgstr ""
-#: plugins/power/gpm-common.c:794
+#: plugins/power/gpm-common.c:833
msgid "Laptop battery is empty"
msgstr ""
-#: plugins/power/gpm-common.c:798
+#: plugins/power/gpm-common.c:837
msgid "Laptop battery is charged"
msgstr ""
-#: plugins/power/gpm-common.c:802
+#: plugins/power/gpm-common.c:841
msgid "Laptop battery is waiting to charge"
msgstr ""
-#: plugins/power/gpm-common.c:806
+#: plugins/power/gpm-common.c:845
msgid "Laptop battery is waiting to discharge"
msgstr ""
-#: plugins/power/gpm-common.c:815
+#: plugins/power/gpm-common.c:854
msgid "UPS is charging"
msgstr ""
-#: plugins/power/gpm-common.c:819
+#: plugins/power/gpm-common.c:858
msgid "UPS is discharging"
msgstr ""
-#: plugins/power/gpm-common.c:823
+#: plugins/power/gpm-common.c:862
msgid "UPS is empty"
msgstr ""
-#: plugins/power/gpm-common.c:827
+#: plugins/power/gpm-common.c:866
msgid "UPS is charged"
msgstr ""
-#: plugins/power/gpm-common.c:836
+#: plugins/power/gpm-common.c:875
msgid "Mouse is charging"
msgstr ""
-#: plugins/power/gpm-common.c:840
+#: plugins/power/gpm-common.c:879
msgid "Mouse is discharging"
msgstr ""
-#: plugins/power/gpm-common.c:844
+#: plugins/power/gpm-common.c:883
msgid "Mouse is empty"
msgstr ""
-#: plugins/power/gpm-common.c:848
+#: plugins/power/gpm-common.c:887
msgid "Mouse is charged"
msgstr ""
-#: plugins/power/gpm-common.c:857
+#: plugins/power/gpm-common.c:896
msgid "Keyboard is charging"
msgstr ""
-#: plugins/power/gpm-common.c:861
+#: plugins/power/gpm-common.c:900
msgid "Keyboard is discharging"
msgstr ""
-#: plugins/power/gpm-common.c:865
+#: plugins/power/gpm-common.c:904
msgid "Keyboard is empty"
msgstr ""
-#: plugins/power/gpm-common.c:869
+#: plugins/power/gpm-common.c:908
msgid "Keyboard is charged"
msgstr ""
-#: plugins/power/gpm-common.c:878
+#: plugins/power/gpm-common.c:917
msgid "PDA is charging"
msgstr ""
-#: plugins/power/gpm-common.c:882
+#: plugins/power/gpm-common.c:921
msgid "PDA is discharging"
msgstr ""
-#: plugins/power/gpm-common.c:886
+#: plugins/power/gpm-common.c:925
msgid "PDA is empty"
msgstr ""
-#: plugins/power/gpm-common.c:890
+#: plugins/power/gpm-common.c:929
msgid "PDA is charged"
msgstr ""
-#: plugins/power/gpm-common.c:899
+#: plugins/power/gpm-common.c:938
msgid "Cell phone is charging"
msgstr ""
-#: plugins/power/gpm-common.c:903
+#: plugins/power/gpm-common.c:942
msgid "Cell phone is discharging"
msgstr ""
-#: plugins/power/gpm-common.c:907
+#: plugins/power/gpm-common.c:946
msgid "Cell phone is empty"
msgstr ""
-#: plugins/power/gpm-common.c:911
+#: plugins/power/gpm-common.c:950
msgid "Cell phone is charged"
msgstr ""
-#: plugins/power/gpm-common.c:920
+#: plugins/power/gpm-common.c:959
msgid "Media player is charging"
msgstr ""
-#: plugins/power/gpm-common.c:924
+#: plugins/power/gpm-common.c:963
msgid "Media player is discharging"
msgstr ""
-#: plugins/power/gpm-common.c:928
+#: plugins/power/gpm-common.c:967
msgid "Media player is empty"
msgstr ""
-#: plugins/power/gpm-common.c:932
+#: plugins/power/gpm-common.c:971
msgid "Media player is charged"
msgstr ""
-#: plugins/power/gpm-common.c:941
+#: plugins/power/gpm-common.c:980
msgid "Tablet is charging"
msgstr ""
-#: plugins/power/gpm-common.c:945
+#: plugins/power/gpm-common.c:984
msgid "Tablet is discharging"
msgstr ""
-#: plugins/power/gpm-common.c:949
+#: plugins/power/gpm-common.c:988
msgid "Tablet is empty"
msgstr ""
-#: plugins/power/gpm-common.c:953
+#: plugins/power/gpm-common.c:992
msgid "Tablet is charged"
msgstr ""
-#: plugins/power/gpm-common.c:962
+#: plugins/power/gpm-common.c:1001
msgid "Computer is charging"
msgstr ""
-#: plugins/power/gpm-common.c:966
+#: plugins/power/gpm-common.c:1005
msgid "Computer is discharging"
msgstr ""
-#: plugins/power/gpm-common.c:970
+#: plugins/power/gpm-common.c:1009
msgid "Computer is empty"
msgstr ""
-#: plugins/power/gpm-common.c:974
+#: plugins/power/gpm-common.c:1013
msgid "Computer is charged"
msgstr ""
-#: plugins/power/gpm-common.c:984
+#: plugins/power/gpm-common.c:1023
msgid "Game controller is charging"
msgstr ""
-#: plugins/power/gpm-common.c:988
+#: plugins/power/gpm-common.c:1027
msgid "Game controller is discharging"
msgstr ""
-#: plugins/power/gpm-common.c:992
+#: plugins/power/gpm-common.c:1031
msgid "Game controller is empty"
msgstr ""
-#: plugins/power/gpm-common.c:996
+#: plugins/power/gpm-common.c:1035
msgid "Game controller is charged"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-settings-daemon-4.8.5/debian/changelog
new/cinnamon-settings-daemon-5.0.1/debian/changelog
--- old/cinnamon-settings-daemon-4.8.5/debian/changelog 2021-01-14
00:02:29.000000000 +0100
+++ new/cinnamon-settings-daemon-5.0.1/debian/changelog 2021-06-10
15:04:01.000000000 +0200
@@ -1,3 +1,41 @@
+cinnamon-settings-daemon (5.0.1) uma; urgency=medium
+
+ [ Michael Webster ]
+ * csd-power-manager.c: Remove percentage from mouse and keyboard 'warning'
notifications.
+
+ [ Clement Lefebvre ]
+ * l10n: Update POT
+
+ -- Clement Lefebvre <r...@linuxmint.com> Thu, 10 Jun 2021 14:03:36 +0100
+
+cinnamon-settings-daemon (5.0.0) uma; urgency=medium
+
+ [ Michael Webster ]
+ * csd-power-manager.c: Make sure to propagate the icon and/or state
properties immediately when they change.
+ * power/gpm-common.c: Prefer more specific battery level icons if they're
available in the theme.
+ * gpm-common.c: Adjust thresholds for battery-level icon changes.
+
+ [ Mike Gerow ]
+ * datetime: use full path for d-bus service Exec
+
+ [ Sparky Bluefang ]
+ * build: Add missing defines. Fix optional wacom build. Make build options
behave consistently.
+
+ [ Joshua Peisach ]
+ * Shush compiler warnings (#329)
+
+ [ Michael Webster ]
+ * csd-xrandr-manager.c: Fix some build warnings.
+ * csd-power-manager.c: Manage idle activation of cinnamon-screensaver
instead of making the screensaver itself handle it.
+
+ [ Joshua Peisach ]
+ * wacom: Fix a crash from assertion failures
+
+ [ Michael Webster ]
+ * csd-power-manager.c: Remove percentage from non-battery critical
notifications.
+
+ -- Clement Lefebvre <r...@linuxmint.com> Mon, 31 May 2021 13:42:46 +0100
+
cinnamon-settings-daemon (4.8.5) ulyssa; urgency=medium
[ Eli Schwartz ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-settings-daemon-4.8.5/meson.build
new/cinnamon-settings-daemon-5.0.1/meson.build
--- old/cinnamon-settings-daemon-4.8.5/meson.build 2021-01-14
00:02:29.000000000 +0100
+++ new/cinnamon-settings-daemon-5.0.1/meson.build 2021-06-10
15:04:01.000000000 +0200
@@ -1,4 +1,4 @@
-project('cinnamon-settings-daemon', 'c', version: '4.8.5', meson_version: '>=
0.47')
+project('cinnamon-settings-daemon', 'c', version: '5.0.1', meson_version: '>=
0.47')
gnome = import('gnome')
i18n = import('i18n')
@@ -9,6 +9,7 @@
api_version = '3.0'
cc = meson.get_compiler('c')
+cargs = []
# directories
prefix = get_option('prefix')
@@ -43,7 +44,7 @@
cinnamon_desktop_required = '>= 4.8.0'
canberra = dependency('libcanberra-gtk3')
cinnamon_desktop = dependency('cinnamon-desktop', version:
cinnamon_desktop_required)
-colord = dependency('colord', version: '>= 0.1.27')
+colord = dependency('colord', version: '>= 0.1.27', required:
get_option('use_color'))
cups = dependency('cups', version: '>= 1.4', required: get_option('use_cups'))
cvc = dependency('cvc', version: cinnamon_desktop_required)
fontconfig = dependency('fontconfig')
@@ -56,13 +57,13 @@
gudev = dependency('gudev-1.0', required: get_option('use_gudev'))
libnotify = dependency('libnotify', version: '>= 0.7.3')
kbproto = dependency('kbproto')
-nss = dependency('nss', version: '>= 3.11.2', required:
get_option('enable_smartcard'))
+nss = dependency('nss', version: '>= 3.11.2', required:
get_option('use_smartcard'))
polkit = dependency('polkit-gobject-1', version: '>= 0.97', required:
get_option('use_polkit'))
pulse_required = '>= 0.9.16'
pulse = dependency('libpulse', version: pulse_required)
pulse_glib = dependency('libpulse-mainloop-glib', version: pulse_required)
upower_glib = dependency('upower-glib', version: '>= 0.9.11')
-wacom = dependency('libwacom', version: '>= 0.7', required: false)
+wacom = dependency('libwacom', version: '>= 0.7', required:
get_option('use_wacom'))
x11 = dependency('x11')
xext = dependency('xext')
xfixes = dependency('xfixes')
@@ -80,13 +81,12 @@
xorg_wacom = dependency('xorg-wacom', required: wacom.found())
lcms = dependency('lcms2', version: '>= 2.2', required: false)
-has_new_lcms = lcms.found()
-if not has_new_lcms
- lcms = dependency('lcms2')
+if lcms.found()
+ cargs += '-DHAVE_NEW_LCMS'
+else
+ lcms = dependency('lcms2', required: colord.found())
endif
-cargs = []
-
using_logind = false
if not get_option('use_logind').disabled()
logind = dependency('libsystemd-logind', required: false)
@@ -125,6 +125,10 @@
cargs += '-DHAVE_GUDEV'
endif
+if wacom.found()
+ cargs += '-DHAVE_WACOM'
+endif
+
if not get_option('enable_debug')
cargs += [
'-Wno-deprecated-declarations',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-settings-daemon-4.8.5/meson_options.txt
new/cinnamon-settings-daemon-5.0.1/meson_options.txt
--- old/cinnamon-settings-daemon-4.8.5/meson_options.txt 2021-01-14
00:02:29.000000000 +0100
+++ new/cinnamon-settings-daemon-5.0.1/meson_options.txt 2021-06-10
15:04:01.000000000 +0200
@@ -35,20 +35,26 @@
description: 'Whether cups (and therefore the print notifications plugin)
support should be enabled'
)
option(
- 'enable_smartcard',
+ 'use_smartcard',
type: 'feature',
value: 'enabled',
description: 'Set to false to disable smartcard support'
)
option(
'use_color',
- type: 'boolean',
- value: true,
+ type: 'feature',
+ value: 'enabled',
description: 'Whether the color plugin should be enabled'
)
option(
+ 'use_wacom',
+ type: 'feature',
+ value: 'auto',
+ description: 'Whether the wacom plugin should be enabled'
+)
+option(
'enable_debug',
type: 'boolean',
value: false,
description: 'Show additional build warnings'
-)
\ No newline at end of file
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.5/plugins/automount/csd-autorun.c
new/cinnamon-settings-daemon-5.0.1/plugins/automount/csd-autorun.c
--- old/cinnamon-settings-daemon-4.8.5/plugins/automount/csd-autorun.c
2021-01-14 00:02:29.000000000 +0100
+++ new/cinnamon-settings-daemon-5.0.1/plugins/automount/csd-autorun.c
2021-06-10 15:04:01.000000000 +0200
@@ -984,8 +984,8 @@
void
csd_autorun_for_content_type (GMount *mount,
const gchar *content_type,
- CsdAutorunOpenWindow *callback,
+ CsdAutorunOpenWindow callback,
gpointer user_data)
{
do_autorun_for_content_type (mount, content_type, callback, user_data);
-}
\ No newline at end of file
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.5/plugins/automount/csd-autorun.h
new/cinnamon-settings-daemon-5.0.1/plugins/automount/csd-autorun.h
--- old/cinnamon-settings-daemon-4.8.5/plugins/automount/csd-autorun.h
2021-01-14 00:02:29.000000000 +0100
+++ new/cinnamon-settings-daemon-5.0.1/plugins/automount/csd-autorun.h
2021-06-10 15:04:01.000000000 +0200
@@ -49,7 +49,7 @@
void csd_autorun_for_content_type (GMount *mount,
const gchar *content_type,
- CsdAutorunOpenWindow *callback,
+ CsdAutorunOpenWindow callback,
gpointer user_data);
void csd_allow_autorun_for_volume (GVolume *volume);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.5/plugins/automount/test-automount-dialog.c
new/cinnamon-settings-daemon-5.0.1/plugins/automount/test-automount-dialog.c
---
old/cinnamon-settings-daemon-4.8.5/plugins/automount/test-automount-dialog.c
2021-01-14 00:02:29.000000000 +0100
+++
new/cinnamon-settings-daemon-5.0.1/plugins/automount/test-automount-dialog.c
2021-06-10 15:04:01.000000000 +0200
@@ -42,8 +42,7 @@
{
GVolumeMonitor *monitor;
GError *error;
- GList *mounts, *l;
- int conflicting_options;
+ GList *mounts;
error = NULL;
if (! gtk_init_with_args (&argc, &argv, NULL, NULL, NULL, &error)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.5/plugins/color/csd-color-manager.c
new/cinnamon-settings-daemon-5.0.1/plugins/color/csd-color-manager.c
--- old/cinnamon-settings-daemon-4.8.5/plugins/color/csd-color-manager.c
2021-01-14 00:02:29.000000000 +0100
+++ new/cinnamon-settings-daemon-5.0.1/plugins/color/csd-color-manager.c
2021-06-10 15:04:01.000000000 +0200
@@ -1756,9 +1756,10 @@
g_hash_table_destroy (manager->priv->device_assign_hash);
manager->priv->device_assign_hash = NULL;
}
- if (manager->priv->x11_screen != NULL)
+ if (manager->priv->x11_screen != NULL) {
g_object_unref (manager->priv->x11_screen);
manager->priv->x11_screen = NULL;
+ }
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.5/plugins/datetime/csd-datetime-mechanism.c
new/cinnamon-settings-daemon-5.0.1/plugins/datetime/csd-datetime-mechanism.c
---
old/cinnamon-settings-daemon-4.8.5/plugins/datetime/csd-datetime-mechanism.c
2021-01-14 00:02:29.000000000 +0100
+++
new/cinnamon-settings-daemon-5.0.1/plugins/datetime/csd-datetime-mechanism.c
2021-06-10 15:04:01.000000000 +0200
@@ -326,7 +326,7 @@
if (settimeofday (tv, NULL) != 0) {
error = g_error_new (CSD_DATETIME_MECHANISM_ERROR,
CSD_DATETIME_MECHANISM_ERROR_GENERAL,
- "Error calling settimeofday({%lld,%lld}):
%s",
+ "Error calling settimeofday({%ld,%ld}):
%s",
(gint64) tv->tv_sec, (gint64) tv->tv_usec,
strerror (errno));
dbus_g_method_return_error (context, error);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.5/plugins/datetime/org.cinnamon.SettingsDaemon.DateTimeMechanism.service.in
new/cinnamon-settings-daemon-5.0.1/plugins/datetime/org.cinnamon.SettingsDaemon.DateTimeMechanism.service.in
---
old/cinnamon-settings-daemon-4.8.5/plugins/datetime/org.cinnamon.SettingsDaemon.DateTimeMechanism.service.in
2021-01-14 00:02:29.000000000 +0100
+++
new/cinnamon-settings-daemon-5.0.1/plugins/datetime/org.cinnamon.SettingsDaemon.DateTimeMechanism.service.in
2021-06-10 15:04:01.000000000 +0200
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=org.cinnamon.SettingsDaemon.DateTimeMechanism
-Exec=csd-datetime-mechanism
+Exec=@LIBEXECDIR@/csd-datetime-mechanism
User=root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.5/plugins/keyboard/csd-keyboard-xkb.c
new/cinnamon-settings-daemon-5.0.1/plugins/keyboard/csd-keyboard-xkb.c
--- old/cinnamon-settings-daemon-4.8.5/plugins/keyboard/csd-keyboard-xkb.c
2021-01-14 00:02:29.000000000 +0100
+++ new/cinnamon-settings-daemon-5.0.1/plugins/keyboard/csd-keyboard-xkb.c
2021-06-10 15:04:01.000000000 +0200
@@ -63,8 +63,6 @@
static PostActivationCallback pa_callback = NULL;
static void *pa_callback_user_data = NULL;
-static GtkStatusIcon *icon = NULL;
-
static GHashTable *preview_dialogs = NULL;
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.5/plugins/media-keys/csd-media-keys-manager.c
new/cinnamon-settings-daemon-5.0.1/plugins/media-keys/csd-media-keys-manager.c
---
old/cinnamon-settings-daemon-4.8.5/plugins/media-keys/csd-media-keys-manager.c
2021-01-14 00:02:29.000000000 +0100
+++
new/cinnamon-settings-daemon-5.0.1/plugins/media-keys/csd-media-keys-manager.c
2021-06-10 15:04:01.000000000 +0200
@@ -1036,12 +1036,13 @@
case C_DESKTOP_MEDIA_KEY_VOLUME_UP:
new_muted = FALSE;
/* When coming out of mute only increase the volume if it was
0 */
- if (!old_muted || old_vol_pa == 0)
+ if (!old_muted || old_vol_pa == 0) {
if (old_vol_pa % vol_step_pa > 0 && !CROSSING_PA_NORM
(old_vol_pa, vol_step_pa)) {
new_vol_pa = MIN (old_vol_pa / vol_step_pa *
vol_step_pa, max_vol_pa);
} else {
new_vol_pa = MIN (old_vol_pa / vol_step_pa *
vol_step_pa + vol_step_pa, max_vol_pa);
}
+ }
break;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-settings-daemon-4.8.5/plugins/meson.build
new/cinnamon-settings-daemon-5.0.1/plugins/meson.build
--- old/cinnamon-settings-daemon-4.8.5/plugins/meson.build 2021-01-14
00:02:29.000000000 +0100
+++ new/cinnamon-settings-daemon-5.0.1/plugins/meson.build 2021-06-10
15:04:01.000000000 +0200
@@ -24,7 +24,7 @@
subdir('xrandr')
subdir('xsettings')
-if get_option('use_color')
+if colord.found()
subdir('color')
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.5/plugins/power/csd-power-manager.c
new/cinnamon-settings-daemon-5.0.1/plugins/power/csd-power-manager.c
--- old/cinnamon-settings-daemon-4.8.5/plugins/power/csd-power-manager.c
2021-01-14 00:02:29.000000000 +0100
+++ new/cinnamon-settings-daemon-5.0.1/plugins/power/csd-power-manager.c
2021-06-10 15:04:01.000000000 +0200
@@ -210,7 +210,7 @@
static void uninhibit_lid_switch (CsdPowerManager *manager);
static void setup_locker_process (gpointer user_data);
static void lock_screen_with_custom_saver (CsdPowerManager *manager,
gchar *custom_saver, gboolean idle_lock);
-static void lock_screensaver (CsdPowerManager *manager);
+static void activate_screensaver (CsdPowerManager *manager, gboolean
force_lock);
static void kill_lid_close_safety_timer (CsdPowerManager *manager);
int backlight_get_output_id (CsdPowerManager *manager);
@@ -367,6 +367,8 @@
if (manager->priv->power_iface == NULL)
return;
+ gboolean need_flush = FALSE;
+
if (icon_changed) {
GIcon *gicon;
gchar *gicon_str;
@@ -375,6 +377,7 @@
gicon_str = g_icon_to_string (gicon);
csd_power_set_icon (manager->priv->power_iface, gicon_str);
+ need_flush = TRUE;
g_free (gicon_str);
g_object_unref (gicon);
@@ -386,9 +389,14 @@
tooltip = engine_get_summary (manager);
csd_power_set_tooltip (manager->priv->power_iface, tooltip);
+ need_flush = TRUE;
g_free (tooltip);
}
+
+ if (need_flush) {
+ g_dbus_interface_skeleton_flush (G_DBUS_INTERFACE_SKELETON
(manager->priv->power_iface));
+ }
}
static CsdPowerManagerWarning
@@ -1261,14 +1269,14 @@
title = _("Mouse battery low");
/* TRANSLATORS: tell user more details */
- message = g_strdup_printf (_("Wireless mouse is low in power
(%.0f%%)"), percentage);
+ message = g_strdup_printf (_("Wireless mouse is low in
power"));
} else if (kind == UP_DEVICE_KIND_KEYBOARD) {
/* TRANSLATORS: keyboard is getting a little low */
title = _("Keyboard battery low");
/* TRANSLATORS: tell user more details */
- message = g_strdup_printf (_("Wireless keyboard is low in
power (%.0f%%)"), percentage);
+ message = g_strdup_printf (_("Wireless keyboard is low in
power"));
} else if (kind == UP_DEVICE_KIND_PDA) {
/* TRANSLATORS: PDA is getting a little low */
@@ -1426,17 +1434,15 @@
title = _("Mouse battery low");
/* TRANSLATORS: the device is just going to stop working */
- message = g_strdup_printf (_("Wireless mouse is very low in
power (%.0f%%). "
- "This device will soon stop
functioning if not charged."),
- percentage);
+ message = g_strdup_printf (_("Wireless mouse is very low in
power. "
+ "This device will soon stop
functioning if not charged."));
} else if (kind == UP_DEVICE_KIND_KEYBOARD) {
/* TRANSLATORS: the keyboard battery is very low */
title = _("Keyboard battery low");
/* TRANSLATORS: the device is just going to stop working */
- message = g_strdup_printf (_("Wireless keyboard is very low in
power (%.0f%%). "
- "This device will soon stop
functioning if not charged."),
- percentage);
+ message = g_strdup_printf (_("Wireless keyboard is very low in
power. "
+ "This device will soon stop
functioning if not charged."));
} else if (kind == UP_DEVICE_KIND_PDA) {
/* TRANSLATORS: the PDA battery is very low */
@@ -1935,7 +1941,7 @@
switch (action_type) {
case CSD_POWER_ACTION_SUSPEND:
if (should_lock_on_suspend (manager)) {
- lock_screensaver (manager);
+ activate_screensaver (manager, TRUE);
}
turn_monitors_off (manager);
@@ -1952,7 +1958,7 @@
break;
case CSD_POWER_ACTION_HIBERNATE:
if (should_lock_on_suspend (manager)) {
- lock_screensaver (manager);
+ activate_screensaver (manager, TRUE);
}
turn_monitors_off (manager);
@@ -1967,7 +1973,7 @@
case CSD_POWER_ACTION_BLANK:
/* Lock first or else xrandr might reconfigure stuff and the
ss's coverage
* may be incorrect upon return. */
- lock_screensaver (manager);
+ activate_screensaver (manager, FALSE);
turn_monitors_off (manager);
break;
case CSD_POWER_ACTION_NOTHING:
@@ -3571,7 +3577,7 @@
}
static void
-lock_screensaver (CsdPowerManager *manager)
+activate_screensaver (CsdPowerManager *manager, gboolean force_lock)
{
GError *error;
gboolean ret;
@@ -3589,7 +3595,12 @@
* a custom screen saver, default to invoking cinnamon-screensaver */
/* do this sync to ensure it's on the screen when we start suspending */
error = NULL;
- ret = g_spawn_command_line_sync ("cinnamon-screensaver-command --lock",
NULL, NULL, NULL, &error);
+
+ if (force_lock) {
+ ret = g_spawn_command_line_sync ("cinnamon-screensaver-command
--lock", NULL, NULL, NULL, &error);
+ } else {
+ ret = g_spawn_command_line_sync ("cinnamon-screensaver-command -a",
NULL, NULL, NULL, &error);
+ }
if (!ret) {
g_warning ("Couldn't lock screen: %s", error->message);
@@ -3751,18 +3762,18 @@
idle_set_mode (manager, CSD_POWER_IDLE_MODE_DIM);
break;
case CSD_POWER_IDLETIME_LOCK_ID:
- /* cinnamon-screensaver has its own lock after some idle delay.
- * If we have a custom screensaver configured, we have to use
- * the idle delay from cinnamon-settings-daemon to trigger the
- * screen lock after the idle timeout */
; /* empty statement, because C does not allow a declaration to
* follow a label */
gchar *custom_saver = g_settings_get_string
(manager->priv->settings_screensaver,
"custom-screensaver-command");
- if (custom_saver && g_strcmp0 (custom_saver, "") != 0)
+ if (custom_saver && g_strcmp0 (custom_saver, "") != 0) {
lock_screen_with_custom_saver (manager,
custom_saver,
TRUE);
+ } else {
+ activate_screensaver (manager, FALSE);
+ }
+
g_free (custom_saver);
break;
@@ -4052,7 +4063,7 @@
* suppose.)
*/
if (should_lock_on_suspend (manager)) {
- lock_screensaver (manager);
+ activate_screensaver (manager, TRUE);
}
/* lift the delay inhibit, so logind can proceed */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.5/plugins/power/gpm-common.c
new/cinnamon-settings-daemon-5.0.1/plugins/power/gpm-common.c
--- old/cinnamon-settings-daemon-4.8.5/plugins/power/gpm-common.c
2021-01-14 00:02:29.000000000 +0100
+++ new/cinnamon-settings-daemon-5.0.1/plugins/power/gpm-common.c
2021-06-10 15:04:01.000000000 +0200
@@ -105,6 +105,37 @@
return "full";
}
+static const gchar *
+gpm_upower_get_precise_icon_index (UpDevice *device)
+{
+ gdouble percentage;
+ /* get device properties */
+ g_object_get (device, "percentage", &percentage, NULL);
+
+ if (percentage < 10)
+ return "0";
+ else if (percentage < 20)
+ return "10";
+ else if (percentage < 30)
+ return "20";
+ else if (percentage < 40)
+ return "30";
+ else if (percentage < 50)
+ return "40";
+ else if (percentage < 60)
+ return "50";
+ else if (percentage < 70)
+ return "60";
+ else if (percentage < 80)
+ return "70";
+ else if (percentage < 90)
+ return "80";
+ else if (percentage < 99)
+ return "90";
+
+ return "100";
+}
+
GIcon *
gpm_upower_get_device_icon (UpDevice *device, gboolean use_symbolic)
{
@@ -113,6 +144,7 @@
const gchar *kind_str;
const gchar *suffix_str;
const gchar *index_str;
+ const gchar *precise_str;
UpDeviceKind kind;
UpDeviceState state;
gboolean is_present;
@@ -164,6 +196,7 @@
break;
case UP_DEVICE_STATE_FULLY_CHARGED:
if (use_symbolic) {
+ g_string_append (filename,
"battery-level-100-charged-symbolic;");
g_string_append (filename,
"battery-full-charged-symbolic;");
g_string_append (filename,
"battery-full-charging-symbolic;");
}
@@ -176,8 +209,11 @@
case UP_DEVICE_STATE_PENDING_CHARGE:
suffix_str = gpm_upower_get_device_icon_suffix
(device);
index_str = gpm_upower_get_device_icon_index
(device);
- if (use_symbolic)
+ precise_str =
gpm_upower_get_precise_icon_index (device);
+ if (use_symbolic) {
+ g_string_append_printf (filename,
"battery-level-%s-charging-symbolic;", precise_str);
g_string_append_printf (filename,
"battery-%s-charging-symbolic;", suffix_str);
+ }
g_string_append_printf (filename,
"gpm-%s-%s-charging;", kind_str, index_str);
g_string_append_printf (filename,
"battery-%s-charging;", suffix_str);
break;
@@ -185,8 +221,11 @@
case UP_DEVICE_STATE_PENDING_DISCHARGE:
suffix_str = gpm_upower_get_device_icon_suffix
(device);
index_str = gpm_upower_get_device_icon_index
(device);
- if (use_symbolic)
+ precise_str =
gpm_upower_get_precise_icon_index (device);
+ if (use_symbolic) {
+ g_string_append_printf (filename,
"battery-level-%s-symbolic;", precise_str);
g_string_append_printf (filename,
"battery-%s-symbolic;", suffix_str);
+ }
g_string_append_printf (filename,
"gpm-%s-%s;", kind_str, index_str);
g_string_append_printf (filename,
"battery-%s;", suffix_str);
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.5/plugins/wacom/csd-wacom-device.c
new/cinnamon-settings-daemon-5.0.1/plugins/wacom/csd-wacom-device.c
--- old/cinnamon-settings-daemon-4.8.5/plugins/wacom/csd-wacom-device.c
2021-01-14 00:02:29.000000000 +0100
+++ new/cinnamon-settings-daemon-5.0.1/plugins/wacom/csd-wacom-device.c
2021-06-10 15:04:01.000000000 +0200
@@ -1854,7 +1854,7 @@
stylus_id, device->priv->name);
/* Setting the default stylus to be the first one */
- g_assert (device->priv->styli);
+ g_return_if_fail (device->priv->styli != NULL);
stylus = device->priv->styli->data;
g_object_set (device, "last-stylus", stylus, NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.5/plugins/xrandr/csd-xrandr-manager.c
new/cinnamon-settings-daemon-5.0.1/plugins/xrandr/csd-xrandr-manager.c
--- old/cinnamon-settings-daemon-4.8.5/plugins/xrandr/csd-xrandr-manager.c
2021-01-14 00:02:29.000000000 +0100
+++ new/cinnamon-settings-daemon-5.0.1/plugins/xrandr/csd-xrandr-manager.c
2021-06-10 15:04:01.000000000 +0200
@@ -205,8 +205,8 @@
static void
log_output (GnomeRROutputInfo *output)
{
- gchar *name = gnome_rr_output_info_get_name (output);
- gchar *display_name = gnome_rr_output_info_get_display_name (output);
+ const gchar *name = gnome_rr_output_info_get_name (output);
+ const gchar *display_name = gnome_rr_output_info_get_display_name
(output);
log_msg (" %s: ", name ? name : "unknown");
@@ -2052,7 +2052,7 @@
g_free (legacy_filename);
if (success) {
- g_debug ("Successfully loaded existing monitor configuration\n",
success);
+ g_debug ("Successfully loaded existing monitor configuration\n");
}
return success;
@@ -2134,6 +2134,8 @@
}
}
+static void register_manager_dbus (CsdXrandrManager *manager);
+
gboolean
csd_xrandr_manager_start (CsdXrandrManager *manager,
GError **error)
@@ -2399,7 +2401,7 @@
NULL);
}
-void
+static void
register_manager_dbus (CsdXrandrManager *manager)
{
manager->priv->introspection_data = g_dbus_node_info_new_for_xml
(introspection_xml, NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.5/plugins/xrandr/meson.build
new/cinnamon-settings-daemon-5.0.1/plugins/xrandr/meson.build
--- old/cinnamon-settings-daemon-4.8.5/plugins/xrandr/meson.build
2021-01-14 00:02:29.000000000 +0100
+++ new/cinnamon-settings-daemon-5.0.1/plugins/xrandr/meson.build
2021-06-10 15:04:01.000000000 +0200
@@ -11,6 +11,7 @@
csd_dep,
libnotify,
upower_glib,
+ wacom,
xfixes,
]
