diff options
| -rw-r--r-- | gtk/gtkappchooserdialog.c | 19 | ||||
| -rw-r--r-- | gtk/gtkappchooseronlinepk.c | 1 |
2 files changed, 14 insertions, 6 deletions
diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c index c0ee59ceaa..2b8c815f90 100644 --- a/gtk/gtkappchooserdialog.c +++ b/gtk/gtkappchooserdialog.c @@ -146,6 +146,7 @@ search_for_mimetype_ready_cb (GObject *source, } out: + g_clear_object (&self->priv->online_cancellable); g_clear_error (&error); g_object_unref (self); @@ -297,6 +298,16 @@ add_or_find_application (GtkAppChooserDialog *self) } static void +cancel_and_clear_cancellable (GtkAppChooserDialog *self) +{ + if (self->priv->online_cancellable != NULL) + { + g_cancellable_cancel (self->priv->online_cancellable); + g_clear_object (&self->priv->online_cancellable); + } +} + +static void gtk_app_chooser_dialog_response (GtkDialog *dialog, gint response_id, gpointer user_data) @@ -310,6 +321,7 @@ gtk_app_chooser_dialog_response (GtkDialog *dialog, break; case GTK_RESPONSE_CANCEL: case GTK_RESPONSE_DELETE_EVENT: + cancel_and_clear_cancellable (self); self->priv->dismissed = TRUE; default : break; @@ -631,14 +643,9 @@ gtk_app_chooser_dialog_dispose (GObject *object) GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object); g_clear_object (&self->priv->gfile); + cancel_and_clear_cancellable (self); g_clear_object (&self->priv->online); - if (self->priv->online_cancellable != NULL) - { - g_cancellable_cancel (self->priv->online_cancellable); - g_clear_object (&self->priv->online_cancellable); - } - G_OBJECT_CLASS (gtk_app_chooser_dialog_parent_class)->dispose (object); } diff --git a/gtk/gtkappchooseronlinepk.c b/gtk/gtkappchooseronlinepk.c index 7bfc84de9c..0f62bb2594 100644 --- a/gtk/gtkappchooseronlinepk.c +++ b/gtk/gtkappchooseronlinepk.c @@ -118,6 +118,7 @@ install_mime_types_ready_cb (GObject *source, } g_simple_async_result_complete (self->priv->result); + g_clear_object (&self->priv->result); } static void |