From ef1771c4798ba6538159d41830fe481400fcde00 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Sun, 12 Jun 2005 16:56:26 +0000 Subject: [PATCH] show the account name when we receive a subscription request --- src/dialogs.py | 13 ++++++------- src/gtkgui.glade | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/dialogs.py b/src/dialogs.py index 7e8feeba7..7118b3ece 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -462,12 +462,11 @@ class HigDialog(Dialog): return response class ConfirmationDialog(HigDialog): - def __init__(self, pritext, sectext=''): - """HIG compliant confirmation dialog.""" - HigDialog.__init__( - self, None, pritext, sectext, gtk.STOCK_DIALOG_WARNING, - [ [gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL], [ gtk.STOCK_OK, gtk.RESPONSE_OK ] ] - ) + """HIG compliant confirmation dialog.""" + def __init__(self, pritext, sectext=''): + HigDialog.__init__(self, None, pritext, sectext, + gtk.STOCK_DIALOG_WARNING, [ [gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL], + [ gtk.STOCK_OK, gtk.RESPONSE_OK ] ]) class WarningDialog(HigDialog): def __init__(self, pritext, sectext=''): @@ -515,7 +514,7 @@ class Subscription_request_window: self.jid = jid self.account = account xml.get_widget('from_label').set_text( - _('Subscription request from %s') % self.jid) + _('Subscription request for account %s from %s') % (account, self.jid)) xml.get_widget('message_textview').get_buffer().set_text(text) xml.signal_autoconnect(self) self.window.show_all() diff --git a/src/gtkgui.glade b/src/gtkgui.glade index 369aae3f4..538d7963e 100644 --- a/src/gtkgui.glade +++ b/src/gtkgui.glade @@ -1963,7 +1963,7 @@ True - Subscription request from + False False GTK_JUSTIFY_LEFT