diff options
| author | daleharvey <daleharvey@users.sourceforge.net> | 2006-05-10 14:34:38 +0000 |
|---|---|---|
| committer | daleharvey <daleharvey@users.sourceforge.net> | 2006-05-10 14:34:38 +0000 |
| commit | ab7611d30ca5cc00e2d6a75eff4e2d91d64bc09d (patch) | |
| tree | 4355ac27318e825f3e7b67e965ba41ba17bbd3f8 /src/jabber_whiteboard/connection-establishment.cpp | |
| parent | increased alarm time-out to 60 secs (because 30 seconds may not have been eno... (diff) | |
| download | inkscape-ab7611d30ca5cc00e2d6a75eff4e2d91d64bc09d.tar.gz inkscape-ab7611d30ca5cc00e2d6a75eff4e2d91d64bc09d.zip | |
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)
Diffstat (limited to 'src/jabber_whiteboard/connection-establishment.cpp')
| -rw-r--r-- | src/jabber_whiteboard/connection-establishment.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 <x xmlns='http://jabber.org/protocol/muc/' /> // (Not anymore: we don't speak it! -- yipdw) @@ -284,7 +284,7 @@ SessionManager::receiveConnectRequestResponse(InvitationResponses response, std: Glib::ustring primary = String::ucompose(_("<span weight=\"bold\" size=\"larger\">The user <b>%1</b> has refused your whiteboard invitation.</span>\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 <b>%2</b>, and may send an invitation to <b>%1</b> 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 <b>%2</b>, and may send an invitation to <b>%1</b> 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(); |