Philipp Hörist pushed to branch master at gajim / gajim
Commits:
516119cf by lovetox at 2022-05-13T22:31:45+02:00
fix: Remove iconset leftovers
Fixes #10851
- - - - -
2 changed files:
- gajim/common/setting_values.py
- gajim/gtk/util.py
Changes:
=====================================
gajim/common/setting_values.py
=====================================
@@ -146,7 +146,6 @@ class _ACCOUNT_DEFAULT:
'emoticons_theme',
'gc_refer_to_nick_char',
'global_proxy',
- 'iconset',
'last_save_dir',
'last_send_dir',
'last_sounds_dir',
@@ -189,7 +188,6 @@ class _ACCOUNT_DEFAULT:
'ask_offline_status': False,
'trayicon': 'always',
'allow_hide_roster': False,
- 'iconset': 'dcraven',
'roster_theme': 'default',
'sort_by_show_in_roster': True,
'sort_by_show_in_muc': False,
=====================================
gajim/gtk/util.py
=====================================
@@ -223,21 +223,14 @@ def get_app_icon_list(scale_widget: Gtk.Widget) ->
list[GdkPixbuf.Pixbuf]:
def get_icon_name(name: str,
- iconset: Optional[str] = None,
transport: Optional[str] = None) -> str:
if name == 'not in roster':
name = 'notinroster'
- if iconset is not None:
- return f'{iconset}-{name}'
-
if transport is not None:
return f'{transport}-{name}'
- iconset = app.settings.get('iconset')
- if not iconset:
- iconset = 'dcraven'
- return f'{iconset}-{name}'
+ return f'dcraven-{name}'
def load_user_iconsets() -> None:
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/516119cf63119f142df125f80a81c5829f212132
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/516119cf63119f142df125f80a81c5829f212132
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits