# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jorge@ubuntu.com-20080205055702-a2cskminc8ret9cm
# target_branch: http://bazaar.launchpad.net/%7Ebrunobord/pyroom\
#   /trunk/
# testament_sha1: a94f71a25e30ca458c8c57a5eb05219e12881f3b
# timestamp: 2008-02-05 00:57:42 -0500
# base_revision_id: bruno@la-chose-20080203154231-f2ew3qg3v62ziuf0
# 
# Begin patch
=== modified file 'pyroom.py'
--- pyroom.py	2008-02-03 15:37:18 +0000
+++ pyroom.py	2008-02-05 05:57:02 +0000
@@ -177,7 +177,6 @@
 
         self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
         self.window.set_name('PyRoom')
-        self.window.fullscreen()
         self.window.connect('delete_event', self.delete_event)
         self.window.connect('destroy', self.destroy)
 
@@ -187,10 +186,11 @@
         self.textbox.connect('key-press-event', self.key_press_event)
         self.textbox.set_wrap_mode(gtk.WRAP_WORD)
 
-        self.fixed = gtk.Fixed()
+        #self.fixed = gtk.Fixed()
         self.vbox = gtk.VBox()
-        self.window.add(self.fixed)
-        self.fixed.put(self.vbox, 0, 0)
+        self.window.add(self.vbox)
+        #self.window.add(self.fixed)
+        #self.fixed.put(self.vbox, 0, 0)
 
         self.boxout = gtk.EventBox()
         self.boxout.set_border_width(1)
@@ -220,6 +220,7 @@
         self.status.set_justify(gtk.JUSTIFY_LEFT)
         self.apply_style()
         self.window.show_all()
+        self.window.fullscreen()
         self.status.set_text(
             _('Welcome to PyRoom 1.0, type Control-H for help'))
 
@@ -371,10 +372,10 @@
 	    """)
         (w, h) = (gtk.gdk.screen_width(), gtk.gdk.screen_height())
         width = int(self.style['size'][0] * w)
-        height = int(self.style['size'][1] * h)
-        self.vbox.set_size_request(width, height)
-        self.fixed.move(self.vbox, int(((1 - self.style['size'][0]) * w)/ 2),
-            int(((1 - self.style['size'][1]) * h) / 2))
+        height = int(self.style['size'][1] * h)        
+        #self.vbox.set_size_request(width, height)
+        #self.fixed.move(self.vbox, int(((1 - self.style['size'][0]) * w)/ 2),
+        #    int(((1 - self.style['size'][1]) * h) / 2))
         self.textbox.set_border_width(self.style['padding'])
 
     def word_count(self, buffer):

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcRdip8AAdxfgEQQWff//3sQ
0Aq////wUAP72I0RNsaNVhKImqfqn6TFPQCehNqaZpqaZAaBo09TRoOaYmAjTAjCMAAAATCMBJJo
jTImQhlHqeoNMRtQyA9TQwJg5piYCNMCMIwAAABMIwEkggRiZPUaamaCaUeT0ypoG1HqGnpPTUdI
1Zbbwb+cHUenRxWl7a9cdVVAZZN6LYvE2MgnAq8SeMLkASpnQaKPOA4bUfOTMwrz19A0H+zUycJq
ShtEXK26x8CLbHTR5zOVn58XeOqBegrXOX7XcpWKHCGq3rz0WmGly6JhGNttQNIkVV9LPdMRsOfE
we2JVesUi6Gu457Kxb5TrlSOSD1iMm8oJwvCVkojgqSOendM/HcPdLmDtZYtMBGmTGMpfsFDapgv
byZFWi56aLwVg3QTwTtbIXeKqcS7yPDqPM4x50FYmbkMVK23fQTlem49BjgZswojjrF3RvNtTFb6
SRaSOhd8FatUzieUQTaoikyUmgax5K4ywx/UNNSjBOIsVUWqZ2BOYOerRYTkxUTqgeaCBrGPY5K0
+yocRoKygJaDOt15ebSj7nVXEomJr17KWeJxdsdQ8UBWikcry4j7nwqyrBG9bCzHc+0VpqGoLC0u
IQaBVVLhwyBVJGDkXa89+wCeNGo8LUSKk+gVZZ1C6CuT5ioStN63MLoYzGzybC05n0x54Dtt3m3p
eUCyEH/YOle2DJjueHPY6kvwsDi61epIZr/zoxY8RPD5HkLwDMcDidu7I1FtptDzvLr4WVI9vwXv
3+Nx+J5B0Dh1Zj6Jd4E5idDLkaxZFDtm8MsH0CySz9GATLWooqWy5sJkYkgyQODUylocjuvw01Jk
eDcN8yJvSfuKILPXytQIhZzb+lgqvgRMRKuSiLXdhZpCrSaDe1IpmAh3KhRz3CVC3rgbi8pOfPAr
Ppv48gbcydP+qlxGSYKT2nWvebAp9YwDiWCnfmLPgPSJy5GRqUDPvF+4UKuH2b1xg+MgKwKfBZ/d
gijnOWexSi4S7gwBASpU0H6FJ6IuMRMzyfMsqGsQWPgpzRuzHAWNPhPzJnQtZLeQFBknt5XIcpkz
Ick4NtmANK9KlNMBlEDEPv/iVS6wXYKpcV+YOljjgoE4VSmmG2Bxc207LHayqCzZyihvmLP431sn
0gUtguE9SfQEiTEsAddUSIzchx5ywPHcxmgzKB2O7Yxad4FicYCsVoTBhQnOy5rdpfOLtKc/QhNC
uks9vDyESkwwTN1sSZcDJWOSVEtyVPrNY8pNG5KnLJYBdaEkGh6csoq6AWCirK45k75Pd8OWEVYP
gJtSP/F3JFOFCQxF2Knw