Fix memory leak. (Patch from Matthias Clasen, #84926)

Wed Jun 12 15:38:01 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems):
        Fix memory leak. (Patch from Matthias Clasen, #84926)

        * gtk/gtkrange.c (gtk_range_init): Initialize
        mouse_x, mouse_y to -1,-1. (#84871, Garrett Lesage)

8 files changed, 53 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b9d55f5016..639a66b113 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jun 12 15:38:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems):
+	Fix memory leak. (Patch from Matthias Clasen, #84926)
+
+	* gtk/gtkrange.c (gtk_range_init): Initialize
+	mouse_x, mouse_y to -1,-1. (#84871, Garrett Lesage)
+
 Wed Jun 12 15:08:37 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrc.c (gtk_rc_get_style_by_paths): Allow 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b9d55f5016..639a66b113 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Wed Jun 12 15:38:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems):
+	Fix memory leak. (Patch from Matthias Clasen, #84926)
+
+	* gtk/gtkrange.c (gtk_range_init): Initialize
+	mouse_x, mouse_y to -1,-1. (#84871, Garrett Lesage)
+
 Wed Jun 12 15:08:37 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrc.c (gtk_rc_get_style_by_paths): Allow 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b9d55f5016..639a66b113 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Wed Jun 12 15:38:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems):
+	Fix memory leak. (Patch from Matthias Clasen, #84926)
+
+	* gtk/gtkrange.c (gtk_range_init): Initialize
+	mouse_x, mouse_y to -1,-1. (#84871, Garrett Lesage)
+
 Wed Jun 12 15:08:37 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrc.c (gtk_rc_get_style_by_paths): Allow 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b9d55f5016..639a66b113 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Wed Jun 12 15:38:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems):
+	Fix memory leak. (Patch from Matthias Clasen, #84926)
+
+	* gtk/gtkrange.c (gtk_range_init): Initialize
+	mouse_x, mouse_y to -1,-1. (#84871, Garrett Lesage)
+
 Wed Jun 12 15:08:37 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrc.c (gtk_rc_get_style_by_paths): Allow 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b9d55f5016..639a66b113 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Wed Jun 12 15:38:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems):
+	Fix memory leak. (Patch from Matthias Clasen, #84926)
+
+	* gtk/gtkrange.c (gtk_range_init): Initialize
+	mouse_x, mouse_y to -1,-1. (#84871, Garrett Lesage)
+
 Wed Jun 12 15:08:37 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrc.c (gtk_rc_get_style_by_paths): Allow 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b9d55f5016..639a66b113 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Wed Jun 12 15:38:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems):
+	Fix memory leak. (Patch from Matthias Clasen, #84926)
+
+	* gtk/gtkrange.c (gtk_range_init): Initialize
+	mouse_x, mouse_y to -1,-1. (#84871, Garrett Lesage)
+
 Wed Jun 12 15:08:37 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrc.c (gtk_rc_get_style_by_paths): Allow 
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index 8ab0207bd1..92279de980 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -499,5 +499,7 @@ gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
       gtk_widget_show (menuitem);
       gtk_menu_shell_append (menushell, menuitem);
     }
+
+  g_free (contexts);
 }
 
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index d815343de2..38e6f19908 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -413,6 +413,9 @@ gtk_range_init (GtkRange *range)
   range->need_recalc = TRUE;
   range->round_digits = -1;
   range->layout = g_new0 (GtkRangeLayout, 1);
+  range->layout->mouse_location = MOUSE_OUTSIDE;
+  range->layout->mouse_x = -1;
+  range->layout->mouse_y = -1;
   range->layout->grab_location = MOUSE_OUTSIDE;
   range->layout->grab_button = 0;
   range->timer = NULL;