Index: orca/ChangeLog
===================================================================
RCS file: /cvs/gnome/orca/ChangeLog,v
retrieving revision 1.1022
diff -p -u -r1.1022 ChangeLog
--- orca/ChangeLog	15 Dec 2006 15:41:29 -0000	1.1022
+++ orca/ChangeLog	15 Dec 2006 16:18:18 -0000
@@ -1,5 +1,13 @@
 2006-12-15  Willie Walker <william.walker@sun.com>
 
+	* src/orca/Gecko.py: work on bug 385949 - prevent stack trace,
+	but there's still a bug looming in Firefox:
+	https://bugzilla.mozilla.org/show_bug.cgi?id=363955
+
+	* bugs/bugs.html: add Firefox bug 363955 regarding the above.
+	
+2006-12-15  Willie Walker <william.walker@sun.com>
+
 	* src/orca/util.py: in getTextLineAtCaret, handle case where the
 	caret is at the very end of the last line of the text.
 
Index: orca/bugs/bugs.html
===================================================================
RCS file: /cvs/gnome/orca/bugs/bugs.html,v
retrieving revision 1.118
diff -p -u -r1.118 bugs.html
--- orca/bugs/bugs.html	13 Dec 2006 21:16:32 -0000	1.118
+++ orca/bugs/bugs.html	15 Dec 2006 16:18:19 -0000
@@ -202,6 +202,14 @@ one might experience in the presence of 
 
   <tr>
     <td>Firefox 3.0 from 08-Dec-2006 nightly</td>
+    <td><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=363955">363955</a>: "Name:" combobx in "Add Bookmark" dialog doesn't give needed accessible information</td>
+    <td>No</td>
+    <td>No</td>
+    <td>Cannot read the name of the bookmark.</td>
+  </tr>
+
+  <tr>
+    <td>Firefox 3.0 from 08-Dec-2006 nightly</td>
     <td><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=363198">363198</a>: caret not positioned properly when following a link</td>
     <td>No</td>
     <td>No</td>
Index: orca/src/orca/Gecko.py
===================================================================
RCS file: /cvs/gnome/orca/src/orca/Gecko.py,v
retrieving revision 1.47
diff -p -u -r1.47 Gecko.py
--- orca/src/orca/Gecko.py	15 Dec 2006 15:41:29 -0000	1.47
+++ orca/src/orca/Gecko.py	15 Dec 2006 16:18:19 -0000
@@ -217,11 +217,11 @@ class BrailleGenerator(braillegenerator.
             regions.append(braille.Region(label + " "))
             focusedRegionIndex = 1
 
-        if menu.name:
+        if menu and menu.name:
             regions.append(braille.Region(menu.name))
         else:
             name = obj.name
-            if menu.state.count(atspi.Accessibility.STATE_VISIBLE):
+            if menu and menu.state.count(atspi.Accessibility.STATE_VISIBLE):
                 selection = menu.selection
                 item = selection.getSelectedChild(0)
                 name = item.name
@@ -330,11 +330,11 @@ class SpeechGenerator(speechgenerator.Sp
         if not already_focused:
             utterances.extend(self._getSpeechForObjectRole(obj))
 
-        if menu.name:
+        if menu and menu.name:
             utterances.append(menu.name)
         else:
             name = obj.name
-            if menu.state.count(atspi.Accessibility.STATE_VISIBLE):
+            if menu and menu.state.count(atspi.Accessibility.STATE_VISIBLE):
                 selection = menu.selection
                 item = selection.getSelectedChild(0)
                 name = item.name
