diff options
44 files changed, 59 insertions, 382 deletions
diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..7ccecc1 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,13 @@ +How to Report a Potential Vulnerability? +======================================== + +If you would like to report a public issue (for example, one with a released +CVE number), please report it using the +[https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Security Security Bugzilla]. +If you have a patch ready, submit it following the same procedure as any other +patch as described in README.md. + +If you are dealing with a not-yet released or urgent issue, please send a +message to security AT yoctoproject DOT org, including as many details as +possible: the layer or software module affected, the recipe and its version, +and any example code, if available. diff --git a/configure.ac b/configure.ac index 96ce6a3..eef2f61 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.53) -AC_INIT([matchbox-window-manager], 1.2.2, [yocto@yoctoproject.org]) +AC_INIT([matchbox-window-manager], 1.2.3, [yocto@yoctoproject.org]) AC_CONFIG_SRCDIR([src/wm.c]) AM_INIT_AUTOMAKE() diff --git a/src/base_client.c b/src/base_client.c index 07f8334..ce36054 100644 --- a/src/base_client.c +++ b/src/base_client.c @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/base_client.h b/src/base_client.h index 60e3f00..efae47a 100644 --- a/src/base_client.h +++ b/src/base_client.h @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/client_common.c b/src/client_common.c index 2b62024..c72f719 100644 --- a/src/client_common.c +++ b/src/client_common.c @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/client_common.h b/src/client_common.h index dd4c1d3..6c39628 100644 --- a/src/client_common.h +++ b/src/client_common.h @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/composite-engine.c b/src/composite-engine.c index 96f850e..c99a9a2 100644 --- a/src/composite-engine.c +++ b/src/composite-engine.c @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/composite-engine.h b/src/composite-engine.h index c0b1341..747bb57 100644 --- a/src/composite-engine.h +++ b/src/composite-engine.h @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/desktop_client.c b/src/desktop_client.c index 984cab6..2119db5 100644 --- a/src/desktop_client.c +++ b/src/desktop_client.c @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/desktop_client.h b/src/desktop_client.h index 9cfe904..4268ff4 100644 --- a/src/desktop_client.h +++ b/src/desktop_client.h @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/dialog_client.c b/src/dialog_client.c index 399a364..f63fd3e 100644 --- a/src/dialog_client.c +++ b/src/dialog_client.c @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/dialog_client.h b/src/dialog_client.h index ed2685f..2e9d17e 100644 --- a/src/dialog_client.h +++ b/src/dialog_client.h @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/dockbar_client.c b/src/dockbar_client.c index 836c003..de1685d 100644 --- a/src/dockbar_client.c +++ b/src/dockbar_client.c @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/dockbar_client.h b/src/dockbar_client.h index 7d805ee..2f41b2e 100644 --- a/src/dockbar_client.h +++ b/src/dockbar_client.h @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/main_client.c b/src/main_client.c index cafe5a0..ac9723d 100644 --- a/src/main_client.c +++ b/src/main_client.c @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ #include "main_client.h" diff --git a/src/main_client.h b/src/main_client.h index 8f4decd..cd863b4 100644 --- a/src/main_client.h +++ b/src/main_client.h @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/matchbox-remote.c b/src/matchbox-remote.c index e6cc076..f15da37 100644 --- a/src/matchbox-remote.c +++ b/src/matchbox-remote.c @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ #define _GNU_SOURCE diff --git a/src/mbtheme-standalone.c b/src/mbtheme-standalone.c index b754a14..9929b00 100644 --- a/src/mbtheme-standalone.c +++ b/src/mbtheme-standalone.c @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/mbtheme-standalone.h b/src/mbtheme-standalone.h index 7aa595a..69d1280 100644 --- a/src/mbtheme-standalone.h +++ b/src/mbtheme-standalone.h @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/mbtheme.c b/src/mbtheme.c index 821195a..10005bd 100644 --- a/src/mbtheme.c +++ b/src/mbtheme.c @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/mbtheme.h b/src/mbtheme.h index aa9a7c5..b9531e0 100644 --- a/src/mbtheme.h +++ b/src/mbtheme.h @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ @@ -46,7 +38,7 @@ typedef struct _mb_theme_param } MBThemeParam; -enum { +typedef enum { LAYER_GRADIENT_HORIZ = 1, LAYER_GRADIENT_VERT, LAYER_LABEL, @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/select_client.c b/src/select_client.c index 0a6c540..3955b29 100644 --- a/src/select_client.c +++ b/src/select_client.c @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/select_client.h b/src/select_client.h index e718cd4..bc385ea 100644 --- a/src/select_client.h +++ b/src/select_client.h @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/session.c b/src/session.c index 8f08279..cad3d25 100644 --- a/src/session.c +++ b/src/session.c @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/session.h b/src/session.h index b9fcf88..5619436 100644 --- a/src/session.h +++ b/src/session.h @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/stack.c b/src/stack.c index c985fa2..2d209f0 100644 --- a/src/stack.c +++ b/src/stack.c @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/stack.h b/src/stack.h index 516fe00..92cda7b 100644 --- a/src/stack.h +++ b/src/stack.h @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/structs.h b/src/structs.h index 24985e7..da7eb0c 100644 --- a/src/structs.h +++ b/src/structs.h @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ @@ -148,7 +140,7 @@ /* Atoms, if you change these check ewmh_init() first */ -enum { +typedef enum { WM_STATE = 0, WM_CHANGE_STATE, WM_PROTOCOLS, diff --git a/src/toolbar_client.c b/src/toolbar_client.c index 422791b..a92c8a1 100644 --- a/src/toolbar_client.c +++ b/src/toolbar_client.c @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/toolbar_client.h b/src/toolbar_client.h index 61c4281..c23555b 100644 --- a/src/toolbar_client.h +++ b/src/toolbar_client.h @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/src/toolbar_client_alt.c b/src/toolbar_client_alt.c index e7f6975..34eda50 100644 --- a/src/toolbar_client_alt.c +++ b/src/toolbar_client_alt.c @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ @@ -496,7 +488,7 @@ xml_parse_data_dom(XMLParser *parser, char *data) XML_SetUserData(p, (void *)parser); if (! XML_Parse(p, data, strlen(data), 1)) { - fprintf(stderr, "Matchbox: XML Parse error at line %d:\n%s\n", + fprintf(stderr, "Matchbox: XML Parse error at line %ld:\n%s\n", XML_GetCurrentLineNumber(p), XML_ErrorString(XML_GetErrorCode(p))); return NULL; @@ -6,15 +6,7 @@ * * Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com * - * 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, 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. + * SPDX-License-Identifier: GPL-2.0-or-later * */ |