Remove the failed and unused "new gui" stuff.

(bzr r9828)

5 files changed, 4 insertions, 36 deletions

diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index 2483dc50e..72da46e29 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -20,8 +20,6 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "application/application.h"
-#include "application/editor.h"
 #include "inkscape.h"
 #include "event-context.h"
 #include "desktop.h"
@@ -109,17 +107,10 @@ Dialog::Dialog(Behavior::BehaviorFactory behavior_factory, const char *prefs_pat
 
     _behavior = behavior_factory(*this);
 
-    if (Inkscape::NSApplication::Application::getNewGui()) {
-        _desktop_activated_connection = Inkscape::NSApplication::Editor::connectDesktopActivated (sigc::mem_fun (*this, &Dialog::onDesktopActivated));
-        _dialogs_hidden_connection = Inkscape::NSApplication::Editor::connectDialogsHidden (sigc::mem_fun (*this, &Dialog::onHideF12));
-        _dialogs_unhidden_connection = Inkscape::NSApplication::Editor::connectDialogsUnhidden (sigc::mem_fun (*this, &Dialog::onShowF12));
-        _shutdown_connection = Inkscape::NSApplication::Editor::connectShutdown (sigc::mem_fun (*this, &Dialog::onShutdown));
-    } else {
-        g_signal_connect(G_OBJECT(INKSCAPE), "activate_desktop", G_CALLBACK(sp_retransientize), (void *)this);
-        g_signal_connect(G_OBJECT(INKSCAPE), "dialogs_hide", G_CALLBACK(hideCallback), (void *)this);
-        g_signal_connect(G_OBJECT(INKSCAPE), "dialogs_unhide", G_CALLBACK(unhideCallback), (void *)this);
-        g_signal_connect(G_OBJECT(INKSCAPE), "shut_down", G_CALLBACK(sp_dialog_shutdown), (void *)this);
-    }
+    g_signal_connect(G_OBJECT(INKSCAPE), "activate_desktop", G_CALLBACK(sp_retransientize), (void *)this);
+    g_signal_connect(G_OBJECT(INKSCAPE), "dialogs_hide", G_CALLBACK(hideCallback), (void *)this);
+    g_signal_connect(G_OBJECT(INKSCAPE), "dialogs_unhide", G_CALLBACK(unhideCallback), (void *)this);
+    g_signal_connect(G_OBJECT(INKSCAPE), "shut_down", G_CALLBACK(sp_dialog_shutdown), (void *)this);
 
     Glib::wrap(gobj())->signal_event().connect(sigc::mem_fun(*this, &Dialog::_onEvent));
     Glib::wrap(gobj())->signal_key_press_event().connect(sigc::mem_fun(*this, &Dialog::_onKeyPress));
@@ -129,14 +120,6 @@ Dialog::Dialog(Behavior::BehaviorFactory behavior_factory, const char *prefs_pat
 
 Dialog::~Dialog()
 {
-    if (Inkscape::NSApplication::Application::getNewGui())
-    {
-        _desktop_activated_connection.disconnect();
-        _dialogs_hidden_connection.disconnect();
-        _dialogs_unhidden_connection.disconnect();
-        _shutdown_connection.disconnect();
-    }
-
     save_geometry();
     delete _behavior;
     _behavior = 0;
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 9cfb9c0b5..c3ba9da9f 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -27,8 +27,6 @@
 #include <gtkmm/tooltips.h>
 #include <glibmm/i18n.h>
 
-#include "application/application.h"
-#include "application/editor.h"
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "dialog-manager.h"
diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp
index 85f078439..884037c25 100644
--- a/src/ui/dialog/floating-behavior.cpp
+++ b/src/ui/dialog/floating-behavior.cpp
@@ -15,8 +15,6 @@
 #include "floating-behavior.h"
 #include "dialog.h"
 
-#include "application/application.h"
-#include "application/editor.h"
 #include "inkscape.h"
 #include "desktop.h"
 #include "dialogs/dialog-events.h"
diff --git a/src/ui/dialog/transformation.h b/src/ui/dialog/transformation.h
index 0607871fd..86c8a9229 100644
--- a/src/ui/dialog/transformation.h
+++ b/src/ui/dialog/transformation.h
@@ -19,7 +19,6 @@
 
 
 #include "ui/widget/panel.h"
-#include "application/application.h"
 #include "ui/widget/notebook-page.h"
 #include "ui/widget/scalar-unit.h"
 #include "ui/widget/imageicon.h"
@@ -145,12 +144,6 @@ protected:
 
     virtual void _apply();
     void presentPage(PageType page);
-
-    void onSelectionChanged(Inkscape::NSApplication::Application *inkscape,
-                            Inkscape::Selection *selection);
-    void onSelectionModified(Inkscape::NSApplication::Application *inkscape,
-                             Inkscape::Selection *selection,
-                             int unsigned flags);
     void onSwitchPage(GtkNotebookPage *page,
                     guint pagenum);
 
diff --git a/src/ui/view/Makefile_insert b/src/ui/view/Makefile_insert
index 812ce21ca..b3ab598d4 100644
--- a/src/ui/view/Makefile_insert
+++ b/src/ui/view/Makefile_insert
@@ -1,10 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
 ink_common_sources +=		\
-	ui/view/edit.h			\
-	ui/view/edit.cpp		\
-	ui/view/edit-widget.h		\
-	ui/view/edit-widget.cpp		\
 	ui/view/edit-widget-interface.h \
 	ui/view/view.h			\
 	ui/view/view.cpp		\