diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-07-10 16:51:52 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-07-10 16:51:52 +0000 |
| commit | 8e552c41447d5ea428f5af330b17ca24349e208b (patch) | |
| tree | 1d14dddc832e2a7754b52068684155adf4f08b62 /gtk/gtkfilechooserbutton.c | |
| parent | ed2fc95be9ded4d397ba0de88065ddacee72462b (diff) | |
| download | gtk+-8e552c41447d5ea428f5af330b17ca24349e208b.tar.gz | |
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)
Diffstat (limited to 'gtk/gtkfilechooserbutton.c')
| -rw-r--r-- | gtk/gtkfilechooserbutton.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index 38e1ab8bf5..ad57571f8b 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -460,7 +460,7 @@ gtk_file_chooser_button_init (GtkFileChooserButton *button) G_TYPE_CHAR, /* Row Type */ G_TYPE_POINTER /* Volume || Path */, G_TYPE_BOOLEAN /* Is Folder? */, - G_TYPE_OBJECT /* handle */)); + G_TYPE_POINTER /* handle */)); priv->combo_box = gtk_combo_box_new (); priv->combo_box_changed_id = @@ -894,9 +894,7 @@ gtk_file_chooser_button_destroy (GtkObject *object) priv->dialog = NULL; } - gtk_tree_model_get_iter_first (priv->model, &iter); - - do + if (priv->model && gtk_tree_model_get_iter_first (priv->model, &iter)) do { model_free_row_data (button, &iter); } @@ -1604,6 +1602,7 @@ model_add_special_get_info_cb (GtkFileSystemHandle *handle, -1); out: + g_object_unref (data->button); gtk_tree_row_reference_free (data->row_ref); g_free (data); |