Skip to content
Snippets Groups Projects
Commit fe7cdb53 authored by Philipp Hörist's avatar Philipp Hörist
Browse files

Don’t return None on format_*() calls

Fixes #10235
parent 6394776f
No related branches found
No related tags found
No related merge requests found
...@@ -554,9 +554,6 @@ def get_account_mood_icon_name(account): ...@@ -554,9 +554,6 @@ def get_account_mood_icon_name(account):
def format_activity(activity, subactivity, text): def format_activity(activity, subactivity, text):
if activity is None:
return None
if subactivity in ACTIVITIES[activity]: if subactivity in ACTIVITIES[activity]:
subactivity = ACTIVITIES[activity][subactivity] subactivity = ACTIVITIES[activity][subactivity]
activity = ACTIVITIES[activity]['category'] activity = ACTIVITIES[activity]['category']
...@@ -586,8 +583,6 @@ def get_account_activity_icon_name(account): ...@@ -586,8 +583,6 @@ def get_account_activity_icon_name(account):
def format_tune(artist, _length, _rating, source, title, _track, _uri): def format_tune(artist, _length, _rating, source, title, _track, _uri):
if artist is None and title is None and source is None:
return None
artist = GLib.markup_escape_text(artist or _('Unknown Artist')) artist = GLib.markup_escape_text(artist or _('Unknown Artist'))
title = GLib.markup_escape_text(title or _('Unknown Title')) title = GLib.markup_escape_text(title or _('Unknown Title'))
source = GLib.markup_escape_text(source or _('Unknown Source')) source = GLib.markup_escape_text(source or _('Unknown Source'))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment