Cleaned up some suspect int* casts, and added assertions to text calls in libspi

Also changed getCharacterAtOffset() to return an unsigned long, to allow for 32-bit characters.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@74 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 35f3af6..ee18d16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+<2001-10-09  Bill Haneman <bill.haneman@sun.com>
+       * libspi/text.c, editabletext.c:
+               Added new assertions to all casts of bonobo-objects from
+       CORBA servants, to prevent Text API calls on non-text objects.
+               Changed suspect casts of int-pointer types, so that we
+       always send a valid CORBA_long pointer to the CORBA APIs that use
+       in/out long parameters.  We then have to copy from the CORBA_long
+       into the regular long or int for return to the C bindings, or
+       vice-versa when returning parameters from ATK calls to the bonobo wrappers.
+       
+       * cspi/spi_text.c:
+       * libspi/deviceeventcontroller.c:
+               Cleaned these sources up.
+       * idl/Text.idl:
+               Changed return type for getCharacterAtOffset to
+       CORBA_unsigned_long, to allow for 32-bit characters.
+       
+               
 <2001-10-08  Bill Haneman <bill.haneman@sun.com>
 
        * util/Makefile.am:

diff --git a/cspi/spi.h b/cspi/spi.h
index bb63dc1..19d1fa3 100644 (file)
--- a/cspi/spi.h
+++ b/cspi/spi.h
@@ -1234,7 +1234,7 @@ AccessibleText_getTextAfterOffset (AccessibleText *obj,
                                     long offset,
                                     TEXT_BOUNDARY_TYPE type,
                                   long *startOffset, long *endOffset);
-char
+unsigned long
 AccessibleText_getCharacterAtOffset (AccessibleText *obj,
                                      long offset);
 

diff --git a/cspi/spi_text.c b/cspi/spi_text.c
index 6c672e9..28bd5bd 100644 (file)
--- a/cspi/spi_text.c
+++ b/cspi/spi_text.c
@@ -53,11 +53,17 @@ AccessibleText_getAttributes (AccessibleText *obj,
                                 long *startOffset,
                                 long *endOffset)
 {
-  return (char *)
+  CORBA_long retStartOffset, retEndOffset;
+  char *retval;        
+  retval = (char *)
     Accessibility_Text_getAttributes (*obj,
                                      (CORBA_long) offset,
-                                     (CORBA_long *) startOffset,
-                                     (CORBA_long *) endOffset, &ev);
+                                     &retStartOffset,
+                                     &retEndOffset,
+                                     &ev);
+  *startOffset = (long) retStartOffset;
+  *endOffset = (long) retEndOffset;
+  return retval;
 }
 
 
@@ -79,11 +85,16 @@ AccessibleText_getTextBeforeOffset (AccessibleText *obj,
                                     TEXT_BOUNDARY_TYPE type,
                                    long *startOffset, long *endOffset)
 {
-  return (char *)
+  char *retval;
+  CORBA_long retStartOffset, retEndOffset;
+  retval = (char *)
     Accessibility_Text_getTextBeforeOffset (*obj,
-                                           (CORBA_long) offset, (Accessibility_TEXT_BOUNDARY_TYPE) type,
-                                           (CORBA_long *) startOffset, (CORBA_long *) endOffset,
-                                           &ev);
+                                          (CORBA_long) offset, (Accessibility_TEXT_BOUNDARY_TYPE) type,
+                                          &retStartOffset, &retEndOffset,
+                                          &ev);
+  *startOffset = (long) retStartOffset;
+  *endOffset = (long) retEndOffset;
+  return retval;
 }
 
 
