X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fmain.cpp;h=36bf16d7670f7eb20b60f0070ee68baa9479dbe8;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=5dd69d29089877a028510101e9bcc94defae976b;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/main.cpp b/synfig-studio/trunk/src/gtkmm/main.cpp
index 5dd69d2..36bf16d 100644
--- a/synfig-studio/trunk/src/gtkmm/main.cpp
+++ b/synfig-studio/trunk/src/gtkmm/main.cpp
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -59,27 +59,30 @@ using namespace studio;
 int main(int argc, char **argv)
 {
 
+#ifdef ENABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain("synfigstudio", LOCALEDIR);
+	bind_textdomain_codeset("synfigstudio", "UTF-8");
 	textdomain("synfigstudio");
+#endif
 
 	{
 		SmartFILE file(IPC::make_connection());
 		if(file)
 		{
-			fprintf(file.get(),"F\n");
+			cout << endl;
+			cout << "   " << _("synfig studio is already running") << endl << endl;
+			cout << "   " << _("the existing process will be used") << endl << endl;;
 
 			// Hey, another copy of us is open!
 			// don't bother opening us, just go ahead and
 			// tell the other copy to load it all up
-			if(argc>=1)
-			{
-				for(;argc>=1;(argc)--)
-					if((argv)[argc] && (argv)[argc][0]!='-')
-					{
-						fprintf(file.get(),"O %s\n",etl::absolute_path((argv)[argc]).c_str());
-					}
-			}
+			if (argc>1)
+				fprintf(file.get(),"F\n");
+
+			while(--argc)
+				if((argv)[argc] && (argv)[argc][0]!='-')
+					fprintf(file.get(),"O %s\n",etl::absolute_path((argv)[argc]).c_str());
 
 			fprintf(file.get(),"F\n");
 
@@ -87,17 +90,15 @@ int main(int argc, char **argv)
 		}
 	}
 
+	cout << endl;
+	cout << "   " << _("synfig studio -- starting up application...") << endl << endl;
+
 	try
 	{
 		studio::App app(&argc, &argv);
 
 		app.run();
 	}
-	catch(synfig::SoftwareExpired)
-	{
-		cerr<<"FATAL: Software Expired"<<endl;
-		return 39;
-	}
 	catch(int ret)
 	{
 		std::cerr<<"Application shutdown with errors ("<<ret<<')'<<std::endl;