GNOME.org
 

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

commit 5d584907bb9c41f592d7b28f6bdee29734eb3940
Author: Richard Hughes <richard hughsie com>
Date:   Fri Sep 11 16:26:39 2009 +0100

    moo

 src/Makefile.am         |   11 ++++++++++-
 src/gpk-application.c   |   14 +++++++-------
 src/gpk-check-update.c  |    4 ++--
 src/gpk-dbus-task.c     |   20 ++++++++++----------
 src/gpk-firmware.c      |    2 +-
 src/gpk-hardware.c      |    2 +-
 src/gpk-modal-dialog.c  |    4 ++--
 src/gpk-service-pack.c  |   36 ++++++++++++++++++------------------
 src/gpk-update-viewer.c |    6 +++---
 9 files changed, 54 insertions(+), 45 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 208e320..f1f5952 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -206,11 +206,20 @@ gpk_application_LDADD =					\
 
 gpk_service_pack_SOURCES =				\
 	gpk-service-pack.c				\
+	egg-debug.c					\
+	egg-debug.h					\
+	gpk-enum.h					\
+	gpk-enum.c					\
+	gpk-common.h					\
+	gpk-common.c					\
+	gpk-gnome.h					\
+	gpk-gnome.c					\
+	gpk-animated-icon.c				\
+	gpk-animated-icon.h				\
 	$(NULL)
 
 gpk_service_pack_LDADD =				\
 	libgpkshared.a					\
-	$(shared_LIBS)					\
 	$(NULL)
 
 gpk_prefs_SOURCES =					\
diff --git a/src/gpk-application.c b/src/gpk-application.c
index 5c8acd8..3286ced 100644
--- a/src/gpk-application.c
+++ b/src/gpk-application.c
@@ -1339,7 +1339,7 @@ gpk_application_run_installed (GpkApplication *application)
 
 	/* get the package list and filter on INSTALLED */
 	array = g_ptr_array_new ();
