diff options
| -rw-r--r-- | gtk/gtkfilechooserbutton.c | 5 | ||||
| -rw-r--r-- | gtk/gtkfilechooserdefault.c | 4 | ||||
| -rw-r--r-- | gtk/gtkfilechooserentry.c | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index 8b917fb303..c12ef917f0 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -1551,7 +1551,10 @@ model_free_row_data (GtkFileChooserButton *button, -1); if (cancellable) - g_cancellable_cancel (cancellable); + { + g_cancellable_cancel (cancellable); + g_object_unref (cancellable); + } switch (type) { diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 2022a3d2d8..b5e46d5ba6 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -3195,7 +3195,7 @@ shortcuts_reorder (GtkFileChooserDefault *impl, int bookmarks_index; GFile *file; GError *error; - gchar *name; + gchar *name = NULL; /* Get the selected path */ @@ -3241,6 +3241,7 @@ shortcuts_reorder (GtkFileChooserDefault *impl, out: g_object_unref (file); + g_free (name); } /* Callback used when we get the drag data for the bookmarks list. We add the @@ -10035,6 +10036,7 @@ list_row_activated (GtkTreeView *tree_view, if (is_folder && file) { change_folder_and_display_error (impl, file, FALSE); + g_object_unref (file); goto out; } diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c index 4ac71ed5f7..d0d043fcd0 100644 --- a/gtk/gtkfilechooserentry.c +++ b/gtk/gtkfilechooserentry.c @@ -336,8 +336,9 @@ match_selected_callback (GtkEntryCompletion *completion, if (!display_name || !file) { - /* these shouldn't complain if passed NULL */ - g_object_unref (file); + if (file) + g_object_unref (file); + g_free (display_name); return FALSE; } |