diff --git a/ChangeLog b/ChangeLog
index 35dd6c46c7c49bfc051916c9c7455027882c5d41..56a6d6d683105d4188bb2005ad179d1a30038aa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-31  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/gtkimcontextxim.c: Use NULL, not 0 to terminate 
+	NULL-terminated va lists.  (#165683)
+
 2005-01-29  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkseparatortoolitem.c (gtk_separator_tool_item_set_draw): 
@@ -18,6 +23,9 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
 
 2005-01-27  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render): 
+	Make wrapping work in RTL mode.  
+
 	* gtk/gtkaboutdialog.c: Some visual tweaks to the about dialog,
 	obey HIG spacing a bit more, add a hand cursor when over the
 	link button.  (#163979, Jorn Baayen)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 35dd6c46c7c49bfc051916c9c7455027882c5d41..56a6d6d683105d4188bb2005ad179d1a30038aa3 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-01-31  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/gtkimcontextxim.c: Use NULL, not 0 to terminate 
+	NULL-terminated va lists.  (#165683)
+
 2005-01-29  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkseparatortoolitem.c (gtk_separator_tool_item_set_draw): 
@@ -18,6 +23,9 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
 
 2005-01-27  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render): 
+	Make wrapping work in RTL mode.  
+
 	* gtk/gtkaboutdialog.c: Some visual tweaks to the about dialog,
 	obey HIG spacing a bit more, add a hand cursor when over the
 	link button.  (#163979, Jorn Baayen)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 35dd6c46c7c49bfc051916c9c7455027882c5d41..56a6d6d683105d4188bb2005ad179d1a30038aa3 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-01-31  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/gtkimcontextxim.c: Use NULL, not 0 to terminate 
+	NULL-terminated va lists.  (#165683)
+
 2005-01-29  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkseparatortoolitem.c (gtk_separator_tool_item_set_draw): 
@@ -18,6 +23,9 @@ Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
 
 2005-01-27  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render): 
+	Make wrapping work in RTL mode.  
+
 	* gtk/gtkaboutdialog.c: Some visual tweaks to the about dialog,
 	obey HIG spacing a bit more, add a hand cursor when over the
 	link button.  (#163979, Jorn Baayen)
diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index 030440270bb97cdd832f02a593a6cc79b6cf0132..220a04a8f25e09f8afd9965b3af4283b47138c79 100644
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -810,7 +810,7 @@ gtk_im_context_xim_set_cursor_location (GtkIMContext *context,
 
   preedit_attr = XVaCreateNestedList (0,
 				      XNSpotLocation, &spot,
-				      0);
+				      NULL);
   XSetICValues (ic,
 		XNPreeditAttributes, preedit_attr,
 		NULL);
@@ -857,7 +857,7 @@ gtk_im_context_xim_reset (GtkIMContext *context)
 
   preedit_attr = XVaCreateNestedList(0,
                                      XNPreeditState, &preedit_state,
-                                     0);
+                                     NULL);
   if (!XGetICValues(ic,
                     XNPreeditAttributes, preedit_attr,
                     NULL))
@@ -869,7 +869,7 @@ gtk_im_context_xim_reset (GtkIMContext *context)
 
   preedit_attr = XVaCreateNestedList(0,
                                      XNPreeditState, preedit_state,
-                                     0);
+                                     NULL);
   if (have_preedit_state)
     XSetICValues(ic,
 		 XNPreeditAttributes, preedit_attr,