@@ -119,20 +130,25 @@ AccessibleText_getTextAfterOffset (AccessibleText *obj,
                                     TEXT_BOUNDARY_TYPE type,
                                    long *startOffset, long *endOffset)
 {
-  return (char *)
+  char *retval;
+  CORBA_long retStartOffset, retEndOffset;
+  retval = (char *)
     Accessibility_Text_getTextAfterOffset (*obj,
                                           (CORBA_long) offset, (Accessibility_TEXT_BOUNDARY_TYPE) type,
-                                          (CORBA_long *) startOffset, (CORBA_long *) endOffset,
+                                          &retStartOffset, &retEndOffset,
                                           &ev);
+  *startOffset = (long) retStartOffset;
+  *endOffset = (long) retEndOffset;
+  return retval;
 }
 
 
 
-char
+unsigned long
 AccessibleText_getCharacterAtOffset (AccessibleText *obj,
                                      long offset)
 {
-  return (char)
+  return (unsigned long)
     Accessibility_Text_getCharacterAtOffset (*obj,
                                             (CORBA_long) offset, &ev);
 }
@@ -148,13 +164,18 @@ AccessibleText_getCharacterExtents (AccessibleText *obj,
                                     long *height,
                                    AccessibleCoordType type)
 {
+  CORBA_long retX, retY, retWidth, retHeight;
   Accessibility_Text_getCharacterExtents (*obj,
                                          (CORBA_long) offset,
-                                         (CORBA_long *) x,
-                                         (CORBA_long *) y,
-                                         (CORBA_long *) width,
-                                         (CORBA_long *) height, 
+                                         &retX,
+                                         &retY,
+                                         &retWidth,
+                                         &retHeight,
                                          (CORBA_short) type, &ev);
+  *x = (long) retX;
+  *y = (long) retY;
+  *width = (long) retWidth;
+  *height = (long) retHeight;
 }
 
 
@@ -186,10 +207,13 @@ AccessibleText_getSelection (AccessibleText *obj,
                             long selectionNum, long *startOffset,
                             long *endOffset)
 {
+  CORBA_long retStartOffset, retEndOffset;
   Accessibility_Text_getSelection (*obj,
                                   (CORBA_long) selectionNum,
-                                  (CORBA_long *) startOffset,
-                                  (CORBA_long *) endOffset, &ev);
+                                  &retStartOffset, &retEndOffset, &ev);
+  
+  *startOffset = (long) retStartOffset;
+  *endOffset = (long) retEndOffset;
 }
 
 
@@ -227,7 +251,7 @@ AccessibleText_setSelection (AccessibleText *obj,
     Accessibility_Text_setSelection (*obj,
                                     (CORBA_long) selectionNum,
                                     (CORBA_long) startOffset,
- (CORBA_long) endOffset, &ev);
+                                    (CORBA_long) endOffset, &ev);
 }
 
 

diff --git a/idl/Accessibility_Text.idl b/idl/Accessibility_Text.idl
index 5d1c442..2833a21 100644 (file)
--- a/idl/Accessibility_Text.idl
+++ b/idl/Accessibility_Text.idl
@@ -43,9 +43,9 @@ module Accessibility {
                                                        out long startOffset, out long endOffset);
     string getTextAfterOffset (in long offset, in TEXT_BOUNDARY_TYPE type,
                                                        out long startOffset, out long endOffset);
-    wchar getCharacterAtOffset (in long offset); /* could be string instead, 
-                                                 * to allow unicode chars > 16 bits 
-                                                 */
+    unsigned long getCharacterAtOffset (in long offset);  /* long instead of wchar, 
+                                                          * to allow unicode chars > 16 bits 
+                                                          */
     /* void getRowColAtOffset (in long offset, out long row, out long column); */
     string getAttributes (in long offset,
                          out long startOffset, out long endOffset);

diff --git a/idl/Text.idl b/idl/Text.idl
index 5d1c442..2833a21 100644 (file)
--- a/idl/Text.idl
+++ b/idl/Text.idl
@@ -43,9 +43,9 @@ module Accessibility {
                                                        out long startOffset, out long endOffset);
     string getTextAfterOffset (in long offset, in TEXT_BOUNDARY_TYPE type,
                                                        out long startOffset, out long endOffset);
