Daniel Brötzmann pushed to branch master at gajim / gajim

Commits:

3 changed files:

Changes:

  • gajim/common/structs.py
    ... ... @@ -200,7 +200,7 @@ def msg_iq(self, value: Any) -> None:
    200 200
     
    
    201 201
     @dataclass(frozen=True)
    
    202 202
     class PresenceData:
    
    203
    -    show: str
    
    203
    +    show: PresenceShow
    
    204 204
         status: str
    
    205 205
         priority: int
    
    206 206
         idle_time: Optional[float]
    

  • gajim/gtk/contact_info.py
    ... ... @@ -137,7 +137,7 @@ def _on_key_press(self, _widget: ContactInfo, event: Gdk.EventKey) -> None:
    137 137
     
    
    138 138
         def _on_stack_child_changed(self,
    
    139 139
                                     _widget: Gtk.Stack,
    
    140
    -                                pspec: GObject.ParamSpec) -> None:
    
    140
    +                                _pspec: GObject.ParamSpec) -> None:
    
    141 141
     
    
    142 142
             name = self._ui.main_stack.get_visible_child_name()
    
    143 143
             self._ui.header_revealer.set_reveal_child(name != 'information')
    
    ... ... @@ -158,7 +158,6 @@ def _on_destroy(self, _widget: ContactInfo) -> None:
    158 158
     
    
    159 159
         def _fill_information_page(self, contact: ContactT) -> None:
    
    160 160
             self._vcard_grid = VCardGrid(self.account)
    
    161
    -        self._vcard_grid.set_column_homogeneous(True)
    
    162 161
             self._ui.vcard_box.add(self._vcard_grid)
    
    163 162
             self._client.get_module('VCard4').request_vcard(
    
    164 163
                 jid=self.contact.jid,
    
    ... ... @@ -236,7 +235,8 @@ def _fill_device_info(self, contact: BareContact) -> None:
    236 235
             self._switcher.set_row_visible('devices', True)
    
    237 236
     
    
    238 237
         def _query_device(self, contact: ResourceContact) -> None:
    
    239
    -        task = self._client.get_module('SoftwareVersion').request_software_version(
    
    238
    +        software_module = self._client.get_module('SoftwareVersion')
    
    239
    +        task = software_module.request_software_version(
    
    240 240
                 contact.jid,
    
    241 241
                 callback=self._set_os_info,
    
    242 242
                 user_data=contact.resource)
    
    ... ... @@ -485,7 +485,7 @@ def set_entity_time(self, entity_time: Optional[str]) -> None:
    485 485
     
    
    486 486
         def set_software(self, software: Optional[SoftwareVersionResult]) -> None:
    
    487 487
             if software is not None:
    
    488
    -            software_string = '%s %s' % (software.name, software.version)
    
    488
    +            software_string = f'{software.name} {software.version}'
    
    489 489
                 self._ui.software_value.set_text(software_string)
    
    490 490
                 self._ui.software_value.show()
    
    491 491
                 self._ui.software_label.show()
    

  • pyrightconfig.json
    ... ... @@ -31,6 +31,7 @@
    31 31
             "gajim/gtk/chat_list_stack.py",
    
    32 32
             "gajim/gtk/chat_page.py",
    
    33 33
             "gajim/gtk/const.py",
    
    34
    +        "gajim/gtk/contact_info.py",
    
    34 35
             "gajim/gtk/contacts_flowbox.py",
    
    35 36
             "gajim/gtk/conversation/code_widget.py",
    
    36 37
             "gajim/gtk/conversation/jump_to_end_button.py",