From fe7cdb53372666e768cb4f07a5cfb18dc34d82da Mon Sep 17 00:00:00 2001
From: lovetox <philipp@hoerist.com>
Date: Tue, 29 Dec 2020 21:51:38 +0100
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20return=20None=20on=20format=5F*?=
=?UTF-8?q?()=20calls?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes #10235
---
gajim/gtk/util.py | 5 -----
1 file changed, 5 deletions(-)
diff --git a/gajim/gtk/util.py b/gajim/gtk/util.py
index ac1dd53929..fb6b39c526 100644
--- a/gajim/gtk/util.py
+++ b/gajim/gtk/util.py
@@ -554,9 +554,6 @@ def get_account_mood_icon_name(account):
def format_activity(activity, subactivity, text):
- if activity is None:
- return None
-
if subactivity in ACTIVITIES[activity]:
subactivity = ACTIVITIES[activity][subactivity]
activity = ACTIVITIES[activity]['category']
@@ -586,8 +583,6 @@ def get_account_activity_icon_name(account):
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'))
title = GLib.markup_escape_text(title or _('Unknown Title'))
source = GLib.markup_escape_text(source or _('Unknown Source'))
--
GitLab