GNOME.org
 

[gnome-packagekit/glib2] moo

commit 18306bc5b356a1b008c28b1d999d60bbb61717ff
Author: Richard Hughes <richard hughsie com>
Date:   Tue Oct 6 11:23:20 2009 +0100

    moo

 src/gpk-animated-icon.c         |    3 ---
 src/gpk-application.c           |   32 +++++++++++++++-----------------
 src/gpk-cell-renderer-info.c    |    3 ---
 src/gpk-cell-renderer-restart.c |    5 -----
 src/gpk-cell-renderer-size.c    |    3 ---
 src/gpk-check-update.c          |    3 +--
 src/gpk-dbus-task.c             |   24 ++++++++++++------------
 src/gpk-dialog.c                |    2 --
 src/gpk-error.c                 |    2 +-
 src/gpk-helper-chooser.c        |    2 +-
 src/gpk-helper-run.c            |    2 +-
 src/gpk-log.c                   |    2 +-
 src/gpk-modal-dialog.c          |    2 +-
 src/gpk-prefs.c                 |    4 +---
 src/gpk-task.c                  |    6 +++---
 src/gpk-update-viewer.c         |   10 +++++-----
 src/gpk-watch.c                 |   13 ++++---------
 17 files changed, 46 insertions(+), 72 deletions(-)
---
diff --git a/src/gpk-animated-icon.c b/src/gpk-animated-icon.c
index 90c8468..c8556c7 100644
--- a/src/gpk-animated-icon.c
+++ b/src/gpk-animated-icon.c
@@ -266,12 +266,9 @@ gpk_animated_icon_destroy (GtkObject *object)
 static void
 gpk_animated_icon_class_init (GpkAnimatedIconClass *class)
 {
-	GtkImageClass *image_class;
 	GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
 	object_class->destroy = gpk_animated_icon_destroy;
-
 	parent_class = g_type_class_peek_parent (class);
-	image_class = GTK_IMAGE_CLASS (class);
 }
 
 /**
diff --git a/src/gpk-application.c b/src/gpk-application.c
index 5f9326c..56405e8 100644
--- a/src/gpk-application.c
+++ b/src/gpk-application.c
@@ -526,19 +526,19 @@ gpk_application_strcmp_indirect (gchar **a, gchar **b)
 static void
 gpk_application_get_files_cb (PkClient *client, GAsyncResult *res, GpkApplication *application)
 {
-	PkResults *results;
+	gboolean ret;
+	gchar **files = NULL;
+	gchar *package_id_selected = NULL;
+	gchar **split = NULL;
+	gchar *title = NULL;
 	GError *error = NULL;
-	PkItemErrorCode *error_item = NULL;
 	GPtrArray *array = NULL;
-	PkItemFiles *item;
-	GPtrArray *array_sort;
-	gchar **files;
-	gchar *title;
-	GtkWindow *window;
+	GPtrArray *array_sort = NULL;
 	GtkWidget *dialog;
-	gchar *package_id_selected = NULL;
-	gboolean ret;
-	gchar **split;
+	GtkWindow *window;
+	PkItemErrorCode *error_item = NULL;
+	PkItemFiles *item;
+	PkResults *results;
 
 	g_return_if_fail (GPK_IS_APPLICATION (application));
 
@@ -601,7 +601,6 @@ gpk_application_get_files_cb (PkClient *client, GAsyncResult *res, GpkApplicatio
 	gtk_widget_destroy (GTK_WIDGET (dialog));
 out:
 	g_free (title);
-	g_ptr_array_unref (array_sort);
 	g_strfreev (files);
 	g_strfreev (split);
 	g_free (package_id_selected);
@@ -609,6 +608,8 @@ out:
 		pk_item_error_code_unref (error_item);
 	if (array != NULL)
 		g_ptr_array_unref (array);
+	if (array_sort != NULL)
+		g_ptr_array_unref (array_sort);
 	if (results != NULL)
 		g_object_unref (results);
 }
@@ -1301,7 +1302,7 @@ gpk_application_add_item_to_results (GpkApplication *application, const PkItemPa
 	gtk_list_store_append (application->priv->packages_store, &iter);
 	gtk_list_store_set (application->priv->packages_store, &iter,
 			    PACKAGES_COLUMN_STATE, state,
-			    PACKAGES_COLUMN_CHECKBOX, installed ^ in_queue,
+			    PACKAGES_COLUMN_CHECKBOX, checkbox,
 			    PACKAGES_COLUMN_CHECKBOX_VISIBLE, enabled,
 			    PACKAGES_COLUMN_TEXT, text,
 			    PACKAGES_COLUMN_SUMMARY, item->summary,
@@ -1481,15 +1482,12 @@ gpk_application_finished_cb (PkClient *client, PkExitEnum exit_enum, guint runti
 static void
 gpk_application_cancel_cb (GtkWidget *button_widget, GpkApplication *application)
 {
-	gboolean ret;
-
 	g_return_if_fail (GPK_IS_APPLICATION (application));
 
 	g_cancellable_cancel (application->priv->cancellable);
 
 	/* switch buttons around */
