[gnome-games] [lightsoff] Cleanup, as Seed recently added script cwd to include path



commit 4f632438858661520c9ef693026353c8f7f825bb
Author: Tim Horton <hortont svn gnome org>
Date:   Wed Jun 24 02:29:31 2009 -0400

    [lightsoff] Cleanup, as Seed recently added script cwd to include path

 .gitignore                                |    1 -
 configure.in                              |    6 ------
 lightsoff/{Arrow.js.in => Arrow.js}       |    3 ---
 lightsoff/{Board.js.in => Board.js}       |    3 ---
 lightsoff/{Game.js.in => Game.js}         |    3 ---
 lightsoff/{LED.js.in => LED.js}           |    3 ---
 lightsoff/{Light.js.in => Light.js}       |    3 ---
 lightsoff/Makefile.am                     |   12 ++++++------
 lightsoff/{Settings.js.in => Settings.js} |    7 ++-----
 lightsoff/main.js.in                      |    1 -
 10 files changed, 8 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 33731d3..f1bfbe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 *.[oa]
 *.la
 *.so
-*.js
 *.lo
 *.omf
 *.desktop.in
diff --git a/configure.in b/configure.in
index 63a7cf0..a579421 100644
--- a/configure.in
+++ b/configure.in
@@ -1255,13 +1255,7 @@ same-gnome-clutter/same-gnome-clutter.desktop.in
 lightsoff/Makefile
 lightsoff/lightsoff
 lightsoff/lightsoff.desktop.in
-lightsoff/Arrow.js
-lightsoff/Board.js
-lightsoff/Light.js
 lightsoff/main.js
-lightsoff/Game.js
-lightsoff/LED.js
-lightsoff/Settings.js
 lightsoff/themes/Makefile
 lightsoff/themes/tango/Makefile
 lightsoff/themes/tango/theme.js
diff --git a/lightsoff/Arrow.js.in b/lightsoff/Arrow.js
similarity index 82%
rename from lightsoff/Arrow.js.in
rename to lightsoff/Arrow.js
index bb91565..a0ba0f0 100644
--- a/lightsoff/Arrow.js.in
+++ b/lightsoff/Arrow.js
@@ -1,6 +1,3 @@
-file_prefix = '@prefix@' + "/share/gnome-games/lightsoff/";
-imports.searchPath.unshift(file_prefix);
-
 Settings = imports.Settings;
 Clutter = imports.gi.Clutter;
 
diff --git a/lightsoff/Board.js.in b/lightsoff/Board.js
similarity index 97%
rename from lightsoff/Board.js.in
rename to lightsoff/Board.js
index 0e222a6..a5e4f33 100644
--- a/lightsoff/Board.js.in
+++ b/lightsoff/Board.js
@@ -1,6 +1,3 @@
-file_prefix = '@prefix@' + "/share/gnome-games/lightsoff/";
-imports.searchPath.unshift(file_prefix);
-
 Settings = imports.Settings;
 GLib = imports.gi.GLib;
 Clutter = imports.gi.Clutter;
diff --git a/lightsoff/Game.js.in b/lightsoff/Game.js
similarity index 97%
rename from lightsoff/Game.js.in
rename to lightsoff/Game.js
index c858ebf..4f0ad15 100644
--- a/lightsoff/Game.js.in
+++ b/lightsoff/Game.js
@@ -1,6 +1,3 @@
-file_prefix = '@prefix@' + "/share/gnome-games/lightsoff/";
-imports.searchPath.unshift(file_prefix);
-
 Settings = imports.Settings;
 GLib = imports.gi.GLib;
 Clutter = imports.gi.Clutter;
diff --git a/lightsoff/LED.js.in b/lightsoff/LED.js
similarity index 98%
rename from lightsoff/LED.js.in
rename to lightsoff/LED.js
index 9256192..e819e01 100644
--- a/lightsoff/LED.js.in
+++ b/lightsoff/LED.js
@@ -1,6 +1,3 @@
-file_prefix = '@prefix@' + "/share/gnome-games/lightsoff/";
-imports.searchPath.unshift(file_prefix);
-
 Settings = imports.Settings;
 cairo = imports.cairo;
 Clutter = imports.gi.Clutter;
diff --git a/lightsoff/Light.js.in b/lightsoff/Light.js
similarity index 95%
rename from lightsoff/Light.js.in
rename to lightsoff/Light.js
index 5ae064e..8601426 100644
--- a/lightsoff/Light.js.in
+++ b/lightsoff/Light.js
@@ -1,6 +1,3 @@
-file_prefix = '@prefix@' + "/share/gnome-games/lightsoff/";
-imports.searchPath.unshift(file_prefix);
-
 Settings = imports.Settings;
 Clutter = imports.gi.Clutter;
 
diff --git a/lightsoff/Makefile.am b/lightsoff/Makefile.am
index 732835c..9a76baa 100644
--- a/lightsoff/Makefile.am
+++ b/lightsoff/Makefile.am
@@ -23,12 +23,12 @@ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 CLEANFILES = $(lojs_DATA) $(desktop_DATA)
 
 EXTRA_DIST = \
-	Arrow.js.in \
-	Board.js.in \
-	Light.js.in \
+	Arrow.js \
+	Board.js \
+	Light.js \
 	main.js.in \
-	Game.js.in \
-	LED.js.in \
-	Settings.js.in \
+	Game.js \
+	LED.js \
+	Settings.js \
 	settings.ui \
 	main-window.ui
diff --git a/lightsoff/Settings.js.in b/lightsoff/Settings.js
similarity index 91%
rename from lightsoff/Settings.js.in
rename to lightsoff/Settings.js
index 9649bb9..12ed578 100644
--- a/lightsoff/Settings.js.in
+++ b/lightsoff/Settings.js
@@ -1,6 +1,3 @@
-file_prefix = '@prefix@' + "/share/gnome-games/lightsoff/";
-imports.searchPath.unshift(file_prefix);
-
 Gtk = imports.gi.Gtk;
 Gio = imports.gi.Gio;
 GtkBuilder = imports.gtkbuilder;
@@ -74,7 +71,7 @@ handlers = {
 function show_settings()
 {
 	b = new Gtk.Builder();
-	b.add_from_file(file_prefix+"/settings.ui");
+	b.add_from_file(main.file_prefix+"/settings.ui");
 	b.connect_signals(handlers);
 
 	populate_theme_selector(b.get_object("theme-selector"));
@@ -95,7 +92,7 @@ function populate_theme_selector(selector)
 	selector.pack_start(cell, true);
 	selector.add_attribute(cell, "text", 0);
 
-	file = Gio.file_new_for_path(file_prefix+"/themes");
+	file = Gio.file_new_for_path(main.file_prefix+"/themes");
 	enumerator = file.enumerate_children("standard::name");
 	
 	var i = 0;
diff --git a/lightsoff/main.js.in b/lightsoff/main.js.in
index bdd1fc1..d2cc8cf 100755
--- a/lightsoff/main.js.in
+++ b/lightsoff/main.js.in
@@ -1,7 +1,6 @@
 #!/usr/bin/env seed
 
 file_prefix = '@prefix@' + "/share/gnome-games/lightsoff/";
-imports.searchPath.unshift(file_prefix);
 
 GtkClutter = imports.gi.GtkClutter;
 Clutter = imports.gi.Clutter;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]