[gnome-packagekit] Ensure we remove the timeout source of the auto-closing dialogs. Fixes rh#570436

[Richard Hughes <rhughes src gnome org>]

commit ff9b8b4c52c277a8821e9e9a389d21cf42189bc0
Author: Richard Hughes <richard hughsie com>
Date:   Thu Mar 4 13:11:07 2010 +0000

    Ensure we remove the timeout source of the auto-closing dialogs. Fixes rh#570436

 src/gpk-update-viewer.c |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
index 1caaca3..b27be48 100644
--- a/src/gpk-update-viewer.c
+++ b/src/gpk-update-viewer.c
@@ -187,15 +187,13 @@ gpk_update_viewer_packages_set_sensitive (GpkUpdateViewer *update_viewer, gboole
 }
 
 /**
- * gpk_update_viewer_auto_shutdown:
+ * gpk_update_viewer_auto_shutdown_cb:
  **/
 static gboolean
-gpk_update_viewer_auto_shutdown (GtkDialog *dialog)
+gpk_update_viewer_auto_shutdown_cb (GtkDialog *dialog)
 {
-	GpkUpdateViewer *update_viewer;
-	update_viewer = GPK_UPDATE_VIEWER(g_object_get_data (G_OBJECT(dialog), "instance"));
+	egg_debug ("autoclosing dialog");
 	gtk_dialog_response (dialog, GTK_RESPONSE_CANCEL);
-	update_viewer->priv->auto_shutdown_id = 0;
 	return FALSE;
 }
 
@@ -287,11 +285,17 @@ gpk_update_viewer_check_restart (GpkUpdateViewer *update_viewer)
 
 	/* setup a callback so we autoclose */
 	g_object_set_data_full (G_OBJECT(dialog), "instance", g_object_ref (update_viewer), (GDestroyNotify) g_object_unref);
-	priv->auto_shutdown_id = g_timeout_add_seconds (GPK_UPDATE_VIEWER_AUTO_RESTART_TIMEOUT, (GSourceFunc) gpk_update_viewer_auto_shutdown, dialog);
+	priv->auto_shutdown_id = g_timeout_add_seconds (GPK_UPDATE_VIEWER_AUTO_RESTART_TIMEOUT, (GSourceFunc) gpk_update_viewer_auto_shutdown_cb, dialog);
 
 	response = gtk_dialog_run (GTK_DIALOG(dialog));
 	gtk_widget_destroy (dialog);
 
+	/* remove auto-shutdown */
+	if (priv->auto_shutdown_id != 0) {
+		g_source_remove (priv->auto_shutdown_id);
+		priv->auto_shutdown_id = 0;
+	}
+
 	/* cancel */
 	if (response != GTK_RESPONSE_OK)
 		goto out;
@@ -562,11 +566,17 @@ gpk_update_viewer_update_packages_cb (PkTask *task, GAsyncResult *res, GpkUpdate
 	gtk_window_set_icon_name (GTK_WINDOW(dialog), GPK_ICON_SOFTWARE_INSTALLER);
 
 	/* setup a callback so we autoclose */
-	priv->auto_shutdown_id = g_timeout_add_seconds (GPK_UPDATE_VIEWER_AUTO_RESTART_TIMEOUT, (GSourceFunc) gpk_update_viewer_auto_shutdown, dialog);
+	priv->auto_shutdown_id = g_timeout_add_seconds (GPK_UPDATE_VIEWER_AUTO_RESTART_TIMEOUT, (GSourceFunc) gpk_update_viewer_auto_shutdown_cb, dialog);
 
 	gtk_dialog_run (GTK_DIALOG(dialog));
 	gtk_widget_destroy (dialog);
 
+	/* remove auto-shutdown */
+	if (priv->auto_shutdown_id != 0) {
+		g_source_remove (priv->auto_shutdown_id);
+		priv->auto_shutdown_id = 0;
+	}
+
 	/* quit after we successfully updated */
 	gpk_update_viewer_quit (update_viewer);
 out:
@@ -1398,11 +1408,17 @@ gpk_update_viewer_reconsider_info (GpkUpdateViewer *update_viewer)
 		gtk_window_set_icon_name (GTK_WINDOW(dialog), GPK_ICON_SOFTWARE_INSTALLER);
 
 		/* setup a callback so we autoclose */
-		priv->auto_shutdown_id = g_timeout_add_seconds (GPK_UPDATE_VIEWER_AUTO_RESTART_TIMEOUT, (GSourceFunc) gpk_update_viewer_auto_shutdown, dialog);
+		priv->auto_shutdown_id = g_timeout_add_seconds (GPK_UPDATE_VIEWER_AUTO_RESTART_TIMEOUT, (GSourceFunc) gpk_update_viewer_auto_shutdown_cb, dialog);
 
 		gtk_dialog_run (GTK_DIALOG(dialog));
 		gtk_widget_destroy (dialog);
 
+		/* remove auto-shutdown */
+		if (priv->auto_shutdown_id != 0) {
+			g_source_remove (priv->auto_shutdown_id);
+			priv->auto_shutdown_id = 0;
+		}
+
 		/* exit the program */
 		gpk_update_viewer_quit (update_viewer);
 		goto out;
@@ -3239,6 +3255,10 @@ gpk_update_viewer_finalize (GObject *object)
 	/* we might have visual stuff running, close it down */
 	g_cancellable_cancel (priv->cancellable);
 
+	/* remove auto-shutdown */
+	if (priv->auto_shutdown_id != 0)
+		g_source_remove (priv->auto_shutdown_id);
+
 	if (priv->update_array != NULL)
 		g_ptr_array_unref (priv->update_array);
 	g_free (priv->package_id_last);