[gnome-packagekit/glib2: 44/79] Moo

[Richard Hughes <rhughes src gnome org>]

commit d06b8671b55a88a4aeee1d70574c013adb9ca5d6
Author: Richard Hughes <richard hughsie com>
Date:   Fri Sep 25 12:12:12 2009 +0100

    Moo

 src/Makefile.am        |   33 ++++++++++++++++-----------------
 src/gpk-modal-dialog.c |    6 ++++--
 src/gpk-task.c         |   18 ++++++++----------
 3 files changed, 28 insertions(+), 29 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index bb9ad32..9f22a3f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,18 +32,21 @@ INCLUDES =						\
 	-DEGG_CONSOLE="\"GPK_CONSOLE\""			\
 	$(NULL)
 
+if FALSE
+	gpk-application					
+	gpk-service-pack				
+	gpk-update-viewer				
+endif
+
 bin_PROGRAMS =						\
-	gpk-application					\
 	gpk-repo					\
 	gpk-prefs					\
-	gpk-service-pack				\
 	gpk-install-catalog				\
 	gpk-install-local-file				\
 	gpk-install-mime-type				\
 	gpk-install-provide-file			\
 	gpk-install-package-name			\
 	gpk-update-icon					\
-	gpk-update-viewer				\
 	gpk-log						\
 	gpk-backend-status				\
 	$(NULL)
@@ -179,6 +182,7 @@ gpk_update_icon_LDADD =					\
 	$(shared_LIBS)					\
 	$(NULL)
 
+if FALSE
 gpk_application_SOURCES =				\
 	gpk-application-main.c				\
 	gpk-application.c				\
@@ -191,6 +195,9 @@ gpk_application_LDADD =					\
 	libgpkshared.a					\
 	$(shared_LIBS)					\
 	$(NULL)
+endif
+
+if FALSE
 
 gpk_service_pack_SOURCES =				\
 	gpk-service-pack.c				\
@@ -204,12 +211,15 @@ gpk_service_pack_LDADD =				\
 gpk_prefs_SOURCES =					\
 	gpk-prefs.c					\
 	$(NULL)
+endif
 
 gpk_prefs_LDADD =					\
 	$(shared_LIBS)					\
 	libgpkshared.a					\
 	$(NULL)
 
+if FALSE
+
 gpk_update_viewer_SOURCES =				\
 	gpk-update-viewer.c				\
 	gpk-cell-renderer-size.c			\
@@ -226,6 +236,7 @@ gpk_update_viewer_LDADD =				\
 	libgpkshared.a					\
 	$(shared_LIBS)					\
 	$(NULL)
+endif
 
 gpk_repo_SOURCES =					\
 	gpk-repo.c					\
@@ -328,24 +339,12 @@ gpk_self_test_SOURCES =					\
 	gpk-vendor.h					\
 	gpk-desktop.c					\
 	gpk-desktop.h					\
-	gpk-helper-repo-signature.c			\
-	gpk-helper-repo-signature.h			\
-	gpk-helper-eula.c				\
-	gpk-helper-eula.h				\
+	gpk-task.c					\
+	gpk-task.h					\
 	gpk-helper-run.c				\
 	gpk-helper-run.h				\
-	gpk-helper-deps-remove.c			\
-	gpk-helper-deps-remove.h			\
-	gpk-helper-deps-install.c			\
-	gpk-helper-deps-install.h			\
-	gpk-helper-deps-update.c			\
-	gpk-helper-deps-update.h			\
-	gpk-helper-untrusted.c				\
-	gpk-helper-untrusted.h				\
 	gpk-helper-chooser.c				\
 	gpk-helper-chooser.h				\
-	gpk-helper-media-change.c			\
-	gpk-helper-media-change.h			\
 	gpk-marshal.c					\
 	gpk-marshal.h					\
 	gpk-dialog.c					\
