diff options
Diffstat (limited to 'src/jabber_whiteboard/session-manager.cpp')
| -rw-r--r-- | src/jabber_whiteboard/session-manager.cpp | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/src/jabber_whiteboard/session-manager.cpp b/src/jabber_whiteboard/session-manager.cpp index a04ab05f0..0dcd744c3 100644 --- a/src/jabber_whiteboard/session-manager.cpp +++ b/src/jabber_whiteboard/session-manager.cpp @@ -29,9 +29,6 @@ #include "ui/view/view-widget.h" -#include "application/application.h" -#include "application/editor.h" - #include "document-private.h" #include "interface.h" #include "sp-namedview.h" @@ -386,20 +383,14 @@ makeInkboardDesktop(SPDocument* doc) { SPDesktop* dt; - if (NSApplication::Application::getNewGui()) - dt = NSApplication::Editor::createDesktop(doc); + SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL)); + g_return_val_if_fail(dtw != NULL, NULL); + sp_document_unref(doc); - else - { - SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL)); - g_return_val_if_fail(dtw != NULL, NULL); - sp_document_unref(doc); - - sp_create_window(dtw, TRUE); - dt = static_cast<SPDesktop*>(dtw->view); - sp_namedview_window_from_document(dt); - sp_namedview_update_layers_from_document(dt); - } + sp_create_window(dtw, TRUE); + dt = static_cast<SPDesktop*>(dtw->view); + sp_namedview_window_from_document(dt); + sp_namedview_update_layers_from_document(dt); return dt; } @@ -418,4 +409,4 @@ makeInkboardDesktop(SPDocument* doc) fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : |