[gnome-shell] Switch string formatting to the one inside gjs

[Jasper St. Pierre <jstpierre src gnome org>]

commit 8a9e3e0df27c590462948eb2ad8a409a329fd9e3
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri May 4 17:23:08 2012 -0400

    Switch string formatting to the one inside gjs
    
    https://bugzilla.gnome.org/show_bug.cgi?id=675479

 js/Makefile.am            |    1 -
 js/extensionPrefs/main.js |    2 +-
 js/misc/format.js         |   71 ---------------------------------------------
 js/ui/environment.js      |    2 +-
 src/shell-js.c            |   12 -------
 src/shell-js.h            |    2 -
 6 files changed, 2 insertions(+), 88 deletions(-)
---
diff --git a/js/Makefile.am b/js/Makefile.am
index 6b05536..ea66c3e 100644
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -28,7 +28,6 @@ nobase_dist_js_DATA = 	\
 	misc/config.js		\
 	misc/extensionUtils.js	\
 	misc/fileUtils.js	\
-	misc/format.js		\
 	misc/gnomeSession.js	\
 	misc/history.js		\
 	misc/jsParse.js		\
diff --git a/js/extensionPrefs/main.js b/js/extensionPrefs/main.js
index 59bf6cb..c924af5 100644
--- a/js/extensionPrefs/main.js
+++ b/js/extensionPrefs/main.js
@@ -6,11 +6,11 @@ const GObject = imports.gi.GObject;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const Pango = imports.gi.Pango;
+const Format = imports.format;
 
 const _ = Gettext.gettext;
 
 const Config = imports.misc.config;
-const Format = imports.misc.format;
 const ExtensionUtils = imports.misc.extensionUtils;
 
 
diff --git a/js/ui/environment.js b/js/ui/environment.js
index fc3992a..aa7a4bd 100644
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -90,7 +90,7 @@ function init() {
     }
 
     // OK, now things are initialized enough that we can import shell JS
-    const Format = imports.misc.format;
+    const Format = imports.format;
     const Tweener = imports.ui.tweener;
 
     Tweener.init();
diff --git a/src/shell-js.c b/src/shell-js.c
index 6657b48..8267fdc 100644
--- a/src/shell-js.c
+++ b/src/shell-js.c
@@ -79,15 +79,3 @@ shell_js_add_extension_importer (const char  *target_object_script,
   JS_EndRequest (context);
   return ret;
 }
-
-/**
- * shell_js_format_int_alternative_output:
- * @intval:
- *
- * Returns: (transfer full):
- */
-gchar *
-shell_js_format_int_alternative_output (gint intval)
-{
-  return g_strdup_printf ("%Id", intval);
-}
diff --git a/src/shell-js.h b/src/shell-js.h
index fd85304..26cbf4d 100644
--- a/src/shell-js.h
+++ b/src/shell-js.h
@@ -11,8 +11,6 @@ gboolean shell_js_add_extension_importer (const char   *target_object_script,
                                           const char   *directory,
                                           GError      **error);
 
-gchar   *shell_js_format_int_alternative_output (gint intval);
-
 G_BEGIN_DECLS
 
 #endif /* __SHELL_JS_H__ */