diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2019-01-14 01:00:38 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2019-01-14 01:00:38 +0000 |
| commit | 613941df6339335c98c4acf04379a91f5997a72d (patch) | |
| tree | 7e4e99cd76b6465dc21a745532bdd26ccd2494e9 | |
| parent | Merge branch 'transl_fr2' of gitlab.com:gadic/inkscape (diff) | |
| download | inkscape-613941df6339335c98c4acf04379a91f5997a72d.tar.gz inkscape-613941df6339335c98c4acf04379a91f5997a72d.zip | |
Fix memleak and hopefully windows CI
| -rw-r--r-- | share/templates/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/preferences.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/share/templates/CMakeLists.txt b/share/templates/CMakeLists.txt index 870244657..aecdca6bb 100644 --- a/share/templates/CMakeLists.txt +++ b/share/templates/CMakeLists.txt @@ -17,7 +17,7 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${INKSCAPE_SHARE_INSTA add_custom_target(inkscape_default_svg ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/create_defaults.pl ${CMAKE_CURRENT_SOURCE_DIR}/default.svg - BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/default-* + #BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/default-* COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/create_defaults.pl" COMMAND sh -c "mv default-* ${CMAKE_CURRENT_BINARY_DIR}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/preferences.cpp b/src/preferences.cpp index 4321b9e0d..8954ce5eb 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -299,7 +299,7 @@ void Preferences::reset() { if (g_file_test(_prefs_filename.c_str(), G_FILE_TEST_EXISTS)) { int retcode = g_unlink (_prefs_filename.c_str()); - if (retcode == 0) g_strdup_printf(_("Preferences file was deleted.")); + if (retcode == 0) g_warning(_("Preferences file was deleted.")); else g_warning(_("There was an error trying to delete the preferences file.")); } for (_ObsMap::iterator i = _observer_map.begin(); i != _observer_map.end(); ) { |