[gtk+/gtk-3-18] Fix the licensing blurb in GtkPlacesSidebar



commit d368b396d47b1ceb5b717bea946e5861ab2a06d8
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Thu Nov 19 12:06:54 2015 +0000

    Fix the licensing blurb in GtkPlacesSidebar
    
    The code is released under the terms of the LGPL v2.1+, as is the rest
    of the GTK+ code.

 gtk/gtkplacessidebar.c        |   35 ++++++++++++++++-------------------
 gtk/gtkplacessidebarprivate.h |    2 +-
 2 files changed, 17 insertions(+), 20 deletions(-)
---
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 8dc6d30..cdc068e 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -1,27 +1,24 @@
-/*
- *  GtkPlacesSidebar - sidebar widget for places in the filesystem
+/* GtkPlacesSidebar - sidebar widget for places in the filesystem
  *
- *  This code comes from Nautilus, GNOME’s file manager.
+ * 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 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 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
- *  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, see <http://www.gnu.org/licenses/>.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this library; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  Authors : Mr Jamie McCracken (jamiemcc at blueyonder dot co dot uk)
- *            Cosimo Cecchi <cosimoc gnome org>
- *            Federico Mena Quintero <federico gnome org>
- *            Carlos Soriano <csoriano gnome org>
+ * This code is originally from Nautilus.
  *
+ * Authors : Mr Jamie McCracken (jamiemcc at blueyonder dot co dot uk)
+ *           Cosimo Cecchi <cosimoc gnome org>
+ *           Federico Mena Quintero <federico gnome org>
+ *           Carlos Soriano <csoriano gnome org>
  */
 
 #include "config.h"
diff --git a/gtk/gtkplacessidebarprivate.h b/gtk/gtkplacessidebarprivate.h
index 34850cc..2df244c 100644
--- a/gtk/gtkplacessidebarprivate.h
+++ b/gtk/gtkplacessidebarprivate.h
@@ -4,7 +4,7 @@
  *
  * This file 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 3 of the
+ * published by the Free Software Foundation; either version 2.1 of the
  * License, or (at your option) any later version.
  *
  * This file is distributed in the hope that it will be useful, but


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]