From 36fd551c10a5af0ce5f64bcac0d3725ac4abf86d Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Mon, 10 Apr 2006 11:13:18 +0000
Subject: [PATCH] "Set avatar when I connect" -> "Set my profile when I
connect". Fixes #1837
---
src/gajim.py | 2 --
src/gtkgui.glade | 35 +++++++++++++++++++++++++----------
2 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/gajim.py b/src/gajim.py
index 18dbaf8f6a..0b07281ac7 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -777,8 +777,6 @@ class Interface:
win = self.instances[account]['infos'][array['jid']]
win.set_values(array)
if account in self.show_vcard_when_connect:
- win.xml.get_widget('information_notebook').set_current_page(-1)
- win.xml.get_widget('set_avatar_button').clicked()
self.show_vcard_when_connect.remove(account)
def handle_event_vcard(self, account, vcard):
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index a1bff23d70..77e7d6e041 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -10877,14 +10877,14 @@ Custom</property>
</child>
</widget>
</child>
-
+
<child>
- <widget class="GtkImageMenuItem" id="join_gc_menuitem">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Group Chat</property>
- <property name="use_underline">True</property>
+ <widget class="GtkImageMenuItem" id="join_gc_menuitem">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Group Chat</property>
+ <property name="use_underline">True</property>
- <child internal-child="image">
+ <child internal-child="image">
<widget class="GtkImage" id="image1445">
<property name="visible">True</property>
<property name="stock">gtk-connect</property>
@@ -10894,10 +10894,10 @@ Custom</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
- </child>
- </widget>
+ </child>
+ </widget>
</child>
-
+
<child>
<widget class="GtkSeparatorMenuItem" id="separator12">
<property name="visible">True</property>
@@ -13090,7 +13090,7 @@ Please wait...</property>
<widget class="GtkCheckButton" id="show_vcard_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Set an avatar when I connect</property>
+ <property name="label" translatable="yes">Set my profile when I connect</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -20486,6 +20486,7 @@ No</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">phone_work_entry</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -20514,6 +20515,7 @@ No</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">phone_home_entry</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -20866,6 +20868,7 @@ No</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">scrolledwindow44</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -20936,6 +20939,7 @@ No</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">home_city_entry</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -20964,6 +20968,7 @@ No</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">home_pobox_entry</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -21052,6 +21057,7 @@ No</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">home_postal_code_entry</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -21242,6 +21248,7 @@ No</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">scrolledwindow45</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -21312,6 +21319,7 @@ No</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">work_city_entry</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -21340,6 +21348,7 @@ No</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">work_pobox_entry</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -21428,6 +21437,7 @@ No</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">work_postal_code_entry</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -21484,6 +21494,7 @@ No</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">work_province_entry</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -21653,6 +21664,7 @@ No</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">homepage_entry</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -21681,6 +21693,7 @@ No</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">blog_entry</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -21814,6 +21827,7 @@ No</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">profession_entry</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -21842,6 +21856,7 @@ No</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">company_entry</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
--
GitLab