diff --git a/js/ui/search.js b/js/ui/search.js index 1244def89..eb84b09f1 100644 --- a/js/ui/search.js +++ b/js/ui/search.js @@ -276,7 +276,7 @@ OpenSearchSystem.prototype = { _addProvider: function(fileName) { let path = global.datadir + '/search_providers/' + fileName; 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, url: url, id: this._providers.length, diff --git a/src/shell-global.c b/src/shell-global.c index 3061d5fe8..cdf9fcb2a 100644 --- a/src/shell-global.c +++ b/src/shell-global.c @@ -1086,21 +1086,19 @@ shell_global_reexec_self (ShellGlobal *global) } /** - * shell_global_breakpoint: - * @global: A #ShellGlobal + * shell_breakpoint: * * Using G_BREAKPOINT(), interrupt the current process. This is useful * in conjunction with a debugger such as gdb. */ void -shell_global_breakpoint (ShellGlobal *global) +shell_breakpoint (void) { G_BREAKPOINT (); } /** - * shell_global_parse_search_provider: - * @global: A #ShellGlobal + * shell_parse_search_provider: * @data: description of provider * @name: (out): location to store a display name * @url: (out): location to store template of url @@ -1111,13 +1109,12 @@ shell_global_breakpoint (ShellGlobal *global) * Returns: %TRUE on success */ gboolean -shell_global_parse_search_provider (ShellGlobal *global, - const char *data, - char **name, - char **url, - GList **langs, - char **icon_data_uri, - GError **error) +shell_parse_search_provider (const char *data, + char **name, + char **url, + GList **langs, + char **icon_data_uri, + GError **error) { xmlDocPtr doc = xmlParseMemory (data, strlen(data)); xmlNode *root; diff --git a/src/shell-global.h b/src/shell-global.h index 311a12cbd..67e657fee 100644 --- a/src/shell-global.h +++ b/src/shell-global.h @@ -73,15 +73,14 @@ void shell_global_end_modal (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, - const char *data, - char **name, - char **url, - GList **langs, - char **icon_data_uri, - GError **error); +gboolean shell_parse_search_provider (const char *data, + char **name, + char **url, + GList **langs, + char **icon_data_uri, + GError **error); void shell_global_gc (ShellGlobal *global);