projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Color::is_straight(). Also, re-enable the optimization for straight blending...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
main.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/main.cpp
b/synfig-studio/trunk/src/gtkmm/main.cpp
index
e6485bc
..
15dc9d6
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/main.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/main.cpp
@@
-35,6
+35,8
@@
#include "ipc.h"
#include <stdexcept>
#include "ipc.h"
#include <stdexcept>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-56,6
+58,13
@@
using namespace studio;
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
+
+#ifdef ENABLE_NLS
+ setlocale(LC_ALL, "");
+ bindtextdomain("synfigstudio", LOCALEDIR);
+ textdomain("synfigstudio");
+#endif
+
{
SmartFILE file(IPC::make_connection());
if(file)
{
SmartFILE file(IPC::make_connection());
if(file)
@@
-86,11
+95,6
@@
int main(int argc, char **argv)
app.run();
}
app.run();
}
- catch(synfig::SoftwareExpired)
- {
- cerr<<"FATAL: Software Expired"<<endl;
- return 39;
- }
catch(int ret)
{
std::cerr<<"Application shutdown with errors ("<<ret<<')'<<std::endl;
catch(int ret)
{
std::cerr<<"Application shutdown with errors ("<<ret<<')'<<std::endl;