diff --git a/ChangeLog b/ChangeLog
index d5b2d187e1..bd180ee73e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkscale.c (gtk_scale_get_layout_offsets): Silence
+	compiler warnings.
+
+	* gtk/gtkinputdialog.c (gtk_input_dialog_set_mapping_mode): Don't
+	dereference info before checking it for NULL.  (Coverity)
+
 2006-04-07  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d5b2d187e1..bd180ee73e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2006-04-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkscale.c (gtk_scale_get_layout_offsets): Silence
+	compiler warnings.
+
+	* gtk/gtkinputdialog.c (gtk_input_dialog_set_mapping_mode): Don't
+	dereference info before checking it for NULL.  (Coverity)
+
 2006-04-07  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c
index b936ee12ad..d4cadb1252 100644
--- a/gtk/gtkinputdialog.c
+++ b/gtk/gtkinputdialog.c
@@ -463,12 +463,14 @@ gtk_input_dialog_set_mapping_mode (GtkWidget *w,
 {
   GtkInputDialog *inputd = input_dialog_from_widget (w);
   GdkDevice *info = inputd->current_device;
-  GdkInputMode old_mode = info->mode;
+  GdkInputMode old_mode;
   GdkInputMode mode = GPOINTER_TO_INT (data);
 
   if (!info)
     return;
 
+  old_mode = info->mode;
+
   if (mode != old_mode)
     {
       if (gdk_device_set_mode (info, mode))
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 0f2f78dc8c..d6c251086a 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -722,7 +722,8 @@ gtk_scale_get_layout_offsets (GtkScale *scale,
                               gint     *x,
                               gint     *y)
 {
-  gint local_x, local_y;
+  gint local_x = 0;
+  gint local_y = 0;
 
   g_return_if_fail (GTK_IS_SCALE (scale));