Fix some memory handling issues. (#347043, Chris Wilson)

2006-07-10  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserbutton.c: Fix some memory handling
	issues.  (#347043, Chris Wilson)
This commit is contained in:
Matthias Clasen
2006-07-10 16:51:52 +00:00
committed by Matthias Clasen
parent ed2fc95be9
commit 8e552c4144
3 changed files with 13 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2006-07-10 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c: Fix some memory handling
issues. (#347043, Chris Wilson)
2006-07-10 Emmanuele Bassi <ebassi@gnome.org> 2006-07-10 Emmanuele Bassi <ebassi@gnome.org>
* gtk/gtkrecentchooserdefault.c (scan_for_uri_cb): Do not * gtk/gtkrecentchooserdefault.c (scan_for_uri_cb): Do not

View File

@ -1,3 +1,8 @@
2006-07-10 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c: Fix some memory handling
issues. (#347043, Chris Wilson)
2006-07-10 Emmanuele Bassi <ebassi@gnome.org> 2006-07-10 Emmanuele Bassi <ebassi@gnome.org>
* gtk/gtkrecentchooserdefault.c (scan_for_uri_cb): Do not * gtk/gtkrecentchooserdefault.c (scan_for_uri_cb): Do not

View File

@ -460,7 +460,7 @@ gtk_file_chooser_button_init (GtkFileChooserButton *button)
G_TYPE_CHAR, /* Row Type */ G_TYPE_CHAR, /* Row Type */
G_TYPE_POINTER /* Volume || Path */, G_TYPE_POINTER /* Volume || Path */,
G_TYPE_BOOLEAN /* Is Folder? */, G_TYPE_BOOLEAN /* Is Folder? */,
G_TYPE_OBJECT /* handle */)); G_TYPE_POINTER /* handle */));
priv->combo_box = gtk_combo_box_new (); priv->combo_box = gtk_combo_box_new ();
priv->combo_box_changed_id = priv->combo_box_changed_id =
@ -894,9 +894,7 @@ gtk_file_chooser_button_destroy (GtkObject *object)
priv->dialog = NULL; priv->dialog = NULL;
} }
gtk_tree_model_get_iter_first (priv->model, &iter); if (priv->model && gtk_tree_model_get_iter_first (priv->model, &iter)) do
do
{ {
model_free_row_data (button, &iter); model_free_row_data (button, &iter);
} }
@ -1604,6 +1602,7 @@ model_add_special_get_info_cb (GtkFileSystemHandle *handle,
-1); -1);
out: out:
g_object_unref (data->button);
gtk_tree_row_reference_free (data->row_ref); gtk_tree_row_reference_free (data->row_ref);
g_free (data); g_free (data);