brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

format: move shell_format_int_alternative_output() to ShellJS

Browse Source 
gnome-shell-extension-prefs uses format(), but can't pull in Shell
(which is a dependency for the module), since that in turn would pull in
Meta. Fix this by moving the introspected int format function to ShellJS
instead.

https://bugzilla.gnome.org/show_bug.cgi?id=673106
This commit is contained in:
Cosimo Cecchi 2012-04-10 11:21:19 -04:00
parent 8089f24c81
commit 49d8e6da40
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/misc/format.js
View File

@ -1,6 +1,6 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
const Shell = imports.gi.Shell; const ShellJS = imports.gi.ShellJS;
/* /*
* This function is intended to extend the String object and provide * This function is intended to extend the String object and provide
@ -50,7 +50,7 @@ function format() {
case 'd': case 'd':
let intV = parseInt(args[i++]); let intV = parseInt(args[i++]);
if (hasAlternativeIntFlag) if (hasAlternativeIntFlag)
s = Shell.format_int_alternative_output(intV); s = ShellJS.format_int_alternative_output(intV);
else else
s = intV.toString(); s = intV.toString();
break; break;

12
src/shell-js.c
View File

@ -79,3 +79,15 @@ shell_js_add_extension_importer (const char *target_object_script,
JS_EndRequest (context); JS_EndRequest (context);
return ret; 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);
}

2
src/shell-js.h
View File

@ -11,6 +11,8 @@ gboolean shell_js_add_extension_importer (const char *target_object_script,
const char *directory, const char *directory,
GError **error); GError **error);
gchar *shell_js_format_int_alternative_output (gint intval);
G_BEGIN_DECLS G_BEGIN_DECLS
#endif /* __SHELL_JS_H__ */ #endif /* __SHELL_JS_H__ */

12
src/shell-util.c
View File

@ -868,15 +868,3 @@ shell_util_wifexited (int status,
return ret; return ret;
} }
/**
* shell_format_int_alternative_output:
* @intval:
*
* Returns: (transfer full):
*/
gchar *
shell_format_int_alternative_output (gint intval)
{
return g_strdup_printf ("%Id", intval);
}

2
src/shell-util.h
View File

@ -52,8 +52,6 @@ gboolean shell_session_is_active_for_systemd (void);
gboolean shell_util_wifexited (int status, gboolean shell_util_wifexited (int status,
int *exit); int *exit);
gchar *shell_format_int_alternative_output (gint intval);
G_END_DECLS G_END_DECLS