diff --git a/plugins/gtkgui/dialogs.py b/plugins/gtkgui/dialogs.py
index 7e970b6d4..db8c96d0f 100644
--- a/plugins/gtkgui/dialogs.py
+++ b/plugins/gtkgui/dialogs.py
@@ -596,18 +596,21 @@ class new_message_window: #FIXME: NOT READY
def on_chat_button_clicked(self, widget):
"""When Chat button is clicked"""
#FIXME: either make it simple entry, or find a way to handle windows the easy way
+ userid_comboboxentry = self.xml.get_widget('userid_comboboxentry')
+ userid_comboboxentry.child.set_activates_default(True)
userid = self.xml.get_widget('userid_comboboxentry').child.get_text()
#FIXME: if the user doesn't give jid, but name look in the roster
#DO IT WITH AUTOCOMPLETE
#SO USER ID SHOULD BECOME JID and sent to new_chat()
jid = userid
- if not self.contacts[account].has_key(jid):
- # use User class, new_chat expects it that way
- user = gtkgui.User(jid, jid, ['not in the roster'], \
- 'not in the roster', 'not in the roster', 'none', None, '', 0, '')
- self.plugin.roster.contacts[self.account][jid] = [user]
- self.plugin.roster.add_user_to_roster(user.jid, self.account)
+ #FIXME: if user is there, use that instance IF POSSIBLE [is it Yann?]
+ #if not self.plugin.roster.contacts[self.account].has_key(jid):
+ # use User class, new_chat expects it that way
+ user = gtkgui.User(jid, jid, ['not in the roster'], \
+ 'not in the roster', 'not in the roster', 'none', None, '', 0, '')
+ self.plugin.roster.contacts[self.account][jid] = [user]
+ self.plugin.roster.add_user_to_roster(user.jid, self.account)
self.plugin.roster.new_chat(user, self.account)
widget.get_toplevel().destroy()
diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade
index b31b9647c..754a28f3c 100644
--- a/plugins/gtkgui/gtkgui.glade
+++ b/plugins/gtkgui/gtkgui.glade
@@ -8319,7 +8319,7 @@ send a chat message to
True
GTK_BUTTONBOX_END
- 5
+ 10
@@ -8416,22 +8416,225 @@ send a chat message to
-
+
+ 4
True
Edit Groups
GTK_WINDOW_TOPLEVEL
GTK_WIN_POS_NONE
False
- True
+ False
False
True
False
False
GDK_WINDOW_TYPE_HINT_NORMAL
GDK_GRAVITY_NORTH_WEST
+ False
-
-
+
+
+ True
+ False
+ 5
+
+
+
+ True
+ GTK_BUTTONBOX_END
+
+
+
+ True
+ True
+ True
+ gtk-apply
+ True
+ GTK_RELIEF_NORMAL
+ True
+ -10
+
+
+
+
+
+ True
+ True
+ True
+ gtk-cancel
+ True
+ GTK_RELIEF_NORMAL
+ True
+ -6
+
+
+
+
+
+ True
+ True
+ True
+ True
+ gtk-ok
+ True
+ GTK_RELIEF_NORMAL
+ True
+ -5
+
+
+
+
+ 0
+ False
+ True
+ GTK_PACK_END
+
+
+
+
+
+ 6
+ True
+ False
+ 5
+
+
+
+ True
+ False
+ 0
+
+
+
+ True
+ <b>Edit groups for Nickname</b>
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ jid_label
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ False
+ 5
+
+
+
+ True
+ True
+ True
+ True
+ 0
+
+ True
+ *
+ False
+
+
+ 0
+ True
+ True
+
+
+
+
+
+ True
+ True
+ gtk-add
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+ 0
+ False
+ False
+
+
+
+
+ 0
+ True
+ True
+
+
+
+
+
+ True
+ True
+ GTK_POLICY_AUTOMATIC
+ GTK_POLICY_AUTOMATIC
+ GTK_SHADOW_IN
+ GTK_CORNER_TOP_LEFT
+
+
+
+ True
+ True
+ False
+ False
+ False
+ True
+
+
+
+
+ 0
+ True
+ True
+
+
+
+
+ 0
+ False
+ False
+
+
+