From be8029ed57d68a7b8e94cfc5b82984a8b1c75e55 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Tue, 12 Oct 2010 22:06:35 +0200 Subject: Remove the failed and unused "new gui" stuff. (bzr r9828) --- src/main.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 78b66d847..605b0f677 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -114,7 +114,6 @@ using Inkscape::Extension::Internal::PrintWin32; #define bind_textdomain_codeset(p,c) #endif -#include "application/application.h" #include "main-cmdlineact.h" #include "widgets/icon.h" #include "ui/widget/panel.h" @@ -208,7 +207,6 @@ static gboolean sp_query_width = FALSE; static gboolean sp_query_height = FALSE; static gboolean sp_query_all = FALSE; static gchar *sp_query_id = NULL; -static int sp_new_gui = FALSE; static gboolean sp_shell = FALSE; static gboolean sp_vacuum_defs = FALSE; @@ -583,7 +581,7 @@ static void set_extensions_env() * architectures it might be called by something else. */ int -main(int argc, char **argv) +main(int argc, const char **argv) { #ifdef HAVE_FPSETMASK /* This is inherited from Sodipodi code, where it was in #ifdef __FreeBSD__. It's probably @@ -713,10 +711,15 @@ main(int argc, char **argv) } #endif // WIN32 - /// \todo Should this be a static object (see inkscape.cpp)? - Inkscape::NSApplication::Application app(argc, argv, use_gui, sp_new_gui); + int retcode; - return app.run(); + if (use_gui) { + retcode = sp_main_gui(argc, argv); + } else { + retcode = sp_main_console(argc, argv); + } + + return retcode; } -- cgit v1.2.3 From de2f3c136fb601ac9bf4a10b594248a705c22357 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Wed, 13 Oct 2010 22:04:35 +0200 Subject: Fix build breakage on Windows after the recent "new gui" removal. (bzr r9830) --- src/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 605b0f677..eda6d0b03 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -581,7 +581,7 @@ static void set_extensions_env() * architectures it might be called by something else. */ int -main(int argc, const char **argv) +main(int argc, char **argv) { #ifdef HAVE_FPSETMASK /* This is inherited from Sodipodi code, where it was in #ifdef __FreeBSD__. It's probably @@ -714,9 +714,9 @@ main(int argc, const char **argv) int retcode; if (use_gui) { - retcode = sp_main_gui(argc, argv); + retcode = sp_main_gui(argc, (const char **) argv); } else { - retcode = sp_main_console(argc, argv); + retcode = sp_main_console(argc, (const char **) argv); } return retcode; -- cgit v1.2.3