[mate-panel] add patch file
Dan Mashal
vicodan at fedoraproject.org
Tue Dec 18 21:20:41 UTC 2012
commit a3b4d3a5e8c941152d3be11fe07449b741a7438a
Author: Dan Mashal <dan.mashal at gmail.com>
Date: Tue Dec 18 13:20:33 2012 -0800
add patch file
fix_crash_on_delete_panel.patch | 2436 +++++++++++++++++++++++++++++++++++++++
1 files changed, 2436 insertions(+), 0 deletions(-)
---
diff --git a/fix_crash_on_delete_panel.patch b/fix_crash_on_delete_panel.patch
new file mode 100644
index 0000000..d460860
--- /dev/null
+++ b/fix_crash_on_delete_panel.patch
@@ -0,0 +1,2436 @@
+diff -uNrp b/applets/clock/calendar-window.c a/applets/clock/calendar-window.c
+--- b/applets/clock/calendar-window.c 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/clock/calendar-window.c 2012-12-18 12:42:29.707577882 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/applets/clock/calendar-window.h a/applets/clock/calendar-window.h
+--- b/applets/clock/calendar-window.h 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/clock/calendar-window.h 2012-12-18 12:42:29.707577882 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/applets/clock/clock.c a/applets/clock/clock.c
+--- b/applets/clock/clock.c 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/clock/clock.c 2012-12-18 12:42:29.707577882 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Miguel de Icaza
+diff -uNrp b/applets/clock/clock.h a/applets/clock/clock.h
+--- b/applets/clock/clock.h 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/clock/clock.h 2012-12-18 12:42:29.710578299 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/applets/clock/clock-sunpos.c a/applets/clock/clock-sunpos.c
+--- b/applets/clock/clock-sunpos.c 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/clock/clock-sunpos.c 2012-12-18 12:42:29.707577882 -0800
+@@ -13,8 +13,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Jonathan Blandford <jrb at redhat.com>
+diff -uNrp b/applets/clock/clock-utils.c a/applets/clock/clock-utils.c
+--- b/applets/clock/clock-utils.c 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/clock/clock-utils.c 2012-12-18 12:42:29.707577882 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/applets/clock/clock-utils.h a/applets/clock/clock-utils.h
+--- b/applets/clock/clock-utils.h 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/clock/clock-utils.h 2012-12-18 12:42:29.707577882 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/applets/clock/set-timezone.c a/applets/clock/set-timezone.c
+--- b/applets/clock/set-timezone.c 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/clock/set-timezone.c 2012-12-18 12:42:29.713578718 -0800
+@@ -14,7 +14,7 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+diff -uNrp b/applets/clock/set-timezone.h a/applets/clock/set-timezone.h
+--- b/applets/clock/set-timezone.h 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/clock/set-timezone.h 2012-12-18 12:42:29.714578858 -0800
+@@ -14,7 +14,7 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+diff -uNrp b/applets/clock/system-timezone.c a/applets/clock/system-timezone.c
+--- b/applets/clock/system-timezone.c 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/clock/system-timezone.c 2012-12-18 12:42:29.714578858 -0800
+@@ -16,7 +16,7 @@
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Some code is based on previous code in clock-location.c and on code from
+ * tz.c (shipped with version <= 2.22.0). Those files were under the same
+diff -uNrp b/applets/clock/system-timezone.h a/applets/clock/system-timezone.h
+--- b/applets/clock/system-timezone.h 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/clock/system-timezone.h 2012-12-18 12:42:29.714578858 -0800
+@@ -16,7 +16,7 @@
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef __SYSTEM_TIMEZONE_H__
+diff -uNrp b/applets/clock/test-system-timezone.c a/applets/clock/test-system-timezone.c
+--- b/applets/clock/test-system-timezone.c 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/clock/test-system-timezone.c 2012-12-18 12:42:29.714578858 -0800
+@@ -16,7 +16,7 @@
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include <glib.h>
+diff -uNrp b/applets/fish/fish.c a/applets/fish/fish.c
+--- b/applets/fish/fish.c 2012-10-17 02:05:32.000000000 -0700
++++ a/applets/fish/fish.c 2012-12-18 12:42:29.715578998 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place, Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * George Lebl <jirka at 5z.com>
+@@ -572,7 +572,7 @@ static void display_about_dialog(GtkActi
+ "logo-icon-name", FISH_ICON,
+ "translator-credits", _("translator-credits"),
+ "version", VERSION, // "3.4.7.4ac19"
+- "website", "http://matsusoft.com.ar/projects/mate/",
++ "website", "http://mate-desktop.org/",
+ NULL);
+
+ g_free(descr);
+diff -uNrp b/applets/notification_area/fixedtip.c a/applets/notification_area/fixedtip.c
+--- b/applets/notification_area/fixedtip.c 2012-10-17 02:05:32.000000000 -0700
++++ a/applets/notification_area/fixedtip.c 2012-12-18 12:42:29.716579137 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ */
+
+ #include "fixedtip.h"
+diff -uNrp b/applets/notification_area/fixedtip.h a/applets/notification_area/fixedtip.h
+--- b/applets/notification_area/fixedtip.h 2012-10-17 02:05:32.000000000 -0700
++++ a/applets/notification_area/fixedtip.h 2012-12-18 12:42:29.717579276 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ */
+
+ #ifndef FIXED_TIP_H
+diff -uNrp b/applets/notification_area/main.c a/applets/notification_area/main.c
+--- b/applets/notification_area/main.c 2012-10-17 02:05:32.000000000 -0700
++++ a/applets/notification_area/main.c 2012-12-18 12:42:29.717579276 -0800
+@@ -17,8 +17,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff -uNrp b/applets/notification_area/na-tray.c a/applets/notification_area/na-tray.c
+--- b/applets/notification_area/na-tray.c 2012-10-17 02:05:32.000000000 -0700
++++ a/applets/notification_area/na-tray.c 2012-12-18 12:42:29.717579276 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff -uNrp b/applets/notification_area/na-tray-child.c a/applets/notification_area/na-tray-child.c
+--- b/applets/notification_area/na-tray-child.c 2012-10-17 02:05:32.000000000 -0700
++++ a/applets/notification_area/na-tray-child.c 2012-12-18 12:42:29.717579276 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff -uNrp b/applets/notification_area/na-tray-child.h a/applets/notification_area/na-tray-child.h
+--- b/applets/notification_area/na-tray-child.h 2012-10-17 02:05:32.000000000 -0700
++++ a/applets/notification_area/na-tray-child.h 2012-12-18 12:42:29.717579276 -0800
+@@ -16,8 +16,8 @@
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef __NA_TRAY_CHILD_H__
+diff -uNrp b/applets/notification_area/na-tray.h a/applets/notification_area/na-tray.h
+--- b/applets/notification_area/na-tray.h 2012-10-17 02:05:32.000000000 -0700
++++ a/applets/notification_area/na-tray.h 2012-12-18 12:42:29.717579276 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Used to be: eggtraytray.h
+ */
+diff -uNrp b/applets/notification_area/na-tray-manager.c a/applets/notification_area/na-tray-manager.c
+--- b/applets/notification_area/na-tray-manager.c 2012-10-17 02:05:32.000000000 -0700
++++ a/applets/notification_area/na-tray-manager.c 2012-12-18 12:42:29.717579276 -0800
+@@ -14,8 +14,8 @@
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Used to be: eggtraymanager.c
+ */
+diff -uNrp b/applets/notification_area/na-tray-manager.h a/applets/notification_area/na-tray-manager.h
+--- b/applets/notification_area/na-tray-manager.h 2012-10-17 02:05:32.000000000 -0700
++++ a/applets/notification_area/na-tray-manager.h 2012-12-18 12:42:29.717579276 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Used to be: eggtraymanager.h
+ */
+diff -uNrp b/applets/notification_area/testtray.c a/applets/notification_area/testtray.c
+--- b/applets/notification_area/testtray.c 2012-10-17 02:05:32.000000000 -0700
++++ a/applets/notification_area/testtray.c 2012-12-18 12:42:29.717579276 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ */
+
+ #include "config.h"
+diff -uNrp b/applets/wncklet/showdesktop.c a/applets/wncklet/showdesktop.c
+--- b/applets/wncklet/showdesktop.c 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/wncklet/showdesktop.c 2012-12-18 12:42:29.719579554 -0800
+@@ -17,8 +17,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ */
+
+ #ifdef HAVE_CONFIG_H
+diff -uNrp b/applets/wncklet/showdesktop.h a/applets/wncklet/showdesktop.h
+--- b/applets/wncklet/showdesktop.h 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/wncklet/showdesktop.h 2012-12-18 12:42:29.719579554 -0800
+@@ -17,8 +17,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ */
+
+ #ifndef _SHOWDESKTOP_H_
+diff -uNrp b/applets/wncklet/window-list.c a/applets/wncklet/window-list.c
+--- b/applets/wncklet/window-list.c 2012-10-17 02:05:32.000000000 -0700
++++ a/applets/wncklet/window-list.c 2012-12-18 12:42:29.719579554 -0800
+@@ -549,7 +549,8 @@ static void group_windows_toggled(GtkTog
+ {
+ if (gtk_toggle_button_get_active(button))
+ {
+- gint value = g_object_get_data(G_OBJECT(button), "group_value");
++ gint value;
++ g_object_get (G_OBJECT(button), "group_value", &value);
+ g_settings_set_enum (tasklist->settings, "group-windows", value);
+ }
+ }
+diff -uNrp b/applets/wncklet/window-menu.c a/applets/wncklet/window-menu.c
+--- b/applets/wncklet/window-menu.c 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/wncklet/window-menu.c 2012-12-18 12:42:29.719579554 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place, Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/applets/wncklet/window-menu.h a/applets/wncklet/window-menu.h
+--- b/applets/wncklet/window-menu.h 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/wncklet/window-menu.h 2012-12-18 12:42:29.719579554 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place, Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/applets/wncklet/wncklet.c a/applets/wncklet/wncklet.c
+--- b/applets/wncklet/wncklet.c 2012-10-17 02:05:31.000000000 -0700
++++ a/applets/wncklet/wncklet.c 2012-12-18 12:42:29.719579554 -0800
+@@ -14,8 +14,8 @@
+ *
+ * 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., 59 Temple Place, Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/applets/wncklet/wncklet.h a/applets/wncklet/wncklet.h
+--- b/applets/wncklet/wncklet.h 2012-10-17 02:05:32.000000000 -0700
++++ a/applets/wncklet/wncklet.h 2012-12-18 12:42:29.720579694 -0800
+@@ -14,8 +14,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors: Arvind Samptur <arvind.samptur at wipro.com>
+ *
+diff -uNrp b/configure.ac a/configure.ac
+--- b/configure.ac 2012-10-17 02:05:31.000000000 -0700
++++ a/configure.ac 2012-12-18 12:42:29.720579694 -0800
+@@ -59,7 +59,7 @@ AC_CHECK_FUNCS(_NSGetEnviron)
+ LIBMATE_DESKTOP_REQUIRED=1.1.0
+ GDK_PIXBUF_REQUIRED=2.7.1
+ PANGO_REQUIRED=1.15.4
+-GLIB_REQUIRED=2.25.12
++GLIB_REQUIRED=2.26
+ GTK_REQUIRED=2.19.7
+ LIBMATEWNCK_REQUIRED=1.3.0
+ LIBMATE_MENU_REQUIRED=1.1.0
+diff -uNrp b/distro/archlinux/mate-panel.install a/distro/archlinux/mate-panel.install
+--- b/distro/archlinux/mate-panel.install 1969-12-31 16:00:00.000000000 -0800
++++ a/distro/archlinux/mate-panel.install 2012-12-18 12:42:29.721579834 -0800
+@@ -0,0 +1,31 @@
++pkgname=mate-panel
++
++post_install() {
++ MATECONF_CONFIG_SOURCE=`usr/bin/mateconftool-2 --get-default-source`
++ usr/bin/mateconftool-2 --config-source="${MATECONF_CONFIG_SOURCE}" --direct --load \
++ etc/mateconf/schemas/panel-default-setup.entries >/dev/null
++ usr/sbin/mateconfpkg --install ${pkgname}
++
++ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
++}
++
++pre_upgrade() {
++ pre_remove $1
++}
++
++post_upgrade() {
++ post_install $1
++}
++
++pre_remove() {
++ MATECONF_CONFIG_SOURCE=`usr/bin/mateconftool-2 --get-default-source`
++
++ usr/bin/mateconftool-2 --config-source="${MATECONF_CONFIG_SOURCE}" --direct --unload \
++ etc/mateconf/schemas/panel-default-setup.entries > /dev/null
++
++ usr/sbin/mateconfpkg --uninstall ${pkgname}
++}
++
++post_remove() {
++ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
++}
+diff -uNrp b/distro/archlinux/PKGBUILD a/distro/archlinux/PKGBUILD
+--- b/distro/archlinux/PKGBUILD 1969-12-31 16:00:00.000000000 -0800
++++ a/distro/archlinux/PKGBUILD 2012-12-18 12:42:29.721579834 -0800
+@@ -0,0 +1,39 @@
++pkgname=mate-panel
++pkgver=1.1.1
++pkgrel=1
++pkgdesc="The MATE Panel"
++arch=('i686' 'x86_64')
++license=('GPL')
++depends=('libmatewnck' 'mate-conf' 'mate-menus' 'mate-desktop' 'librsvg' 'hicolor-icon-theme' 'libcanberra' 'libmatecomponentui' 'libmateweather') # 'evolution-data-server'
++makedepends=('mate-doc-utils' 'pkgconfig' 'intltool' 'networkmanager')
++options=('!emptydirs' '!libtool')
++install=mate-panel.install
++source=()
++sha256sums=()
++url="http://matsusoft.com.ar/projects/mate/"
++groups=('mate')
++
++build() {
++ cd "${srcdir}/../../../"
++
++ PYTHON=/usr/bin/python2 ./autogen.sh \
++ --prefix=/usr \
++ --sysconfdir=/etc \
++ --localstatedir=/var \
++ --disable-static \
++ --libexecdir=/usr/lib/mate-panel \
++ --disable-scrollkeeper \
++ --enable-introspection \
++ --enable-matecomponent || return 1
++ make || return 1
++}
++
++package() {
++ cd "${srcdir}/../../../"
++
++ make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
++
++ install -m755 -d "${pkgdir}/usr/share/mateconf/schemas"
++ mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas || return 1
++ rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas
++}
+diff -uNrp b/libmate-panel-applet/mate-panel-applet.c a/libmate-panel-applet/mate-panel-applet.c
+--- b/libmate-panel-applet/mate-panel-applet.c 2012-10-17 02:05:24.000000000 -0700
++++ a/libmate-panel-applet/mate-panel-applet.c 2012-12-18 12:42:29.742582763 -0800
+@@ -16,8 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/libmate-panel-applet/mate-panel-applet-factory.c a/libmate-panel-applet/mate-panel-applet-factory.c
+--- b/libmate-panel-applet/mate-panel-applet-factory.c 2012-10-17 02:05:24.000000000 -0700
++++ a/libmate-panel-applet/mate-panel-applet-factory.c 2012-12-18 12:42:29.742582763 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ */
+
+ #include "mate-panel-applet.h"
+diff -uNrp b/libmate-panel-applet/mate-panel-applet-factory.h a/libmate-panel-applet/mate-panel-applet-factory.h
+--- b/libmate-panel-applet/mate-panel-applet-factory.h 2012-10-17 02:05:24.000000000 -0700
++++ a/libmate-panel-applet/mate-panel-applet-factory.h 2012-12-18 12:42:29.742582763 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef MATE_PANEL_APPLET_FACTORY_H
+diff -uNrp b/libmate-panel-applet/mate-panel-applet-gsettings.c a/libmate-panel-applet/mate-panel-applet-gsettings.c
+--- b/libmate-panel-applet/mate-panel-applet-gsettings.c 2012-10-17 02:05:24.000000000 -0700
++++ a/libmate-panel-applet/mate-panel-applet-gsettings.c 2012-12-18 12:42:29.742582763 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Stefano Karapetsas <stefano at karapetsas.com>
+diff -uNrp b/libmate-panel-applet/mate-panel-applet-gsettings.h a/libmate-panel-applet/mate-panel-applet-gsettings.h
+--- b/libmate-panel-applet/mate-panel-applet-gsettings.h 2012-10-17 02:05:24.000000000 -0700
++++ a/libmate-panel-applet/mate-panel-applet-gsettings.h 2012-12-18 12:42:29.742582763 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Stefano Karapetsas <stefano at karapetsas.com>
+diff -uNrp b/libmate-panel-applet/mate-panel-applet.h a/libmate-panel-applet/mate-panel-applet.h
+--- b/libmate-panel-applet/mate-panel-applet.h 2012-10-17 02:05:24.000000000 -0700
++++ a/libmate-panel-applet/mate-panel-applet.h 2012-12-18 12:42:29.742582763 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/applet.c a/mate-panel/applet.c
+--- b/mate-panel/applet.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/applet.c 2012-12-18 12:42:29.743582903 -0800
+@@ -1300,6 +1300,7 @@ mate_panel_applet_register (GtkWidget
+ locked_changed,
+ G_CALLBACK (mate_panel_applet_locked_change_notify),
+ G_OBJECT (applet));
++ g_free (locked_changed);
+
+ if (type == PANEL_OBJECT_DRAWER) {
+ Drawer *drawer = data;
+diff -uNrp b/mate-panel/libegg/eggdesktopfile.c a/mate-panel/libegg/eggdesktopfile.c
+--- b/mate-panel/libegg/eggdesktopfile.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libegg/eggdesktopfile.c 2012-12-18 12:42:29.745583182 -0800
+@@ -17,8 +17,8 @@
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING.LIB. If not,
+- * write to the Free Software Foundation, Inc., 59 Temple Place -
+- * Suite 330, Boston, MA 02111-1307, USA.
++ * write to the Free Software Foundation, Inc., 151 Franklin Street,
++ * Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifdef HAVE_CONFIG_H
+diff -uNrp b/mate-panel/libegg/eggdesktopfile.h a/mate-panel/libegg/eggdesktopfile.h
+--- b/mate-panel/libegg/eggdesktopfile.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libegg/eggdesktopfile.h 2012-12-18 12:42:29.745583182 -0800
+@@ -13,8 +13,8 @@
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING.LIB. If not,
+- * write to the Free Software Foundation, Inc., 59 Temple Place -
+- * Suite 330, Boston, MA 02111-1307, USA.
++ * write to the Free Software Foundation, Inc., 151 Franklin St,
++ * Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef __EGG_DESKTOP_FILE_H__
+diff -uNrp b/mate-panel/libegg/eggsmclient.c a/mate-panel/libegg/eggsmclient.c
+--- b/mate-panel/libegg/eggsmclient.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libegg/eggsmclient.c 2012-12-18 12:42:29.745583182 -0800
+@@ -13,8 +13,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ */
+
+ #include "config.h"
+diff -uNrp b/mate-panel/libegg/eggsmclient.h a/mate-panel/libegg/eggsmclient.h
+--- b/mate-panel/libegg/eggsmclient.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libegg/eggsmclient.h 2012-12-18 12:42:29.745583182 -0800
+@@ -13,8 +13,8 @@
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef __EGG_SM_CLIENT_H__
+diff -uNrp b/mate-panel/libegg/eggsmclient-private.h a/mate-panel/libegg/eggsmclient-private.h
+--- b/mate-panel/libegg/eggsmclient-private.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libegg/eggsmclient-private.h 2012-12-18 12:42:29.745583182 -0800
+@@ -13,8 +13,8 @@
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef __EGG_SM_CLIENT_PRIVATE_H__
+diff -uNrp b/mate-panel/libegg/eggsmclient-xsmp.c a/mate-panel/libegg/eggsmclient-xsmp.c
+--- b/mate-panel/libegg/eggsmclient-xsmp.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libegg/eggsmclient-xsmp.c 2012-12-18 12:42:29.745583182 -0800
+@@ -17,8 +17,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ */
+
+ #include "config.h"
+diff -uNrp b/mate-panel/libmate-panel-applet-private/mate-panel-applet-container.c a/mate-panel/libmate-panel-applet-private/mate-panel-applet-container.c
+--- b/mate-panel/libmate-panel-applet-private/mate-panel-applet-container.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libmate-panel-applet-private/mate-panel-applet-container.c 2012-12-18 12:42:29.745583182 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+diff -uNrp b/mate-panel/libmate-panel-applet-private/mate-panel-applet-container.h a/mate-panel/libmate-panel-applet-private/mate-panel-applet-container.h
+--- b/mate-panel/libmate-panel-applet-private/mate-panel-applet-container.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libmate-panel-applet-private/mate-panel-applet-container.h 2012-12-18 12:42:29.745583182 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+diff -uNrp b/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c
+--- b/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c 2012-12-18 12:42:29.745583182 -0800
+@@ -18,8 +18,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.h a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.h
+--- b/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.h 2012-12-18 12:42:29.746583321 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/libmate-panel-applet-private/mate-panel-applets-manager-dbus.c a/mate-panel/libmate-panel-applet-private/mate-panel-applets-manager-dbus.c
+--- b/mate-panel/libmate-panel-applet-private/mate-panel-applets-manager-dbus.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libmate-panel-applet-private/mate-panel-applets-manager-dbus.c 2012-12-18 12:42:29.746583321 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff -uNrp b/mate-panel/libmate-panel-applet-private/mate-panel-applets-manager-dbus.h a/mate-panel/libmate-panel-applet-private/mate-panel-applets-manager-dbus.h
+--- b/mate-panel/libmate-panel-applet-private/mate-panel-applets-manager-dbus.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libmate-panel-applet-private/mate-panel-applets-manager-dbus.h 2012-12-18 12:42:29.746583321 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ */
+
+ #ifndef __MATE_PANEL_APPLETS_MANAGER_DBUS_H__
+diff -uNrp b/mate-panel/libpanel-util/panel-cleanup.c a/mate-panel/libpanel-util/panel-cleanup.c
+--- b/mate-panel/libpanel-util/panel-cleanup.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-cleanup.c 2012-12-18 12:42:29.746583321 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-cleanup.h a/mate-panel/libpanel-util/panel-cleanup.h
+--- b/mate-panel/libpanel-util/panel-cleanup.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-cleanup.h 2012-12-18 12:42:29.746583321 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-dbus-service.c a/mate-panel/libpanel-util/panel-dbus-service.c
+--- b/mate-panel/libpanel-util/panel-dbus-service.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-dbus-service.c 2012-12-18 12:42:29.746583321 -0800
+@@ -20,8 +20,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-dbus-service.h a/mate-panel/libpanel-util/panel-dbus-service.h
+--- b/mate-panel/libpanel-util/panel-dbus-service.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-dbus-service.h 2012-12-18 12:42:29.746583321 -0800
+@@ -20,8 +20,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-dconf.c a/mate-panel/libpanel-util/panel-dconf.c
+--- b/mate-panel/libpanel-util/panel-dconf.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-dconf.c 2012-12-18 12:42:29.746583321 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-dconf.h a/mate-panel/libpanel-util/panel-dconf.h
+--- b/mate-panel/libpanel-util/panel-dconf.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-dconf.h 2012-12-18 12:42:29.746583321 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-error.c a/mate-panel/libpanel-util/panel-error.c
+--- b/mate-panel/libpanel-util/panel-error.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-error.c 2012-12-18 12:42:29.746583321 -0800
+@@ -23,8 +23,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-error.h a/mate-panel/libpanel-util/panel-error.h
+--- b/mate-panel/libpanel-util/panel-error.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-error.h 2012-12-18 12:42:29.746583321 -0800
+@@ -18,8 +18,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-glib.c a/mate-panel/libpanel-util/panel-glib.c
+--- b/mate-panel/libpanel-util/panel-glib.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-glib.c 2012-12-18 12:42:29.746583321 -0800
+@@ -20,8 +20,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-glib.h a/mate-panel/libpanel-util/panel-glib.h
+--- b/mate-panel/libpanel-util/panel-glib.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-glib.h 2012-12-18 12:42:29.746583321 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-gtk.c a/mate-panel/libpanel-util/panel-gtk.c
+--- b/mate-panel/libpanel-util/panel-gtk.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-gtk.c 2012-12-18 12:42:29.746583321 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-gtk.h a/mate-panel/libpanel-util/panel-gtk.h
+--- b/mate-panel/libpanel-util/panel-gtk.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-gtk.h 2012-12-18 12:42:29.746583321 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-icon-chooser.c a/mate-panel/libpanel-util/panel-icon-chooser.c
+--- b/mate-panel/libpanel-util/panel-icon-chooser.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-icon-chooser.c 2012-12-18 12:42:29.746583321 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-icon-chooser.h a/mate-panel/libpanel-util/panel-icon-chooser.h
+--- b/mate-panel/libpanel-util/panel-icon-chooser.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-icon-chooser.h 2012-12-18 12:42:29.746583321 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-keyfile.c a/mate-panel/libpanel-util/panel-keyfile.c
+--- b/mate-panel/libpanel-util/panel-keyfile.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-keyfile.c 2012-12-18 12:42:29.747583460 -0800
+@@ -17,8 +17,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-keyfile.h a/mate-panel/libpanel-util/panel-keyfile.h
+--- b/mate-panel/libpanel-util/panel-keyfile.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-keyfile.h 2012-12-18 12:42:29.747583460 -0800
+@@ -17,8 +17,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-launch.c a/mate-panel/libpanel-util/panel-launch.c
+--- b/mate-panel/libpanel-util/panel-launch.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-launch.c 2012-12-18 12:42:29.747583460 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+@@ -58,13 +58,10 @@ _panel_launch_handle_error (const gchar
+ GError *local_error,
+ GError **error)
+ {
+- if (local_error == NULL)
+- return TRUE;
+-
+- else if (g_error_matches (local_error,
+- G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+- g_error_free (local_error);
+- return TRUE;
++ if (g_error_matches (local_error,
++ G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
++ g_error_free (local_error);
++ return TRUE;
+ }
+
+ else if (error != NULL)
+@@ -104,6 +101,9 @@ panel_app_info_launch_uris (GAppInfo *
+
+ g_object_unref (context);
+
++ if ((local_error == NULL) && (retval == TRUE))
++ return TRUE;
++
+ return _panel_launch_handle_error (g_app_info_get_name (appinfo),
+ screen, local_error, error);
+ }
+@@ -229,6 +229,9 @@ panel_launch_desktop_file_with_fallback
+ G_SPAWN_SEARCH_PATH,
+ NULL, NULL, NULL, &local_error);
+
++ if (local_error == NULL && retval == TRUE)
++ return TRUE;
++
+ return _panel_launch_handle_error (fallback_exec,
+ screen, local_error, error);
+ }
+diff -uNrp b/mate-panel/libpanel-util/panel-launch.h a/mate-panel/libpanel-util/panel-launch.h
+--- b/mate-panel/libpanel-util/panel-launch.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-launch.h 2012-12-18 12:42:29.747583460 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-list.c a/mate-panel/libpanel-util/panel-list.c
+--- b/mate-panel/libpanel-util/panel-list.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-list.c 2012-12-18 12:42:29.747583460 -0800
+@@ -19,8 +19,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-list.h a/mate-panel/libpanel-util/panel-list.h
+--- b/mate-panel/libpanel-util/panel-list.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-list.h 2012-12-18 12:42:29.748583599 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-session-manager.c a/mate-panel/libpanel-util/panel-session-manager.c
+--- b/mate-panel/libpanel-util/panel-session-manager.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-session-manager.c 2012-12-18 12:42:29.748583599 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-session-manager.h a/mate-panel/libpanel-util/panel-session-manager.h
+--- b/mate-panel/libpanel-util/panel-session-manager.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-session-manager.h 2012-12-18 12:42:29.748583599 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-show.c a/mate-panel/libpanel-util/panel-show.c
+--- b/mate-panel/libpanel-util/panel-show.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-show.c 2012-12-18 12:42:29.748583599 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+@@ -141,8 +141,8 @@ static gboolean _panel_show_handle_error
+
+ static gboolean panel_show_caja_search_uri(GdkScreen* screen, const gchar* uri, guint32 timestamp, GError** error)
+ {
+- char* desktopfile;
+- GDesktopAppInfo* appinfo;
++ char* desktopfile = NULL;
++ GDesktopAppInfo* appinfo = NULL;
+ gboolean ret;
+
+ desktopfile = panel_g_lookup_in_applications_dirs("caja-folder-handler.desktop");
+diff -uNrp b/mate-panel/libpanel-util/panel-show.h a/mate-panel/libpanel-util/panel-show.h
+--- b/mate-panel/libpanel-util/panel-show.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-show.h 2012-12-18 12:42:29.748583599 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-xdg.c a/mate-panel/libpanel-util/panel-xdg.c
+--- b/mate-panel/libpanel-util/panel-xdg.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-xdg.c 2012-12-18 12:42:29.748583599 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/libpanel-util/panel-xdg.h a/mate-panel/libpanel-util/panel-xdg.h
+--- b/mate-panel/libpanel-util/panel-xdg.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/libpanel-util/panel-xdg.h 2012-12-18 12:42:29.748583599 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/mate-panel-applet-frame.c a/mate-panel/mate-panel-applet-frame.c
+--- b/mate-panel/mate-panel-applet-frame.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/mate-panel-applet-frame.c 2012-12-18 12:42:29.749583738 -0800
+@@ -17,8 +17,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/mate-panel-applet-info.c a/mate-panel/mate-panel-applet-info.c
+--- b/mate-panel/mate-panel-applet-info.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/mate-panel-applet-info.c 2012-12-18 12:42:29.749583738 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff -uNrp b/mate-panel/mate-panel-applets-manager.c a/mate-panel/mate-panel-applets-manager.c
+--- b/mate-panel/mate-panel-applets-manager.c 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/mate-panel-applets-manager.c 2012-12-18 12:42:29.749583738 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff -uNrp b/mate-panel/mate-panel-applets-manager.h a/mate-panel/mate-panel-applets-manager.h
+--- b/mate-panel/mate-panel-applets-manager.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/mate-panel-applets-manager.h 2012-12-18 12:42:29.749583738 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ */
+
+ #ifndef __MATE_PANEL_APPLETS_MANAGER_H__
+diff -uNrp b/mate-panel/mate-panel.desktop.in.in a/mate-panel/mate-panel.desktop.in.in
+--- b/mate-panel/mate-panel.desktop.in.in 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/mate-panel.desktop.in.in 2012-12-18 12:42:29.749583738 -0800
+@@ -10,7 +10,7 @@ X-MATE-Bugzilla-Bugzilla=MATE
+ X-MATE-Bugzilla-Product=mate-panel
+ X-MATE-Bugzilla-Component=general
+ X-MATE-Bugzilla-Version=@VERSION@
+-Categories=MATE;GTK;System;Core;
++Categories=GTK;System;Core;
+ OnlyShowIn=MATE;
+ NoDisplay=true
+ X-MATE-AutoRestart=true
+diff -uNrp b/mate-panel/menu.c a/mate-panel/menu.c
+--- b/mate-panel/menu.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/menu.c 2012-12-18 12:42:29.749583738 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff -uNrp b/mate-panel/menu.h a/mate-panel/menu.h
+--- b/mate-panel/menu.h 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/menu.h 2012-12-18 12:42:29.749583738 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ */
+
+ #ifndef __MENU_H__
+diff -uNrp b/mate-panel/panel-a11y.c a/mate-panel/panel-a11y.c
+--- b/mate-panel/panel-a11y.c 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/panel-a11y.c 2012-12-18 12:42:29.750583878 -0800
+@@ -15,7 +15,7 @@
+ *
+ * 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., 59 Temple Street #330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02110-1301, USA.
+ */
+
+ #include "panel-a11y.h"
+diff -uNrp b/mate-panel/panel-a11y.h a/mate-panel/panel-a11y.h
+--- b/mate-panel/panel-a11y.h 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/panel-a11y.h 2012-12-18 12:42:29.750583878 -0800
+@@ -15,7 +15,7 @@
+ *
+ * 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., 59 Temple Street #330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef __PANEL_A11Y_H__
+diff -uNrp b/mate-panel/panel-action-button.c a/mate-panel/panel-action-button.c
+--- b/mate-panel/panel-action-button.c 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/panel-action-button.c 2012-12-18 12:42:29.750583878 -0800
+@@ -17,8 +17,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-action-button.h a/mate-panel/panel-action-button.h
+--- b/mate-panel/panel-action-button.h 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/panel-action-button.h 2012-12-18 12:42:29.750583878 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-action-protocol.c a/mate-panel/panel-action-protocol.c
+--- b/mate-panel/panel-action-protocol.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-action-protocol.c 2012-12-18 12:42:29.750583878 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-action-protocol.h a/mate-panel/panel-action-protocol.h
+--- b/mate-panel/panel-action-protocol.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-action-protocol.h 2012-12-18 12:42:29.750583878 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-addto.c a/mate-panel/panel-addto.c
+--- b/mate-panel/panel-addto.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-addto.c 2012-12-18 12:42:29.750583878 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vincent at vuntz.net>
+diff -uNrp b/mate-panel/panel-addto.h a/mate-panel/panel-addto.h
+--- b/mate-panel/panel-addto.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-addto.h 2012-12-18 12:42:29.750583878 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vincent at vuntz.net>
+diff -uNrp b/mate-panel/panel-background.c a/mate-panel/panel-background.c
+--- b/mate-panel/panel-background.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-background.c 2012-12-18 12:42:29.751584018 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-background.h a/mate-panel/panel-background.h
+--- b/mate-panel/panel-background.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-background.h 2012-12-18 12:42:29.751584018 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-background-monitor.c a/mate-panel/panel-background-monitor.c
+--- b/mate-panel/panel-background-monitor.c 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/panel-background-monitor.c 2012-12-18 12:42:29.751584018 -0800
+@@ -16,8 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Ian McKellar <yakk at yakk.net>
+diff -uNrp b/mate-panel/panel-background-monitor.h a/mate-panel/panel-background-monitor.h
+--- b/mate-panel/panel-background-monitor.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-background-monitor.h 2012-12-18 12:42:29.751584018 -0800
+@@ -16,8 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Ian McKellar <yakk at yakk.net>
+diff -uNrp b/mate-panel/panel-bindings.c a/mate-panel/panel-bindings.c
+--- b/mate-panel/panel-bindings.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-bindings.c 2012-12-18 12:42:29.751584018 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-bindings.h a/mate-panel/panel-bindings.h
+--- b/mate-panel/panel-bindings.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-bindings.h 2012-12-18 12:42:29.751584018 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-config-global.c a/mate-panel/panel-config-global.c
+--- b/mate-panel/panel-config-global.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-config-global.c 2012-12-18 12:42:29.751584018 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-config-global.h a/mate-panel/panel-config-global.h
+--- b/mate-panel/panel-config-global.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-config-global.h 2012-12-18 12:42:29.751584018 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-context-menu.c a/mate-panel/panel-context-menu.c
+--- b/mate-panel/panel-context-menu.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-context-menu.c 2012-12-18 12:42:29.751584018 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Most of the original code come from menu.c
+ *
+@@ -81,6 +81,11 @@ panel_context_menu_show_about_dialog (Gt
+ {
+ static GtkWidget *about = NULL;
+ char *authors [] = {
++ /* MATE */
++ "Perberos <perberos at gmail.com>",
++ "Stefano Karapetsas <stefano at karapetsas.com>",
++ "Steve Zesch <stevezesch2 at gmail.com>",
++ /* GNOME */
+ "Alex Larsson <alexl at redhat.com>",
+ "Anders Carlsson <andersca at gnu.org>",
+ "Arvind Samptur <arvind.samptur at wipro.com>",
+diff -uNrp b/mate-panel/panel-context-menu.h a/mate-panel/panel-context-menu.h
+--- b/mate-panel/panel-context-menu.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-context-menu.h 2012-12-18 12:42:29.751584018 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vincent at vuntz.net>
+diff -uNrp b/mate-panel/panel-ditem-editor.c a/mate-panel/panel-ditem-editor.c
+--- b/mate-panel/panel-ditem-editor.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-ditem-editor.c 2012-12-18 12:42:29.751584018 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Mate Library; see the file COPYING.LIB. If not,
+- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/panel-ditem-editor.h a/mate-panel/panel-ditem-editor.h
+--- b/mate-panel/panel-ditem-editor.h 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/panel-ditem-editor.h 2012-12-18 12:42:29.751584018 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Mate Library; see the file COPYING.LIB. If not,
+- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/panel-enums-gsettings.h a/mate-panel/panel-enums-gsettings.h
+--- b/mate-panel/panel-enums-gsettings.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-enums-gsettings.h 2012-12-18 12:42:29.752584158 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-enums.h a/mate-panel/panel-enums.h
+--- b/mate-panel/panel-enums.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-enums.h 2012-12-18 12:42:29.752584158 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-force-quit.c a/mate-panel/panel-force-quit.c
+--- b/mate-panel/panel-force-quit.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-force-quit.c 2012-12-18 12:42:29.752584158 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-force-quit.h a/mate-panel/panel-force-quit.h
+--- b/mate-panel/panel-force-quit.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-force-quit.h 2012-12-18 12:42:29.752584158 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-frame.c a/mate-panel/panel-frame.c
+--- b/mate-panel/panel-frame.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-frame.c 2012-12-18 12:42:29.752584158 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-frame.h a/mate-panel/panel-frame.h
+--- b/mate-panel/panel-frame.h 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/panel-frame.h 2012-12-18 12:42:29.752584158 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-globals.h a/mate-panel/panel-globals.h
+--- b/mate-panel/panel-globals.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-globals.h 2012-12-18 12:42:29.752584158 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-gsettings.c a/mate-panel/panel-gsettings.c
+--- b/mate-panel/panel-gsettings.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-gsettings.c 2012-12-18 12:42:29.752584158 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-gsettings.h a/mate-panel/panel-gsettings.h
+--- b/mate-panel/panel-gsettings.h 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/panel-gsettings.h 2012-12-18 12:42:29.752584158 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-layout.c a/mate-panel/panel-layout.c
+--- b/mate-panel/panel-layout.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-layout.c 2012-12-18 12:42:29.753584298 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Stefano Karapetsas <stefano at karapetsas.com>
+@@ -162,7 +162,7 @@ panel_layout_append_group_helper (GKeyFi
+ existing_ids = panel_dconf_list_subdirs (dconf_path, TRUE);
+
+ if (id) {
+- for (i = 0; existing_ids[i]; i) {
++ for (i = 0; existing_ids[i]; i++) {
+ if (!strcmp (existing_ids[i], id)) {
+ existing_id = TRUE;
+ }
+diff -uNrp b/mate-panel/panel-layout.h a/mate-panel/panel-layout.h
+--- b/mate-panel/panel-layout.h 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/panel-layout.h 2012-12-18 12:42:29.753584298 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Stefano Karapetsas <stefano at karapetsas.com>
+diff -uNrp b/mate-panel/panel-lockdown.c a/mate-panel/panel-lockdown.c
+--- b/mate-panel/panel-lockdown.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-lockdown.c 2012-12-18 12:42:29.753584298 -0800
+@@ -14,8 +14,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Matt Keenan <matt.keenan at sun.com>
+diff -uNrp b/mate-panel/panel-lockdown.h a/mate-panel/panel-lockdown.h
+--- b/mate-panel/panel-lockdown.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-lockdown.h 2012-12-18 12:42:29.753584298 -0800
+@@ -14,8 +14,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Matt Keenan <matt.keenan at sun.com>
+diff -uNrp b/mate-panel/panel-menu-bar.c a/mate-panel/panel-menu-bar.c
+--- b/mate-panel/panel-menu-bar.c 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/panel-menu-bar.c 2012-12-18 12:42:29.753584298 -0800
+@@ -16,8 +16,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-menu-bar.h a/mate-panel/panel-menu-bar.h
+--- b/mate-panel/panel-menu-bar.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-menu-bar.h 2012-12-18 12:42:29.753584298 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-menu-button.c a/mate-panel/panel-menu-button.c
+--- b/mate-panel/panel-menu-button.c 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/panel-menu-button.c 2012-12-18 12:42:29.753584298 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-menu-button.h a/mate-panel/panel-menu-button.h
+--- b/mate-panel/panel-menu-button.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-menu-button.h 2012-12-18 12:42:29.753584298 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-menu-items.c a/mate-panel/panel-menu-items.c
+--- b/mate-panel/panel-menu-items.c 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/panel-menu-items.c 2012-12-18 12:42:29.754584438 -0800
+@@ -14,8 +14,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vincent at vuntz.net>
+@@ -1083,7 +1083,7 @@ panel_place_menu_item_create_menu (Panel
+ add_menu_separator (places_menu);
+
+ panel_menu_items_append_from_desktop (places_menu,
+- "network-scheme.desktop",
++ "mate-network-scheme.desktop",
+ NULL,
+ TRUE);
+ panel_place_menu_item_append_remote_gio (place_item, places_menu);
+diff -uNrp b/mate-panel/panel-menu-items.h a/mate-panel/panel-menu-items.h
+--- b/mate-panel/panel-menu-items.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-menu-items.h 2012-12-18 12:42:29.754584438 -0800
+@@ -13,8 +13,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vincent at vuntz.net>
+diff -uNrp b/mate-panel/panel-modules.c a/mate-panel/panel-modules.c
+--- b/mate-panel/panel-modules.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-modules.c 2012-12-18 12:42:29.754584438 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/panel-modules.h a/mate-panel/panel-modules.h
+--- b/mate-panel/panel-modules.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-modules.h 2012-12-18 12:42:29.754584438 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz at gnome.org>
+diff -uNrp b/mate-panel/panel-multiscreen.c a/mate-panel/panel-multiscreen.c
+--- b/mate-panel/panel-multiscreen.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-multiscreen.c 2012-12-18 12:42:29.754584438 -0800
+@@ -16,7 +16,7 @@
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * Authors: George Lebl <jirka at 5z.com>,
+diff -uNrp b/mate-panel/panel-multiscreen.h a/mate-panel/panel-multiscreen.h
+--- b/mate-panel/panel-multiscreen.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-multiscreen.h 2012-12-18 12:42:29.754584438 -0800
+@@ -16,7 +16,7 @@
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * Authors: George Lebl <jirka at 5z.com>,
+diff -uNrp b/mate-panel/panel-profile.c a/mate-panel/panel-profile.c
+--- b/mate-panel/panel-profile.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-profile.c 2012-12-18 12:42:29.755584577 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+@@ -76,7 +76,9 @@ typedef void (*PanelProfileDestro
+ static GSettings *profile_settings = NULL;
+
+ static GQuark toplevel_id_quark = 0;
++#if 0
+ static GQuark queued_changes_quark = 0;
++#endif
+ static GQuark commit_timeout_quark = 0;
+
+ static void panel_profile_object_id_list_update (gchar **objects);
+@@ -222,8 +224,8 @@ panel_profile_set_background_type (Panel
+ PanelBackgroundType
+ panel_profile_get_background_type (PanelToplevel *toplevel)
+ {
+- PanelBackgroundType background_type = PANEL_BACK_NONE;
+- g_settings_get_enum (toplevel->background_settings,
++ PanelBackgroundType background_type;
++ background_type = g_settings_get_enum (toplevel->background_settings,
+ "type");
+ return background_type;
+ }
+@@ -848,8 +850,8 @@ void
+ panel_profile_add_to_list (PanelGSettingsKeyType type,
+ const char *id)
+ {
+- char *key;
+- char *new_id;
++ char *key = NULL;
++ char *new_id = NULL;
+
+ new_id = id ? g_strdup (id) : panel_profile_find_new_id (type);
+
+@@ -858,12 +860,13 @@ panel_profile_add_to_list (PanelGSetting
+ else if (type == PANEL_GSETTINGS_OBJECTS)
+ key = g_strdup (PANEL_OBJECT_ID_LIST_KEY);
+
+- panel_gsettings_append_strv (profile_settings,
++ if ((key != NULL) && (new_id != NULL)) {
++ panel_gsettings_append_strv (profile_settings,
+ key,
+ new_id);
+-
+- g_free (key);
+- g_free (new_id);
++ g_free (key);
++ g_free (new_id);
++ }
+ }
+
+ void
+@@ -1037,6 +1040,16 @@ panel_profile_delete_toplevel (PanelTopl
+
+ toplevel_id = panel_profile_get_toplevel_id (toplevel);
+
++ /* disable GSettings signals */
++ if (toplevel->settings) {
++ g_object_unref (toplevel->settings);
++ toplevel->settings = NULL;
++ }
++ if (toplevel->background_settings) {
++ g_object_unref (toplevel->background_settings);
++ toplevel->background_settings = NULL;
++ }
++
+ panel_profile_delete_toplevel_objects (toplevel_id);
+
+ panel_profile_remove_from_list (PANEL_GSETTINGS_TOPLEVELS, toplevel_id);
+@@ -1069,7 +1082,7 @@ get_toplevel_screen (char *toplevel_path
+ }
+
+ PanelToplevel *
+-panel_profile_load_toplevel (char *toplevel_id)
++panel_profile_load_toplevel (const char *toplevel_id)
+ {
+ PanelToplevel *toplevel;
+ GdkScreen *screen;
+@@ -1236,7 +1249,6 @@ panel_profile_prepare_object_with_id (Pa
+ gboolean right_stick)
+ {
+ PanelGSettingsKeyType key_type;
+- const char *key;
+ char *id;
+ char *settings_path;
+ GSettings *settings;
+@@ -1329,7 +1341,7 @@ static void
+ panel_profile_delete_dir (PanelGSettingsKeyType type,
+ const char *id)
+ {
+- gchar *dir;
++ gchar *dir = NULL;
+
+ switch (type) {
+ case PANEL_GSETTINGS_TOPLEVELS:
+@@ -1353,9 +1365,10 @@ panel_profile_delete_dir (PanelGSettings
+ g_free (subdir);
+ }
+
+- panel_dconf_recursive_reset (dir, NULL);
+-
+- g_free (dir);
++ if (dir != NULL) {
++ panel_dconf_recursive_reset (dir, NULL);
++ g_free (dir);
++ }
+ }
+
+ static gboolean
+@@ -1476,7 +1489,7 @@ panel_profile_toplevel_id_list_notify (G
+
+ toplevel_ids = panel_gsettings_strv_to_gslist (toplevel_ids_strv);
+ toplevel_ids = panel_g_slist_make_unique (toplevel_ids,
+- g_strcmp0,
++ (GCompareFunc)g_strcmp0,
+ FALSE);
+ g_strfreev (toplevel_ids_strv);
+
+@@ -1516,7 +1529,7 @@ panel_profile_object_id_list_update (gch
+
+ object_ids = panel_gsettings_strv_to_gslist (objects);
+ object_ids = panel_g_slist_make_unique (object_ids,
+- g_strcmp0,
++ (GCompareFunc)g_strcmp0,
+ FALSE);
+
+ existing_applets = mate_panel_applet_list_applets ();
+@@ -1562,7 +1575,7 @@ panel_profile_load_list (GSettings
+ GCallback notify_handler)
+ {
+
+- gchar *key;
++ gchar *key = NULL;
+ gchar *changed_signal;
+ gchar **list;
+ gint i;
+@@ -1572,6 +1585,7 @@ panel_profile_load_list (GSettings
+ else if (type == PANEL_GSETTINGS_OBJECTS)
+ key = g_strdup (PANEL_OBJECT_ID_LIST_KEY);
+
++ g_assert (key != NULL);
+ changed_signal = g_strdup_printf ("changed::%s", key);
+
+ g_signal_connect (settings, changed_signal, G_CALLBACK (notify_handler), NULL);
+@@ -1633,11 +1647,11 @@ panel_profile_load (void)
+
+ panel_profile_load_list (profile_settings,
+ PANEL_GSETTINGS_TOPLEVELS,
+- panel_profile_load_and_show_toplevel_startup,
++ (PanelProfileLoadFunc)panel_profile_load_and_show_toplevel_startup,
+ G_CALLBACK (panel_profile_toplevel_id_list_notify));
+ panel_profile_load_list (profile_settings,
+ PANEL_GSETTINGS_OBJECTS,
+- panel_profile_load_object,
++ (PanelProfileLoadFunc)panel_profile_load_object,
+ G_CALLBACK (panel_profile_object_id_list_notify));
+
+ panel_profile_ensure_toplevel_per_screen ();
+diff -uNrp b/mate-panel/panel-profile.h a/mate-panel/panel-profile.h
+--- b/mate-panel/panel-profile.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-profile.h 2012-12-18 12:42:29.755584577 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+@@ -57,7 +57,7 @@ void panel_profile_remove_from
+ const char *id);
+ gboolean panel_profile_id_lists_are_writable (void);
+ void panel_profile_create_toplevel (GdkScreen *screen);
+-PanelToplevel *panel_profile_load_toplevel (char *toplevel_id);
++PanelToplevel *panel_profile_load_toplevel (const char *toplevel_id);
+ void panel_profile_delete_toplevel (PanelToplevel *toplevel);
+ char *panel_profile_prepare_object (PanelObjectType object_type,
+ PanelToplevel *toplevel,
+diff -uNrp b/mate-panel/panel-properties-dialog.c a/mate-panel/panel-properties-dialog.c
+--- b/mate-panel/panel-properties-dialog.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-properties-dialog.c 2012-12-18 12:42:29.755584577 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-properties-dialog.h a/mate-panel/panel-properties-dialog.h
+--- b/mate-panel/panel-properties-dialog.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-properties-dialog.h 2012-12-18 12:42:29.755584577 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-recent.c a/mate-panel/panel-recent.c
+--- b/mate-panel/panel-recent.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-recent.c 2012-12-18 12:42:29.756584716 -0800
+@@ -16,8 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * James Willcox <jwillcox at gnome.org>
+diff -uNrp b/mate-panel/panel-recent.h a/mate-panel/panel-recent.h
+--- b/mate-panel/panel-recent.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-recent.h 2012-12-18 12:42:29.756584716 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * James Willcox <jwillcox at gnome.org>
+diff -uNrp b/mate-panel/panel-reset.c a/mate-panel/panel-reset.c
+--- b/mate-panel/panel-reset.c 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/panel-reset.c 2012-12-18 12:42:29.756584716 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Perberos <perberos at gmail.com>
+@@ -32,7 +32,8 @@
+ #include "panel-schemas.h"
+ #include <libpanel-util/panel-dconf.h>
+
+-void panel_reset()
++void
++panel_reset()
+ {
+ panel_dconf_recursive_reset (PANEL_GENERAL_PATH, NULL);
+ panel_dconf_recursive_reset (PANEL_TOPLEVEL_PATH, NULL);
+diff -uNrp b/mate-panel/panel-reset.h a/mate-panel/panel-reset.h
+--- b/mate-panel/panel-reset.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-reset.h 2012-12-18 12:42:29.756584716 -0800
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef __PANEL_RESET_H__
+diff -uNrp b/mate-panel/panel-run-dialog.c a/mate-panel/panel-run-dialog.c
+--- b/mate-panel/panel-run-dialog.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-run-dialog.c 2012-12-18 12:42:29.756584716 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+
+ * Authors:
+ * Frank Worsley <fworsley at shaw.ca>
+diff -uNrp b/mate-panel/panel-run-dialog.h a/mate-panel/panel-run-dialog.h
+--- b/mate-panel/panel-run-dialog.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-run-dialog.h 2012-12-18 12:42:29.756584716 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+
+ * Authors:
+ * Frank Worsley <fworsley at shaw.ca>
+diff -uNrp b/mate-panel/panel-separator.c a/mate-panel/panel-separator.c
+--- b/mate-panel/panel-separator.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-separator.c 2012-12-18 12:42:29.757584855 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Carlos Garcia Campos <carlosgc at gnome.org>
+diff -uNrp b/mate-panel/panel-separator.h a/mate-panel/panel-separator.h
+--- b/mate-panel/panel-separator.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-separator.h 2012-12-18 12:42:29.757584855 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Carlos Garcia Campos <carlosgc at gnome.org>
+diff -uNrp b/mate-panel/panel-session.c a/mate-panel/panel-session.c
+--- b/mate-panel/panel-session.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-session.c 2012-12-18 12:42:29.757584855 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-session.h a/mate-panel/panel-session.h
+--- b/mate-panel/panel-session.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-session.h 2012-12-18 12:42:29.757584855 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-shell.c a/mate-panel/panel-shell.c
+--- b/mate-panel/panel-shell.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-shell.c 2012-12-18 12:42:29.757584855 -0800
+@@ -18,8 +18,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Jacob Berkman <jacob at ximian.com>
+diff -uNrp b/mate-panel/panel-shell.h a/mate-panel/panel-shell.h
+--- b/mate-panel/panel-shell.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-shell.h 2012-12-18 12:42:29.757584855 -0800
+@@ -17,8 +17,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Jacob Berkman <jacob at ximian.com>
+diff -uNrp b/mate-panel/panel-stock-icons.c a/mate-panel/panel-stock-icons.c
+--- b/mate-panel/panel-stock-icons.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-stock-icons.c 2012-12-18 12:42:29.757584855 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-stock-icons.h a/mate-panel/panel-stock-icons.h
+--- b/mate-panel/panel-stock-icons.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-stock-icons.h 2012-12-18 12:42:29.757584855 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-struts.c a/mate-panel/panel-struts.c
+--- b/mate-panel/panel-struts.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-struts.c 2012-12-18 12:42:29.757584855 -0800
+@@ -14,8 +14,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-struts.h a/mate-panel/panel-struts.h
+--- b/mate-panel/panel-struts.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-struts.h 2012-12-18 12:42:29.758584994 -0800
+@@ -13,8 +13,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-toplevel.c a/mate-panel/panel-toplevel.c
+--- b/mate-panel/panel-toplevel.c 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/panel-toplevel.c 2012-12-18 12:42:29.759585133 -0800
+@@ -17,8 +17,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+@@ -3360,6 +3360,8 @@ panel_toplevel_calculate_animation_end_g
+ screen = panel_toplevel_get_monitor_geometry (
+ toplevel, NULL, NULL, &monitor_width, &monitor_height);
+
++ g_assert (screen != NULL);
++
+ if (!toplevel->priv->expand) {
+
+ if (toplevel->priv->x_centered)
+diff -uNrp b/mate-panel/panel-toplevel.h a/mate-panel/panel-toplevel.h
+--- b/mate-panel/panel-toplevel.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-toplevel.h 2012-12-18 12:42:29.759585133 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-util.c a/mate-panel/panel-util.c
+--- b/mate-panel/panel-util.c 2012-10-17 02:05:28.000000000 -0700
++++ a/mate-panel/panel-util.c 2012-12-18 12:42:29.759585133 -0800
+@@ -654,7 +654,7 @@ panel_make_unique_desktop_uri (const cha
+ p = strrchr (name, '-');
+ if (p) {
+ char *end;
+- strtol ((p + 1), &end, 10);
++ (void) strtol ((p + 1), &end, 10);
+ if (!*end)
+ *p = '\0';
+ }
+diff -uNrp b/mate-panel/panel-xutils.c a/mate-panel/panel-xutils.c
+--- b/mate-panel/panel-xutils.c 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-xutils.c 2012-12-18 12:42:29.760585273 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
+diff -uNrp b/mate-panel/panel-xutils.h a/mate-panel/panel-xutils.h
+--- b/mate-panel/panel-xutils.h 2012-10-17 02:05:27.000000000 -0700
++++ a/mate-panel/panel-xutils.h 2012-12-18 12:42:29.760585273 -0800
+@@ -15,8 +15,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
+ *
+ * Authors:
+ * Mark McLoughlin <mark at skynet.ie>
More information about the scm-commits
mailing list