diff options
| author | Matthew Petroff <matthew@mpetroff.net> | 2013-07-30 01:54:37 +0000 |
|---|---|---|
| committer | Matthew Petroff <matthew@mpetroff.net> | 2013-07-30 01:54:37 +0000 |
| commit | 3dab417176ed1ba5b1301acbd9a1c08e8c546c49 (patch) | |
| tree | 83d01a0cc1356dd914b6690a5dbffd6e840e16af /src/main.cpp | |
| parent | Update unit extraction regular expressions. (diff) | |
| parent | Remove unnecessary variable from the GMarkup-based unit parser (diff) | |
| download | inkscape-3dab417176ed1ba5b1301acbd9a1c08e8c546c49.tar.gz inkscape-3dab417176ed1ba5b1301acbd9a1c08e8c546c49.zip | |
Merge from trunk.
(bzr r12380.1.51)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp index 4e2f2fd2b..d425b88bb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1283,12 +1283,15 @@ int sp_main_console(int argc, char const **argv) { /* We are started in text mode */ +#if !GLIB_CHECK_VERSION(2,36,0) /* Do this g_type_init(), so that we can use Xft/Freetype2 (Pango) * in a non-Gtk environment. Used in libnrtype's * FontInstance.cpp and FontFactory.cpp. * http://mail.gnome.org/archives/gtk-list/2003-December/msg00063.html */ g_type_init(); +#endif + char **argv2 = const_cast<char **>(argv); gtk_init_check( &argc, &argv2 ); //setlocale(LC_ALL, ""); |