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 2022-01-03 10:50:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-settings-daemon.new.1896 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-settings-daemon"
Mon Jan 3 10:50:05 2022 rev:29 rq:943503 version:5.2.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-settings-daemon/cinnamon-settings-daemon.changes
2021-08-25 20:59:33.493054851 +0200
+++
/work/SRC/openSUSE:Factory/.cinnamon-settings-daemon.new.1896/cinnamon-settings-daemon.changes
2022-01-03 10:50:48.419612328 +0100
@@ -1,0 +2,7 @@
+Thu Dec 9 01:11:54 UTC 2021 - andy great <andythe_gr...@pm.me>
+
+- Update to version 5.2.0.
+ * Add trackball support (#341)
+ * wacom: Drop LED helper (#337)
+
+-------------------------------------------------------------------
Old:
----
cinnamon-settings-daemon-5.0.4.tar.gz
New:
----
cinnamon-settings-daemon-5.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.Co5ZrQ/_old 2022-01-03 10:50:48.883612505 +0100
+++ /var/tmp/diff_new_pack.Co5ZrQ/_new 2022-01-03 10:50:48.887612507 +0100
@@ -17,7 +17,7 @@
Name: cinnamon-settings-daemon
-Version: 5.0.4
+Version: 5.2.0
Release: 0
Summary: The settings Daemon for the Cinnamon Desktop
License: GPL-2.0-or-later AND LGPL-2.1-only
++++++ cinnamon-settings-daemon-5.0.4.tar.gz ->
cinnamon-settings-daemon-5.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-5.0.4/data/org.cinnamon.settings-daemon.peripherals.gschema.xml.in.in
new/cinnamon-settings-daemon-5.2.0/data/org.cinnamon.settings-daemon.peripherals.gschema.xml.in.in
---
old/cinnamon-settings-daemon-5.0.4/data/org.cinnamon.settings-daemon.peripherals.gschema.xml.in.in
2021-07-23 13:28:43.000000000 +0200
+++
new/cinnamon-settings-daemon-5.2.0/data/org.cinnamon.settings-daemon.peripherals.gschema.xml.in.in
2021-11-15 13:52:42.000000000 +0100
@@ -4,6 +4,7 @@
<child name="touchpad"
schema="org.cinnamon.settings-daemon.peripherals.touchpad"/>
<child name="keyboard"
schema="org.cinnamon.settings-daemon.peripherals.keyboard"/>
<child name="mouse"
schema="org.cinnamon.settings-daemon.peripherals.mouse"/>
+ <child name="trackball"
schema="org.cinnamon.settings-daemon.peripherals.trackball"/>
<child name="touchscreen"
schema="org.cinnamon.settings-daemon.peripherals.touchscreen"/>
<child name="input-devices"
schema="org.cinnamon.settings-daemon.peripherals.input-devices"/>
</schema>
@@ -188,6 +189,13 @@
<summary>Whether the tablet's orientation is locked, or rotated
automatically.</summary>
</key>
</schema>
+ <schema gettext-domain="@GETTEXT_PACKAGE@"
id="org.cinnamon.settings-daemon.peripherals.trackball"
path="/org/cinnamon/settings-daemon/peripherals/trackball/">
+ <key name="scroll-wheel-emulation-button" type="i">
+ <default>0</default>
+ <range min="0" max="24"/>
+ <summary>Mouse wheel emulation button. 0 to disable the
feature.</summary>
+ </key>
+ </schema>
<schema gettext-domain="@GETTEXT_PACKAGE@"
id="org.cinnamon.settings-daemon.peripherals.input-devices"
path="/org/cinnamon/settings-daemon/peripherals/input-devices/">
<key name="hotplug-command" type="s">
<default>''</default>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-settings-daemon-5.0.4/debian/changelog
new/cinnamon-settings-daemon-5.2.0/debian/changelog
--- old/cinnamon-settings-daemon-5.0.4/debian/changelog 2021-07-23
13:28:43.000000000 +0200
+++ new/cinnamon-settings-daemon-5.2.0/debian/changelog 2021-11-15
13:52:42.000000000 +0100
@@ -1,3 +1,13 @@
+cinnamon-settings-daemon (5.2.0) una; urgency=medium
+
+ [ Leigh Scott ]
+ * Add trackball support (#341)
+
+ [ Joshua Peisach ]
+ * wacom: Drop LED helper (#337)
+
+ -- Clement Lefebvre <r...@linuxmint.com> Mon, 15 Nov 2021 12:51:44 +0000
+
cinnamon-settings-daemon (5.0.4) uma; urgency=medium
[ Michael Webster ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-settings-daemon-5.0.4/meson.build
new/cinnamon-settings-daemon-5.2.0/meson.build
--- old/cinnamon-settings-daemon-5.0.4/meson.build 2021-07-23
13:28:43.000000000 +0200
+++ new/cinnamon-settings-daemon-5.2.0/meson.build 2021-11-15
13:52:42.000000000 +0100
@@ -1,4 +1,4 @@
-project('cinnamon-settings-daemon', 'c', version: '5.0.4', meson_version: '>=
0.47')
+project('cinnamon-settings-daemon', 'c', version: '5.2.0', meson_version: '>=
0.47')
gnome = import('gnome')
i18n = import('i18n')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-5.0.4/plugins/common/csd-input-helper.c
new/cinnamon-settings-daemon-5.2.0/plugins/common/csd-input-helper.c
--- old/cinnamon-settings-daemon-5.0.4/plugins/common/csd-input-helper.c
2021-07-23 13:28:43.000000000 +0200
+++ new/cinnamon-settings-daemon-5.2.0/plugins/common/csd-input-helper.c
2021-11-15 13:52:42.000000000 +0100
@@ -20,6 +20,8 @@
#include "config.h"
+#include <string.h>
+
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
@@ -236,6 +238,24 @@
return (device_info->type == XInternAtom (GDK_DISPLAY_XDISPLAY
(gdk_display_get_default ()), XI_MOUSE, False));
}
+gboolean
+device_info_is_trackball (XDeviceInfo *device_info)
+{
+ gboolean retval;
+
+ retval = (device_info->type == XInternAtom (GDK_DISPLAY_XDISPLAY
(gdk_display_get_default ()), XI_TRACKBALL, False));
+ if (retval == FALSE &&
+ device_info->name != NULL) {
+ char *lowercase;
+
+ lowercase = g_ascii_strdown (device_info->name, -1);
+ retval = strstr (lowercase, "trackball") != NULL;
+ g_free (lowercase);
+ }
+
+ return retval;
+}
+
static gboolean
device_type_is_present (InfoIdentifyFunc info_func,
DeviceIdentifyFunc device_func)
@@ -304,6 +324,13 @@
NULL);
}
+gboolean
+trackball_is_present (void)
+{
+ return device_type_is_present (device_info_is_trackball,
+ NULL);
+}
+
char *
xdevice_get_device_node (int deviceid)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-5.0.4/plugins/common/csd-input-helper.h
new/cinnamon-settings-daemon-5.2.0/plugins/common/csd-input-helper.h
--- old/cinnamon-settings-daemon-5.0.4/plugins/common/csd-input-helper.h
2021-07-23 13:28:43.000000000 +0200
+++ new/cinnamon-settings-daemon-5.2.0/plugins/common/csd-input-helper.h
2021-11-15 13:52:42.000000000 +0100
@@ -64,10 +64,12 @@
gboolean device_info_is_touchscreen (XDeviceInfo *device_info);
gboolean device_info_is_tablet (XDeviceInfo *device_info);
gboolean device_info_is_mouse (XDeviceInfo *device_info);
+gboolean device_info_is_trackball (XDeviceInfo *device_info);
gboolean touchpad_is_present (void);
gboolean touchscreen_is_present (void);
gboolean mouse_is_present (void);
+gboolean trackball_is_present (void);
gboolean device_set_property (XDevice *xdevice,
const char *device_name,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-5.0.4/plugins/mouse/csd-mouse-manager.c
new/cinnamon-settings-daemon-5.2.0/plugins/mouse/csd-mouse-manager.c
--- old/cinnamon-settings-daemon-5.0.4/plugins/mouse/csd-mouse-manager.c
2021-07-23 13:28:43.000000000 +0200
+++ new/cinnamon-settings-daemon-5.2.0/plugins/mouse/csd-mouse-manager.c
2021-11-15 13:52:42.000000000 +0100
@@ -56,6 +56,7 @@
#define SETTINGS_MOUSE_DIR
"org.cinnamon.settings-daemon.peripherals.mouse"
#define SETTINGS_TOUCHPAD_DIR
"org.cinnamon.settings-daemon.peripherals.touchpad"
+#define SETTINGS_TRACKBALL_DIR
"org.cinnamon.settings-daemon.peripherals.trackball"
/* Keys for both touchpad and mouse */
#define KEY_LEFT_HANDED "left-handed" /* a boolean for
mouse, an enum for touchpad */
@@ -82,12 +83,16 @@
#define KEY_SECONDARY_CLICK_ENABLED "secondary-click-enabled"
#define KEY_MIDDLE_BUTTON_EMULATION "middle-button-enabled"
+/* Trackball settings */
+#define KEY_SCROLL_WHEEL_BUTTON "scroll-wheel-emulation-button"
+
struct CsdMouseManagerPrivate
{
guint start_idle_id;
GSettings *touchpad_settings;
GSettings *mouse_settings;
GSettings *mouse_a11y_settings;
+ GSettings *trackball_settings;
GdkDeviceManager *device_manager;
guint device_added_id;
guint device_removed_id;
@@ -162,6 +167,38 @@
}
static gboolean
+device_is_trackball (GdkDevice *device)
+{
+ XDeviceInfo *device_info;
+ gboolean retval = FALSE;
+ gint n_devices;
+ guint i;
+ int id;
+
+ g_object_get (G_OBJECT (device), "device-id", &id, NULL);
+
+ gdk_error_trap_push ();
+
+ device_info = XListInputDevices (GDK_DISPLAY_XDISPLAY
(gdk_display_get_default ()), &n_devices);
+ if (device_info == NULL)
+ return retval;
+
+ for (i = 0; i < n_devices; i++) {
+ if (device_info[i].id != id)
+ continue;
+
+ retval = device_info_is_trackball (&device_info[i]);
+ break;
+ }
+ XFreeDeviceList (device_info);
+
+ if (gdk_error_trap_pop () != 0)
+ return FALSE;
+
+ return retval;
+}
+
+static gboolean
device_is_blacklisted (CsdMouseManager *manager,
GdkDevice *device)
{
@@ -1437,6 +1474,83 @@
}
static void
+set_scroll_wheel_button (CsdMouseManager *manager,
+ GdkDevice *device)
+{
+ Atom wheel_prop, button_prop;
+ XDevice *xdevice;
+ Atom type;
+ int format;
+ unsigned long nitems, bytes_after;
+ unsigned char *data = NULL;
+ int button;
+ int rc;
+
+ if (!device_is_trackball (device))
+ return;
+
+ xdevice = open_gdk_device (device);
+ if (xdevice == NULL)
+ return;
+
+ wheel_prop = XInternAtom (GDK_DISPLAY_XDISPLAY
(gdk_display_get_default ()),
+ "Evdev Wheel Emulation", True);
+ button_prop = XInternAtom (GDK_DISPLAY_XDISPLAY
(gdk_display_get_default ()),
+ "Evdev Wheel Emulation Button", True);
+
+ if (!wheel_prop || !button_prop) {
+ xdevice_close (xdevice);
+ return;
+ }
+
+ g_debug ("setting scroll wheel emulation on %s", gdk_device_get_name
(device));
+
+ gdk_error_trap_push ();
+
+ button = g_settings_get_int (manager->priv->trackball_settings,
KEY_SCROLL_WHEEL_BUTTON);
+
+ /* Whether scroll wheel emulation is enabled */
+ rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default
()),
+ xdevice, wheel_prop, 0, 1, False, XA_INTEGER,
&type, &format,
+ &nitems, &bytes_after, &data);
+
+ if (rc == Success && format == 8 && type == XA_INTEGER && nitems == 1)
{
+ data[0] = button > 0 ? 1 : 0;
+
+ gdk_error_trap_push ();
+ XChangeDeviceProperty (GDK_DISPLAY_XDISPLAY
(gdk_display_get_default ()),
+ xdevice, wheel_prop, type, format,
PropModeReplace, data, nitems);
+ }
+
+ if (data) {
+ XFree (data);
+ data = NULL;
+ }
+
+ /* Which button is used for the emulation */
+ if (button > 0) {
+ rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY
(gdk_display_get_default ()),
+ xdevice, button_prop, 0, 1, False,
XA_INTEGER, &type, &format,
+ &nitems, &bytes_after, &data);
+
+ if (rc == Success && format == 8 && type == XA_INTEGER &&
nitems == 1) {
+ data[0] = button;
+
+ XChangeDeviceProperty (GDK_DISPLAY_XDISPLAY
(gdk_display_get_default ()),
+ xdevice, button_prop, type,
format, PropModeReplace, data, nitems);
+ }
+
+ if (data)
+ XFree (data);
+ }
+
+ if (gdk_error_trap_pop ())
+ g_warning ("Error in setting scroll wheel emulation on
\"%s\"", gdk_device_get_name (device));
+
+ xdevice_close (xdevice);
+}
+
+static void
set_mouse_settings (CsdMouseManager *manager,
GdkDevice *device)
{
@@ -1460,6 +1574,8 @@
}
if (g_settings_get_boolean (manager->priv->touchpad_settings,
KEY_TOUCHPAD_ENABLED) == FALSE)
set_touchpad_disabled (device);
+
+ set_scroll_wheel_button (manager, device);
}
static void
@@ -1601,6 +1717,26 @@
g_list_free (devices);
}
+static void
+trackball_callback (GSettings *settings,
+ const gchar *key,
+ CsdMouseManager *manager)
+{
+ GList *devices, *l;
+
+ devices = gdk_device_manager_list_devices
(manager->priv->device_manager, GDK_DEVICE_TYPE_SLAVE);
+
+ for (l = devices; l != NULL; l = l->next) {
+ GdkDevice *device = l->data;
+
+ if (device_is_ignored (manager, device))
+ continue;
+
+ set_scroll_wheel_button (manager, device);
+ }
+ g_list_free (devices);
+}
+
/* Re-enable touchpad when any other pointing device isn't present. */
static void
ensure_touchpad_active (CsdMouseManager *manager)
@@ -1768,6 +1904,10 @@
g_signal_connect (manager->priv->touchpad_settings, "changed",
G_CALLBACK (touchpad_callback), manager);
+ manager->priv->trackball_settings = g_settings_new
(SETTINGS_TRACKBALL_DIR);
+ g_signal_connect (manager->priv->trackball_settings, "changed",
+ G_CALLBACK (trackball_callback), manager);
+
manager->priv->syndaemon_spawned = FALSE;
set_locate_pointer (manager, g_settings_get_boolean
(manager->priv->mouse_settings, KEY_LOCATE_POINTER));
@@ -1855,6 +1995,7 @@
g_clear_object (&p->mouse_a11y_settings);
g_clear_object (&p->mouse_settings);
g_clear_object (&p->touchpad_settings);
+ g_clear_object (&p->trackball_settings);
set_locate_pointer (manager, FALSE);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-5.0.4/plugins/wacom/csd-wacom-led-helper.c
new/cinnamon-settings-daemon-5.2.0/plugins/wacom/csd-wacom-led-helper.c
--- old/cinnamon-settings-daemon-5.0.4/plugins/wacom/csd-wacom-led-helper.c
2021-07-23 13:28:43.000000000 +0200
+++ new/cinnamon-settings-daemon-5.2.0/plugins/wacom/csd-wacom-led-helper.c
1970-01-01 01:00:00.000000000 +0100
@@ -1,181 +0,0 @@
-/*
- * Copyright (C) 2010-2011 Richard Hughes <rich...@hughsie.com>
- * Copyright (C) 2012 Bastien Nocera <had...@hadess.net>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
- */
-
-#include "config.h"
-
-#include <glib.h>
-#include <locale.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <gudev/gudev.h>
-
-static gboolean
-csd_wacom_led_helper_write (const gchar *filename, gint value, GError **error)
-{
- gchar *text = NULL;
- gint retval;
- gint length;
- gint fd = -1;
- gboolean ret = TRUE;
-
- fd = open (filename, O_WRONLY);
- if (fd < 0) {
- ret = FALSE;
- g_set_error (error, 1, 0, "failed to open filename: %s",
filename);
- goto out;
- }
-
- /* convert to text */
- text = g_strdup_printf ("%i", value);
- length = strlen (text);
-
- /* write to device file */
- retval = write (fd, text, length);
- if (retval != length) {
- ret = FALSE;
- g_set_error (error, 1, 0, "writing '%s' to %s failed", text,
filename);
- goto out;
- }
-out:
- if (fd >= 0)
- close (fd);
- g_free (text);
- return ret;
-}
-
-static char *
-get_led_sysfs_path (GUdevDevice *device,
- int group_num)
-{
- char *status;
- char *filename;
-
- status = g_strdup_printf ("status_led%d_select", group_num);
- filename = g_build_filename (g_udev_device_get_sysfs_path (device),
"wacom_led", status, NULL);
- g_free (status);
-
- return filename;
-}
-
-static char *path = NULL;
-static int group_num = -1;
-static int led_num = -1;
-
-const GOptionEntry options[] = {
- { "path", '\0', 0, G_OPTION_ARG_FILENAME, &path, "Device path for the
Wacom device", NULL },
- { "group", '\0', 0, G_OPTION_ARG_INT, &group_num, "Which LED group to
set", NULL },
- { "led", '\0', 0, G_OPTION_ARG_INT, &led_num, "Which LED to set", NULL
},
- { NULL}
-};
-
-
-int main (int argc, char **argv)
-{
- GOptionContext *context;
- GUdevClient *client;
- GUdevDevice *device, *parent;
- int uid, euid;
- char *filename;
- GError *error = NULL;
- const char * const subsystems[] = { "input", NULL };
-
- /* get calling process */
- uid = getuid ();
- euid = geteuid ();
- if (uid != 0 || euid != 0) {
- g_print ("This program can only be used by the root user\n");
- return 1;
- }
-
- context = g_option_context_new (NULL);
- g_option_context_set_summary (context, "Cinnamon Settings Daemon
Digitizer LED Helper");
- g_option_context_add_main_entries (context, options, NULL);
- g_option_context_parse (context, &argc, &argv, NULL);
-
- if (path == NULL ||
- group_num < 0 ||
- led_num < 0) {
- char *txt;
-
- txt = g_option_context_get_help (context, FALSE, NULL);
- g_print ("%s", txt);
- g_free (txt);
-
- g_option_context_free (context);
-
- return 1;
- }
- g_option_context_free (context);
-
- client = g_udev_client_new (subsystems);
- device = g_udev_client_query_by_device_file (client, path);
- if (device == NULL) {
- g_debug ("Could not find device '%s' in udev database", path);
- goto bail;
- }
-
- if (g_udev_device_get_property_as_boolean (device, "ID_INPUT_TABLET")
== FALSE &&
- g_udev_device_get_property_as_boolean (device, "ID_INPUT_TOUCHPAD")
== FALSE) {
- g_debug ("Device '%s' is not a Wacom tablet", path);
- goto bail;
- }
-
- if (g_strcmp0 (g_udev_device_get_property (device, "ID_BUS"), "usb") !=
0) {
- /* FIXME handle Bluetooth LEDs too */
- g_debug ("Non-USB LEDs setting is not supported");
- goto bail;
- }
-
- parent = g_udev_device_get_parent_with_subsystem (device, "usb",
"usb_interface");
- if (parent == NULL) {
- g_debug ("Could not find parent USB device for '%s'", path);
- goto bail;
- }
- g_object_unref (device);
- device = parent;
-
- filename = get_led_sysfs_path (device, group_num);
- if (csd_wacom_led_helper_write (filename, led_num, &error) == FALSE) {
- g_debug ("Could not set LED status for '%s': %s", path,
error->message);
- g_error_free (error);
- g_free (filename);
- goto bail;
- }
- g_free (filename);
-
- g_debug ("Successfully set LED status for '%s', group %d to %d",
- path, group_num, led_num);
-
- g_object_unref (device);
- g_object_unref (client);
-
- return 0;
-
-bail:
- if (device != NULL)
- g_object_unref (device);
- if (client != NULL)
- g_object_unref (client);
- return 1;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-5.0.4/plugins/wacom/csd-wacom-manager.c
new/cinnamon-settings-daemon-5.2.0/plugins/wacom/csd-wacom-manager.c
--- old/cinnamon-settings-daemon-5.0.4/plugins/wacom/csd-wacom-manager.c
2021-07-23 13:28:43.000000000 +0200
+++ new/cinnamon-settings-daemon-5.2.0/plugins/wacom/csd-wacom-manager.c
2021-11-15 13:52:42.000000000 +0100
@@ -545,49 +545,6 @@
set_pressurethreshold (device, threshold);
}
-static void
-set_led (CsdWacomDevice *device,
- CsdWacomTabletButton *button,
- int index)
-{
- GError *error = NULL;
- const char *path;
- char *command;
- gint status_led;
- gboolean ret;
-
-#ifndef HAVE_GUDEV
- /* Not implemented on non-Linux systems */
- return;
-#endif
- g_return_if_fail (index >= 1);
-
- path = csd_wacom_device_get_path (device);
- status_led = button->status_led;
-
- if (status_led == CSD_WACOM_NO_LED) {
- g_debug ("Ignoring unhandled group ID %d for device %s",
- button->group_id, csd_wacom_device_get_name (device));
- return;
- }
- g_debug ("Switching group ID %d to index %d for device %s",
button->group_id, index, path);
-
- command = g_strdup_printf ("pkexec " LIBEXECDIR "/csd-wacom-led-helper
--path %s --group %d --led %d",
- path, status_led, index - 1);
- ret = g_spawn_command_line_sync (command,
- NULL,
- NULL,
- NULL,
- &error);
-
- if (ret == FALSE) {
- g_debug ("Failed to launch '%s': %s", command, error->message);
- g_error_free (error);
- }
-
- g_free (command);
-}
-
struct DefaultButtons {
const char *button;
int num;
@@ -696,10 +653,6 @@
buttons = csd_wacom_device_get_buttons (device);
for (l = buttons; l != NULL; l = l->next) {
CsdWacomTabletButton *button = l->data;
- if (button->type == WACOM_TABLET_BUTTON_TYPE_HARDCODED &&
- button->status_led != CSD_WACOM_NO_LED) {
- set_led (device, button, 1);
- }
}
g_list_free (buttons);
}
@@ -1280,7 +1233,6 @@
csd_wacom_osd_window_set_mode
(CSD_WACOM_OSD_WINDOW(manager->priv->osd_window), wbutton->group_id, new_mode);
osd_window_update_viewable (manager, wbutton, dir,
xiev);
}
- set_led (device, wbutton, new_mode);
return GDK_FILTER_REMOVE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-5.0.4/plugins/wacom/meson.build
new/cinnamon-settings-daemon-5.2.0/plugins/wacom/meson.build
--- old/cinnamon-settings-daemon-5.0.4/plugins/wacom/meson.build
2021-07-23 13:28:43.000000000 +0200
+++ new/cinnamon-settings-daemon-5.2.0/plugins/wacom/meson.build
2021-11-15 13:52:42.000000000 +0100
@@ -23,10 +23,6 @@
wacom_resources,
]
-wacom_led_helper_sources = [
- 'csd-wacom-led-helper.c',
-]
-
wacom_osd_sources = [
'test-osd-window.c',
'csd-wacom-osd-window.c',
@@ -66,22 +62,6 @@
meson.add_install_script(ln_script, libexecdir, pkglibdir, 'csd-wacom')
endif
-if gudev.found()
- executable(
- 'csd-wacom-led-helper',
- wacom_led_helper_sources,
- include_directories: [include_dirs, common_inc, include_enums],
- dependencies: wacom_deps,
- install: true,
- install_dir: libexecdir,
- )
-
- meson.add_install_script(ln_script, libexecdir, bindir,
'csd-wacom-led-helper')
- if libexecdir != pkglibdir
- meson.add_install_script(ln_script, libexecdir, pkglibdir,
'csd-wacom-led-helper')
- endif
-endif
-
executable(
'csd-list-wacom',
list_wacom_sources,
