Philipp Hörist pushed to branch master at gajim / gajim

Commits:

2 changed files:

Changes:

  • gajim/data/gui/start_chat_dialog.ui
    ... ... @@ -320,7 +320,6 @@
    320 320
                     </child>
    
    321 321
                     <child>
    
    322 322
                       <object class="GtkTreeViewColumn">
    
    323
    -                    <property name="title" translatable="yes">icon</property>
    
    324 323
                         <child>
    
    325 324
                           <object class="GtkCellRendererPixbuf" id="icon_pixbuf"/>
    
    326 325
                           <attributes>
    
    ... ... @@ -331,7 +330,6 @@
    331 330
                     </child>
    
    332 331
                     <child>
    
    333 332
                       <object class="GtkTreeViewColumn">
    
    334
    -                    <property name="title" translatable="yes">account</property>
    
    335 333
                         <child>
    
    336 334
                           <object class="GtkCellRendererText" id="account_text"/>
    
    337 335
                           <attributes>
    

  • gajim/groupchat_control.py
    ... ... @@ -171,7 +171,6 @@ class GroupchatControl(ChatControlBase):
    171 171
     
    
    172 172
             self.room_jid = self.contact.jid
    
    173 173
             self.nick = nick
    
    174
    -        self.new_nick = ''
    
    175 174
     
    
    176 175
             bm_module = app.connections[self.account].get_module('Bookmarks')
    
    177 176
             self.name = bm_module.get_name_from_bookmark(self.room_jid)