--- gedit-2.16.0/gedit/gedit-commands-file.c.a11y	2006-11-29 15:34:43.000000000 -0500
+++ gedit-2.16.0/gedit/gedit-commands-file.c	2006-11-29 15:39:53.000000000 -0500
@@ -1151,6 +1151,7 @@
 	gchar *primary_msg;
 	gchar *secondary_msg;
 	glong seconds;
+        AtkObject *atk_obj, *win_atk_obj;
 
 	gedit_debug (DEBUG_COMMANDS);
 
@@ -1258,6 +1259,15 @@
 	gtk_dialog_set_default_response	(GTK_DIALOG (dialog),
 					 GTK_RESPONSE_CANCEL);
 
+        atk_obj = gtk_widget_get_accessible (dialog);
+        win_atk_obj = gtk_widget_get_accessible (GTK_WIDGET (window));
+        if (GTK_IS_ACCESSIBLE (atk_obj))
+          {
+             atk_object_set_name (atk_obj, "Question");
+             atk_object_set_role (atk_obj, ATK_ROLE_ALERT);
+             atk_object_add_relationship (atk_obj, ATK_RELATION_POPUP_FOR, win_atk_obj);
+          }
+
 	return dialog;
 }
 
--- gedit-2.16.0/gedit/gedit-view.c.a11y	2006-11-29 15:06:30.000000000 -0500
+++ gedit-2.16.0/gedit/gedit-view.c	2006-11-29 15:12:29.000000000 -0500
@@ -1468,7 +1468,7 @@
 	GtkWidget          *vbox;
 	GtkWidget          *toplevel;
 	GtkEntryCompletion *completion;
-
+        AtkObject          *atk_obj, *win_atk_obj;
 	
 	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (view));
 
@@ -1507,6 +1507,15 @@
 			  G_CALLBACK (search_window_scroll_event),
 			  view);
 
+	atk_obj = gtk_widget_get_accessible (view->priv->search_window);
+        win_atk_obj = gtk_widget_get_accessible (toplevel);
+        if (GTK_IS_ACCESSIBLE (atk_obj))
+          {
+            atk_object_set_name (atk_obj, "Line number popup");
+            atk_object_set_role (atk_obj, ATK_ROLE_ALERT);
+            atk_object_add_relationship (atk_obj, ATK_RELATION_POPUP_FOR, win_atk_obj);
+          }
+
 	frame = gtk_frame_new (NULL);
 	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
 	gtk_widget_show (frame);