[gnome-packagekit] Remove support for SimulateX roles as these are no longer present in PackageKit

[Richard Hughes <rhughes src gnome org>]

commit 05a71f7b4dfb2997fe0772f7e141ee0b7cc89ef6
Author: Richard Hughes <richard hughsie com>
Date:   Wed Jun 6 13:57:34 2012 +0100

    Remove support for SimulateX roles as these are no longer present in PackageKit

 src/gpk-enum.c          |   45 ---------------------------------------------
 src/gpk-task.c          |   12 +++++++-----
 src/gpk-update-viewer.c |    2 +-
 3 files changed, 8 insertions(+), 51 deletions(-)
---
diff --git a/src/gpk-enum.c b/src/gpk-enum.c
index cde5156..ccd878a 100644
--- a/src/gpk-enum.c
+++ b/src/gpk-enum.c
@@ -171,12 +171,7 @@ static const PkEnumMatch enum_role_icon_name[] = {
 	{PK_ROLE_ENUM_UPDATE_PACKAGES,		"pk-package-update"},
 	{PK_ROLE_ENUM_UPDATE_SYSTEM,		"system-software-update"},
 	{PK_ROLE_ENUM_WHAT_PROVIDES,		"pk-package-search"},
-	{PK_ROLE_ENUM_SIMULATE_INSTALL_FILES,	"pk-package-add"},
-	{PK_ROLE_ENUM_SIMULATE_INSTALL_PACKAGES, "pk-package-add"},
-	{PK_ROLE_ENUM_SIMULATE_REMOVE_PACKAGES,	"pk-package-delete"},
-	{PK_ROLE_ENUM_SIMULATE_UPDATE_PACKAGES,	"pk-package-update"},
 	{PK_ROLE_ENUM_UPGRADE_SYSTEM,		"system-software-update"},
-	{PK_ROLE_ENUM_SIMULATE_REPAIR_SYSTEM,	"system-software-update"},
 	{PK_ROLE_ENUM_REPAIR_SYSTEM,		"system-software-update"},
 	{0, NULL}
 };
@@ -1393,30 +1388,10 @@ gpk_role_enum_to_localised_present (PkRoleEnum role)
 		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Getting old transactions");
 		break;
-	case PK_ROLE_ENUM_SIMULATE_INSTALL_FILES:
-		/* TRANSLATORS: The role of the transaction, in present tense */
-		text = _("Simulating the install of files");
-		break;
-	case PK_ROLE_ENUM_SIMULATE_INSTALL_PACKAGES:
-		/* TRANSLATORS: The role of the transaction, in present tense */
-		text = _("Simulating the install");
-		break;
-	case PK_ROLE_ENUM_SIMULATE_REMOVE_PACKAGES:
-		/* TRANSLATORS: The role of the transaction, in present tense */
-		text = _("Simulating the remove");
-		break;
-	case PK_ROLE_ENUM_SIMULATE_UPDATE_PACKAGES:
-		/* TRANSLATORS: The role of the transaction, in present tense */
-		text = _("Simulating the update");
-		break;
 	case PK_ROLE_ENUM_UPGRADE_SYSTEM:
 		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Upgrading system");
 		break;
-	case PK_ROLE_ENUM_SIMULATE_REPAIR_SYSTEM:
-		/* TRANSLATORS: The role of the transaction, in present tense */
-		text = _("Simulating the system repair");
-		break;
 	case PK_ROLE_ENUM_REPAIR_SYSTEM:
 		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Repairing the system");
@@ -1557,30 +1532,10 @@ gpk_role_enum_to_localised_past (PkRoleEnum role)
 		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Got old transactions");
 		break;
-	case PK_ROLE_ENUM_SIMULATE_INSTALL_FILES:
-		/* TRANSLATORS: The role of the transaction, in past tense */
-		text = _("Simulated the install of files");
-		break;
-	case PK_ROLE_ENUM_SIMULATE_INSTALL_PACKAGES:
-		/* TRANSLATORS: The role of the transaction, in past tense */
-		text = _("Simulated the install");
-		break;
-	case PK_ROLE_ENUM_SIMULATE_REMOVE_PACKAGES:
-		/* TRANSLATORS: The role of the transaction, in past tense */
-		text = _("Simulated the remove");
-		break;
-	case PK_ROLE_ENUM_SIMULATE_UPDATE_PACKAGES:
-		/* TRANSLATORS: The role of the transaction, in past tense */
-		text = _("Simulated the update");
-		break;
 	case PK_ROLE_ENUM_UPGRADE_SYSTEM:
 		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Upgraded system");
 		break;
