diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-07-17 18:47:49 +0000 |
|---|---|---|
| committer | Javiertxo <jtx@jtx.marker.es> | 2013-07-17 18:47:49 +0000 |
| commit | 00b6038922558dec35d4ba2b5d9a1c96edc7ee5d (patch) | |
| tree | b3200a45594f2b55a4b753bc28e07246a94e5644 /src/main.cpp | |
| parent | Update to trunk (diff) | |
| parent | Changed metadata tooltips to match the definition of Dublin Core terms. (diff) | |
| download | inkscape-00b6038922558dec35d4ba2b5d9a1c96edc7ee5d.tar.gz inkscape-00b6038922558dec35d4ba2b5d9a1c96edc7ee5d.zip | |
Update to trunk
(bzr r11950.1.126)
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, ""); |