-	if (ret)
-		application->priv->search_mode = PK_MODE_UNKNOWN;
+	application->priv->search_mode = PK_MODE_UNKNOWN;
 }
 
 /**
@@ -3716,7 +3714,7 @@ gpk_application_init (GpkApplication *application)
 	/* get UI */
 	application->priv->builder = gtk_builder_new ();
 	retval = gtk_builder_add_from_file (application->priv->builder, GPK_DATA "/gpk-application.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-cell-renderer-info.c b/src/gpk-cell-renderer-info.c
index 80cc8cd..a0340d5 100644
--- a/src/gpk-cell-renderer-info.c
+++ b/src/gpk-cell-renderer-info.c
@@ -140,14 +140,11 @@ gpk_cell_renderer_finalize (GObject *object)
 static void
 gpk_cell_renderer_info_class_init (GpkCellRendererInfoClass *class)
 {
-	GtkCellRendererClass *cell_renderer_class;
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 	object_class->finalize = gpk_cell_renderer_finalize;
 
 	parent_class = g_type_class_peek_parent (class);
 
-	cell_renderer_class = GTK_CELL_RENDERER_CLASS (class);
-
 	object_class->get_property = gpk_cell_renderer_info_get_property;
 	object_class->set_property = gpk_cell_renderer_info_set_property;
 
diff --git a/src/gpk-cell-renderer-restart.c b/src/gpk-cell-renderer-restart.c
index 8c6d4aa..566235d 100644
--- a/src/gpk-cell-renderer-restart.c
+++ b/src/gpk-cell-renderer-restart.c
@@ -81,22 +81,17 @@ gpk_cell_renderer_restart_set_property (GObject *object, guint param_id,
 static void
 gpk_cell_renderer_finalize (GObject *object)
 {
-	GpkCellRendererRestart *cru;
-	cru = GPK_CELL_RENDERER_RESTART (object);
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void
 gpk_cell_renderer_restart_class_init (GpkCellRendererRestartClass *class)
 {
-	GtkCellRendererClass *cell_renderer_class;
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 	object_class->finalize = gpk_cell_renderer_finalize;
 
 	parent_class = g_type_class_peek_parent (class);
 
-	cell_renderer_class = GTK_CELL_RENDERER_CLASS (class);
-
 	object_class->get_property = gpk_cell_renderer_restart_get_property;
 	object_class->set_property = gpk_cell_renderer_restart_set_property;
 
diff --git a/src/gpk-cell-renderer-size.c b/src/gpk-cell-renderer-size.c
index b4a5c6f..1339167 100644
--- a/src/gpk-cell-renderer-size.c
+++ b/src/gpk-cell-renderer-size.c
@@ -91,14 +91,11 @@ gpk_cell_renderer_finalize (GObject *object)
 static void
 gpk_cell_renderer_size_class_init (GpkCellRendererSizeClass *class)
 {
-	GtkCellRendererClass *cell_renderer_class;
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 	object_class->finalize = gpk_cell_renderer_finalize;
 
 	parent_class = g_type_class_peek_parent (class);
 
-	cell_renderer_class = GTK_CELL_RENDERER_CLASS (class);
-
 	object_class->get_property = gpk_cell_renderer_size_get_property;
 	object_class->set_property = gpk_cell_renderer_size_set_property;
 
diff --git a/src/gpk-check-update.c b/src/gpk-check-update.c
index db23a5f..c7ca9a7 100644
--- a/src/gpk-check-update.c
+++ b/src/gpk-check-update.c
@@ -866,7 +866,7 @@ gpk_check_update_get_updates_finished_cb (GObject *object, GAsyncResult *res, Gp
 	guint i;
 	guint more;
 	guint showing = 0;
-	gboolean ret = FALSE;
+	gboolean ret;
 	GString *status_security = NULL;
 	GString *status_tooltip = NULL;
 	GpkUpdateEnum update;
@@ -963,7 +963,6 @@ gpk_check_update_get_updates_finished_cb (GObject *object, GAsyncResult *res, Gp
 	/* if we are just refreshing after a failed update, don't try to do the actions */
 	if (FALSE) { //TODO
 		egg_debug ("skipping actions");
-		ret = TRUE;
 		goto out;
 	}
 
diff --git a/src/gpk-dbus-task.c b/src/gpk-dbus-task.c
index 79ab37c..7d6b0c8 100644
--- a/src/gpk-dbus-task.c
+++ b/src/gpk-dbus-task.c
@@ -751,7 +751,7 @@ gpk_dbus_task_is_installed_resolve_cb (PkClient *client, GAsyncResult *res, GpkD
 	GError *error = NULL;
 	GError *error_dbus = NULL;
 	PkResults *results = NULL;
-	GPtrArray *array;
+	GPtrArray *array = NULL;
 	gboolean ret;
 	PkItemErrorCode *error_item = NULL;
 
@@ -813,7 +813,7 @@ gpk_dbus_task_search_file_search_file_cb (PkClient *client, GAsyncResult *res, G
 	GError *error = NULL;
 	GError *error_dbus = NULL;
 	PkResults *results = NULL;
-	GPtrArray *array;
+	GPtrArray *array = NULL;
 	PkItemErrorCode *error_item = NULL;
 	gchar **split = NULL;
 	const PkItemPackage *item;
@@ -943,7 +943,7 @@ gpk_dbus_task_install_package_names_resolve_cb (PkTask *task, GAsyncResult *res,
 	GError *error = NULL;
 	GError *error_dbus = NULL;
 	PkResults *results = NULL;
-	GPtrArray *array;
+	GPtrArray *array = NULL;
 	PkItemErrorCode *error_item = NULL;
 	const gchar *package_id = NULL;
 	gchar *title;
@@ -951,7 +951,7 @@ gpk_dbus_task_install_package_names_resolve_cb (PkTask *task, GAsyncResult *res,
 	PkItemPackage *item;
 	GtkResponseType button;
 	guint i;
-	gboolean already_installed;
+	gboolean already_installed = FALSE;
 
 	/* get the results */
 	results = pk_task_generic_finish (task, res, &error);
@@ -1161,14 +1161,14 @@ gpk_dbus_task_install_provide_files_search_file_cb (PkClient *client, GAsyncResu
 	GError *error = NULL;
 	GError *error_dbus = NULL;
 	PkResults *results = NULL;
-	GPtrArray *array;
+	GPtrArray *array = NULL;
 	PkItemErrorCode *error_item = NULL;
 	const gchar *package_id = NULL;
 	gchar *info_url;
 	PkItemPackage *item;
 	GtkResponseType button;
 	guint i;
-	gboolean already_installed;
+	gboolean already_installed = FALSE;
 	gchar *text;
 	gchar **split;
 
@@ -1458,7 +1458,7 @@ gpk_dbus_task_codec_what_provides_cb (PkClient *client, GAsyncResult *res, GpkDb
 	GError *error = NULL;
 	GError *error_dbus = NULL;
 	PkResults *results = NULL;
-	GPtrArray *array;
+	GPtrArray *array = NULL;
 	PkItemErrorCode *error_item = NULL;
 	GtkResponseType button;
 	gchar *info_url;
@@ -1570,8 +1570,8 @@ gpk_dbus_task_install_gstreamer_resources (GpkDbusTask *dtask, gchar **codec_nam
 {
 	gboolean ret = TRUE;
 	GError *error_dbus = NULL;
-	gchar **parts;
-	gchar *message;
+	gchar **parts = NULL;
+	gchar *message = NULL;
 
 	/* check it's not session wide banned in gconf */
 	ret = gconf_client_get_bool (dtask->priv->gconf_client, GPK_CONF_ENABLE_CODEC_HELPER, NULL);
@@ -1632,7 +1632,7 @@ gpk_dbus_task_mime_what_provides_cb (PkClient *client, GAsyncResult *res, GpkDbu
 	GError *error = NULL;
 	GError *error_dbus = NULL;
 	PkResults *results = NULL;
-	GPtrArray *array;
+	GPtrArray *array = NULL;
 	PkItemErrorCode *error_item = NULL;
 	gchar *info_url;
 	GtkResponseType button;
@@ -1880,7 +1880,7 @@ gpk_dbus_task_fontconfig_what_provides_cb (PkClient *client, GAsyncResult *res,
 	GError *error = NULL;
 	GError *error_dbus = NULL;
 	PkResults *results = NULL;
-	GPtrArray *array;
+	GPtrArray *array = NULL;
 	PkItemErrorCode *error_item = NULL;
 	gchar *title;
 	gchar *info_url;
@@ -2121,7 +2121,7 @@ gpk_dbus_task_catalog_lookup_cb (GObject *object, GAsyncResult *res, GpkDbusTask
 	PkCatalog *catalog = PK_CATALOG (object);
 	GError *error = NULL;
 	GError *error_dbus = NULL;
-	GPtrArray *array;
+	GPtrArray *array = NULL;
 	GtkResponseType button;
 
 	/* get the results */
diff --git a/src/gpk-dialog.c b/src/gpk-dialog.c
index ac2ef41..a86e8f8 100644
--- a/src/gpk-dialog.c
+++ b/src/gpk-dialog.c
@@ -88,7 +88,6 @@ gpk_dialog_package_array_to_list_store (GPtrArray *array)
 	const PkItemPackage *item;
 	PkDesktop *desktop;
 	const gchar *icon;
-	gchar *package_id;
 	gchar *text;
 	guint i;
 	gchar **split;
@@ -115,7 +114,6 @@ gpk_dialog_package_array_to_list_store (GPtrArray *array)
 				    -1);
 		g_strfreev (split);
 		g_free (text);
-		g_free (package_id);
 	}
 
 	g_object_unref (desktop);
diff --git a/src/gpk-error.c b/src/gpk-error.c
index 79b9b47..213c5a1 100644
--- a/src/gpk-error.c
+++ b/src/gpk-error.c
@@ -74,7 +74,7 @@ gpk_error_dialog_modal_with_time (GtkWindow *window, const gchar *title, const g
 	/* get UI */
 	builder = gtk_builder_new ();
 	retval = gtk_builder_add_from_file (builder, GPK_DATA "/gpk-error.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-helper-chooser.c b/src/gpk-helper-chooser.c
index e18955c..655970c 100644
--- a/src/gpk-helper-chooser.c
+++ b/src/gpk-helper-chooser.c
@@ -261,7 +261,7 @@ gpk_helper_chooser_init (GpkHelperChooser *helper)
 	/* get UI */
 	helper->priv->builder = gtk_builder_new ();
 	retval = gtk_builder_add_from_file (helper->priv->builder, GPK_DATA "/gpk-log.ui", &error);
-	if (error != NULL) {
+	if (retval == 0) {
 		egg_warning ("failed to load ui: %s", error->message);
 		g_error_free (error);
 	}
diff --git a/src/gpk-helper-run.c b/src/gpk-helper-run.c
index 16b6cf2..df7091d 100644
--- a/src/gpk-helper-run.c
+++ b/src/gpk-helper-run.c
@@ -441,7 +441,7 @@ gpk_helper_run_init (GpkHelperRun *helper)
 	/* get UI */
 	helper->priv->builder = gtk_builder_new ();
 	retval = gtk_builder_add_from_file (helper->priv->builder, GPK_DATA "/gpk-log.ui", &error);
-	if (error != NULL) {
+	if (retval == 0) {
 		egg_warning ("failed to load ui: %s", error->message);
 		g_error_free (error);
 	}
diff --git a/src/gpk-log.c b/src/gpk-log.c
index c0684d1..f33eb80 100644
--- a/src/gpk-log.c
+++ b/src/gpk-log.c
@@ -703,7 +703,7 @@ main (int argc, char *argv[])
 	/* get UI */
 	builder = gtk_builder_new ();
 	retval = gtk_builder_add_from_file (builder, GPK_DATA "/gpk-log.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-modal-dialog.c b/src/gpk-modal-dialog.c
index c4ff62d..89220bc 100644
--- a/src/gpk-modal-dialog.c
+++ b/src/gpk-modal-dialog.c
@@ -802,7 +802,7 @@ gpk_modal_dialog_init (GpkModalDialog *dialog)
 	/* get UI */
 	dialog->priv->builder = gtk_builder_new ();
 	retval = gtk_builder_add_from_file (dialog->priv->builder, GPK_DATA "/gpk-client.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-prefs.c b/src/gpk-prefs.c
index fe9c4de..f18b615 100644
--- a/src/gpk-prefs.c
+++ b/src/gpk-prefs.c
@@ -158,7 +158,6 @@ gpk_prefs_update_combo_changed (GtkWidget *widget, gpointer data)
 	const gchar *action;
 	GpkUpdateEnum update = GPK_UPDATE_ENUM_UNKNOWN;
 	GConfClient *client;
-	GtkWidget *notify_widget;
 
 	client = gconf_client_get_default ();
 	value = gtk_combo_box_get_active_text (GTK_COMBO_BOX (widget));
@@ -166,7 +165,6 @@ gpk_prefs_update_combo_changed (GtkWidget *widget, gpointer data)
 		egg_warning ("value NULL");
 		return;
 	}
-	notify_widget = GTK_WIDGET (gtk_builder_get_object (builder, "checkbutton_notify_updates"));
 	if (strcmp (value, PK_UPDATE_ALL_TEXT) == 0) {
 		update = GPK_UPDATE_ENUM_ALL;
 	} else if (strcmp (value, PK_UPDATE_SECURITY_TEXT) == 0) {
@@ -541,7 +539,7 @@ main (int argc, char *argv[])
 	/* get UI */
 	builder = gtk_builder_new ();
 	retval = gtk_builder_add_from_file (builder, GPK_DATA "/gpk-prefs.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-task.c b/src/gpk-task.c
index 234af58..78d0b64 100644
--- a/src/gpk-task.c
+++ b/src/gpk-task.c
@@ -442,7 +442,7 @@ gpk_task_setup_dialog_untrusted (GpkTask *task)
 	/* get UI */
 	task->priv->builder_untrusted = gtk_builder_new ();
 	retval = gtk_builder_add_from_file (task->priv->builder_untrusted, GPK_DATA "/gpk-error.ui", &error);
-	if (error != NULL) {
+	if (retval == 0) {
 		egg_warning ("failed to load ui: %s", error->message);
 		g_error_free (error);
 	}
@@ -490,7 +490,7 @@ gpk_task_setup_dialog_signature (GpkTask *task)
 	/* get UI */
 	task->priv->builder_signature = gtk_builder_new ();
 	retval = gtk_builder_add_from_file (task->priv->builder_signature, GPK_DATA "/gpk-signature.ui", &error);
-	if (error != NULL) {
+	if (retval == 0) {
 		egg_warning ("failed to load ui: %s", error->message);
 		g_error_free (error);
 	}
@@ -525,7 +525,7 @@ gpk_task_setup_dialog_eula (GpkTask *task)
 	/* get UI */
 	task->priv->builder_eula = gtk_builder_new ();
 	retval = gtk_builder_add_from_file (task->priv->builder_eula, GPK_DATA "/gpk-eula.ui", &error);
-	if (error != NULL) {
+	if (retval == 0) {
 		egg_warning ("failed to load ui: %s", error->message);
 		g_error_free (error);
 	}
diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
index b8ce45e..e54aad5 100644
--- a/src/gpk-update-viewer.c
+++ b/src/gpk-update-viewer.c
@@ -398,10 +398,11 @@ gpk_update_viewer_update_packages_cb (PkTask *_task, GAsyncResult *res, GMainLoo
 
 	gpk_update_viewer_undisable_packages ();
 
-	/* get data */
+	/* get blocked data */
 	array = pk_results_get_package_array (results);
 	for (i=0; i<array->len; i++) {
 		item = g_ptr_array_index (array, i);
+		egg_debug ("updated %s:%s", pk_info_enum_to_text (item->info), item->package_id);
 	}
 
 	/* TODO: use ca_gtk_context_get_for_screen to allow use of GDK_MULTIHEAD_SAFE */
@@ -2425,8 +2426,7 @@ gpk_update_viewer_set_network_state (PkNetworkEnum state)
 	gboolean ret = TRUE;
 	gchar *text_size = NULL;
 	gchar *message = NULL;
-	GtkResponseType response;
-	guint size = 0;
+	guint size = 0; //TODO: FIXME
 
 	/* not on wireless mobile */
 	if (state != PK_NETWORK_ENUM_MOBILE)
@@ -2456,7 +2456,7 @@ gpk_update_viewer_set_network_state (PkNetworkEnum state)
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog), "%s", message);
 	gpk_dialog_embed_do_not_show_widget (GTK_DIALOG (dialog), GPK_CONF_UPDATE_VIEWER_MOBILE_BBAND);
 	gtk_window_set_icon_name (GTK_WINDOW(dialog), GPK_ICON_SOFTWARE_INSTALLER);
-	response = gtk_dialog_run (GTK_DIALOG(dialog));
+	gtk_dialog_run (GTK_DIALOG(dialog));
 	gtk_widget_destroy (dialog);
 out:
 	g_free (text_size);
@@ -2619,7 +2619,7 @@ main (int argc, char *argv[])
 	/* get UI */
 	builder = gtk_builder_new ();
 	retval = gtk_builder_add_from_file (builder, GPK_DATA "/gpk-update-viewer.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-watch.c b/src/gpk-watch.c
index 91bb2fd..adea7b1 100644
--- a/src/gpk-watch.c
+++ b/src/gpk-watch.c
@@ -253,7 +253,6 @@ out:
 static PkBitfield
 gpk_watch_task_list_to_status_bitfield (GpkWatch *watch)
 {
-	gboolean ret;
 	gboolean active;
 	gboolean watch_active;
 	guint i;
@@ -284,10 +283,6 @@ gpk_watch_task_list_to_status_bitfield (GpkWatch *watch)
 			      "transaction-id", &transaction_id,
 			      NULL);
 
-		/* if we failed to get data, assume bad things happened */
-		if (!ret)
-			active = TRUE;
-
 		/* add to bitfield calculation */
 		egg_debug ("%s %s (active:%i)", transaction_id, pk_status_enum_to_text (status), active);
 		if (!active || watch_active)
@@ -546,7 +541,7 @@ gpk_watch_menu_show_messages_cb (GtkMenuItem *item, gpointer data)
 	/* get UI */
 	builder = gtk_builder_new ();
 	retval = gtk_builder_add_from_file (builder, GPK_DATA "/gpk-repo.ui", &error);
-	if (error != NULL) {
+	if (retval == 0) {
 		egg_warning ("failed to load ui: %s", error->message);
 		g_error_free (error);
 		goto out_build;
@@ -729,9 +724,6 @@ gpk_watch_monitor_tid (GpkWatch *watch, const gchar *transaction_id)
 		return FALSE;
 	}
 
-	/* fill in role */
-	gpk_modal_dialog_set_title (watch->priv->dialog, gpk_role_enum_to_localised_present (role));
-
 	/* coldplug */
 	g_object_get (progress,
 		      "role", &role,
@@ -742,6 +734,9 @@ gpk_watch_monitor_tid (GpkWatch *watch, const gchar *transaction_id)
 		      "package-id", &package_id,
 		      NULL);
 
+	/* fill in role */
+	gpk_modal_dialog_set_title (watch->priv->dialog, gpk_role_enum_to_localised_present (role));
+
 	/* are we cancellable? */
 	gpk_modal_dialog_set_allow_cancel (watch->priv->dialog, allow_cancel);
 	gpk_modal_dialog_set_percentage (watch->priv->dialog, percentage);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]