diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-11-25 20:51:17 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2010-11-25 20:51:17 +0000 |
| commit | 0bd9f7e209d522dbcebe0449a91397fdd9e38977 (patch) | |
| tree | 834c7d02456658b57625ab68cc28f7854a5a85dc /src/main.cpp | |
| parent | Fix handling of x and y attributes of patterns (diff) | |
| parent | Fix ruler redraw issue on GTK 2.22 (diff) | |
| download | inkscape-0bd9f7e209d522dbcebe0449a91397fdd9e38977.tar.gz inkscape-0bd9f7e209d522dbcebe0449a91397fdd9e38977.zip | |
Merge from trunk
(bzr r9508.1.70)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp index 78b66d847..eda6d0b03 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; @@ -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, (const char **) argv); + } else { + retcode = sp_main_console(argc, (const char **) argv); + } + + return retcode; } |