-	list = pk_client_get_package_list (application->priv->client_primary);
+	list = pk_results_get_package_array (application->priv->client_primary);
 	len = PK_OBJ_LIST (list)->len;
 	for (i=0; i<len; i++) {
 		obj = g_ptr_array_index (list, i);
@@ -1428,7 +1428,7 @@ gpk_application_finished_cb (PkClient *client, PkExitEnum exit_enum, guint runti
 	/* simulating */
 	if (role == PK_ROLE_ENUM_SIMULATE_INSTALL_PACKAGES &&
 	    exit_enum == PK_EXIT_ENUM_SUCCESS) {
-		list = pk_client_get_package_list (application->priv->client_primary);
+		list = pk_results_get_package_array (application->priv->client_primary);
 		gpk_helper_deps_install_show (application->priv->helper_deps_install, application->priv->package_list, list);
 		g_object_unref (list);
 	}
@@ -1436,7 +1436,7 @@ gpk_application_finished_cb (PkClient *client, PkExitEnum exit_enum, guint runti
 	/* get reqs */
 	if (role == PK_ROLE_ENUM_SIMULATE_REMOVE_PACKAGES &&
 	    exit_enum == PK_EXIT_ENUM_SUCCESS) {
-		list = pk_client_get_package_list (application->priv->client_primary);
+		list = pk_results_get_package_array (application->priv->client_primary);
 		gpk_helper_deps_remove_show (application->priv->helper_deps_remove, application->priv->package_list, list);
 		g_object_unref (list);
 	}
@@ -1444,7 +1444,7 @@ gpk_application_finished_cb (PkClient *client, PkExitEnum exit_enum, guint runti
 	/* get deps */
 	if (role == PK_ROLE_ENUM_GET_DEPENDS &&
 	    exit_enum == PK_EXIT_ENUM_SUCCESS) {
-		list = pk_client_get_package_list (application->priv->client_primary);
+		list = pk_results_get_package_array (application->priv->client_primary);
 		gpk_application_finished_get_depends (application, list);
 		g_object_unref (list);
 	}
@@ -1452,7 +1452,7 @@ gpk_application_finished_cb (PkClient *client, PkExitEnum exit_enum, guint runti
 	/* get reqs */
 	if (role == PK_ROLE_ENUM_GET_REQUIRES &&
 	    exit_enum == PK_EXIT_ENUM_SUCCESS) {
-		list = pk_client_get_package_list (application->priv->client_primary);
+		list = pk_results_get_package_array (application->priv->client_primary);
 		gpk_application_finished_get_requires (application, list);
 		g_object_unref (list);
 	}
@@ -1460,7 +1460,7 @@ gpk_application_finished_cb (PkClient *client, PkExitEnum exit_enum, guint runti
 	/* get deps */
 	if (role == PK_ROLE_ENUM_GET_DEPENDS &&
 	    exit_enum == PK_EXIT_ENUM_SUCCESS) {
-		list = pk_client_get_package_list (application->priv->client_primary);
+		list = pk_results_get_package_array (application->priv->client_primary);
 		if (application->priv->dep_check_info_only)
 			gpk_application_finished_get_depends (application, list);
 		else
@@ -1471,7 +1471,7 @@ gpk_application_finished_cb (PkClient *client, PkExitEnum exit_enum, guint runti
 	/* get reqs */
 	if (role == PK_ROLE_ENUM_GET_REQUIRES &&
 	    exit_enum == PK_EXIT_ENUM_SUCCESS) {
-		list = pk_client_get_package_list (application->priv->client_primary);
+		list = pk_results_get_package_array (application->priv->client_primary);
 		if (application->priv->dep_check_info_only)
 			gpk_application_finished_get_requires (application, list);
 		else
diff --git a/src/gpk-check-update.c b/src/gpk-check-update.c
index 8698174..5e9ebaa 100644
--- a/src/gpk-check-update.c
+++ b/src/gpk-check-update.c
@@ -1300,7 +1300,7 @@ gpk_check_update_finished_notify (GpkCheckUpdate *cupdate, PkClient *client)
 	const gchar *message;
 
 	/* check we got some packages */
-	list = pk_client_get_package_list (client);
+	list = pk_results_get_package_array (client);
 	egg_debug ("length=%i", list->len);
 	if (list->len == 0) {
 		egg_debug ("no updates");
@@ -1412,7 +1412,7 @@ gpk_check_update_finished_cb (PkClient *client, PkExitEnum exit_enum, guint runt
 	/* get-updates */
 	if (role == PK_ROLE_ENUM_GET_UPDATES &&
 	    exit_enum == PK_EXIT_ENUM_SUCCESS) {
-		list = pk_client_get_package_list (client);
+		list = pk_results_get_package_array (client);
 		gpk_check_update_process_updates (cupdate, list, TRUE);
 		g_object_unref (list);
 	}
diff --git a/src/gpk-dbus-task.c b/src/gpk-dbus-task.c
index 373e28d..ab52da8 100644
--- a/src/gpk-dbus-task.c
+++ b/src/gpk-dbus-task.c
@@ -702,7 +702,7 @@ gpk_dbus_task_finished_cb (PkClient *client, PkExitEnum exit_enum, guint runtime
 	    role == PK_ROLE_ENUM_WHAT_PROVIDES) {
 
 		/* found nothing? */
-		list = pk_client_get_package_list (task->priv->client_primary);
+		list = pk_results_get_package_array (task->priv->client_primary);
 		if (list->len == 0) {
 			if (task->priv->show_warning) {
 				info_url = gpk_vendor_get_not_found_url (task->priv->vendor, GPK_VENDOR_URL_TYPE_MIME);
@@ -738,7 +738,7 @@ gpk_dbus_task_finished_cb (PkClient *client, PkExitEnum exit_enum, guint runtime
 	if (task->priv->role == GPK_DBUS_TASK_ROLE_INSTALL_PROVIDE_FILES &&
 	    role == PK_ROLE_ENUM_SEARCH_FILE) {
 		/* found nothing? */
-		list = pk_client_get_package_list (task->priv->client_primary);
+		list = pk_results_get_package_array (task->priv->client_primary);
 		if (list->len == 0) {
 			if (task->priv->show_warning) {
 				info_url = gpk_vendor_get_not_found_url (task->priv->vendor, GPK_VENDOR_URL_TYPE_DEFAULT);
@@ -813,7 +813,7 @@ gpk_dbus_task_finished_cb (PkClient *client, PkExitEnum exit_enum, guint runtime
 		GPtrArray *new;
 
 		/* these are the new packages */
-		list = pk_client_get_package_list (task->priv->client_primary);
+		list = pk_results_get_package_array (task->priv->client_primary);
 		new = g_ptr_array_new_with_free_func_xxx ();
 		for (i=0; i<list->len; i++) {
 			obj = g_ptr_array_index (list, i);
@@ -892,7 +892,7 @@ skip_checks:
 
 		/* show summary? */
 		if (task->priv->show_finished) {
-			list = pk_client_get_package_list (client);
+			list = pk_results_get_package_array (client);
 			/* TRANSLATORS: list the packages we just installed */
 			gpk_modal_dialog_setup (task->priv->dialog, GPK_MODAL_DIALOG_PAGE_FINISHED, GPK_MODAL_DIALOG_PACKAGE_LIST);
 			gpk_modal_dialog_set_message (task->priv->dialog, _("The following packages were installed:"));
@@ -920,7 +920,7 @@ skip_checks:
 
 	/* IsInstalled */
 	if (task->priv->role == GPK_DBUS_TASK_ROLE_IS_INSTALLED) {
-		list = pk_client_get_package_list (task->priv->client_primary);
+		list = pk_results_get_package_array (task->priv->client_primary);
 
 		/* one or more entry? */
 		ret = (PK_OBJ_LIST(list)->len > 0);
@@ -931,7 +931,7 @@ skip_checks:
 
 	/* SearchFile */
 	if (task->priv->role == GPK_DBUS_TASK_ROLE_SEARCH_FILE) {
-		list = pk_client_get_package_list (task->priv->client_primary);
+		list = pk_results_get_package_array (task->priv->client_primary);
 
 		/* one or more entry? */
 		len = PK_OBJ_LIST(list)->len;
@@ -947,7 +947,7 @@ skip_checks:
 	    role == PK_ROLE_ENUM_RESOLVE) {
 
 		/* found nothing? */
-		list = pk_client_get_package_list (task->priv->client_primary);
+		list = pk_results_get_package_array (task->priv->client_primary);
 		if (list->len == 0) {
 			if (task->priv->show_warning) {
 				//FIXME: shows package_id in UI
@@ -2291,7 +2291,7 @@ gpk_dbus_task_install_gstreamer_codec_part (GpkDbusTask *task, const gchar *code
 	if (!ret)
 		return NULL;
 
-	list = pk_client_get_package_list (task->priv->client_primary);
+	list = pk_results_get_package_array (task->priv->client_primary);
 
 	/* found nothing? */
 	if (list->len == 0) {
@@ -2889,7 +2889,7 @@ skip_checks:
 		}
 
 		/* add to main list */
-		list_tmp = pk_client_get_package_list (task->priv->client_primary);
+		list_tmp = pk_results_get_package_array (task->priv->client_primary);
 		g_ptr_array_add_list (PK_OBJ_LIST (list), PK_OBJ_LIST (list_tmp));
 		g_object_unref (list_tmp);
 	}
@@ -3125,7 +3125,7 @@ gpk_dbus_task_get_package_for_exec (GpkDbusTask *task, const gchar *exec)
 	}
 
 	/* get the list of packages */
-	list = pk_client_get_package_list (task->priv->client_primary);
+	list = pk_results_get_package_array (task->priv->client_primary);
 
 	/* nothing found */
 	if (list->len == 0) {
diff --git a/src/gpk-firmware.c b/src/gpk-firmware.c
index 270f74b..efbe515 100644
--- a/src/gpk-firmware.c
+++ b/src/gpk-firmware.c
@@ -354,7 +354,7 @@ gpk_firmware_check_available (GpkFirmware *firmware, const gchar *filename)
 	}
 
 	/* make sure we have one package */
-	list = pk_client_get_package_list (firmware->priv->client_primary);
+	list = pk_results_get_package_array (firmware->priv->client_primary);
 	if (list->len == 0)
 		egg_debug ("no package providing %s found", filename);
 	else if (list->len != 1)
diff --git a/src/gpk-hardware.c b/src/gpk-hardware.c
index 65b873a..3d9d640 100644
--- a/src/gpk-hardware.c
+++ b/src/gpk-hardware.c
@@ -139,7 +139,7 @@ gpk_hardware_check_for_driver_available (GpkHardware *hardware, const gchar *udi
 	}
 
 	/* If there are no driver packages available just return */
-	list = pk_client_get_package_list (client);
+	list = pk_results_get_package_array (client);
 	if (list->len == 0) {
 		egg_debug ("no drivers available");
 		goto out;
diff --git a/src/gpk-modal-dialog.c b/src/gpk-modal-dialog.c
index 2351a7d..198570e 100644
--- a/src/gpk-modal-dialog.c
+++ b/src/gpk-modal-dialog.c
@@ -655,8 +655,8 @@ gpk_modal_dialog_set_package_list (GpkModalDialog *dialog, const GPtrArray *list
 		item = g_ptr_array_index (list, i);
 
 		/* not installed, so ignore icon */
-		if (item->info_enum == PK_INFO_ENUM_DOWNLOADING ||
-		    item->info_enum == PK_INFO_ENUM_CLEANUP)
+		if (item->info == PK_INFO_ENUM_DOWNLOADING ||
+		    item->info == PK_INFO_ENUM_CLEANUP)
 			continue;
 
 		text = gpk_package_id_format_twoline (item->package_id, item->summary);
diff --git a/src/gpk-service-pack.c b/src/gpk-service-pack.c
index a0929b6..db4f0ed 100644
--- a/src/gpk-service-pack.c
+++ b/src/gpk-service-pack.c
@@ -21,15 +21,15 @@
 
 #include "config.h"
 
-#include <glib.h>
+//#include <glib.h>
 #include <glib/gi18n.h>
 #include <locale.h>
 
 #include <gtk/gtk.h>
-#include <math.h>
-#include <string.h>
+//#include <math.h>
+//#include <string.h>
 #include <sys/utsname.h>
-#include <dbus/dbus-glib.h>
+//#include <dbus/dbus-glib.h>
 #include <gconf/gconf-client.h>
 #include <packagekit-glib2/packagekit.h>
 #include <unique/unique.h>
@@ -134,6 +134,7 @@ gpk_pack_widgets_activate (gboolean enable)
 	gtk_widget_set_sensitive (widget, enable);
 }
 
+#if 0
 /**
  * gpk_pack_package_cb:
  **/
@@ -149,6 +150,7 @@ gpk_pack_package_cb (PkServicePack *pack, const PkItemPackage *obj, gpointer dat
 	gtk_progress_bar_set_text (progress_bar, text);
 	g_free (text);
 }
+#endif
 
 /**
  * gpk_pack_percentage_pulse_cb:
@@ -188,6 +190,7 @@ gpk_pack_set_percentage (guint percentage)
 	gtk_progress_bar_set_fraction (progress_bar, percentage / 100.0f);
 }
 
+#if 0
 /**
  * gpk_pack_percentage_cb:
  **/
@@ -206,6 +209,7 @@ gpk_pack_progress_changed_cb (PkClient *_client, guint percentage, guint subperc
 {
 	gpk_pack_set_percentage (percentage);
 }
+#endif
 
 /**
  * gpk_pack_resolve_package_id:
@@ -222,7 +226,7 @@ gpk_pack_resolve_package_id (const gchar *package)
 
 	/* get package list */
 	packages = g_strsplit (package, ";", 0);
-	ret = pk_client_resolve (client, pk_bitfield_value (PK_FILTER_ENUM_NEWEST), packages, &error);
+	ret = pk_client_resolve_async (client, pk_bitfield_value (PK_FILTER_ENUM_NEWEST), packages, &error);
 	if (!ret) {
 		egg_warning ("failed to resolve: %s", error->message);
 		g_error_free (error);
@@ -230,7 +234,7 @@ gpk_pack_resolve_package_id (const gchar *package)
 	}
 
 	/* get the deps */
-	list = pk_client_get_package_list (client);
+	list = pk_results_get_package_array (client);
 
 	/* no matches */
 	if (list->len == 0)
@@ -315,7 +319,7 @@ gpk_pack_copy_package_lists (const gchar *filename, GError **error)
 	GError *error_local = NULL;
 
 	/* get package list */
-	ret = pk_client_get_packages (client, pk_bitfield_value (PK_FILTER_ENUM_INSTALLED), &error_local);
+	ret = pk_client_get_packages_async (client, pk_bitfield_value (PK_FILTER_ENUM_INSTALLED), &error_local);
 	if (!ret) {
 		/* TRANSLATORS: cannot get package list */
 		*error = g_error_new (1, 0, _("Could not get list of installed packages: %s"), error_local->message);
@@ -324,10 +328,10 @@ gpk_pack_copy_package_lists (const gchar *filename, GError **error)
 	}
 
 	/* get the deps */
-	list = pk_client_get_package_list (client);
+	list = pk_results_get_package_array (client);
 
 	/* write new file : FIXME: return a GError */
-	ret = pk_obj_list_to_file (PK_OBJ_LIST(list), filename);
+	ret = pk_obj_list_to_file (list, filename);
 	if (!ret) {
 		/* TRANSLATORS: we could not write to the destination directory for some reason */
 		*error = g_error_new (1, 0, _("Could not write package list"));
@@ -421,7 +425,7 @@ gpk_pack_button_create_cb (GtkWidget *widget2, gpointer data)
 		gtk_progress_bar_set_text (progress_bar, _("Refreshing system package list"));
 
 		/* refresh package list */
-		ret = pk_client_refresh_cache (client, TRUE, &error);
+		ret = pk_client_refresh_cache_async (client, TRUE, &error);
 		if (!ret) {
 			widget = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_pack"));
 			/* TRANSLATORS: we could not reset internal state */
@@ -433,7 +437,7 @@ gpk_pack_button_create_cb (GtkWidget *widget2, gpointer data)
 
 	/* add the exclude list */
 	list = g_ptr_array_new_with_free_func_xxx ();
-	ret = pk_obj_list_from_file (PK_OBJ_LIST(list), exclude);
+	ret = pk_obj_list_from_file (list, exclude);
 	if (!ret) {
 		widget = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_pack"));
 		/* TRANSLATORS: we could not read the file list for the destination computer */
@@ -445,14 +449,12 @@ gpk_pack_button_create_cb (GtkWidget *widget2, gpointer data)
 	pack = pk_service_pack_new ();
 	g_signal_connect (pack, "package", G_CALLBACK (gpk_pack_package_cb), pack);
 	g_signal_connect (pack, "percentage", G_CALLBACK (gpk_pack_percentage_cb), pack);
-	pk_service_pack_set_filename (pack, filename);
 	pk_service_pack_set_temp_directory (pack, NULL);
-	pk_service_pack_set_exclude_list (pack, list);
 
 	if (action == GPK_ACTION_ENUM_UPDATES)
-		ret = pk_service_pack_create_for_updates (pack, &error);
+		ret = pk_service_pack_create_for_updates_async (pack, filename, list, &error);
 	else if (action == GPK_ACTION_ENUM_PACKAGE)
-		ret = pk_service_pack_create_for_package_ids (pack, package_ids, &error);
+		ret = pk_service_pack_create_for_package_ids_async (pack, filename, package_ids, list, &error);
 	if (!ret) {
 		widget = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_pack"));
 		/* TRANSLATORS: we could not create the pack file, generic error */
@@ -586,7 +588,6 @@ main (int argc, char *argv[])
 
 	if (! g_thread_supported ())
 		g_thread_init (NULL);
-	dbus_g_thread_init ();
 	g_type_init ();
 
 	context = g_option_context_new (NULL);
@@ -610,12 +611,11 @@ main (int argc, char *argv[])
 			  G_CALLBACK (gpk_pack_message_received_cb), NULL);
 
 	client = pk_client_new ();
-	g_signal_connect (client, "progress-changed", G_CALLBACK (gpk_pack_progress_changed_cb), NULL);
 
 	/* get UI */
 	builder = gtk_builder_new ();
 	retval = gtk_builder_add_from_file (builder, GPK_DATA "/gpk-service-pack.ui", &error);
-	if (error != NULL) {
+	if (retval == 0) {
 		egg_warning ("failed to load ui: %s", error->message);
 		g_error_free (error);
 		goto out_build;
diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
index b4e9095..e1b4730 100644
--- a/src/gpk-update-viewer.c
+++ b/src/gpk-update-viewer.c
@@ -1770,7 +1770,7 @@ gpk_update_viewer_finished_cb (PkClient *client, PkExitEnum exit, guint runtime,
 	if (exit == PK_EXIT_ENUM_SUCCESS && role == PK_ROLE_ENUM_GET_DEPENDS) {
 #endif
 		/* show deps dialog */
-		list = pk_client_get_package_list (client);
+		list = pk_results_get_package_array (client);
 		gpk_helper_deps_update_show (helper_deps_update, list);
 		g_object_unref (list);
 	}
@@ -1779,7 +1779,7 @@ gpk_update_viewer_finished_cb (PkClient *client, PkExitEnum exit, guint runtime,
 		/* get the download sizes */
 		if (update_list != NULL)
 			g_object_unref (update_list);
-		update_list = pk_client_get_package_list (client_primary);
+		update_list = pk_results_get_package_array (client_primary);
 
 		/* sort by name */
 		gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model), GPK_UPDATES_COLUMN_ID, GTK_SORT_ASCENDING);
@@ -1854,7 +1854,7 @@ gpk_update_viewer_finished_cb (PkClient *client, PkExitEnum exit, guint runtime,
 			restart_update = restart;
 
 		/* check blocked */
-		list = pk_client_get_package_list (client_primary);
+		list = pk_results_get_package_array (client_primary);
 		gpk_update_viewer_check_blocked_packages (list);
 		g_object_unref (list);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]