Yann Leboulanger pushed to branch master at gajim / gajim

Commits:

2 changed files:

Changes:

  • gajim/common/config.py
    ... ... @@ -153,6 +153,10 @@ class Config:
    153 153
                 'gc-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide
    
    154 154
                 'gc-msgwin-width': [opt_int, 600],
    
    155 155
                 'gc-msgwin-height': [opt_int, 440],
    
    156
    +            'pm-msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide
    
    157
    +            'pm-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide
    
    158
    +            'pm-msgwin-width': [opt_int, 480],
    
    159
    +            'pm-msgwin-height': [opt_int, 440],
    
    156 160
                 'single-msg-x-position': [opt_int, 0],
    
    157 161
                 'single-msg-y-position': [opt_int, 0],
    
    158 162
                 'single-msg-width': [opt_int, 400],
    

  • gajim/message_window.py
    ... ... @@ -1019,8 +1019,6 @@ class MessageWindowMgr(GObject.GObject):
    1019 1019
                 size = (gajim.config.get_per('accounts', acct, 'msgwin-width'),
    
    1020 1020
                         gajim.config.get_per('accounts', acct, 'msgwin-height'))
    
    1021 1021
             elif self.mode in (self.ONE_MSG_WINDOW_NEVER, self.ONE_MSG_WINDOW_PERTYPE):
    
    1022
    -            if type_ == message_control.TYPE_PM:
    
    1023
    -                type_ = message_control.TYPE_CHAT
    
    1024 1022
                 opt_width = type_ + '-msgwin-width'
    
    1025 1023
                 opt_height = type_ + '-msgwin-height'
    
    1026 1024
                 size = (gajim.config.get(opt_width), gajim.config.get(opt_height))