Use the standard apps tree for gnome-control-center panels desktop files
gnome-control-center is planning on removing its own tree in the future. Since it already installs these applications into /usr/share/applications, just use this for now. https://bugzilla.gnome.org/show_bug.cgi?id=692483
This commit is contained in:
parent
f2ba49fa35
commit
5d1de33026
@ -889,7 +889,7 @@ const PopupMenuBase = new Lang.Class({
|
||||
|
||||
addSettingsAction: function(title, desktopFile) {
|
||||
let menuItem = this.addAction(title, function() {
|
||||
let app = Shell.AppSystem.get_default().lookup_setting(desktopFile);
|
||||
let app = Shell.AppSystem.get_default().lookup_app(desktopFile);
|
||||
|
||||
if (!app) {
|
||||
log('Settings panel for desktop file ' + desktopFile + ' could not be loaded!');
|
||||
|
@ -822,7 +822,7 @@ const UserMenuButton = new Lang.Class({
|
||||
|
||||
_onMyAccountActivate: function() {
|
||||
Main.overview.hide();
|
||||
let app = Shell.AppSystem.get_default().lookup_setting('gnome-user-accounts-panel.desktop');
|
||||
let app = Shell.AppSystem.get_default().lookup_app('gnome-user-accounts-panel.desktop');
|
||||
app.activate();
|
||||
},
|
||||
|
||||
|
@ -457,27 +457,6 @@ shell_app_system_get_tree (ShellAppSystem *self)
|
||||
return self->priv->apps_tree;
|
||||
}
|
||||
|
||||
/**
|
||||
* shell_app_system_lookup_setting:
|
||||
* @system:
|
||||
* @id: desktop file id
|
||||
*
|
||||
* Returns: (transfer none): Application in gnomecc.menu, or %NULL if none
|
||||
*/
|
||||
ShellApp *
|
||||
shell_app_system_lookup_setting (ShellAppSystem *self,
|
||||
const char *id)
|
||||
{
|
||||
ShellApp *app;
|
||||
|
||||
/* Actually defer to the main app set if there's overlap */
|
||||
app = shell_app_system_lookup_app (self, id);
|
||||
if (app != NULL)
|
||||
return app;
|
||||
|
||||
return g_hash_table_lookup (self->priv->setting_id_to_app, id);
|
||||
}
|
||||
|
||||
/**
|
||||
* shell_app_system_get_default:
|
||||
*
|
||||
|
@ -63,8 +63,4 @@ GSList *shell_app_system_subsearch (ShellAppSystem *sys
|
||||
GSList *shell_app_system_search_settings (ShellAppSystem *system,
|
||||
GSList *terms);
|
||||
|
||||
ShellApp *shell_app_system_lookup_setting (ShellAppSystem *system,
|
||||
const char *id);
|
||||
|
||||
|
||||
#endif /* __SHELL_APP_SYSTEM_H__ */
|
||||
|
Loading…
Reference in New Issue
Block a user