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

[Richard Hughes <rhughes src gnome org>]

commit 37fafb4463a51bb4b573d9be09afaa61bc5c9719
Author: Richard Hughes <richard hughsie com>
Date:   Mon Oct 5 17:03:08 2009 +0100

    moo

 data/gpk-update-viewer.ui |   13 +--------
 src/gpk-update-viewer.c   |   69 ++++++++++++---------------------------------
 2 files changed, 19 insertions(+), 63 deletions(-)
---
diff --git a/data/gpk-update-viewer.ui b/data/gpk-update-viewer.ui
index f471e33..56a3dff 100644
--- a/data/gpk-update-viewer.ui
+++ b/data/gpk-update-viewer.ui
@@ -234,7 +234,7 @@
                     <child>
                       <object class="GtkLabel" id="label_status">
                         <property name="visible">True</property>
-                        <property name="label">&lt;b&gt;Downloading:&lt;/b&gt;</property>
+                        <property name="label">&lt;b&gt;Downloading&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                       <packing>
@@ -242,17 +242,6 @@
                         <property name="position">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkLabel" id="label_package">
-                        <property name="visible">True</property>
-                        <property name="label">data</property>
-                        <property name="use_markup">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
index 1603354..231efd4 100644
--- a/src/gpk-update-viewer.c
+++ b/src/gpk-update-viewer.c
@@ -163,6 +163,7 @@ gpk_update_viewer_quit (void)
 {
 	/* are we in a transaction */
 	g_cancellable_cancel (cancellable);
+	g_main_loop_quit (loop);
 }
 
 /**
@@ -378,6 +379,11 @@ gpk_update_viewer_update_packages_cb (PkTask *_task, GAsyncResult *res, GMainLoo
 
 		/* re-enable the package list */
 		gpk_update_viewer_undisable_packages ();
+
+		/* allow clicking again */
+		widget = GTK_WIDGET (gtk_builder_get_object (builder, "button_install"));
+		gtk_widget_set_sensitive (widget, TRUE);
+
 		goto out;
 	}
 
@@ -725,7 +731,6 @@ gpk_update_viewer_progress_cb (PkProgress *progress, PkProgressType type, GMainL
 			gtk_label_set_label (GTK_LABEL (widget), "");
 			widget = GTK_WIDGET (gtk_builder_get_object (builder, "image_progress"));
 			gtk_widget_hide (widget);
-			goto out;
 		}
 		if (status == PK_STATUS_ENUM_QUERY || status == PK_STATUS_ENUM_SETUP) {
 			/* TRANSLATORS: querying update array */
@@ -742,9 +747,20 @@ gpk_update_viewer_progress_cb (PkProgress *progress, PkProgressType type, GMainL
 		gtk_image_set_from_icon_name (GTK_IMAGE (widget), gpk_status_enum_to_icon_name (status), GTK_ICON_SIZE_BUTTON);
 		gtk_widget_show (widget);
 
+		/* clear UI */
+		if (status == PK_STATUS_ENUM_FINISHED) {
+			widget = GTK_WIDGET (gtk_builder_get_object (builder, "label_package"));
+			gtk_label_set_label (GTK_LABEL (widget), "");
+
+			widget = GTK_WIDGET (gtk_builder_get_object (builder, "progressbar_progress"));
+			gtk_widget_hide (widget);
+
+			widget = GTK_WIDGET (gtk_builder_get_object (builder, "button_quit"));
+			gtk_widget_set_sensitive (widget, TRUE);
+		}
+
 	} else if (type == PK_PROGRESS_TYPE_PERCENTAGE) {
 
-//		GtkWidget *widget;
 		GtkTreeView *treeview;
 		GtkTreeModel *model;
 		GtkTreeIter iter;
@@ -1713,13 +1729,6 @@ gpk_update_viewer_deps_update_event_cb (gpointer *helper, GtkResponseType type,
 	treeview = GTK_TREE_VIEW (gtk_builder_get_object (builder, "treeview_updates"));
 	model = gtk_tree_view_get_model (treeview);
 
-	if (type != GTK_RESPONSE_YES) {
-		/* clear selection */
-		gpk_update_viewer_reconsider_info (model);
-		gpk_update_viewer_undisable_packages ();
-		goto out;
-	}
-
 	/* need to select or add packages in deps_array */
 	len = deps_array->len;
 	for (i=0; i<len; i++) {
@@ -1779,48 +1788,6 @@ out:
 }
 #endif
 
-#if 0
-/**
- * gpk_update_viewer_finished_cb:
- **/
-static void
-gpk_update_viewer_finished_cb (PkClient *client, PkExitEnum exit, guint runtime, gpointer data)
-{
-	GtkWidget *widget;
-	GtkTreeView *treeview;
-	GtkTreeModel *model;
-	PkRoleEnum role;
-
-	/* clear package */
-	widget = GTK_WIDGET (gtk_builder_get_object (builder, "label_package"));
-	gtk_label_set_label (GTK_LABEL (widget), "");
-
-	widget = GTK_WIDGET (gtk_builder_get_object (builder, "progressbar_progress"));
-	gtk_widget_hide (widget);
-
-	widget = GTK_WIDGET (gtk_builder_get_object (builder, "button_quit"));
-	gtk_widget_set_sensitive (widget, TRUE);
-
-	/* get model */
-	treeview = GTK_TREE_VIEW (gtk_builder_get_object (builder, "treeview_updates"));
-	model = gtk_tree_view_get_model (treeview);
-
-	/* clicked cancel on get updates screen */
-	if (role == PK_ROLE_ENUM_GET_UPDATES &&
-	    exit == PK_EXIT_ENUM_CANCELLED) {
-		g_main_loop_quit (loop);
-		return;
-	}
-
-	/* we pressed cancel */
-	if (exit != PK_EXIT_ENUM_SUCCESS) {
-		gpk_update_viewer_undisable_packages ();
-		widget = GTK_WIDGET (gtk_builder_get_object (builder, "button_install"));
-		gtk_widget_set_sensitive (widget, TRUE);
-	}
-}
-#endif
-
 /**
  * gpk_update_viewer_repo_array_changed_cb:
  **/