[Xfce4-commits] <libxfce4ui:master> Fix licenses.
Nick Schermer
noreply at xfce.org
Sun Mar 27 14:22:01 CEST 2011
Updating branch refs/heads/master
to f9cd2ddf53b9eedb64865466d08fb98680dc9162 (commit)
from b232a4043b42926e27eb13833e858dfed2bbebe7 (commit)
commit f9cd2ddf53b9eedb64865466d08fb98680dc9162
Author: Nick Schermer <nick at xfce.org>
Date: Sun Mar 27 14:20:22 2011 +0200
Fix licenses.
autogen.sh | 17 +++++++++++++--
glade/libxfce4ui-glade.c | 9 +++----
libxfce4kbd-private/xfce-shortcut-dialog.c | 2 +-
libxfce4kbd-private/xfce-shortcut-dialog.h | 2 +-
libxfce4kbd-private/xfce-shortcuts-grabber.c | 2 +-
libxfce4kbd-private/xfce-shortcuts-grabber.h | 2 +-
libxfce4kbd-private/xfce-shortcuts-provider.c | 2 +-
libxfce4kbd-private/xfce-shortcuts-provider.h | 2 +-
libxfce4kbd-private/xfce-shortcuts.c | 2 +-
libxfce4kbd-private/xfce-shortcuts.h | 2 +-
libxfce4ui/libxfce4ui-config.c | 9 +++----
libxfce4ui/libxfce4ui-config.h.in | 9 +++----
libxfce4ui/libxfce4ui-private.h | 9 +++----
libxfce4ui/libxfce4ui.h | 9 +++----
libxfce4ui/libxfce4ui.symbols | 9 +++----
libxfce4ui/make-libxfce4ui-alias.pl | 6 ++--
libxfce4ui/xfce-dialogs.c | 9 +++----
libxfce4ui/xfce-dialogs.h | 9 +++----
libxfce4ui/xfce-gdk-extensions.c | 9 +++----
libxfce4ui/xfce-gdk-extensions.h | 9 +++----
libxfce4ui/xfce-gtk-extensions.c | 9 +++----
libxfce4ui/xfce-gtk-extensions.h | 9 +++----
libxfce4ui/xfce-heading.c | 9 +++----
libxfce4ui/xfce-heading.h | 9 +++----
libxfce4ui/xfce-sm-client.c | 27 +++++++++++++------------
libxfce4ui/xfce-sm-client.h | 27 +++++++++++++------------
libxfce4ui/xfce-spawn.c | 13 +++++------
libxfce4ui/xfce-spawn.h | 9 +++----
libxfce4ui/xfce-titled-dialog.c | 9 +++----
libxfce4ui/xfce-titled-dialog.h | 9 +++----
30 files changed, 127 insertions(+), 132 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 26212d7..5059380 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,9 +1,20 @@
#!/bin/sh
#
-# $Id$
+# Copyright (c) 2002-2009 The Xfce development team. All rights reserved.
#
-# Copyright (c) 2002-2006
-# The Xfce development team. All rights reserved.
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This library is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# Written for Xfce by Benedikt Meurer <benny at xfce.org>.
#
diff --git a/glade/libxfce4ui-glade.c b/glade/libxfce4ui-glade.c
index ed6625a..28760d5 100644
--- a/glade/libxfce4ui-glade.c
+++ b/glade/libxfce4ui-glade.c
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2008 The Xfce Development Team
*
* This library is free software; you can redistribute it and/or
@@ -13,9 +12,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libxfce4kbd-private/xfce-shortcut-dialog.c b/libxfce4kbd-private/xfce-shortcut-dialog.c
index 00953c3..8049467 100644
--- a/libxfce4kbd-private/xfce-shortcut-dialog.c
+++ b/libxfce4kbd-private/xfce-shortcut-dialog.c
@@ -1,5 +1,5 @@
/* vi:set expandtab sw=2 sts=2: */
-/*-
+/*
* Copyright (c) 2008 Jannis Pohlmann <jannis at xfce.org>
*
* This library is free software; you can redistribute it and/or
diff --git a/libxfce4kbd-private/xfce-shortcut-dialog.h b/libxfce4kbd-private/xfce-shortcut-dialog.h
index 304bda3..84a7abb 100644
--- a/libxfce4kbd-private/xfce-shortcut-dialog.h
+++ b/libxfce4kbd-private/xfce-shortcut-dialog.h
@@ -1,5 +1,5 @@
/* vi:set expandtab sw=2 sts=2: */
-/*-
+/*
* Copyright (c) 2008 Jannis Pohlmann <jannis at xfce.org>
*
* This library is free software; you can redistribute it and/or
diff --git a/libxfce4kbd-private/xfce-shortcuts-grabber.c b/libxfce4kbd-private/xfce-shortcuts-grabber.c
index c79a59c..e1a4f97 100644
--- a/libxfce4kbd-private/xfce-shortcuts-grabber.c
+++ b/libxfce4kbd-private/xfce-shortcuts-grabber.c
@@ -1,5 +1,5 @@
/* vi:set expandtab sw=2 sts=2: */
-/*-
+/*
* Copyright (c) 2008 Jannis Pohlmann <jannis at xfce.org>
*
* This library is free software; you can redistribute it and/or
diff --git a/libxfce4kbd-private/xfce-shortcuts-grabber.h b/libxfce4kbd-private/xfce-shortcuts-grabber.h
index 0b00cca..6df0df6 100644
--- a/libxfce4kbd-private/xfce-shortcuts-grabber.h
+++ b/libxfce4kbd-private/xfce-shortcuts-grabber.h
@@ -1,5 +1,5 @@
/* vi:set expandtab sw=2 sts=2: */
-/*-
+/*
* Copyright (c) 2008 Jannis Pohlmann <jannis at xfce.org>
*
* This library is free software; you can redistribute it and/or
diff --git a/libxfce4kbd-private/xfce-shortcuts-provider.c b/libxfce4kbd-private/xfce-shortcuts-provider.c
index 528503d..d5b3bbb 100644
--- a/libxfce4kbd-private/xfce-shortcuts-provider.c
+++ b/libxfce4kbd-private/xfce-shortcuts-provider.c
@@ -1,5 +1,5 @@
/* vi:set expandtab sw=2 sts=2: */
-/*-
+/*
* Copyright (c) 2008 Jannis Pohlmann <jannis at xfce.org>
*
* This library is free software; you can redistribute it and/or
diff --git a/libxfce4kbd-private/xfce-shortcuts-provider.h b/libxfce4kbd-private/xfce-shortcuts-provider.h
index ed79539..03c8bce 100644
--- a/libxfce4kbd-private/xfce-shortcuts-provider.h
+++ b/libxfce4kbd-private/xfce-shortcuts-provider.h
@@ -1,5 +1,5 @@
/* vi:set expandtab sw=2 sts=2: */
-/*-
+/*
* Copyright (c) 2008 Jannis Pohlmann <jannis at xfce.org>
*
* This library is free software; you can redistribute it and/or
diff --git a/libxfce4kbd-private/xfce-shortcuts.c b/libxfce4kbd-private/xfce-shortcuts.c
index 2a8da39..b98898b 100644
--- a/libxfce4kbd-private/xfce-shortcuts.c
+++ b/libxfce4kbd-private/xfce-shortcuts.c
@@ -1,5 +1,5 @@
/* vi:set expandtab sw=2 sts=2: */
-/*-
+/*
* Copyright (c) 2008 Jannis Pohlmann <jannis at xfce.org>
*
* This library is free software; you can redistribute it and/or
diff --git a/libxfce4kbd-private/xfce-shortcuts.h b/libxfce4kbd-private/xfce-shortcuts.h
index c10c57d..4c7a27a 100644
--- a/libxfce4kbd-private/xfce-shortcuts.h
+++ b/libxfce4kbd-private/xfce-shortcuts.h
@@ -1,5 +1,5 @@
/* vi:set expandtab sw=2 sts=2: */
-/*-
+/*
* Copyright (c) 2008 Jannis Pohlmann <jannis at xfce.org>
*
* This library is free software; you can redistribute it and/or
diff --git a/libxfce4ui/libxfce4ui-config.c b/libxfce4ui/libxfce4ui-config.c
index e5c1b2f..28c9aee 100644
--- a/libxfce4ui/libxfce4ui-config.c
+++ b/libxfce4ui/libxfce4ui-config.c
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2007 The Xfce Development Team
*
* This library is free software; you can redistribute it and/or
@@ -13,9 +12,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libxfce4ui/libxfce4ui-config.h.in b/libxfce4ui/libxfce4ui-config.h.in
index fe4b8cb..21359e8 100644
--- a/libxfce4ui/libxfce4ui-config.h.in
+++ b/libxfce4ui/libxfce4ui-config.h.in
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2007 The Xfce Development Team
*
* This library is free software; you can redistribute it and/or
@@ -13,9 +12,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION)
diff --git a/libxfce4ui/libxfce4ui-private.h b/libxfce4ui/libxfce4ui-private.h
index c9aa28c..7b9d2e3 100644
--- a/libxfce4ui/libxfce4ui-private.h
+++ b/libxfce4ui/libxfce4ui-private.h
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2007 The Xfce Development Team
*
* This library is free software; you can redistribute it and/or
@@ -13,9 +12,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#if !defined (LIBXFCE4UI_COMPILATION)
diff --git a/libxfce4ui/libxfce4ui.h b/libxfce4ui/libxfce4ui.h
index 1d17782..3e0b536 100644
--- a/libxfce4ui/libxfce4ui.h
+++ b/libxfce4ui/libxfce4ui.h
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2007 The Xfce Development Team
*
* This library is free software; you can redistribute it and/or
@@ -13,9 +12,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#ifndef __LIBXFCE4UI_H__
diff --git a/libxfce4ui/libxfce4ui.symbols b/libxfce4ui/libxfce4ui.symbols
index 9e9b9fe..80a2290 100644
--- a/libxfce4ui/libxfce4ui.symbols
+++ b/libxfce4ui/libxfce4ui.symbols
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2007 The Xfce Development Team
*
* This library is free software; you can redistribute it and/or
@@ -13,9 +12,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
/* This file lists all exported symbols. It is used to generate
diff --git a/libxfce4ui/make-libxfce4ui-alias.pl b/libxfce4ui/make-libxfce4ui-alias.pl
index abae0a6..0a2ac5d 100644
--- a/libxfce4ui/make-libxfce4ui-alias.pl
+++ b/libxfce4ui/make-libxfce4ui-alias.pl
@@ -14,9 +14,9 @@
# Library General Public License for more details.
#
# 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.
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA
#
my $option_def = 0;
diff --git a/libxfce4ui/xfce-dialogs.c b/libxfce4ui/xfce-dialogs.c
index c683c49..5bf4e71 100644
--- a/libxfce4ui/xfce-dialogs.c
+++ b/libxfce4ui/xfce-dialogs.c
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2006-2007 Benedikt Meurer <benny at xfce.org>
* Copyright (c) 2007 The Xfce Development Team
*
@@ -14,9 +13,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libxfce4ui/xfce-dialogs.h b/libxfce4ui/xfce-dialogs.h
index 1f31987..1c2f390 100644
--- a/libxfce4ui/xfce-dialogs.h
+++ b/libxfce4ui/xfce-dialogs.h
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2007 The Xfce Development Team
*
* This library is free software; you can redistribute it and/or
@@ -13,9 +12,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION)
diff --git a/libxfce4ui/xfce-gdk-extensions.c b/libxfce4ui/xfce-gdk-extensions.c
index c824eba..4773853 100644
--- a/libxfce4ui/xfce-gdk-extensions.c
+++ b/libxfce4ui/xfce-gdk-extensions.c
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2003-2007 Benedikt Meurer <benny at xfce.org>
* Copyright (c) 2007 The Xfce Development Team
*
@@ -14,9 +13,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libxfce4ui/xfce-gdk-extensions.h b/libxfce4ui/xfce-gdk-extensions.h
index 267fd24..df336e4 100644
--- a/libxfce4ui/xfce-gdk-extensions.h
+++ b/libxfce4ui/xfce-gdk-extensions.h
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2007 The Xfce Development Team
*
* This library is free software; you can redistribute it and/or
@@ -13,9 +12,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION)
diff --git a/libxfce4ui/xfce-gtk-extensions.c b/libxfce4ui/xfce-gtk-extensions.c
index 8581bfa..194dc31 100644
--- a/libxfce4ui/xfce-gtk-extensions.c
+++ b/libxfce4ui/xfce-gtk-extensions.c
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2007 The Xfce Development Team
*
* This library is free software; you can redistribute it and/or
@@ -13,9 +12,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libxfce4ui/xfce-gtk-extensions.h b/libxfce4ui/xfce-gtk-extensions.h
index 64af7d0..a16cb15 100644
--- a/libxfce4ui/xfce-gtk-extensions.h
+++ b/libxfce4ui/xfce-gtk-extensions.h
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2007 The Xfce Development Team
*
* This library is free software; you can redistribute it and/or
@@ -13,9 +12,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION)
diff --git a/libxfce4ui/xfce-heading.c b/libxfce4ui/xfce-heading.c
index 34b9b59..1fef083 100644
--- a/libxfce4ui/xfce-heading.c
+++ b/libxfce4ui/xfce-heading.c
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>.
*
* This library is free software; you can redistribute it and/or
@@ -13,9 +12,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libxfce4ui/xfce-heading.h b/libxfce4ui/xfce-heading.h
index 9ad1f01..4859589 100644
--- a/libxfce4ui/xfce-heading.h
+++ b/libxfce4ui/xfce-heading.h
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>.
*
* This library is free software; you can redistribute it and/or
@@ -13,9 +12,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION)
diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c
index 28997ef..6307650 100644
--- a/libxfce4ui/xfce-sm-client.c
+++ b/libxfce4ui/xfce-sm-client.c
@@ -1,20 +1,21 @@
/*
- * Copyright (c) 2009 Brian Tarricone <brian at terricone.org>
- * Copyright (C) 1999 Olivier Fourdan (fourdan at xfce.org)
+ * Copyright (c) 2009 Brian Tarricone <brian at terricone.org>
+ * Copyright (C) 1999 Olivier Fourdan <fourdan at xfce.org>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
*
- * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
/**
diff --git a/libxfce4ui/xfce-sm-client.h b/libxfce4ui/xfce-sm-client.h
index 7a4ed5d..7a7a19f 100644
--- a/libxfce4ui/xfce-sm-client.h
+++ b/libxfce4ui/xfce-sm-client.h
@@ -1,20 +1,21 @@
/*
- * Copyright (c) 2009 Brian Tarricone <brian at terricone.org>
- * Copyright (C) 1999 Olivier Fourdan (fourdan at xfce.org)
+ * Copyright (c) 2009 Brian Tarricone <brian at terricone.org>
+ * Copyright (C) 1999 Olivier Fourdan <fourdan at xfce.org>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
*
- * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#ifndef __XFCE_SM_CLIENT_H__
diff --git a/libxfce4ui/xfce-spawn.c b/libxfce4ui/xfce-spawn.c
index 731ffb2..2479d88 100644
--- a/libxfce4ui/xfce-spawn.c
+++ b/libxfce4ui/xfce-spawn.c
@@ -1,7 +1,6 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2007 Benedikt Meurer <benny at xfce.org>
- * Copyright (c) 2007 The Xfce Development Team
+/*
+ * Copyright (c) 2009 Brian Tarricone <brian at terricone.org>
+ * Copyright (C) 1999 Olivier Fourdan <fourdan at xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -14,9 +13,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libxfce4ui/xfce-spawn.h b/libxfce4ui/xfce-spawn.h
index 486f30e..5491c76 100644
--- a/libxfce4ui/xfce-spawn.h
+++ b/libxfce4ui/xfce-spawn.h
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2007 The Xfce Development Team
*
* This library is free software; you can redistribute it and/or
@@ -13,9 +12,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION)
diff --git a/libxfce4ui/xfce-titled-dialog.c b/libxfce4ui/xfce-titled-dialog.c
index ffc8a2d..385afa1 100644
--- a/libxfce4ui/xfce-titled-dialog.c
+++ b/libxfce4ui/xfce-titled-dialog.c
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>.
*
* This library is free software; you can redistribute it and/or
@@ -13,9 +12,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libxfce4ui/xfce-titled-dialog.h b/libxfce4ui/xfce-titled-dialog.h
index 0c72966..1dde53e 100644
--- a/libxfce4ui/xfce-titled-dialog.h
+++ b/libxfce4ui/xfce-titled-dialog.h
@@ -1,5 +1,4 @@
-/* $Id$ */
-/*-
+/*
* Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>.
*
* This library is free software; you can redistribute it and/or
@@ -13,9 +12,9 @@
* Library General Public License for more details.
*
* 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.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION)
More information about the Xfce4-commits
mailing list