[gnome-packagekit/glib2: 15/79] moo

[Richard Hughes <rhughes src gnome org>]

commit 1ea6c530f4a81174d11faca7fc59bcd608ae07a4
Author: Richard Hughes <richard hughsie com>
Date:   Tue Sep 15 16:03:07 2009 +0100

    moo

 src/gpk-check-update.c          |   57 +++++++++++----------------------------
 src/gpk-firmware.c              |    2 +-
 src/gpk-helper-deps-remove.c    |    2 +-
 src/gpk-helper-repo-signature.c |    3 +-
 4 files changed, 19 insertions(+), 45 deletions(-)
---
diff --git a/src/gpk-check-update.c b/src/gpk-check-update.c
index 5e9ebaa..4a21105 100644
--- a/src/gpk-check-update.c
+++ b/src/gpk-check-update.c
@@ -73,8 +73,7 @@ struct GpkCheckUpdatePrivate
 	PkControl		*control;
 	GpkHelperRepoSignature	*helper_repo_signature;
 	GpkAutoRefresh		*arefresh;
-	PkClient		*client_primary;
-	PkClient		*client_secondary;
+	PkClient		*client;
 	GConfClient		*gconf_client;
 	guint			 number_updates_critical_last_shown;
 	NotifyNotification	*notification_updates_available;
@@ -346,11 +345,7 @@ gpk_check_update_update_system (GpkCheckUpdate *cupdate)
 	gboolean ret;
 	GError *error = NULL;
 
