diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 582d4f456..5f7369b7f 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -6648,23 +6648,31 @@ Custom
0
-
- 100
+
True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 5
- 5
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
+ True
+ False
+
+
+
+ 100
+ True
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 5
+ 5
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
0
@@ -6699,22 +6707,30 @@ Custom
-
+
True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
+ True
+ False
+
+
+
+ True
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
0
diff --git a/src/vcard.py b/src/vcard.py
index e8fc0b899..000bf4602 100644
--- a/src/vcard.py
+++ b/src/vcard.py
@@ -274,14 +274,29 @@ class VcardWindow:
self.xml.get_widget('os_label').set_text(os)
def fill_jabber_page(self):
+ tooltips = gtk.Tooltips()
self.xml.get_widget('nickname_label').set_text(self.contact.name)
self.xml.get_widget('jid_label').set_text(self.contact.jid)
uf_sub = helpers.get_uf_sub(self.contact.sub)
self.xml.get_widget('subscription_label').set_text(uf_sub)
+ eb = self.xml.get_widget('subscription_label_eventbox')
+ if self.contact.sub == 'from':
+ tt_text = _("This contact is interested in your presence information, but he/she is not interested in yours")
+ elif self.contact.sub == 'to':
+ tt_text = _("You are interested in the contact's presence information, but he/she is not interested in yours")
+ elif self.contact.sub == 'both':
+ tt_text = _("You and the contact are interested in each other's presence information")
+ else: # None
+ tt_text = _("You are not interested in the contact's presence, and neither he/she is interested in yours")
+ tooltips.set_tip(eb, tt_text)
+
label = self.xml.get_widget('ask_label')
-
uf_ask = helpers.get_uf_ask(self.contact.ask)
label.set_text(uf_ask)
+ eb = self.xml.get_widget('ask_label_eventbox')
+ if self.contact.ask == 'subscribe':
+ tooltips.set_tip(eb,
+ _("You are waiting contact's answer about your subscription request"))
self.xml.get_widget('nickname_entry').set_text(self.contact.name)
log = 1
if self.contact.jid in gajim.config.get_per('accounts', self.account,