diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-07-25 19:06:28 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-07-25 19:06:28 +0000 |
| commit | 73e263588ca2ca99ea7cac8bbf274695dcd0bec6 (patch) | |
| tree | 75a0b4cbc426c1c21671ee784c0230b09ffd4fc4 /src/main.cpp | |
| parent | Merged from trunk (r12419). (diff) | |
| parent | Remove unnecessary variable from the GMarkup-based unit parser (diff) | |
| download | inkscape-73e263588ca2ca99ea7cac8bbf274695dcd0bec6.tar.gz inkscape-73e263588ca2ca99ea7cac8bbf274695dcd0bec6.zip | |
Merge from trunk (r12439).
(bzr r11608.1.108)
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 a01c56036..b3070a95c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1282,12 +1282,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, ""); |