Add option to align & distribute dialog to treat the selection as a group (closes...

[inkscape.git] / src / ui / dialog / whiteboard-sharewithchat.cpp

diff --git a/src/ui/dialog/whiteboard-sharewithchat.cpp b/src/ui/dialog/whiteboard-sharewithchat.cpp
index 4c86b0dfac416dfac6e4af439e2eae254396ca20..b2b913de06e3981bc0dff34a23c6c032597e8130 100644 (file)
--- a/src/ui/dialog/whiteboard-sharewithchat.cpp
+++ b/src/ui/dialog/whiteboard-sharewithchat.cpp
@@ -20,6 +20,8 @@
 #include "inkscape.h"
 #include "desktop.h"
 
+#include "prefs-utils.h"
+
 #include "jabber_whiteboard/typedefs.h"
 #include "jabber_whiteboard/session-manager.h"
 #include "jabber_whiteboard/buddy-list-manager.h"
@@ -58,8 +60,8 @@ WhiteboardShareWithChatroomDialogImpl::~WhiteboardShareWithChatroomDialogImpl()
 void
 WhiteboardShareWithChatroomDialogImpl::setSessionManager()
 {
-       this->_desktop = SP_ACTIVE_DESKTOP;
-       this->_sm = SP_ACTIVE_DESKTOP->whiteboard_session_manager();
+        this->_desktop = this->getDesktop();
+       this->_sm = this->_desktop->whiteboard_session_manager();
 
 }
 
@@ -80,6 +82,11 @@ WhiteboardShareWithChatroomDialogImpl::_construct()
        this->_labels[2].set_mnemonic_widget(this->_roompass);
        this->_labels[3].set_mnemonic_widget(this->_handle);
 
+
+       this->_roomname.set_text(prefs_get_string_attribute("whiteboard.room", "name"));
+       this->_confserver.set_text(prefs_get_string_attribute("whiteboard.room", "server"));
+       this->_handle.set_text(prefs_get_string_attribute("whiteboard.server", "username"));
+
        // Pack table
        this->_layout.attach(this->_labels[0], 0, 1, 0, 1);
        this->_layout.attach(this->_labels[1], 0, 1, 1, 2);
@@ -105,7 +112,7 @@ WhiteboardShareWithChatroomDialogImpl::_construct()
        this->_buttonsbox.pack_start(this->_share);
 
        // Set default values
-       Glib::ustring jid = lm_connection_get_jid(this->_sm->session_data->connection);
+       Glib::ustring jid = this->_sm->session_data->jid;
        Glib::ustring nick = jid.substr(0, jid.find_first_of('@'));
        this->_handle.set_text(nick);
        this->_roomname.set_text("inkboard");