-	case PK_ROLE_ENUM_SIMULATE_REPAIR_SYSTEM:
-		/* TRANSLATORS: The role of the transaction, in past tense */
-		text = _("Simulated the system repair");
-		break;
 	case PK_ROLE_ENUM_REPAIR_SYSTEM:
 		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Repaired the system");
diff --git a/src/gpk-task.c b/src/gpk-task.c
index 4188ac1..830df14 100644
--- a/src/gpk-task.c
+++ b/src/gpk-task.c
@@ -470,6 +470,7 @@ gpk_task_simulate_question (PkTask *task, guint request, PkResults *results)
 	const gchar *title;
 	const gchar *message = NULL;
 	GtkNotebook *tabbed_widget = NULL;
+	PkBitfield transaction_flags = 0;
 
 	/* save the current request */
 	priv->request = request;
@@ -478,10 +479,11 @@ gpk_task_simulate_question (PkTask *task, guint request, PkResults *results)
 	g_object_get (results,
 		      "role", &role,
 		      "inputs", &inputs,
+		      "transaction-flags", &transaction_flags,
 		      NULL);
 
 	/* allow skipping of deps except when we remove other packages */
-	if (role != PK_ROLE_ENUM_SIMULATE_REMOVE_PACKAGES) {
+	if (role != PK_ROLE_ENUM_REMOVE_PACKAGES) {
 		/* have we previously said we don't want to be shown the confirmation */
 		ret = g_settings_get_boolean (priv->settings, GPK_SETTINGS_SHOW_DEPENDS);
 		if (!ret) {
@@ -495,22 +497,22 @@ gpk_task_simulate_question (PkTask *task, guint request, PkResults *results)
 	title = _("Additional confirmation required");
 
 	/* per-role messages */
-	if (role == PK_ROLE_ENUM_SIMULATE_INSTALL_PACKAGES) {
+	if (role == PK_ROLE_ENUM_INSTALL_PACKAGES) {
 
 		/* TRANSLATORS: message text of a dependency dialog */
 		message = ngettext ("To install this package, additional software also has to be modified.",
 				    "To install these packages, additional software also has to be modified.", inputs);
-	} else if (role == PK_ROLE_ENUM_SIMULATE_REMOVE_PACKAGES) {
+	} else if (role == PK_ROLE_ENUM_REMOVE_PACKAGES) {
 
 		/* TRANSLATORS: message text of a dependency dialog */
 		message = ngettext ("To remove this package, additional software also has to be modified.",
 				    "To remove these packages, additional software also has to be modified.", inputs);
-	} else if (role == PK_ROLE_ENUM_SIMULATE_UPDATE_PACKAGES) {
+	} else if (role == PK_ROLE_ENUM_UPDATE_PACKAGES) {
 
 		/* TRANSLATORS: message text of a dependency dialog */
 		message = ngettext ("To update this package, additional software also has to be modified.",
 				    "To update these packages, additional software also has to be modified.", inputs);
-	} else if (role == PK_ROLE_ENUM_SIMULATE_INSTALL_FILES) {
+	} else if (role == PK_ROLE_ENUM_INSTALL_FILES) {
 
 		/* TRANSLATORS: message text of a dependency dialog */
 		message = ngettext ("To install this file, additional software also has to be modified.",
diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
index 4fecab5..765acc2 100644
--- a/src/gpk-update-viewer.c
+++ b/src/gpk-update-viewer.c
@@ -936,7 +936,7 @@ gpk_update_viewer_progress_cb (PkProgress *progress,
 		gtk_tree_model_get_iter (model, &iter, path);
 
 		/* if we are adding deps, then select the checkbox */
-		if (role == PK_ROLE_ENUM_SIMULATE_UPDATE_PACKAGES) {
+		if (role == PK_ROLE_ENUM_UPDATE_PACKAGES) {
 			gtk_tree_store_set (array_store_updates, &iter,
 					    GPK_UPDATES_COLUMN_SELECT, TRUE,
 					    -1);