[Xfce4-commits] <postler:master> Remove the now unnecessary hpaned

[Christian Dywan]

Updating branch refs/heads/master
         to 213ad57052a57f449109c6c108b17fd3b7ab9dcf (commit)
       from 504ebf02ae31f0d155f35360cd3b03d330c44b64 (commit)

commit 213ad57052a57f449109c6c108b17fd3b7ab9dcf
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Jul 3 16:29:06 2011 +0200

    Remove the now unnecessary hpaned

 postler/postler-bureau.vala |   25 +++++++++----------------
 1 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/postler/postler-bureau.vala b/postler/postler-bureau.vala
index 5b10358..d67aaca 100644
--- a/postler/postler-bureau.vala
+++ b/postler/postler-bureau.vala
@@ -255,11 +255,6 @@ public class Postler.Bureau : Gtk.Window {
         } else {
             unfullscreen ();
         }
-        window_state_event (new Gdk.EventWindowState ());
-    }
-
-    public override bool window_state_event (Gdk.EventWindowState event) {
-        return true;
     }
 
     void action_report_bug () {
@@ -469,7 +464,8 @@ public class Postler.Bureau : Gtk.Window {
     Gtk.InfoBar show_fetch_error_infobar (string account, string error_message) {
         var infobar = new Gtk.InfoBar ();
         infobar.set_message_type (Gtk.MessageType.ERROR);
-        messages_box.pack_start (infobar, false, false, 0);
+        shelf.pack_start (infobar, false, false, 0);
+        shelf.reorder_child (infobar, 3);
         var infobox = infobar.get_content_area () as Gtk.Box;
         var image = new Gtk.Image.from_stock (Gtk.STOCK_DIALOG_ERROR,
                                               Gtk.IconSize.BUTTON);
@@ -673,7 +669,6 @@ public class Postler.Bureau : Gtk.Window {
         folders = new Postler.Folders (accounts);
         shelf.pack_start (folders, false, false, 0);
 
-        var hpaned = new Gtk.HPaned ();
         search.sensitive = false;
         folders.notify["selected-location"].connect ((object, pspec) => {
             string? selected_location = folders.selected_location;
@@ -712,11 +707,6 @@ public class Postler.Bureau : Gtk.Window {
                 trash_action_infobar.hide ();
         });
 
-        shelf.pack_start (hpaned, true, true, 0);
-        var vpaned = new Gtk.HPaned ();
-        hpaned.pack2 (vpaned, true, false); /* do expand, don't shrink */
-        messages_box = new Gtk.VBox (false, 0);
-        vpaned.pack1 (messages_box, false, false); /* no expand, no shrink */
         search_options = ui.get_widget ("/search_options") as Gtk.Toolbar;
         actions.get_action ("SearchSubject").is_important = true;
         actions.get_action ("SearchSender").is_important = true;
@@ -731,12 +721,16 @@ public class Postler.Bureau : Gtk.Window {
                 toolbutton.label_widget = label;
             }
         }
-        messages_box.pack_start (search_options, false, false, 0);
+        shelf.pack_start (search_options, false, false, 0);
 
+        var vpaned = new Gtk.HPaned ();
+        shelf.pack_start (vpaned, true, true, 0);
+        messages_box = new Gtk.VBox (false, 0);
+        vpaned.pack1 (messages_box, false, false); /* no expand, no shrink */
         client.received.connect (client_received);
 
         messages = new Postler.Messages (accounts);
-        messages.set_size_request (250, 200);
+        messages.set_size_request (300, 0);
         actions.get_action ("MessageFlag").sensitive = false;
         actions.get_action ("MessageArchive").sensitive = false;
         actions.get_action ("MessageJunk").sensitive = false;
@@ -752,7 +746,7 @@ public class Postler.Bureau : Gtk.Window {
             action.sensitive = state;
         });
         var scrolled = new Postler.ScrolledWindow (messages);
-        messages_box.pack_end (scrolled, true, true, 0);
+        messages_box.pack_start (scrolled, true, true, 0);
 
         messages_label = new Gtk.Label (null);
         shelf.pack_end (messages_label, false, false, 0);
@@ -873,7 +867,6 @@ public class Postler.Bureau : Gtk.Window {
         messages.set_headers_visible (false);
         messages.set_rules_hint (true);
         vpaned.set_position ((int)(window_height / 3));
-        hpaned.set_position ((int)(window_width / 4));
 
         folders.messages = messages;
         messages.content = content;