diff --git a/src/gpk-modal-dialog.c b/src/gpk-modal-dialog.c
index 198570e..0f19522 100644
--- a/src/gpk-modal-dialog.c
+++ b/src/gpk-modal-dialog.c
@@ -902,8 +902,8 @@ gpk_modal_dialog_test (EggTest *test)
 {
 	GtkResponseType button;
 	GpkModalDialog *dialog = NULL;
-	GPtrArray *list;
-	gchar *id;
+//	GPtrArray *list;
+//	gchar *id;
 
 	if (!egg_test_start (test, "GpkModalDialog"))
 		return;
@@ -916,6 +916,7 @@ gpk_modal_dialog_test (EggTest *test)
 	else
 		egg_test_failed (test, NULL);
 
+#if 0
 	/* set some packages */
 	list = g_ptr_array_new_with_free_func_xxx ();
 	id = pk_package_id_new_from_list ("totem", "0.0.1", "i386", "fedora-newkey");
@@ -924,6 +925,7 @@ gpk_modal_dialog_test (EggTest *test)
 	gpk_modal_dialog_set_package_list (dialog, list);
 	g_free (id);
 	g_object_unref (list);
+#endif
 
 	/************************************************************/
 	egg_test_title (test, "help button");
diff --git a/src/gpk-task.c b/src/gpk-task.c
index b39c97e..b0833c9 100644
--- a/src/gpk-task.c
+++ b/src/gpk-task.c
@@ -124,7 +124,6 @@ static void
 gpk_task_untrusted_question (PkTask *task, guint request, PkResults *results)
 {
 	GtkWidget *widget;
-	gchar *text;
 	gchar *message;
 	PkRoleEnum role;
 	GpkTaskPrivate *priv = GPK_TASK(task)->priv;
@@ -134,9 +133,7 @@ gpk_task_untrusted_question (PkTask *task, guint request, PkResults *results)
 
 	/* title */
 	widget = GTK_WIDGET(gtk_builder_get_object (priv->builder_untrusted, "label_title"));
-	text = g_strdup_printf ("<b><big>%s</big></b>", _("The software is not signed by a trusted provider."));
-	gtk_label_set_label (GTK_LABEL (widget), text);
-	g_free (text);
+	gtk_widget_hide (widget);
 
 	/* message */
 	g_object_get (results, "role", &role, NULL);
@@ -174,6 +171,7 @@ gpk_task_untrusted_question (PkTask *task, guint request, PkResults *results)
 		/* this is a modal popup, so don't show a window title */
 		gtk_window_set_title (priv->current_window, "");
 	}
+	gtk_window_set_title (priv->current_window, _("The software is not signed by a trusted provider."));
 	gtk_widget_show (GTK_WIDGET(priv->current_window));
 }
 
@@ -350,7 +348,7 @@ gpk_task_simulate_question (PkTask *task, guint request, PkResults *results)
 	PkRoleEnum role;
 	guint inputs;
 	const gchar *title;
-	const gchar *message;
+	const gchar *message = NULL;
 
 	/* get data about the transaction */
 	g_object_get (results,
@@ -383,6 +381,8 @@ gpk_task_simulate_question (PkTask *task, guint request, PkResults *results)
 	} else if (role == PK_ROLE_ENUM_INSTALL_FILES) {
 		message = ngettext ("To install this file, additional software also has to be installed.",
 				    "To install these file, additional software also has to be installed.", inputs);
+	} else {
+		message = _("To process this transaction, additional software is required.");
 	}
 
 	/* save the current request */
@@ -614,7 +614,7 @@ gpk_task_test_install_packages_cb (GObject *object, GAsyncResult *res, EggTest *
 	PkItemErrorCode *error_item = NULL;
 
 	/* get the results */
-	results = pk_task_generic_finish (GPK_TASK (task), res, &error);
+	results = pk_task_generic_finish (PK_TASK(task), res, &error);
 	if (results == NULL) {
 		egg_test_failed (test, "failed to resolve: %s", error->message);
 		g_error_free (error);
@@ -640,8 +640,6 @@ gpk_task_test_install_packages_cb (GObject *object, GAsyncResult *res, EggTest *
 		egg_test_failed (test, "invalid number of packages: %i", packages->len);
 
 	g_ptr_array_unref (packages);
-
-	egg_debug ("results exit enum = %s", pk_exit_enum_to_text (exit_enum));
 out:
 	if (error_item != NULL)
 		pk_item_error_code_unref (error_item);
@@ -654,7 +652,7 @@ static void
 gpk_task_test_progress_cb (PkProgress *progress, PkProgressType type, EggTest *test)
 {
 	PkStatusEnum status;
-	if (type == GPK_PROGRESS_TYPE_STATUS) {
+	if (type == PK_PROGRESS_TYPE_STATUS) {
 		g_object_get (progress,
 			      "status", &status,
 			      NULL);
@@ -686,7 +684,7 @@ gpk_task_test (gpointer user_data)
 	/************************************************************/
 	egg_test_title (test, "install package");
 	package_ids = pk_package_ids_from_id ("vips-doc;7.12.4-2.fc8;noarch;linva");
-	pk_task_install_packages_async (GPK_TASK (task), package_ids, NULL,
+	pk_task_install_packages_async (PK_TASK(task), package_ids, NULL,
 				        (PkProgressCallback) gpk_task_test_progress_cb, test,
 				        (GAsyncReadyCallback) gpk_task_test_install_packages_cb, test);
 	g_strfreev (package_ids);