[sushi] Improve copying and add license and copyright for copied snippets



commit af84711d850756205d17c19bdb10ceec7edbae04
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sat Jul 2 00:58:55 2011 -0400

    Improve copying and add license and copyright for copied snippets

 COPYING                           |    5 +++++
 src/libsushi/sushi-cover-art.c    |   17 +++++++++++++----
 src/libsushi/sushi-font-widget.c  |    8 +++++++-
 src/libsushi/sushi-sound-player.c |    2 ++
 4 files changed, 27 insertions(+), 5 deletions(-)
---
diff --git a/COPYING b/COPYING
index 94a9ed0..88317e1 100644
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,8 @@
+The source code of Sushi is licensed to you under the GNU General Public
+License version 3.
+
+========================================================================
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
diff --git a/src/libsushi/sushi-cover-art.c b/src/libsushi/sushi-cover-art.c
index 8304587..368717a 100644
--- a/src/libsushi/sushi-cover-art.c
+++ b/src/libsushi/sushi-cover-art.c
@@ -360,7 +360,18 @@ try_fetch_from_amazon (SushiCoverArtFetcher *self)
   g_free (album);
 }
 
-/* code taken from Totem */
+/* code taken from Totem; totem-gst-helpers.c
+ *
+ * Copyright (C) 2003-2007 the GStreamer project
+ *      Julien Moutte <julien moutte net>
+ *      Ronald Bultje <rbultje ronald bitfreak net>
+ * Copyright (C) 2005-2008 Tim-Philipp MÃller <tim centricular net>
+ * Copyright (C) 2009 Sebastian DrÃge <sebastian droege collabora co uk>
+ * Copyright  2009 Christian Persch
+ *
+ * License: GPLv2+
+ *
+ */
 static GdkPixbuf *
 totem_gst_buffer_to_pixbuf (GstBuffer *buffer)
 {
@@ -447,9 +458,7 @@ totem_gst_tag_list_get_cover (GstTagList *tag_list)
 
   return NULL;
 }
-
-/* end of code taken from Totem */
-
+/* */
 static void
 try_fetch_from_tags (SushiCoverArtFetcher *self)
 {
diff --git a/src/libsushi/sushi-font-widget.c b/src/libsushi/sushi-font-widget.c
index 57f5ccf..426abac 100644
--- a/src/libsushi/sushi-font-widget.c
+++ b/src/libsushi/sushi-font-widget.c
@@ -42,7 +42,13 @@ static const gchar lowercase_text_stock[] = "abcdefghijklmnopqrstuvwxyz";
 static const gchar uppercase_text_stock[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 static const gchar punctuation_text_stock[] = "0123456789.:,;(*!?')";
 
-/* adapted from gnome-utils:font-viewer/font-view.c */
+/* adapted from gnome-utils:font-viewer/font-view.c
+ *
+ * Copyright (C) 2002-2003  James Henstridge <james daa com au>
+ * Copyright (C) 2010 Cosimo Cecchi <cosimoc gnome org>
+ *
+ * License: GPLv2+
+ */
 static void
 draw_string (cairo_t *cr,
              GtkBorder padding,
diff --git a/src/libsushi/sushi-sound-player.c b/src/libsushi/sushi-sound-player.c
index cd9d2c9..d275ac8 100644
--- a/src/libsushi/sushi-sound-player.c
+++ b/src/libsushi/sushi-sound-player.c
@@ -1,5 +1,7 @@
 /* this code is mostly copied and renamed from TheBoard, see
  * the-board/src/tb/tb-sound-player.[ch]
+ *
+ * License: GPLv3
  */
 
 #include <glib.h>



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