shell-global: Remove unused ShellGlobal parameters
Remove the ShellGlobal parameter from any method that isn't actually ShellGlobal-related (and rename them to not have "global" in the name). https://bugzilla.gnome.org/show_bug.cgi?id=648755
This commit is contained in:
parent
bee37b5bc4
commit
4b008b1ada
@ -276,7 +276,7 @@ OpenSearchSystem.prototype = {
|
|||||||
_addProvider: function(fileName) {
|
_addProvider: function(fileName) {
|
||||||
let path = global.datadir + '/search_providers/' + fileName;
|
let path = global.datadir + '/search_providers/' + fileName;
|
||||||
let source = Shell.get_file_contents_utf8_sync(path);
|
let source = Shell.get_file_contents_utf8_sync(path);
|
||||||
let [success, name, url, langs, icon_uri] = global.parse_search_provider(source);
|
let [success, name, url, langs, icon_uri] = Shell.parse_search_provider(source);
|
||||||
let provider ={ name: name,
|
let provider ={ name: name,
|
||||||
url: url,
|
url: url,
|
||||||
id: this._providers.length,
|
id: this._providers.length,
|
||||||
|
@ -1086,21 +1086,19 @@ shell_global_reexec_self (ShellGlobal *global)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* shell_global_breakpoint:
|
* shell_breakpoint:
|
||||||
* @global: A #ShellGlobal
|
|
||||||
*
|
*
|
||||||
* Using G_BREAKPOINT(), interrupt the current process. This is useful
|
* Using G_BREAKPOINT(), interrupt the current process. This is useful
|
||||||
* in conjunction with a debugger such as gdb.
|
* in conjunction with a debugger such as gdb.
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
shell_global_breakpoint (ShellGlobal *global)
|
shell_breakpoint (void)
|
||||||
{
|
{
|
||||||
G_BREAKPOINT ();
|
G_BREAKPOINT ();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* shell_global_parse_search_provider:
|
* shell_parse_search_provider:
|
||||||
* @global: A #ShellGlobal
|
|
||||||
* @data: description of provider
|
* @data: description of provider
|
||||||
* @name: (out): location to store a display name
|
* @name: (out): location to store a display name
|
||||||
* @url: (out): location to store template of url
|
* @url: (out): location to store template of url
|
||||||
@ -1111,8 +1109,7 @@ shell_global_breakpoint (ShellGlobal *global)
|
|||||||
* Returns: %TRUE on success
|
* Returns: %TRUE on success
|
||||||
*/
|
*/
|
||||||
gboolean
|
gboolean
|
||||||
shell_global_parse_search_provider (ShellGlobal *global,
|
shell_parse_search_provider (const char *data,
|
||||||
const char *data,
|
|
||||||
char **name,
|
char **name,
|
||||||
char **url,
|
char **url,
|
||||||
GList **langs,
|
GList **langs,
|
||||||
|
@ -73,10 +73,9 @@ void shell_global_end_modal (ShellGlobal *global,
|
|||||||
|
|
||||||
void shell_global_reexec_self (ShellGlobal *global);
|
void shell_global_reexec_self (ShellGlobal *global);
|
||||||
|
|
||||||
void shell_global_breakpoint (ShellGlobal *global);
|
void shell_breakpoint (void);
|
||||||
|
|
||||||
gboolean shell_global_parse_search_provider (ShellGlobal *global,
|
gboolean shell_parse_search_provider (const char *data,
|
||||||
const char *data,
|
|
||||||
char **name,
|
char **name,
|
||||||
char **url,
|
char **url,
|
||||||
GList **langs,
|
GList **langs,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user