diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index e93d7ea2b..5a77eed29 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -5847,31 +5847,6 @@ Custom
-
-
- True
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- True
- 0
- 0.5
- 5
- 5
-
-
- 1
- 2
- 3
- 4
- fill
-
-
-
-
True
@@ -6214,6 +6189,39 @@ Custom
+
+
+
+ True
+ True
+ False
+
+
+
+ True
+ True
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ True
+ 0
+ 0.5
+ 5
+ 5
+
+
+
+
+ 1
+ 2
+ 3
+ 4
+ fill
+
+
+
False
diff --git a/src/vcard.py b/src/vcard.py
index fb639fbd5..07750a51c 100644
--- a/src/vcard.py
+++ b/src/vcard.py
@@ -254,7 +254,16 @@ class VcardWindow:
'os': ''}
i += 1
self.xml.get_widget('resource_label').set_text(resources)
- self.xml.get_widget('status_label').set_text(stats)
+
+ status_label = self.xml.get_widget('status_label')
+ #FIXME: when gtk2.4 is OOOOLD do it via glade2.10+
+ if gtk.pygtk_version > (2, 6, 0) and gtk.gtk_version > (2, 6, 0):
+ tip = gtk.Tooltips()
+ status_label_eventbox = self.xml.get_widget('status_label_eventbox')
+ tip.set_tip(status_label_eventbox, stats)
+ status_label.set_max_width_chars(15)
+ status_label.set_text(stats)
+
gajim.connections[self.account].request_vcard(self.user.jid)
def add_to_vcard(self, vcard, entry, txt):
@@ -351,14 +360,14 @@ class VcardWindow:
#publish button
button = gtk.Button(stock = gtk.STOCK_GOTO_TOP)
button.get_children()[0].get_children()[0].get_children()[1].set_text(
- _('Publish'))
+ _('_Publish'))
button.connect('clicked', self.on_publish_button_clicked)
button.show_all()
information_hbuttonbox.pack_start(button)
#retrieve button
button = gtk.Button(stock = gtk.STOCK_GOTO_BOTTOM)
button.get_children()[0].get_children()[0].get_children()[1].set_text(
- _('Retrieve'))
+ _('_Retrieve'))
button.connect('clicked', self.on_retrieve_button_clicked)
button.show_all()
information_hbuttonbox.pack_start(button)