status line fixups

3 files changed, 23 insertions, 18 deletions

diff --git a/mdns.c b/mdns.c
index 2044590..1336559 100644
--- a/mdns.c
+++ b/mdns.c
@@ -1027,7 +1027,7 @@ static void set_default_visible_cols(struct mdns_window *mdns, enum mdns_view vi
 struct mdns_window *mdns_create_window(int standalone, enum mdns_view view)
 {
     struct mdns_window *mdns;
-    GtkWidget *vbox, *menubar, *toolbar, *scroll;
+    GtkWidget *vbox, *menubar, *toolbar, *scroll, *frame;
     GtkAccelGroup *accel;
     GtkUIManager *ui;
     GError *err;
@@ -1088,10 +1088,9 @@ struct mdns_window *mdns_create_window(int standalone, enum mdns_view view)
 				   GTK_POLICY_AUTOMATIC);
 
     /* other widgets */
-    mdns->status = gtk_widget_new(GTK_TYPE_LABEL,
-				  "label",  "status line",
-				  "xalign", 0.0,
-				  NULL);
+    mdns->status = gtk_label_new("status line");
+    gtk_misc_set_alignment(GTK_MISC(mdns->status), 0, 0.5);
+    gtk_misc_set_padding(GTK_MISC(mdns->status), 3, 1);
 
     /* Make a vbox and put stuff in */
     vbox = gtk_vbox_new(FALSE, 1);
@@ -1103,7 +1102,10 @@ struct mdns_window *mdns_create_window(int standalone, enum mdns_view view)
     gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(vbox), scroll, TRUE, TRUE, 0);
     gtk_container_add(GTK_CONTAINER(scroll), mdns->view);
-    gtk_box_pack_end(GTK_BOX(vbox), mdns->status, FALSE, TRUE, 0);
+
+    frame = gtk_frame_new(NULL);
+    gtk_box_pack_end(GTK_BOX(vbox), frame, FALSE, TRUE, 0);
+    gtk_container_add(GTK_CONTAINER(frame), mdns->status);
 
     set_default_visible_cols(mdns, view);
     return mdns;
diff --git a/xd_view.c b/xd_view.c
index c809cb6..163a709 100644
--- a/xd_view.c
+++ b/xd_view.c
@@ -625,7 +625,7 @@ static GtkWidget *xen_doms_create_view(XenDoms *store)
 
 void xen_doms_create_window(void)
 {
-    GtkWidget *vbox, *menubar, *toolbar, *scroll;
+    GtkWidget *vbox, *menubar, *toolbar, *scroll, *frame;
     GtkAccelGroup *accel;
     GtkActionGroup *ag;
     GtkUIManager *ui;
@@ -662,10 +662,9 @@ void xen_doms_create_window(void)
 				   GTK_POLICY_AUTOMATIC);
 
     /* other widgets */
-    status = gtk_widget_new(GTK_TYPE_LABEL,
-			    "label",  "status line",
-			    "xalign", 0.0,
-			    NULL);
+    status = gtk_label_new("status line");
+    gtk_misc_set_alignment(GTK_MISC(status), 0, 0.5);
+    gtk_misc_set_padding(GTK_MISC(status), 3, 1);
 
     /* Make a vbox and put stuff in */
     vbox = gtk_vbox_new(FALSE, 1);
@@ -677,7 +676,10 @@ void xen_doms_create_window(void)
     gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(vbox), scroll, TRUE, TRUE, 0);
     gtk_container_add(GTK_CONTAINER(scroll), view);
-    gtk_box_pack_end(GTK_BOX(vbox), status, FALSE, TRUE, 0);
+
+    frame = gtk_frame_new(NULL);
+    gtk_box_pack_end(GTK_BOX(vbox), frame, FALSE, TRUE, 0);
+    gtk_container_add(GTK_CONTAINER(frame), status);
 
     return;
 }
diff --git a/xs_view.c b/xs_view.c
index 5e68be0..824cf3b 100644
--- a/xs_view.c
+++ b/xs_view.c
@@ -132,7 +132,7 @@ static GtkWidget *xenstore_create_view(XenStore *store)
 
 void xenstore_create_window(void)
 {
-    GtkWidget *vbox, *menubar, *toolbar, *scroll;
+    GtkWidget *vbox, *menubar, *toolbar, *scroll, *frame;
     GtkAccelGroup *accel;
     GtkActionGroup *ag;
     GtkUIManager *ui;
@@ -168,10 +168,9 @@ void xenstore_create_window(void)
 				   GTK_POLICY_AUTOMATIC);
     
     /* other widgets */
-    status = gtk_widget_new(GTK_TYPE_LABEL,
-			    "label",  "status line",
-			    "xalign", 0.0,
-			    NULL);
+    status = gtk_label_new("status line");
+    gtk_misc_set_alignment(GTK_MISC(status), 0, 0.5);
+    gtk_misc_set_padding(GTK_MISC(status), 3, 1);
 
     /* Make a vbox and put stuff in */
     vbox = gtk_vbox_new(FALSE, 1);
@@ -185,7 +184,9 @@ void xenstore_create_window(void)
     }
     gtk_box_pack_start(GTK_BOX(vbox), scroll, TRUE, TRUE, 0);
     gtk_container_add(GTK_CONTAINER(scroll), view);
-    gtk_box_pack_end(GTK_BOX(vbox), status, FALSE, TRUE, 0);
 
+    frame = gtk_frame_new(NULL);
+    gtk_box_pack_end(GTK_BOX(vbox), frame, FALSE, TRUE, 0);
+    gtk_container_add(GTK_CONTAINER(frame), status);
     return;
 }