? 1
? cscope.out
? files
? demos/gtk-demo/geninclude.pl
? modules/input/.gtkimcontextxim.c.swn
? modules/input/.gtkimcontextxim.c.swo
? modules/input/.gtkimcontextxim.c.swp
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtk+/ChangeLog,v
retrieving revision 1.4000.2.194
diff -u -r1.4000.2.194 ChangeLog
--- ChangeLog	9 Jun 2003 21:58:30 -0000	1.4000.2.194
+++ ChangeLog	25 Aug 2003 20:54:04 -0000
@@ -1,3 +1,8 @@
+Mon Aug 25 13:17:19 2003  Suresh Chandrasekharan <suresh.chandrasekharan@sun.com>
+	* modules/input/gtkimcontextxim.c (status_window_get): Check 
+	parent == NULL, and break out of the loop if it's so. This fixes 
+	looping for parent == NULL case.
+
 Mon Jun  9 16:29:51 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* === Released 2.2.2 ===
Index: modules/input/gtkimcontextxim.c
===================================================================
RCS file: /cvs/gnome/gtk+/modules/input/gtkimcontextxim.c,v
retrieving revision 1.32.2.4
diff -u -r1.32.2.4 gtkimcontextxim.c
--- modules/input/gtkimcontextxim.c	6 Jun 2003 19:42:38 -0000	1.32.2.4
+++ modules/input/gtkimcontextxim.c	25 Aug 2003 20:54:11 -0000
@@ -1250,7 +1250,7 @@
   while (TRUE)
     {
       GdkWindow *parent = gdk_window_get_parent (toplevel_gdk);
-      if (parent == root_window)
+      if (parent == NULL || parent == root_window)
 	break;
       else
 	toplevel_gdk = parent;
