diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2009-05-29 04:54:27 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2009-05-29 04:54:27 +0000 |
| commit | 2e201f3adc27ae9fad7cb327d3d9baca1d25432a (patch) | |
| tree | 399570f07e5d96d06f37c542a7d1aeeee72fd5ca /src/inkscape.cpp | |
| parent | Fixed ellipsis (diff) | |
| download | inkscape-2e201f3adc27ae9fad7cb327d3d9baca1d25432a.tar.gz inkscape-2e201f3adc27ae9fad7cb327d3d9baca1d25432a.zip | |
Windows cleanups. Fixes bug #381374.
(bzr r7960)
Diffstat (limited to 'src/inkscape.cpp')
| -rw-r--r-- | src/inkscape.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/inkscape.cpp b/src/inkscape.cpp index 6fe15a11a..f1e2c1684 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -141,7 +141,9 @@ static void (* segv_handler) (int) = SIG_DFL; static void (* abrt_handler) (int) = SIG_DFL; static void (* fpe_handler) (int) = SIG_DFL; static void (* ill_handler) (int) = SIG_DFL; +#ifndef WIN32 static void (* bus_handler) (int) = SIG_DFL; +#endif #define INKSCAPE_PROFILE_DIR "inkscape" #define INKSCAPE_PROFILE_DIR_047DEV "Inkscape" @@ -799,7 +801,7 @@ inkscape_application_init (const gchar *argv0, gboolean use_gui) inkscape_load_menus(inkscape); sp_input_load_from_preferences(); - + /* set language for user interface according setting in preferences */ Glib::ustring ui_language = prefs->getString("/ui/language"); if(!ui_language.empty()) @@ -1451,7 +1453,17 @@ profile_path(const char *filename) g_free(dev47Dir); dev47Dir = 0; // In case the XDG user config dir of the moment does not yet exist... - if ( g_mkdir_with_parents(prefdir, S_IRWXU | S_IRGRP | S_IXGRP | S_IXOTH) == -1 ) { + int mode = S_IRWXU; +#ifdef S_IRGRP + mode |= S_IRGRP; +#endif +#ifdef S_IXGRP + mode |= S_IXGRP; +#endif +#ifdef S_IXOTH + mode |= S_IXOTH; +#endif + if ( g_mkdir_with_parents(prefdir, mode) == -1 ) { int problem = errno; g_warning("Unable to create profile directory (%s) (%d)", g_strerror(problem), problem); } |