gnome-schedule r1108 - in branches/x-output-support: . po src

[gauteh svn gnome org]

Author: gauteh
Date: Thu Oct 23 18:44:03 2008
New Revision: 1108
URL: http://svn.gnome.org/viewvc/gnome-schedule?rev=1108&view=rev

Log:


Modified:
   branches/x-output-support/configure.ac
   branches/x-output-support/po/POTFILES.in
   branches/x-output-support/src/xwrapper.py.in

Modified: branches/x-output-support/configure.ac
==============================================================================
--- branches/x-output-support/configure.ac	(original)
+++ branches/x-output-support/configure.ac	Thu Oct 23 18:44:03 2008
@@ -121,6 +121,7 @@
 src/config.py
 src/Makefile
 src/gnome-schedule
+src/xwrapper.py
 icons/Makefile
 po/Makefile.in
 desktop/Makefile

Modified: branches/x-output-support/po/POTFILES.in
==============================================================================
--- branches/x-output-support/po/POTFILES.in	(original)
+++ branches/x-output-support/po/POTFILES.in	Thu Oct 23 18:44:03 2008
@@ -24,4 +24,4 @@
 src/template.py
 src/template_chooser.py
 src/template_manager.py
-
+src/xwrapper.py.in

Modified: branches/x-output-support/src/xwrapper.py.in
==============================================================================
--- branches/x-output-support/src/xwrapper.py.in	(original)
+++ branches/x-output-support/src/xwrapper.py.in	Thu Oct 23 18:44:03 2008
@@ -37,9 +37,11 @@
 if poscorrect_isset == False:
 	os.putenv ("POSIXLY_CORRECT", "enabled")
 	manual_poscorrect = True
-	
+
 if (len (sys.argv) < 4):
-	print _("Minium number of arguments is 4.")
+	print _("Minium number of arguments is 3.")
+	
+	print _("Wrapper script for Gnome-schedule (http://gnome-schedule.sf.net) for applications to be run from crontab under X. Use through gnome-schedule.")
 	sys.exit ()
 
 if sys.argv[1] == "c":
@@ -58,7 +60,7 @@
 	print _("Invalid job id.")
 	sys.exit ()
 
-i = 4
+i = 3
 command = ""
 while (i < len (sys.argv)):
 	command = command + sys.argv[i]
@@ -83,7 +85,11 @@
 	c = crontab.Crontab (is_root, user, uid, gid, home_dir)
 	success, ver, title, desc, nooutput, xoutput, display = c.get_job_data (job_id)
 	if success == False:
-		print _("Could not get job data, might be an old version - try recreating the task")
+		print _("Could not get job data, the task might have been created with an old version - try recreating the task.")
+		sys.exit ()
+	
+	if ver < 4:
+		print _("Data file too old. Recreate task.")
 		sys.exit ()
 	
 	print _("Launching %s.." % title)
@@ -91,7 +97,7 @@
 		print _("xoutput==0: Why am I launched?")
 		sys.exit ()
 	if (len (display) < 2):
-		print :("len(display)<2: No proper DISPLAY variable")
+		print _("len(display)<2: No proper DISPLAY variable")
 		sys.exit ()
 		
 	#### TODO: LAUNCH ####
@@ -104,7 +110,4 @@
 	sys.exit ()
 	
 print _("xwrapper.py: completed")
-		
-	
-