diff --git a/daemon.py b/daemon.py index 3cfc13aa9..abee985c8 100644 --- a/daemon.py +++ b/daemon.py @@ -1077,7 +1077,7 @@ def run_daemon(accounts_data_dir: str, httpd.full_width_tl_button_header = full_width_tl_button_header # whether to show icons in the header (eg calendar) as buttons - httpd.icons_as_buttons = icons_as_buttons + httpd.icons_as_buttons = False # whether to show the RSS icon at the top or the bottom of the timeline httpd.rss_icon_at_top = rss_icon_at_top diff --git a/daemon_get.py b/daemon_get.py index d16982ea5..33c4efe42 100644 --- a/daemon_get.py +++ b/daemon_get.py @@ -2981,7 +2981,7 @@ def daemon_http_get(self) -> None: '/users/' + nickname + '/' + self.server.default_timeline show_publish_as_icon = self.server.show_publish_as_icon rss_icon_at_top = self.server.rss_icon_at_top - icons_as_buttons = self.server.icons_as_buttons + icons_as_buttons = False default_timeline = self.server.default_timeline access_keys = self.server.access_keys if self.server.key_shortcuts.get(nickname): @@ -3026,7 +3026,7 @@ def daemon_http_get(self) -> None: access_keys = self.server.key_shortcuts[nickname] timeline_path = \ '/users/' + nickname + '/' + self.server.default_timeline - icons_as_buttons = self.server.icons_as_buttons + icons_as_buttons = False default_timeline = self.server.default_timeline shared_items_domains = \ self.server.shared_items_federated_domains diff --git a/daemon_post_profile.py b/daemon_post_profile.py index 327e56d6c..2fd46268a 100644 --- a/daemon_post_profile.py +++ b/daemon_post_profile.py @@ -1444,8 +1444,7 @@ def _profile_post_remove_custom_font(base_dir: str, nickname: str, domain: str, get_config_param(base_dir, 'showPublishAsIcon') self.server.full_width_tl_button_header = \ get_config_param(base_dir, 'fullWidthTimelineButtonHeader') - self.server.icons_as_buttons = \ - get_config_param(base_dir, 'iconsAsButtons') + self.server.icons_as_buttons = False self.server.rss_icon_at_top = \ get_config_param(base_dir, 'rssIconAtTop') self.server.publish_button_at_top = \ @@ -2617,8 +2616,7 @@ def _profile_post_theme_change(base_dir: str, nickname: str, get_config_param(base_dir, 'showPublishAsIcon') self.server.full_width_tl_button_header = \ get_config_param(base_dir, 'fullWidthTlButtonHeader') - self.server.icons_as_buttons = \ - get_config_param(base_dir, 'iconsAsButtons') + self.server.icons_as_buttons = False self.server.rss_icon_at_top = \ get_config_param(base_dir, 'rssIconAtTop') self.server.publish_button_at_top = \ diff --git a/daemon_post_theme.py b/daemon_post_theme.py index 6900b7a40..48409ea96 100644 --- a/daemon_post_theme.py +++ b/daemon_post_theme.py @@ -135,11 +135,6 @@ def theme_designer_edit(self, calling_domain: str, cookie: str, self.server.show_publish_as_icon = True else: self.server.show_publish_as_icon = False - if 'icons-as-buttons' in theme_designer_params: - if theme_designer_params['icons-as-buttons'].lower() == 'true': - self.server.icons_as_buttons = True - else: - self.server.icons_as_buttons = False if 'full-width-timeline-buttons' in theme_designer_params: theme_value = theme_designer_params['full-width-timeline-buttons'] if theme_value.lower() == 'true': diff --git a/epicyon.py b/epicyon.py index 5cfc5cd6b..73d583254 100644 --- a/epicyon.py +++ b/epicyon.py @@ -4159,10 +4159,7 @@ def _command_options() -> None: if show_publish_as_icon is not None: argb.show_publish_as_icon = bool(show_publish_as_icon) - icons_as_buttons = \ - get_config_param(base_dir, 'iconsAsButtons') - if icons_as_buttons is not None: - argb.icons_as_buttons = bool(icons_as_buttons) + icons_as_buttons = False rss_icon_at_top = \ get_config_param(base_dir, 'rssIconAtTop')