-    wchar getCharacterAtOffset (in long offset); /* could be string instead, 
-                                                 * to allow unicode chars > 16 bits 
-                                                 */
+    unsigned long getCharacterAtOffset (in long offset);  /* long instead of wchar, 
+                                                          * to allow unicode chars > 16 bits 
+                                                          */
     /* void getRowColAtOffset (in long offset, out long row, out long column); */
     string getAttributes (in long offset,
                          out long startOffset, out long endOffset);

diff --git a/libspi/deviceeventcontroller.c b/libspi/deviceeventcontroller.c
index 76b5666..8966fda 100644 (file)
--- a/libspi/deviceeventcontroller.c
+++ b/libspi/deviceeventcontroller.c
@@ -165,7 +165,7 @@ _controller_deregister_device_listener (DeviceEventController *controller,
       if (!mask_ptr->refcount)
       {
           controller->keymask_list = g_list_remove (controller->keymask_list, mask_ptr);
-          ;  /* release any key grabs that are in place for this key mask */
+          ;  /* TODO: release any key grabs that are in place for this key mask */
       }
       break;
   case DEVICE_TYPE_MOUSE:

diff --git a/libspi/editabletext.c b/libspi/editabletext.c
index 4c14c20..b2a1808 100644 (file)
--- a/libspi/editabletext.c
+++ b/libspi/editabletext.c
@@ -174,6 +174,13 @@ impl_setAttributes (PortableServer_Servant _servant,
                       const CORBA_long endPos,
                                         CORBA_Environment * ev)
 {
+  EditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_EDITABLE_TEXT (obj));
+  editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko));
+
   g_print ("setRunAttributes not implemented.\n");
 }
 
@@ -184,7 +191,13 @@ impl_setTextContents (PortableServer_Servant _servant,
                      const CORBA_char * newContents,
                      CORBA_Environment * ev)
 {
-  EditableText *editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  EditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_EDITABLE_TEXT (obj));
+  editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko));
+  
   atk_editable_text_set_text_contents (ATK_EDITABLE_TEXT( TEXT (editable)->atko),
                                       (gchar *) newContents);
 }
@@ -198,7 +211,13 @@ impl_insertText (PortableServer_Servant _servant,
                 const CORBA_long length,
                 CORBA_Environment * ev)
 {
-  EditableText *editable = EDITABLE_TEXT (bonobo_object_from_servant(_servant));
+  EditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_EDITABLE_TEXT (obj));
+  editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko));
+
   atk_editable_text_insert_text (ATK_EDITABLE_TEXT( TEXT (editable)->atko),
                                 (gchar *) text,
                                 (gint) length,
@@ -211,7 +230,13 @@ impl_copyText (PortableServer_Servant _servant,
               const CORBA_long startPos, const CORBA_long endPos,
               CORBA_Environment * ev)
 {
-  EditableText *editable = EDITABLE_TEXT (bonobo_object_from_servant(_servant));
+  EditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_EDITABLE_TEXT (obj));
+  editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko));
+
   atk_editable_text_copy_text (ATK_EDITABLE_TEXT( TEXT(editable)->atko),
                               (gint) startPos, (gint) endPos);
 }
@@ -223,7 +248,13 @@ impl_cutText (PortableServer_Servant _servant,
              const CORBA_long startPos, const CORBA_long endPos,
              CORBA_Environment * ev)
 {
-  EditableText *editable = EDITABLE_TEXT (bonobo_object_from_servant(_servant));
+  EditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_EDITABLE_TEXT (obj));
+  editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko));
+
   atk_editable_text_cut_text (ATK_EDITABLE_TEXT(TEXT (editable)->atko),
                                 (gint) startPos, (gint) endPos);
 }
