From 912192ed4126b1ab3b6ec5f600ee628c3102f9d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Sat, 23 Dec 2017 21:08:00 +0100 Subject: [PATCH] NotificationAreaTooltip: Dont inherit from BaseTooltip --- gajim/statusicon.py | 3 +-- gajim/tooltips.py | 9 +++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gajim/statusicon.py b/gajim/statusicon.py index a321c1f3f..86edee6f0 100644 --- a/gajim/statusicon.py +++ b/gajim/statusicon.py @@ -104,8 +104,7 @@ class StatusIcon: self.make_menu(event_button, event_time) def on_status_icon_query_tooltip(self, widget, x, y, keyboard_mode, tooltip): - self.tooltip.populate() - tooltip.set_custom(self.tooltip.hbox) + tooltip.set_custom(self.tooltip.get_tooltip()) return True def hide_icon(self): diff --git a/gajim/tooltips.py b/gajim/tooltips.py index a138b26d9..7a7d46380 100644 --- a/gajim/tooltips.py +++ b/gajim/tooltips.py @@ -263,13 +263,13 @@ class StatusTable: self.table.attach(lock_image, 4, self.current_row, 1, 1) self.current_row += 1 -class NotificationAreaTooltip(BaseTooltip, StatusTable): + +class NotificationAreaTooltip(StatusTable): """ Tooltip that is shown in the notification area """ def __init__(self): - BaseTooltip.__init__(self) StatusTable.__init__(self) def fill_table_with_accounts(self, accounts): @@ -297,8 +297,7 @@ class NotificationAreaTooltip(BaseTooltip, StatusTable): for line in acct['event_lines']: self.add_text_row(' ' + line, 1) - def populate(self, data=''): - self.create_window() + def get_tooltip(self): self.create_table() accounts = helpers.get_notification_icon_tooltip_dict() @@ -308,6 +307,8 @@ class NotificationAreaTooltip(BaseTooltip, StatusTable): self.hbox.add(self.table) self.hbox.show_all() + return self.hbox + class GCTooltip(Gtk.Window): # pylint: disable=E1101