From ab7611d30ca5cc00e2d6a75eff4e2d91d64bc09d Mon Sep 17 00:00:00 2001 From: daleharvey Date: Wed, 10 May 2006 14:34:38 +0000 Subject: Users Jid is now stored in session data, which is used in from attributes. lm_connection_set_jid is now not called, which allows authentication against jabber.org (bzr r805) --- src/jabber_whiteboard/connection-establishment.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/jabber_whiteboard/connection-establishment.cpp') diff --git a/src/jabber_whiteboard/connection-establishment.cpp b/src/jabber_whiteboard/connection-establishment.cpp index 2fb367bed..d33d6d6b2 100644 --- a/src/jabber_whiteboard/connection-establishment.cpp +++ b/src/jabber_whiteboard/connection-establishment.cpp @@ -62,7 +62,7 @@ SessionManager::sendRequestToChatroom(Glib::ustring const& server, Glib::ustring // Add 'from' attribute LmMessageNode* preq_root = lm_message_get_node(presence_req); - lm_message_node_set_attribute(preq_root, "from", lm_connection_get_jid(this->session_data->connection)); + lm_message_node_set_attribute(preq_root, "from", this->session_data->jid.c_str()); // Add // (Not anymore: we don't speak it! -- yipdw) @@ -284,7 +284,7 @@ SessionManager::receiveConnectRequestResponse(InvitationResponses response, std: Glib::ustring primary = String::ucompose(_("The user %1 has refused your whiteboard invitation.\n\n"), sender); // TRANSLATORS: %1 is the peer whom refused our invitation, %2 is our Jabber identity. - Glib::ustring secondary = String::ucompose(_("You are still connected to a Jabber server as %2, and may send an invitation to %1 again, or you may send an invitation to a different user."), sender, lm_connection_get_jid(this->session_data->connection)); + Glib::ustring secondary = String::ucompose(_("You are still connected to a Jabber server as %2, and may send an invitation to %1 again, or you may send an invitation to a different user."), sender, this->session_data->jid); Gtk::MessageDialog dialog(primary + secondary, true, Gtk::MESSAGE_INFO, Gtk::BUTTONS_CLOSE, false); dialog.run(); -- cgit v1.2.3