Extensions. Shebangs branch merge.

[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 b2b913de06e3981bc0dff34a23c6c032597e8130..3315a7029cc53425eaf01eaa0eef82d79e3c0ef4 100644 (file)
--- a/src/ui/dialog/whiteboard-sharewithchat.cpp
+++ b/src/ui/dialog/whiteboard-sharewithchat.cpp
@@ -1,12 +1,15 @@
-/**
- * Whiteboard share with chatroom dialog
- *
- * Authors:
- * David Yip <yipdw@rose-hulman.edu>
- * Jason Segal, Jonas Collaros, Stephen Montgomery, Brandi Soggs, Matthew Weinstock (original C/Gtk version)
+/** @file
+ * @brief Whiteboard share with chatroom dialog - implementation
+ */
+/* Authors:
+ *   David Yip <yipdw@rose-hulman.edu>
+ *   Jason Segal
+ *   Jonas Collaros
+ *   Stephen Montgomery
+ *   Brandi Soggs
+ *   Matthew Weinstock (original C/Gtk version)
  *
  * Copyright (c) 2004-2005 Authors
- *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
@@ -20,7 +23,7 @@
 #include "inkscape.h"
 #include "desktop.h"
 
-#include "prefs-utils.h"
+#include "preferences.h"
 
 #include "jabber_whiteboard/typedefs.h"
 #include "jabber_whiteboard/session-manager.h"
@@ -33,9 +36,7 @@
 #include "util/ucompose.hpp"
 
 namespace Inkscape {
-
 namespace UI {
-
 namespace Dialog {
 
 WhiteboardShareWithChatroomDialog* 
@@ -60,7 +61,7 @@ WhiteboardShareWithChatroomDialogImpl::~WhiteboardShareWithChatroomDialogImpl()
 void
 WhiteboardShareWithChatroomDialogImpl::setSessionManager()
 {
-        this->_desktop = this->getDesktop();
+    this->_desktop = this->getDesktop();
        this->_sm = this->_desktop->whiteboard_session_manager();
 
 }
@@ -82,10 +83,10 @@ 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"));
+       Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+       this->_roomname.set_text(prefs->getString("/whiteboard/room/name"));
+       this->_confserver.set_text(prefs->getString("/whiteboard/room/server"));
+       this->_handle.set_text(prefs->getString("/whiteboard/server/username"));
 
        // Pack table
        this->_layout.attach(this->_labels[0], 0, 1, 0, 1);
@@ -147,8 +148,17 @@ WhiteboardShareWithChatroomDialogImpl::_respCallback(int resp)
        }
 }
 
-}
-
-}
-
-}
+} // namespace Dialog
+} // namespace UI
+} // namespace Inkscape
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :