1 files changed, 51 insertions, 16 deletions

diff --git a/gtk/gtktextmark.c b/gtk/gtktextmark.c
index 6cf14624ab..a1a4c6f65f 100644
--- a/gtk/gtktextmark.c
+++ b/gtk/gtktextmark.c
@@ -1,18 +1,53 @@
-/* 
- * tkTextMark.c --
- *
- *	This file contains the procedure that implement marks for
- *	text widgets.
- *
+/* gtktextmark.c - mark segments
+ * 
  * Copyright (c) 1994 The Regents of the University of California.
  * Copyright (c) 1994-1997 Sun Microsystems, Inc.
+ * Copyright (c) 2000      Red Hat, Inc.
+ * Tk -> Gtk port by Havoc Pennington <hp@redhat.com>
  *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * This software is copyrighted by the Regents of the University of
+ * California, Sun Microsystems, Inc., and other parties.  The
+ * following terms apply to all files associated with the software
+ * unless explicitly disclaimed in individual files.
+ * 
+ * The authors hereby grant permission to use, copy, modify,
+ * distribute, and license this software and its documentation for any
+ * purpose, provided that existing copyright notices are retained in
+ * all copies and that this notice is included verbatim in any
+ * distributions. No written agreement, license, or royalty fee is
+ * required for any of the authorized uses.  Modifications to this
+ * software may be copyrighted by their authors and need not follow
+ * the licensing terms described here, provided that the new terms are
+ * clearly indicated on the first page of each file where they apply.
+ * 
+ * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
+ * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
+ * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
+ * OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
+ * NON-INFRINGEMENT.  THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
+ * AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
+ * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
- * RCS: @(#) $Id$
+ * GOVERNMENT USE: If you are acquiring this software on behalf of the
+ * U.S. government, the Government shall have only "Restricted Rights"
+ * in the software and related documentation as defined in the Federal
+ * Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+ * are acquiring the software on behalf of the Department of Defense,
+ * the software shall be classified as "Commercial Computer Software"
+ * and the Government shall have only "Restricted Rights" as defined
+ * in Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
+ * foregoing, the authors grant the U.S. Government and others acting
+ * in its behalf permission to use and distribute the software in
+ * accordance with the terms specified in this license.
+ * 
  */
 
+
 #include "gtktextbtree.h"
 
 gboolean
@@ -43,7 +78,7 @@ gtk_text_mark_ref (GtkTextMark *mark)
 
   seg = (GtkTextLineSegment*)mark;
 
-  mark_segment_ref (seg);
+  _mark_segment_ref (seg);
 
   return mark;
 }
@@ -55,7 +90,7 @@ gtk_text_mark_unref (GtkTextMark *mark)
 
   seg = (GtkTextLineSegment*)mark;
   
-  mark_segment_unref (seg);
+  _mark_segment_unref (seg);
 }
 
 gboolean
@@ -79,9 +114,9 @@ gtk_text_mark_get_deleted (GtkTextMark *mark)
 
 
 GtkTextLineSegment*
-mark_segment_new (GtkTextBTree *tree,
-                  gboolean left_gravity,
-                  const gchar *name)
+_mark_segment_new (GtkTextBTree *tree,
+                   gboolean      left_gravity,
+                   const gchar  *name)
 {
   GtkTextLineSegment *mark;
 
@@ -109,7 +144,7 @@ mark_segment_new (GtkTextBTree *tree,
 }
 
 void
-mark_segment_ref(GtkTextLineSegment *mark)
+_mark_segment_ref (GtkTextLineSegment *mark)
 {
   g_return_if_fail (mark != NULL);
   g_return_if_fail (mark->type == &gtk_text_right_mark_type ||
@@ -120,7 +155,7 @@ mark_segment_ref(GtkTextLineSegment *mark)
 }
 
 void
-mark_segment_unref(GtkTextLineSegment *mark)
+_mark_segment_unref (GtkTextLineSegment *mark)
 {
   g_return_if_fail (mark != NULL);
   g_return_if_fail (mark->type == &gtk_text_right_mark_type ||