From 1e17633d444005f58e53a9a1335b123966f2a67b Mon Sep 17 00:00:00 2001
From: wurstsalat <mailtrash@posteo.de>
Date: Sat, 10 Oct 2020 12:19:19 +0200
Subject: [PATCH] ChatControl: Order message bar buttons correctly
---
gajim/chat_control.py | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/gajim/chat_control.py b/gajim/chat_control.py
index 4859d5a47b..13b6d893f9 100644
--- a/gajim/chat_control.py
+++ b/gajim/chat_control.py
@@ -1510,13 +1510,15 @@ def _got_file_request(self, file_props):
markup += '\n%s: %s' % (
_('Size'),
GLib.format_size_full(file_props.size, units))
- b1 = Gtk.Button.new_with_mnemonic(_('_Accept'))
- b1.connect('clicked', self._on_accept_file_request, file_props)
- b2 = Gtk.Button.new_with_mnemonic(_('_Decline'))
- b2.connect('clicked', self._on_cancel_file_request, file_props)
+ button_decline = Gtk.Button.new_with_mnemonic(_('_Decline'))
+ button_decline.connect(
+ 'clicked', self._on_cancel_file_request, file_props)
+ button_accept = Gtk.Button.new_with_mnemonic(_('_Accept'))
+ button_accept.connect(
+ 'clicked', self._on_accept_file_request, file_props)
self._add_info_bar_message(
markup,
- [b1, b2],
+ [button_decline, button_accept],
file_props,
Gtk.MessageType.QUESTION)
@@ -1570,13 +1572,13 @@ def _get_gc_invitation(self, event):
markup = '<b>%s</b>\n%s' % (_('Group Chat Invitation'), event.muc)
if event.reason:
markup += '\n(%s)' % event.reason
- b1 = Gtk.Button.new_with_mnemonic(_('_Accept'))
- b1.connect('clicked', self._on_accept_gc_invitation, event)
- b2 = Gtk.Button.new_with_mnemonic(_('_Decline'))
- b2.connect('clicked', self._on_cancel_gc_invitation, event)
+ button_decline = Gtk.Button.new_with_mnemonic(_('_Decline'))
+ button_decline.connect('clicked', self._on_cancel_gc_invitation, event)
+ button_accept = Gtk.Button.new_with_mnemonic(_('_Accept'))
+ button_accept.connect('clicked', self._on_accept_gc_invitation, event)
self._add_info_bar_message(
markup,
- [b1, b2],
+ [button_decline, button_accept],
(event.muc, event.reason),
Gtk.MessageType.QUESTION)
--
GitLab