@@ -236,7 +267,13 @@ impl_deleteText (PortableServer_Servant _servant,
                 const CORBA_long startPos, const CORBA_long endPos,
                 CORBA_Environment * ev)
 {
-  EditableText *editable = EDITABLE_TEXT (bonobo_object_from_servant(_servant));
+  EditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_EDITABLE_TEXT (obj));
+  editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko));
+
   atk_editable_text_delete_text (ATK_EDITABLE_TEXT( TEXT(editable)->atko),
                                 (gint) startPos, (gint) endPos);
 }
@@ -246,7 +283,13 @@ static void
 impl_pasteText (PortableServer_Servant _servant,
                const CORBA_long position, CORBA_Environment * ev)
 {
-  EditableText *editable = EDITABLE_TEXT (bonobo_object_from_servant(_servant));
+  EditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_EDITABLE_TEXT (obj));
+  editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko));
+
   atk_editable_text_paste_text (ATK_EDITABLE_TEXT( TEXT(editable)->atko), position);
 }
 

diff --git a/libspi/editabletext.h b/libspi/editabletext.h
index 9d4fc6e..66b4ca7 100644 (file)
--- a/libspi/editabletext.h
+++ b/libspi/editabletext.h
@@ -33,7 +33,7 @@ extern "C" {
 #define EDITABLE_TEXT_TYPE        (editable_text_get_type ())
 #define EDITABLE_TEXT(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), EDITABLE_TEXT_TYPE, EditableText))
 #define EDITABLE_TEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), EDITABLE_TEXT_TYPE, EditableText))
-#define IS_EDITABLE_TEXT(obj)       (G_TYPE_CHECK__INSTANCE_TYPE ((obj), EDITABLE_TEXT_TYPE))
+#define IS_EDITABLE_TEXT(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EDITABLE_TEXT_TYPE))
 #define IS_EDITABLE_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EDITABLE_TEXT_TYPE))
 
 typedef struct _EditableText EditableText;

diff --git a/libspi/text.c b/libspi/text.c
index 8e87079..7b369a7 100644 (file)
--- a/libspi/text.c
+++ b/libspi/text.c
@@ -70,7 +70,8 @@ impl_getTextAtOffset (PortableServer_Servant _servant,
                      CORBA_long * startOffset,
                      CORBA_long * endOffset,
                      CORBA_Environment * ev);
-static CORBA_wchar
+
+static CORBA_unsigned_long
 impl_getCharacterAtOffset (PortableServer_Servant _servant,
                           const CORBA_long offset,
                           CORBA_Environment * ev);
@@ -236,10 +237,16 @@ impl_getText (PortableServer_Servant _servant,
              const CORBA_long endOffset,
              CORBA_Environment * ev)
 {
-  Text *text = TEXT (bonobo_object_from_servant (_servant));
+  Text *text;
   gchar *txt;
   CORBA_char *rv;
-
+  BonoboObject *obj;
+  
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_val_if_fail (IS_TEXT (obj), (CORBA_char *)"");
+  text = TEXT (obj);
+  g_return_val_if_fail (ATK_IS_TEXT (text->atko), (CORBA_char *)"");
+  
   txt = atk_text_get_text (ATK_TEXT(text->atko),
                       (gint) startOffset, (gint) endOffset);
   if (txt)
@@ -263,14 +270,23 @@ impl_getTextAfterOffset (PortableServer_Servant _servant,
                         CORBA_long * endOffset,
                         CORBA_Environment * ev)
 {
-  Text *text = TEXT (bonobo_object_from_servant (_servant));
+  Text *text;
   gchar *txt;
   CORBA_char *rv;
+  gint intStartOffset, intEndOffset;
+  BonoboObject *obj;
 
-
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_val_if_fail (IS_TEXT (obj), (CORBA_char *)"");
+  text = TEXT (obj);
+  g_return_val_if_fail (ATK_IS_TEXT (text->atko), (CORBA_char *)"");
+  
   txt = atk_text_get_text_after_offset (ATK_TEXT(text->atko),
                                    (gint) offset, (AtkTextBoundary) type,
-                                   (gint *) startOffset, (gint *) endOffset);
+                                   &intStartOffset, &intEndOffset);
+  *startOffset = (CORBA_long) intStartOffset;
+  *endOffset = (CORBA_long) intEndOffset;
+
   if (txt)
     {
       rv = CORBA_string_dup (txt);
@@ -295,13 +311,13 @@ impl_getTextAtOffset (PortableServer_Servant _servant,
   CORBA_char *txt;
   CORBA_char *rv;
   gint intStartOffset, intEndOffset;
-
   BonoboObject *obj;
-  fprintf (stderr, "getting bonobo-object from text servant\n");
+
   obj = (bonobo_object_from_servant (_servant));
-  
-  g_return_val_if_fail (IS_TEXT (bonobo_object_from_servant (_servant)), (CORBA_char *)"");
-                       g_return_val_if_fail (ATK_IS_TEXT (text->atko), (CORBA_char *)"");
+  g_return_val_if_fail (IS_TEXT (obj), (CORBA_char *)"");
+  text = TEXT (obj);
+  g_return_val_if_fail (ATK_IS_TEXT (text->atko), (CORBA_char *)"");
+
   txt = (CORBA_char *) atk_text_get_text_at_offset (ATK_TEXT (text->atko),
                                    (gint) offset, (AtkTextBoundary) type,
                                    &intStartOffset, &intEndOffset);
@@ -320,14 +336,20 @@ impl_getTextAtOffset (PortableServer_Servant _servant,
 }
 
 
-
-static CORBA_wchar
+static CORBA_unsigned_long
 impl_getCharacterAtOffset (PortableServer_Servant _servant,
                           const CORBA_long offset,
                           CORBA_Environment * ev)
 {
-  Text *text = TEXT (bonobo_object_from_servant (_servant));
-  return (CORBA_wchar)
+  Text *text;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  
+  g_return_val_if_fail (IS_TEXT (obj), (CORBA_unsigned_long)0);
+  text = TEXT (obj);
+  g_return_val_if_fail (ATK_IS_TEXT (text->atko), (CORBA_unsigned_long)0);
+
+  return (CORBA_unsigned_long)
     atk_text_get_character_at_offset (ATK_TEXT(text->atko), (gint) offset);
 }
 
@@ -341,13 +363,23 @@ impl_getTextBeforeOffset (PortableServer_Servant _servant,
                          CORBA_long * endOffset,
                          CORBA_Environment * ev)
 {
-  Text *text = TEXT (bonobo_object_from_servant (_servant));
+  Text *text;
   gchar *txt;
   CORBA_char *rv;
+  gint intStartOffset, intEndOffset;
+  BonoboObject *obj;
+
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_val_if_fail (IS_TEXT (obj), (CORBA_char *)"");
+  text = TEXT (obj);
+  g_return_val_if_fail (ATK_IS_TEXT (text->atko), (CORBA_char *)"");
 
   txt = atk_text_get_text_before_offset (ATK_TEXT(text->atko),
                                    (gint) offset, (AtkTextBoundary) type,
-                                   (gint *) startOffset, (gint *) endOffset);
+                                   &intStartOffset, &intEndOffset);
+  *startOffset = (CORBA_long) intStartOffset;
+  *endOffset = (CORBA_long) intEndOffset;
+
   if (txt)
     {
       rv = CORBA_string_dup (txt);
@@ -363,7 +395,14 @@ static CORBA_long
 impl__get_caretOffset (PortableServer_Servant _servant,
                     CORBA_Environment * ev)
 {
-  Text *text = TEXT (bonobo_object_from_servant (_servant));
+  Text *text;
+  BonoboObject *obj;
+
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_val_if_fail (IS_TEXT (obj), (CORBA_long)-1);
+  text = TEXT (obj);
+  g_return_val_if_fail (ATK_IS_TEXT (text->atko), (CORBA_long)-1);
+  
   return (CORBA_long)
     atk_text_get_caret_offset (ATK_TEXT(text->atko));
 }
@@ -377,11 +416,16 @@ impl_getAttributes (PortableServer_Servant _servant,
                       CORBA_long * endOffset,
                       CORBA_Environment * ev)
 {
-  Text *text = TEXT (bonobo_object_from_servant (_servant));
-  g_print ("getAttributes not implemented.\n");
-}
+  Text *text;
+  BonoboObject *obj;
 
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_val_if_fail (IS_TEXT (obj), (CORBA_char *)"");
+  text = TEXT (obj);
+  g_return_val_if_fail (ATK_IS_TEXT (text->atko), (CORBA_char *)"");
 
+  g_print ("getAttributes not yet implemented.\n");
+}
 
 static void 
 impl_getCharacterExtents (PortableServer_Servant _servant,
@@ -391,7 +435,14 @@ impl_getCharacterExtents (PortableServer_Servant _servant,
                          const CORBA_short coordType,
                          CORBA_Environment * ev)
 {
-  Text *text = TEXT (bonobo_object_from_servant (_servant));
+  Text *text;
+  BonoboObject *obj;
+
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_TEXT (obj));
+  text = TEXT (obj);
+  g_return_if_fail (ATK_IS_TEXT (text->atko));
+
   atk_text_get_character_extents (ATK_TEXT(text->atko), (gint) offset,
                                  (gint *) x, (gint *) y, (gint *) width, (gint *) height,
                                  (AtkCoordType) coordType);
@@ -403,7 +454,13 @@ static CORBA_long
 impl__get_characterCount (PortableServer_Servant _servant,
                        CORBA_Environment * ev)
 {
-  Text *text = TEXT (bonobo_object_from_servant (_servant));
+  Text *text;
+  BonoboObject *obj;
+
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_val_if_fail (IS_TEXT (obj), (CORBA_long)0);
+  text = TEXT (obj);
+
   return (CORBA_long)
     atk_text_get_character_count (ATK_TEXT(text->atko));
 }
@@ -416,7 +473,13 @@ impl_getOffsetAtPoint (PortableServer_Servant _servant,
                       const CORBA_short coordType,
                       CORBA_Environment * ev)
 {
-  Text *text = TEXT (bonobo_object_from_servant (_servant));
+  Text *text;
+  BonoboObject *obj;
+
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_val_if_fail (IS_TEXT (obj), (CORBA_long)-1);
+  text = TEXT (obj);
+
   return (CORBA_long)
     atk_text_get_offset_at_point (ATK_TEXT(text->atko),
                                  (gint) x, (gint) y, (AtkCoordType) coordType);
@@ -428,7 +491,13 @@ static CORBA_long
 impl_getNSelections (PortableServer_Servant _servant,
                     CORBA_Environment * ev)
 {
-  Text *text = TEXT (bonobo_object_from_servant (_servant));
+  Text *text;
+  BonoboObject *obj;
+
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_val_if_fail (IS_TEXT (obj), (CORBA_long)0);
+  text = TEXT (obj);
+
   return (CORBA_long)
     atk_text_get_n_selections (ATK_TEXT(text->atko));
 }
@@ -441,7 +510,13 @@ impl_getSelection (PortableServer_Servant _servant,
                   CORBA_long * startOffset, CORBA_long * endOffset,
                   CORBA_Environment * ev)
 {
-  Text *text = TEXT (bonobo_object_from_servant (_servant));
+  Text *text;
+  BonoboObject *obj;
+
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_TEXT (obj));
+  text = TEXT (obj);
+
   atk_text_get_selection (ATK_TEXT(text->atko), (gint) selectionNum,
                          (gint *) startOffset, (gint *) endOffset);
 }
@@ -454,7 +529,13 @@ impl_addSelection (PortableServer_Servant _servant,
                   const CORBA_long endOffset,
                   CORBA_Environment * ev)
 {
-  Text *text = TEXT (bonobo_object_from_servant (_servant));
+  Text *text;
+  BonoboObject *obj;
+
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_val_if_fail (IS_TEXT (obj), (CORBA_boolean)FALSE);
+  text = TEXT (obj);
+
   return (CORBA_boolean)
     atk_text_add_selection (ATK_TEXT(text->atko),
                            (gint) startOffset, (gint) endOffset);
@@ -467,7 +548,13 @@ impl_removeSelection (PortableServer_Servant _servant,
                      const CORBA_long selectionNum,
                      CORBA_Environment * ev)
 {
-  Text *text = TEXT (bonobo_object_from_servant (_servant));
+  Text *text;
+  BonoboObject *obj;
+
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_val_if_fail (IS_TEXT (obj), (CORBA_boolean)FALSE);
+  text = TEXT (obj);
+
   return (CORBA_boolean)
     atk_text_remove_selection (ATK_TEXT(text->atko), (gint) selectionNum);
 }
@@ -481,7 +568,13 @@ impl_setSelection (PortableServer_Servant _servant,
                   const CORBA_long endOffset,
                   CORBA_Environment * ev)
 {
-  Text *text = TEXT (bonobo_object_from_servant (_servant));
+  Text *text;
+  BonoboObject *obj;
+
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_val_if_fail (IS_TEXT (obj), (CORBA_boolean)FALSE);
+  text = TEXT (obj);
+
   return (CORBA_boolean)
     atk_text_set_selection (ATK_TEXT(text->atko),
                            (gint) selectionNum, (gint) startOffset, (gint) endOffset);
@@ -494,7 +587,13 @@ impl_setCaretOffset (PortableServer_Servant _servant,
                     const CORBA_long value,
                     CORBA_Environment * ev)
 {
-  Text *text = TEXT (bonobo_object_from_servant (_servant));
+  Text *text;
+  BonoboObject *obj;
+
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_val_if_fail (IS_TEXT (obj), (CORBA_boolean)FALSE);
+  text = TEXT (obj);
+
   return (CORBA_boolean)
     atk_text_set_caret_offset (ATK_TEXT(text->atko), (gint) value);
 }
@@ -506,6 +605,13 @@ impl_getRowColAtOffset (PortableServer_Servant _servant,
                        const CORBA_long offset, CORBA_long * row,
                        CORBA_long * column, CORBA_Environment * ev)
 {
-  Text *text = TEXT (bonobo_object_from_servant (_servant));
+  Text *text;
+  BonoboObject *obj;
+
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_TEXT (obj));
+  text = TEXT (obj);
+
+  g_print ("getRowColAtOffset not yet implemented\n");
 }
 

diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index 76b5666..8966fda 100644 (file)
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -165,7 +165,7 @@ _controller_deregister_device_listener (DeviceEventController *controller,
       if (!mask_ptr->refcount)
       {
           controller->keymask_list = g_list_remove (controller->keymask_list, mask_ptr);
-          ;  /* release any key grabs that are in place for this key mask */
+          ;  /* TODO: release any key grabs that are in place for this key mask */
       }
       break;
   case DEVICE_TYPE_MOUSE:

diff --git a/util/magnifier.c b/util/magnifier.c
index 4a6ebe4..aa13e7a 100644 (file)
--- a/util/magnifier.c
+++ b/util/magnifier.c
@@ -190,7 +190,7 @@ int main (int argc, char** argv){
   gdk_window_resize (window->window, magnifier->mag_data->mag_width, magnifier->mag_data->mag_height);
   magnifier->mag_data->output_window = window;
   if (global_options.fullscreen) gdk_window_stick (window->window);
-  gtk_window_set_decorated(window, FALSE);
+  gtk_window_set_decorated(GTK_WINDOW (window), FALSE);
   gdk_window_set_functions(window->window, 0);
   gdk_window_raise(window->window);