8 files changed, 12 insertions, 7 deletions
diff --git a/plugins/common/eggaccelerators.c b/plugins/common/eggaccelerators.c
index 9662a3f..0f924d3 100644
--- a/plugins/common/eggaccelerators.c
+++ b/plugins/common/eggaccelerators.c
@@ -1,5 +1,6 @@
 /* eggaccelerators.c
 * Copyright (C) 2002 Red Hat, Inc.; Copyright 1998, 2001 Tim Janik
+ * Copyright (C) 2012-2021 MATE Developers
 * Developed by Havoc Pennington, Tim Janik
 *
 * This library is free software; you can redistribute it and/or
diff --git a/plugins/common/eggaccelerators.h b/plugins/common/eggaccelerators.h
index 8584373..547cf9f 100644
--- a/plugins/common/eggaccelerators.h
+++ b/plugins/common/eggaccelerators.h
@@ -1,5 +1,6 @@
 /* eggaccelerators.h
 * Copyright (C) 2002 Red Hat, Inc.
+ * Copyright (C) 2012-2021 MATE Developers
 * Developed by Havoc Pennington
 *
 * This library is free software; you can redistribute it and/or
@@ -94,5 +95,4 @@ gchar* egg_virtual_accelerator_label (guint accelerator_key,
 }
 #endif
 
-
 #endif /* __EGG_ACCELERATORS_H__ */
diff --git a/plugins/common/msd-input-helper.c b/plugins/common/msd-input-helper.c
index 5434014..05fad76 100644
--- a/plugins/common/msd-input-helper.c
+++ b/plugins/common/msd-input-helper.c
@@ -1,6 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * Copyright (C) 2010 Bastien Nocera <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * 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
@@ -120,8 +121,8 @@ touchpad_is_present (void)
 break;
 }
 }
- if (device_info != NULL)
- XFreeDeviceList (device_info);
+
+ XFreeDeviceList (device_info);
 
 return retval;
 }
diff --git a/plugins/common/msd-input-helper.h b/plugins/common/msd-input-helper.h
index e46c97e..8f722e4 100644
--- a/plugins/common/msd-input-helper.h
+++ b/plugins/common/msd-input-helper.h
@@ -1,6 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * Copyright (C) 2010 Bastien Nocera <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * 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
diff --git a/plugins/common/msd-keygrab.c b/plugins/common/msd-keygrab.c
index a0f4105..0ea0cc1 100644
--- a/plugins/common/msd-keygrab.c
+++ b/plugins/common/msd-keygrab.c
@@ -3,6 +3,7 @@
 * Copyright (C) 2001-2003 Bastien Nocera <[email protected]>
 * Copyright (C) 2006-2007 William Jon McCann <[email protected]>
 * Copyright (C) 2008 Jens Granseuer <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * 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
@@ -240,7 +241,6 @@ match_key (Key *key, XEvent *event)
 }
 
 /* The key we passed doesn't have a keysym, so try with just the keycode */
- return (key != NULL
- && key->state == (event->xkey.state & msd_used_mods)
+ return (key->state == (event->xkey.state & msd_used_mods)
 && key_uses_keycode (key, event->xkey.keycode));
 }
diff --git a/plugins/common/msd-keygrab.h b/plugins/common/msd-keygrab.h
index ff633d6..03892ca 100644
--- a/plugins/common/msd-keygrab.h
+++ b/plugins/common/msd-keygrab.h
@@ -1,6 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * Copyright (C) 2008 Jens Granseuer <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * 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
@@ -33,7 +34,6 @@ typedef struct {
 guint *keycodes;
 } Key;
 
-
 void grab_key_unsafe (Key *key,
 gboolean grab,
 GSList *screens);
diff --git a/plugins/common/msd-osd-window.c b/plugins/common/msd-osd-window.c
index bc1ffb6..d241cfb 100644
--- a/plugins/common/msd-osd-window.c
+++ b/plugins/common/msd-osd-window.c
@@ -4,6 +4,7 @@
 *
 * Copyright (C) 2006-2007 William Jon McCann <[email protected]>
 * Copyright (C) 2009 Novell, Inc
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * Authors:
 * William Jon McCann <[email protected]>
@@ -440,7 +441,7 @@ msd_osd_window_init (MsdOsdWindow *window)
 
 screen = gtk_widget_get_screen (GTK_WIDGET (window));
 
- window->priv->is_composited = gdk_screen_is_composited (screen);
+ window->priv->is_composited = (gdk_screen_is_composited (screen) != FALSE);
 window->priv->scale_factor = gtk_widget_get_scale_factor (GTK_WIDGET (window));
 
 if (window->priv->is_composited) {
diff --git a/plugins/common/msd-osd-window.h b/plugins/common/msd-osd-window.h
index ac3325a..23651d2 100644
--- a/plugins/common/msd-osd-window.h
+++ b/plugins/common/msd-osd-window.h
@@ -4,6 +4,7 @@
 *
 * Copyright (C) 2006 William Jon McCann <[email protected]>
 * Copyright (C) 2009 Novell, Inc
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * Authors:
 * William Jon McCann <[email protected]>