? gnopernicus/brlmon/braille_fonts/fonts.dir
Index: gnopernicus/srlow/libsrlow/SRLow.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/srlow/libsrlow/SRLow.c,v
retrieving revision 1.78
diff -u -r1.78 SRLow.c
--- gnopernicus/srlow/libsrlow/SRLow.c	25 Feb 2004 14:41:15 -0000	1.78
+++ gnopernicus/srlow/libsrlow/SRLow.c	3 Mar 2004 10:01:37 -0000
@@ -79,6 +79,8 @@
     SRL_EVENT_FOCUS1, /* some events are reported as "focus:",
 			but all other events for those objects 
 			should not be reported. (eg ALT+CTRL+TAB) */
+    SRL_EVENT_FOCUS2, /* some text object are not focused, but user can 
+			interact with them */
     SRL_EVENT_LINK_SELECTED,
     SRL_EVENT_TEXT_CARET_MOVED,
     SRL_EVENT_TEXT_CHANGED_INSERT,
@@ -678,6 +680,8 @@
 	return SRL_EVENT_NAME_WINDOW_RENAME;
     if (srle_has_type (event, SRL_EVENT_FOCUS1))
 	return SRL_EVENT_NAME_FOCUS;
+    if (srle_has_type (event, SRL_EVENT_FOCUS2))
+	return SRL_EVENT_NAME_FOCUS;
 
     srl_assert_not_reached ();
     return SRL_EVENT_NAME_UNKNOWN;
@@ -708,6 +712,7 @@
     
     return  event->type == SRL_EVENT_FOCUS		||
 	    event->type == SRL_EVENT_FOCUS1		||
+	    event->type == SRL_EVENT_FOCUS2		||
 	    event->type == SRL_EVENT_LINK_SELECTED	||
 	    event->type == SRL_EVENT_TEXT_CARET_MOVED	||
 	    event->type == SRL_EVENT_TEXT_CHANGED_INSERT||
@@ -1137,9 +1142,12 @@
     }
     else if (srle_has_type (event, SRL_EVENT_TEXT_CARET_MOVED))
     {
-	if (!srle_is_for_focused_acc (event) &&
+/*	if (!srle_is_for_focused_acc (event) &&
 	    srl_acc_has_toolkit (srle_get_acc (event), SRL_TOOLKIT_MOZILLA))
 	    event->type = SRL_EVENT_FOCUS;
+*/
+	if (!srle_is_for_focused_acc (event))
+	    event->type = SRL_EVENT_FOCUS2;
     }
     else if (srle_has_type (event, SRL_EVENT_NAME_CHANGED))
     {
@@ -1409,6 +1417,8 @@
 	rv = srle_acc_has_state (event, SPI_STATE_FOCUSED);
     else if (srle_has_type (event, SRL_EVENT_FOCUS1))
 	rv = TRUE;
+    else if (srle_has_type (event, SRL_EVENT_FOCUS2))
+	rv = TRUE;
     else if (srle_is_for_focused_acc (event) ||
 	     srle_is_for_watched_acc (event))
     {
@@ -1483,8 +1493,9 @@
     srle_set_acc (event);
     srle_change_type (event);
 
-    if (srle_has_type (event, SRL_EVENT_FOCUS))
-	srl_set_last_focus ((Accessible*)srle_get_acc (event));
+    if (srle_has_type (event, SRL_EVENT_FOCUS) ||
+	srle_has_type (event, SRL_EVENT_FOCUS2))
+	    srl_set_last_focus ((Accessible*)srle_get_acc (event));
     else if (srle_has_type (event, SRL_EVENT_FOCUS1))
 	srl_set_last_focus (NULL);
 
Index: gnopernicus/srlow/libsrlow/SRObject.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/srlow/libsrlow/SRObject.c,v
retrieving revision 1.93
diff -u -r1.93 SRObject.c
--- gnopernicus/srlow/libsrlow/SRObject.c	23 Feb 2004 09:27:07 -0000	1.93
+++ gnopernicus/srlow/libsrlow/SRObject.c	3 Mar 2004 10:03:33 -0000
@@ -4141,7 +4141,8 @@
     if (val)
 	*val = NULL;
     
-    srl_return_val_if_fail (text_attr && attr && val, FALSE);
+    if (!(text_attr && attr && val))
+	return FALSE;
     
     tmp = strstr (text_attr, attr);
     if (tmp && tmp[strlen (attr)] == ':')
