[gnome-packagekit] trivial: move the status text up into the toolbar in gpk-application

[Richard Hughes <rhughes src gnome org>]

commit d297bcc7e4efacbe31724675dda0251e010145c1
Author: Richard Hughes <richard hughsie com>
Date:   Fri May 11 15:33:35 2012 +0100

    trivial: move the status text up into the toolbar in gpk-application

 data/gpk-application.ui |   54 +++++++++++++---------------------------------
 src/gpk-application.c   |   13 +---------
 2 files changed, 17 insertions(+), 50 deletions(-)
---
diff --git a/data/gpk-application.ui b/data/gpk-application.ui
index 9e98405..9a13af2 100644
--- a/data/gpk-application.ui
+++ b/data/gpk-application.ui
@@ -50,7 +50,7 @@
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="pack_type">end</property>
-                <property name="position">0</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
@@ -69,7 +69,7 @@
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="pack_type">end</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
@@ -89,7 +89,19 @@
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="pack_type">end</property>
-                <property name="position">2</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_status">
+                <property name="can_focus">False</property>
+                <property name="label">Querying</property>
+                <property name="use_markup">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">4</property>
               </packing>
             </child>
           </object>
@@ -157,42 +169,6 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkHBox" id="hbox_status">
-                                <property name="can_focus">False</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkImage" id="image_status">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="stock">gtk-missing-image</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label_status">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label">Querying</property>
-                                    <property name="use_markup">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
diff --git a/src/gpk-application.c b/src/gpk-application.c
index 802fa41..678a76e 100644
--- a/src/gpk-application.c
+++ b/src/gpk-application.c
@@ -640,21 +640,12 @@ gpk_application_status_changed_timeout_cb (GpkApplicationPrivate *priv)
 	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_status"));
 	text = gpk_status_enum_to_localised_text (priv->status_last);
 	gtk_label_set_label (GTK_LABEL (widget), text);
+	gtk_widget_show (widget);
 
 	/* show cancel button */
 	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_cancel"));
 	gtk_widget_show (widget);
 
-	/* set icon */
-	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "image_status"));
-	gtk_image_set_from_icon_name (GTK_IMAGE (widget),
-				      gpk_status_enum_to_icon_name (priv->status_last),
-				      GTK_ICON_SIZE_BUTTON);
-
-	/* show containing box */
-	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hbox_status"));
-	gtk_widget_show (widget);
-
 	/* never repeat */
 	priv->status_id = 0;
 	return FALSE;
@@ -699,7 +690,7 @@ gpk_application_progress_cb (PkProgress *progress, PkProgressType type, GpkAppli
 				priv->status_id = 0;
 			}
 
-			widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hbox_status"));
+			widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_status"));
 			gtk_widget_hide (widget);
 			widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "progressbar_progress"));
 			gtk_widget_hide (widget);