aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--SECURITY.md13
-rw-r--r--applets/battery/battery-acpi.c2
-rw-r--r--applets/battery/battery-apm.c2
-rw-r--r--applets/battery/battery.c2
-rw-r--r--applets/battery/battery.h2
-rw-r--r--applets/brightness/brightness.c2
-rw-r--r--applets/clock/clock.c2
-rw-r--r--applets/common/test_main.c2
-rw-r--r--applets/exit/exit.c2
-rw-r--r--applets/launcher/launcher.c2
-rw-r--r--applets/notify/applet.c2
-rw-r--r--applets/notify/mb-notification.c2
-rw-r--r--applets/notify/mb-notification.h2
-rw-r--r--applets/notify/notify-store.c2
-rw-r--r--applets/notify/notify-store.h2
-rw-r--r--applets/showdesktop/showdesktop.c2
-rw-r--r--applets/startup-notify/startup.c5
-rw-r--r--applets/startup/startup.c5
-rw-r--r--applets/systray/fixedtip.c4
-rw-r--r--applets/systray/fixedtip.h4
-rw-r--r--applets/systray/na-tray-child.c2
-rw-r--r--applets/systray/na-tray-child.h2
-rw-r--r--applets/systray/na-tray-manager.c2
-rw-r--r--applets/systray/na-tray-manager.h2
-rw-r--r--applets/systray/na-tray.c2
-rw-r--r--applets/systray/na-tray.h2
-rw-r--r--applets/systray/systray.c7
-rw-r--r--applets/windowselector/windowselector.c2
-rw-r--r--configure.ac4
-rw-r--r--matchbox-panel/mb-panel-scaling-image.c2
-rw-r--r--matchbox-panel/mb-panel-scaling-image.h2
-rw-r--r--matchbox-panel/mb-panel-scaling-image2.c2
-rw-r--r--matchbox-panel/mb-panel-scaling-image2.h2
-rw-r--r--matchbox-panel/mb-panel.c2
-rw-r--r--matchbox-panel/mb-panel.h2
35 files changed, 90 insertions, 8 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/applets/battery/battery-acpi.c b/applets/battery/battery-acpi.c
index 8431127..d1d3de9 100644
--- a/applets/battery/battery-acpi.c
+++ b/applets/battery/battery-acpi.c
@@ -1,6 +1,8 @@
/*
* (C) 2008 Intel.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Licensed under the GPL v2 or greater.
*/
diff --git a/applets/battery/battery-apm.c b/applets/battery/battery-apm.c
index 2f39cb6..edaba43 100644
--- a/applets/battery/battery-apm.c
+++ b/applets/battery/battery-apm.c
@@ -1,6 +1,8 @@
/*
* (C) 2008 Intel.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Licensed under the GPL v2 or greater.
*/
diff --git a/applets/battery/battery.c b/applets/battery/battery.c
index c755856..b11517d 100644
--- a/applets/battery/battery.c
+++ b/applets/battery/battery.c
@@ -1,6 +1,8 @@
/*
* (C) 2006 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Jorn Baayen <jorn@openedhand.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/applets/battery/battery.h b/applets/battery/battery.h
index cf23431..534988f 100644
--- a/applets/battery/battery.h
+++ b/applets/battery/battery.h
@@ -1,6 +1,8 @@
/*
* (C) 2008 Intel.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Licensed under the GPL v2 or greater.
*/
diff --git a/applets/brightness/brightness.c b/applets/brightness/brightness.c
index f605fbe..a523b29 100644
--- a/applets/brightness/brightness.c
+++ b/applets/brightness/brightness.c
@@ -1,6 +1,8 @@
/*
* Author: Manuel Teira <manuel.teira@telefonica.net>
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Licensed under the GPL v2 or greater.
*/
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index a71f895..b8057a4 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -3,6 +3,8 @@
/*
* (C) 2006-2013 Intel Corp
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Jorn Baayen <jorn@openedhand.com>
* Ross Burton <ross.burton@intel.com>
*
diff --git a/applets/common/test_main.c b/applets/common/test_main.c
index 4558616..94de9a6 100644
--- a/applets/common/test_main.c
+++ b/applets/common/test_main.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include <config.h>
#include <gtk/gtk.h>
diff --git a/applets/exit/exit.c b/applets/exit/exit.c
index f973bb7..480683a 100644
--- a/applets/exit/exit.c
+++ b/applets/exit/exit.c
@@ -1,6 +1,8 @@
/*
* (C) 2013 Intel Corp
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Ross Burton <ross.burton@intel.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/applets/launcher/launcher.c b/applets/launcher/launcher.c
index d1ab8e4..046de0c 100644
--- a/applets/launcher/launcher.c
+++ b/applets/launcher/launcher.c
@@ -1,6 +1,8 @@
/*
* (C) 2006 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Jorn Baayen <jorn@openedhand.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/applets/notify/applet.c b/applets/notify/applet.c
index 2d896e8..6c378c8 100644
--- a/applets/notify/applet.c
+++ b/applets/notify/applet.c
@@ -1,6 +1,8 @@
/*
* (C) 2008 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Ross Burton <ross@openedhand.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/applets/notify/mb-notification.c b/applets/notify/mb-notification.c
index c73b21f..f4463a0 100644
--- a/applets/notify/mb-notification.c
+++ b/applets/notify/mb-notification.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include <gtk/gtk.h>
#include "mb-notification.h"
diff --git a/applets/notify/mb-notification.h b/applets/notify/mb-notification.h
index ecf5ca1..c609ec0 100644
--- a/applets/notify/mb-notification.h
+++ b/applets/notify/mb-notification.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#ifndef _MB_NOTIFICATION
#define _MB_NOTIFICATION
diff --git a/applets/notify/notify-store.c b/applets/notify/notify-store.c
index f25c8b9..bfae532 100644
--- a/applets/notify/notify-store.c
+++ b/applets/notify/notify-store.c
@@ -1,6 +1,8 @@
/*
* (C) 2008 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Ross Burton <ross@openedhand.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/applets/notify/notify-store.h b/applets/notify/notify-store.h
index b1cdd42..0a2b562 100644
--- a/applets/notify/notify-store.h
+++ b/applets/notify/notify-store.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#ifndef _MB_NOTIFY_STORE
#define _MB_NOTIFY_STORE
diff --git a/applets/showdesktop/showdesktop.c b/applets/showdesktop/showdesktop.c
index 14f9d96..36c14d8 100644
--- a/applets/showdesktop/showdesktop.c
+++ b/applets/showdesktop/showdesktop.c
@@ -1,6 +1,8 @@
/*
* (C) 2006 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Jorn Baayen <jorn@openedhand.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/applets/startup-notify/startup.c b/applets/startup-notify/startup.c
index a4686ef..1f3f267 100644
--- a/applets/startup-notify/startup.c
+++ b/applets/startup-notify/startup.c
@@ -7,9 +7,12 @@
* Portions by Matthew Allum <mallum@o-hand.com>,
* Stefan Schmidt <stefan@openmoko.org>.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* 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; version 2 of the license.
+ * 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
diff --git a/applets/startup/startup.c b/applets/startup/startup.c
index 026dce2..fb0fe73 100644
--- a/applets/startup/startup.c
+++ b/applets/startup/startup.c
@@ -9,11 +9,14 @@
* Stefan Schmidt <stefan@openmoko.org>
* Ross Burton <ross.burton@intel.com>
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Based on mb-applet-startup-monitor
*
* 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; version 2 of the license.
+ * 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
diff --git a/applets/systray/fixedtip.c b/applets/systray/fixedtip.c
index ce19067..bc7d86d 100644
--- a/applets/systray/fixedtip.c
+++ b/applets/systray/fixedtip.c
@@ -3,7 +3,9 @@
/*
* Copyright (C) 2001 Havoc Pennington
* Copyright (C) 2003-2006 Vincent Untz
- *
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* 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
diff --git a/applets/systray/fixedtip.h b/applets/systray/fixedtip.h
index a29e85c..e5b69c0 100644
--- a/applets/systray/fixedtip.h
+++ b/applets/systray/fixedtip.h
@@ -3,7 +3,9 @@
/*
* Copyright (C) 2001 Havoc Pennington, 2002 Red Hat Inc.
* Copyright (C) 2003-2006 Vincent Untz
- *
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* 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
diff --git a/applets/systray/na-tray-child.c b/applets/systray/na-tray-child.c
index 1042940..949d612 100644
--- a/applets/systray/na-tray-child.c
+++ b/applets/systray/na-tray-child.c
@@ -3,6 +3,8 @@
* Copyright (C) 2003-2006 Vincent Untz
* Copyright (C) 2008 Red Hat, Inc.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
diff --git a/applets/systray/na-tray-child.h b/applets/systray/na-tray-child.h
index 29cab3b..c3f181b 100644
--- a/applets/systray/na-tray-child.h
+++ b/applets/systray/na-tray-child.h
@@ -4,6 +4,8 @@
* Copyright (C) 2003-2006 Vincent Untz
* Copyright (C) 2008 Red Hat, Inc.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
diff --git a/applets/systray/na-tray-manager.c b/applets/systray/na-tray-manager.c
index 8999350..493ecd1 100644
--- a/applets/systray/na-tray-manager.c
+++ b/applets/systray/na-tray-manager.c
@@ -2,6 +2,8 @@
* Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
* Copyright (C) 2003-2006 Vincent Untz
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
diff --git a/applets/systray/na-tray-manager.h b/applets/systray/na-tray-manager.h
index 0408959..b14db4e 100644
--- a/applets/systray/na-tray-manager.h
+++ b/applets/systray/na-tray-manager.h
@@ -3,6 +3,8 @@
* Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
* Copyright (C) 2003-2006 Vincent Untz
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
diff --git a/applets/systray/na-tray.c b/applets/systray/na-tray.c
index 714bd90..9d98df3 100644
--- a/applets/systray/na-tray.c
+++ b/applets/systray/na-tray.c
@@ -3,6 +3,8 @@
* Copyright (C) 2003-2006 Vincent Untz
* Copyright (C) 2007 Christian Persch
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* 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
diff --git a/applets/systray/na-tray.h b/applets/systray/na-tray.h
index 8fd7db4..af1a099 100644
--- a/applets/systray/na-tray.h
+++ b/applets/systray/na-tray.h
@@ -3,6 +3,8 @@
* Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
* Copyright (C) 2003-2006 Vincent Untz
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
diff --git a/applets/systray/systray.c b/applets/systray/systray.c
index 39698a8..0bd4784 100644
--- a/applets/systray/systray.c
+++ b/applets/systray/systray.c
@@ -2,6 +2,8 @@
/*
* (C) 2006-2013 Intel Corp
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Jorn Baayen <jorn@openedhand.com>
* Ross Burton <ross.burton@intel.com>
*
@@ -29,8 +31,9 @@ on_realize (GtkWidget *widget, gpointer user_data)
tray = (GtkWidget *)na_tray_new_for_screen (screen, orientation);
gtk_widget_show (tray);
-
- gtk_container_add (GTK_CONTAINER (widget), tray);
+ gtk_widget_set_valign (tray, GTK_ALIGN_CENTER);
+ gtk_widget_set_halign (tray, GTK_ALIGN_CENTER);
+ gtk_box_pack_start (GTK_BOX (widget), tray, FALSE, FALSE, 0);
}
G_MODULE_EXPORT GtkWidget *
diff --git a/applets/windowselector/windowselector.c b/applets/windowselector/windowselector.c
index 33f12f5..77eb219 100644
--- a/applets/windowselector/windowselector.c
+++ b/applets/windowselector/windowselector.c
@@ -1,6 +1,8 @@
/*
* (C) 2006, 2007 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Authors: Jorn Baayen <jorn@openedhand.com>
* Ross Burton <ross@openedhand.com>
*
diff --git a/configure.ac b/configure.ac
index d6c57d8..be4d591 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.53)
-AC_INIT(matchbox-panel, 2.11, [yocto@yoctoproject.org])
+AC_INIT(matchbox-panel, 2.12, [yocto@yoctoproject.org])
AM_INIT_AUTOMAKE([-Wno-portability foreign])
AC_CONFIG_SRCDIR(matchbox-panel/mb-panel.c)
AM_CONFIG_HEADER(config.h)
@@ -85,7 +85,7 @@ GETTEXT_PACKAGE=matchbox-panel
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"],
[Define the gettext package to be used])
-AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])
AM_GNU_GETTEXT([external])
# output stuff
diff --git a/matchbox-panel/mb-panel-scaling-image.c b/matchbox-panel/mb-panel-scaling-image.c
index 56d2d78..3e13232 100644
--- a/matchbox-panel/mb-panel-scaling-image.c
+++ b/matchbox-panel/mb-panel-scaling-image.c
@@ -2,6 +2,8 @@
/*
* (C) 2006, 2007 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Jorn Baayen <jorn@openedhand.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/matchbox-panel/mb-panel-scaling-image.h b/matchbox-panel/mb-panel-scaling-image.h
index cd63754..e5fdad6 100644
--- a/matchbox-panel/mb-panel-scaling-image.h
+++ b/matchbox-panel/mb-panel-scaling-image.h
@@ -1,6 +1,8 @@
/*
* (C) 2006, 2007 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Jorn Baayen <jorn@openedhand.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/matchbox-panel/mb-panel-scaling-image2.c b/matchbox-panel/mb-panel-scaling-image2.c
index 258f1e4..f0aaeb5 100644
--- a/matchbox-panel/mb-panel-scaling-image2.c
+++ b/matchbox-panel/mb-panel-scaling-image2.c
@@ -2,6 +2,8 @@
/*
* (C) 2013 Intel Corp
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Ross Burton <ross.burton@intel.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/matchbox-panel/mb-panel-scaling-image2.h b/matchbox-panel/mb-panel-scaling-image2.h
index 5c0dd76..12d5d6b 100644
--- a/matchbox-panel/mb-panel-scaling-image2.h
+++ b/matchbox-panel/mb-panel-scaling-image2.h
@@ -1,6 +1,8 @@
/*
* (C) 2013 Intel Corp
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Ross Burton <ross.burton@intel.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/matchbox-panel/mb-panel.c b/matchbox-panel/mb-panel.c
index 4f5fb74..49aeb46 100644
--- a/matchbox-panel/mb-panel.c
+++ b/matchbox-panel/mb-panel.c
@@ -3,6 +3,8 @@
/*
* (C) 2006-2013 Intel Corp
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Authors: Ross Burton <ross.burton@intel.com>
* Jorn Baayen <jorn@openedhand.com>
*
diff --git a/matchbox-panel/mb-panel.h b/matchbox-panel/mb-panel.h
index be367dd..91e5442 100644
--- a/matchbox-panel/mb-panel.h
+++ b/matchbox-panel/mb-panel.h
@@ -1,6 +1,8 @@
/*
* (C) 2006 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Jorn Baayen <jorn@openedhand.com>
*
* Licensed under the GPL v2 or greater.