projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change to Andreas Jochens patch for Debian bugs #358474/#359690
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
app.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/app.cpp
b/synfig-studio/trunk/src/gtkmm/app.cpp
index
dc5b5f0
..
14c962e
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/app.cpp
@@
-113,6
+113,7
@@
#endif
#ifdef WIN32
#endif
#ifdef WIN32
+#define _WIN32_WINNT 0x0500
#include <windows.h>
#endif
#include <gtkmm/accelmap.h>
#include <windows.h>
#endif
#include <gtkmm/accelmap.h>
@@
-130,6
+131,14
@@
using namespace studio;
/* === M A C R O S ========================================================= */
/* === M A C R O S ========================================================= */
+#ifndef SYNFIG_USER_APP_DIR
+#ifdef __APPLE__
+#define SYNFIG_USER_APP_DIR "Library/Synfig"
+#else
+#define SYNFIG_USER_APP_DIR "Synfig"
+#endif
+#endif
+
#ifndef DPM2DPI
#define DPM2DPI(x) (float(x)/39.3700787402f)
#define DPI2DPM(x) (float(x)*39.3700787402f)
#ifndef DPM2DPI
#define DPM2DPI(x) (float(x)/39.3700787402f)
#define DPI2DPM(x) (float(x)*39.3700787402f)
@@
-660,7
+669,7
@@
public:
}
};
}
};
-static Preferences _preferences;
+static
::
Preferences _preferences;
void
init_ui_manager()
void
init_ui_manager()
@@
-1339,11
+1348,7
@@
App::~App()
String
App::get_user_app_directory()
{
String
App::get_user_app_directory()
{
-#ifdef __APPLE__
- return Glib::build_filename(Glib::get_home_dir(),"Library/Synfig");
-#else
- return Glib::build_filename(Glib::get_home_dir(),"Synfig");
-#endif
+ return Glib::build_filename(Glib::get_home_dir(),SYNFIG_USER_APP_DIR);
}
synfig::String
}
synfig::String