-#if PK_CHECK_VERSION(0,5,0)
-	ret = pk_client_update_system (cupdate->priv->client_primary, TRUE, &error);
-#else
-	ret = pk_client_update_system (cupdate->priv->client_primary, &error);
-#endif
+	ret = pk_client_update_system (cupdate->priv->client, &error);
 	if (!ret) {
 		/* we failed, show the icon */
 		egg_warning ("cannot update system: %s", error->message);
@@ -410,7 +405,7 @@ gpk_check_update_libnotify_cb (NotifyNotification *notification, gchar *action,
 //		gpk_error_dialog (_("Error details"), _("Package Manager error details"), cupdate->priv->error_details);
 	} else if (g_strcmp0 (action, "cancel") == 0) {
 		/* try to cancel */
-		ret = pk_client_cancel (cupdate->priv->client_primary, &error);
+		ret = pk_client_cancel (cupdate->priv->client, &error);
 		if (!ret) {
 			egg_warning ("failed to cancel client: %s", error->message);
 			g_error_free (error);
@@ -427,11 +422,7 @@ gpk_check_update_libnotify_cb (NotifyNotification *notification, gchar *action,
 
 		/* just update the important updates */
 		package_ids = pk_package_ids_from_array (cupdate->priv->important_updates_array);
-#if PK_CHECK_VERSION(0,5,0)
-		ret = pk_client_update_packages (cupdate->priv->client_primary, TRUE, package_ids, &error);
-#else
-		ret = pk_client_update_packages (cupdate->priv->client_primary, package_ids, &error);
-#endif
+		ret = pk_client_update_packages (cupdate->priv->client, package_ids, &error);
 		if (!ret) {
 			egg_warning ("Individual updates failed: %s", error->message);
 			g_error_free (error);
@@ -702,7 +693,7 @@ gpk_check_update_query_updates (GpkCheckUpdate *cupdate, gboolean policy_action)
 		goto out;
 	}
 
-	ret = pk_client_get_updates (cupdate->priv->client_primary, PK_FILTER_ENUM_NONE, &error);
+	ret = pk_client_get_updates (cupdate->priv->client, PK_FILTER_ENUM_NONE, &error);
 	if (!ret) {
 		egg_warning ("cannot get updates: %s", error->message);
 		g_error_free (error);
@@ -914,11 +905,7 @@ gpk_check_update_process_updates (GpkCheckUpdate *cupdate, GPtrArray *list, gboo
 
 		/* convert */
 		package_ids = pk_package_ids_from_array (security_array);
-#if PK_CHECK_VERSION(0,5,0)
-		ret = pk_client_update_packages (cupdate->priv->client_primary, TRUE, package_ids, &error);
-#else
-		ret = pk_client_update_packages (cupdate->priv->client_primary, package_ids, &error);
-#endif
+		ret = pk_client_update_packages (cupdate->priv->client, package_ids, &error);
 		if (!ret) {
 			egg_warning ("Individual updates failed: %s", error->message);
 			g_error_free (error);
@@ -1047,7 +1034,7 @@ gpk_check_update_auto_refresh_cache_cb (GpkAutoRefresh *arefresh, GpkCheckUpdate
 
 	g_return_if_fail (GPK_IS_CHECK_UPDATE (cupdate));
 
-	ret = pk_client_refresh_cache (cupdate->priv->client_primary, TRUE, &error);
+	ret = pk_client_refresh_cache (cupdate->priv->client, TRUE, &error);
 	if (!ret) {
 		egg_warning ("cannot refresh cache: %s", error->message);
 		g_error_free (error);
@@ -1079,7 +1066,7 @@ gpk_check_update_auto_get_upgrades_cb (GpkAutoRefresh *arefresh, GpkCheckUpdate
 	gboolean ret;
 	GError *error = NULL;
 
-	ret = pk_client_get_distro_upgrades (cupdate->priv->client_primary, &error);
+	ret = pk_client_get_distro_upgrades (cupdate->priv->client, &error);
 	if (!ret) {
 		egg_warning ("cannot get updates: %s", error->message);
 		g_error_free (error);
@@ -1237,7 +1224,7 @@ gpk_check_update_repo_signature_event_cb (GpkHelperRepoSignature *helper_repo_si
 	}
 
 	/* install signature */
-	ret = pk_client_install_signature (cupdate->priv->client_secondary, PK_SIGTYPE_ENUM_GPG, key_id, package_id, &error);
+	ret = pk_client_install_signature (cupdate->priv->client, PK_SIGTYPE_ENUM_GPG, key_id, package_id, &error);
 	if (!ret) {
 		egg_warning ("cannot install signature: %s", error->message);
 		g_error_free (error);
@@ -1274,7 +1261,7 @@ gpk_check_update_primary_requeue (GpkCheckUpdate *cupdate)
 	GError *error = NULL;
 
 	/* retry new action */
-	ret = pk_client_requeue (cupdate->priv->client_primary, &error);
+	ret = pk_client_requeue (cupdate->priv->client, &error);
 	if (!ret) {
 		egg_warning ("Failed to requeue: %s", error->message);
 		g_error_free (error);
@@ -1395,7 +1382,7 @@ gpk_check_update_finished_cb (PkClient *client, PkExitEnum exit_enum, guint runt
 	egg_debug ("role: %s, exit: %s", pk_role_enum_to_text (role), pk_exit_enum_to_text (exit_enum));
 
 	/* need to handle retry with only_trusted=FALSE */
-	if (client == cupdate->priv->client_primary &&
+	if (client == cupdate->priv->client &&
 	    exit_enum == PK_EXIT_ENUM_NEED_UNTRUSTED) {
 		egg_debug ("need to handle untrusted");
 		pk_client_set_only_trusted (client, FALSE);
@@ -1420,11 +1407,7 @@ gpk_check_update_finished_cb (PkClient *client, PkExitEnum exit_enum, guint runt
 	/* get-upgrades */
 	if (role == PK_ROLE_ENUM_GET_DISTRO_UPGRADES &&
 	    exit_enum == PK_EXIT_ENUM_SUCCESS) {
-#if PK_CHECK_VERSION(0,5,0)
 		array = pk_client_get_distro_upgrade_list (client);
-#else
-		array = pk_client_get_cached_objects (client); /* removed in 0.5.x */
-#endif
 		gpk_check_update_process_distro_upgrades (cupdate, array);
 		g_object_unref (array);
 	}
@@ -1505,21 +1488,14 @@ gpk_check_update_init (GpkCheckUpdate *cupdate)
 			  G_CALLBACK (gpk_cupdate_connection_changed_cb), cupdate);
 
 	/* use an asynchronous query object */
-	cupdate->priv->client_primary = pk_client_new ();
-	g_signal_connect (cupdate->priv->client_primary, "finished",
+	cupdate->priv->client = pk_client_new ();
+	g_signal_connect (cupdate->priv->client, "finished",
 			  G_CALLBACK (gpk_check_update_finished_cb), cupdate);
-	g_signal_connect (cupdate->priv->client_primary, "error-code",
+	g_signal_connect (cupdate->priv->client, "error-code",
 			  G_CALLBACK (gpk_check_update_error_code_cb), cupdate);
-	g_signal_connect (cupdate->priv->client_primary, "repo-signature-required",
+	g_signal_connect (cupdate->priv->client, "repo-signature-required",
 			  G_CALLBACK (gpk_check_update_repo_signature_required_cb), cupdate);
 
-	/* this is for the auth callback */
-	cupdate->priv->client_secondary = pk_client_new ();
-	g_signal_connect (cupdate->priv->client_secondary, "error-code",
-			  G_CALLBACK (gpk_check_update_error_code_cb), cupdate);
-	g_signal_connect (cupdate->priv->client_secondary, "finished",
-			  G_CALLBACK (gpk_check_update_finished_cb), cupdate);
-
 	/* helpers */
 	cupdate->priv->helper_repo_signature = gpk_helper_repo_signature_new ();
 	g_signal_connect (cupdate->priv->helper_repo_signature, "event", G_CALLBACK (gpk_check_update_repo_signature_event_cb), cupdate);
@@ -1571,8 +1547,7 @@ gpk_check_update_finalize (GObject *object)
 	g_object_unref (cupdate->priv->arefresh);
 	g_object_unref (cupdate->priv->gconf_client);
 	g_object_unref (cupdate->priv->control);
-	g_object_unref (cupdate->priv->client_primary);
-	g_object_unref (cupdate->priv->client_secondary);
+	g_object_unref (cupdate->priv->client);
 	g_object_unref (cupdate->priv->dbus_monitor_viewer);
 	g_object_unref (cupdate->priv->helper_repo_signature);
 	if (cupdate->priv->important_updates_array != NULL) {
diff --git a/src/gpk-firmware.c b/src/gpk-firmware.c
index 7bbe711..9e4b72b 100644
--- a/src/gpk-firmware.c
+++ b/src/gpk-firmware.c
@@ -342,7 +342,7 @@ gpk_firmware_check_available (GpkFirmware *firmware, const gchar *filename)
 
 	/* search for newest not installed package */
 	filter = pk_bitfield_from_enums (PK_FILTER_ENUM_NOT_INSTALLED, PK_FILTER_ENUM_NEWEST, -1);
-	ret = pk_client_search_file_sync (firmware->priv->client, filter, filename, &error);
+	ret = pk_client_search_file (firmware->priv->client, filter, filename, &error);
 	if (!ret) {
 		egg_warning ("failed to search file %s: %s", filename, error->message);
 		g_error_free (error);
diff --git a/src/gpk-helper-deps-remove.c b/src/gpk-helper-deps-remove.c
index 95a642d..433e211 100644
--- a/src/gpk-helper-deps-remove.c
+++ b/src/gpk-helper-deps-remove.c
@@ -81,7 +81,7 @@ gpk_helper_deps_remove_show (GpkHelperDepsRemove *helper, GPtrArray *packages, G
 	/* TRANSLATORS: message: describe in detail why it must happen */
 	message = g_strdup_printf (ngettext ("To remove %s other packages that depend on it must also be removed.",
 					     "To remove %s other packages that depend on them must also be removed.",
-					     PK_OBJ_LIST(packages)->len), name);
+					     packages->len), name);
 
 	dialog = gtk_message_dialog_new (helper->priv->window, GTK_DIALOG_DESTROY_WITH_PARENT,
 					 GTK_MESSAGE_INFO, GTK_BUTTONS_CANCEL, "%s", title);
diff --git a/src/gpk-helper-repo-signature.c b/src/gpk-helper-repo-signature.c
index aaf362d..9aab365 100644
--- a/src/gpk-helper-repo-signature.c
+++ b/src/gpk-helper-repo-signature.c
@@ -117,8 +117,7 @@ gpk_helper_repo_signature_show (GpkHelperRepoSignature *helper, const gchar *pac
 	widget = GTK_WIDGET (gtk_builder_get_object (helper->priv->builder, "label_id"));
 	gtk_label_set_label (GTK_LABEL (widget), key_id);
 
-	/* TODO: pass this as a struct from the PkClient signal */
-	text = gpk_package_id_name_version (package_id);
+	text = pk_package_id_to_printable (package_id);
 
 	widget = GTK_WIDGET (gtk_builder_get_object (helper->priv->builder, "label_package"));
 	gtk_label_set_label (GTK_LABEL (widget), text);