atk/atkgobjectaccessible.h Fixed typo in define (reported by Jeff Franks)

* atk/atkgobjectaccessible.h
Fixed typo in define (reported by Jeff Franks)

* atk/atktext.c atk/atktext.h
Change name of default signal handler for text_caret_moved signal
from caret_changed to text_caret_moved
Change enum CARET_MOVED to TEXT_CARET_MOVED
(both issues reported by Jeff Franks)

4 files changed, 17 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index d2b4d65..dba8c30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-01-02  Padraig O'Briain  <padraig.obriain@sun.com>
+
+	* atk/atkgobjectaccessible.h
+	Fixed typo in define (reported by Jeff Franks)
+
+	* atk/atktext.c atk/atktext.h
+	Change name of default signal handler for text_caret_moved signal
+	from caret_changed to text_caret_moved
+	Change enum CARET_MOVED to TEXT_CARET_MOVED
+	(both issues reported by Jeff Franks)
+
 2001-12-15  Michael Meeks  <michael@ximian.com>
 
 	* atk/atkrelation.c (atk_relation_class_init):
diff --git a/atk/atkgobjectaccessible.h b/atk/atkgobjectaccessible.h
index f1743ad..eae59ea 100644
--- a/atk/atkgobjectaccessible.h
+++ b/atk/atkgobjectaccessible.h
@@ -17,8 +17,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __ATK_GOBJECT_ACCESSIBLE__H__
-#define __ATK_GOBJECT_ACCESSIBLE__H__
+#ifndef __ATK_GOBJECT_ACCESSIBLE_H__
+#define __ATK_GOBJECT_ACCESSIBLE_H__
 
 #include <atk/atk.h>
 
diff --git a/atk/atktext.c b/atk/atktext.c
index 7103add..ff811bb 100755
--- a/atk/atktext.c
+++ b/atk/atktext.c
@@ -27,7 +27,7 @@ GPtrArray *extra_attributes = NULL;
 
 enum {
   TEXT_CHANGED,
-  CARET_MOVED,
+  TEXT_CARET_MOVED,
   TEXT_SELECTION_CHANGED,
   LAST_SIGNAL
 };
@@ -113,11 +113,11 @@ atk_text_base_init (gpointer *g_class)
 		      G_TYPE_NONE,
 		      2, G_TYPE_INT, G_TYPE_INT);
       
-      atk_text_signals[CARET_MOVED] =
+      atk_text_signals[TEXT_CARET_MOVED] =
 	g_signal_new ("text_caret_moved",
 		      ATK_TYPE_TEXT,
 		      G_SIGNAL_RUN_LAST,
-		      G_STRUCT_OFFSET (AtkTextIface, caret_changed),
+		      G_STRUCT_OFFSET (AtkTextIface, text_caret_moved),
 		      (GSignalAccumulator) NULL, NULL,
 		      g_cclosure_marshal_VOID__INT,
 		      G_TYPE_NONE,
diff --git a/atk/atktext.h b/atk/atktext.h
index bc12a6f..8ffc195 100755
--- a/atk/atktext.h
+++ b/atk/atktext.h
@@ -223,7 +223,7 @@ struct _AtkTextIface
   void		 (* text_changed)                 (AtkText          *text,
                                                    gint             position,
                                                    gint             length);
-  void           (* caret_changed)                (AtkText          *text,
+  void           (* text_caret_moved)             (AtkText          *text,
                                                    gint             location);
   void           (* text_selection_changed)       (AtkText          *text);
 };