app-system: Remove lookup_app_for_path
It's absurdly silly. Just modify the one place that uses it to be better. https://bugzilla.gnome.org/show_bug.cgi?id=698486
This commit is contained in:
parent
63cf46e49b
commit
96c2a90e11
@ -296,42 +296,6 @@ shell_app_system_lookup_app (ShellAppSystem *self,
|
|||||||
return g_hash_table_lookup (self->priv->id_to_app, id);
|
return g_hash_table_lookup (self->priv->id_to_app, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* shell_app_system_lookup_app_for_path:
|
|
||||||
* @system: a #ShellAppSystem
|
|
||||||
* @desktop_path: (type utf8): UTF-8 encoded absolute file name
|
|
||||||
*
|
|
||||||
* Find or create a #ShellApp corresponding to a given absolute file
|
|
||||||
* name which must be in the standard paths (XDG_DATA_DIRS). For
|
|
||||||
* files outside the datadirs, this function returns %NULL.
|
|
||||||
*
|
|
||||||
* Return value: (transfer none): The #ShellApp for id, or %NULL if none
|
|
||||||
*/
|
|
||||||
ShellApp *
|
|
||||||
shell_app_system_lookup_app_for_path (ShellAppSystem *system,
|
|
||||||
const char *desktop_path)
|
|
||||||
{
|
|
||||||
const char *basename;
|
|
||||||
const char *app_path;
|
|
||||||
ShellApp *app;
|
|
||||||
|
|
||||||
basename = g_strrstr (desktop_path, "/");
|
|
||||||
if (basename)
|
|
||||||
basename += 1;
|
|
||||||
else
|
|
||||||
basename = desktop_path;
|
|
||||||
|
|
||||||
app = shell_app_system_lookup_app (system, basename);
|
|
||||||
if (!app)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
app_path = g_desktop_app_info_get_filename (shell_app_get_app_info (app));
|
|
||||||
if (strcmp (desktop_path, app_path) != 0)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
return app;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* shell_app_system_lookup_heuristic_basename:
|
* shell_app_system_lookup_heuristic_basename:
|
||||||
* @system: a #ShellAppSystem
|
* @system: a #ShellAppSystem
|
||||||
|
@ -41,8 +41,6 @@ ShellAppSystem *shell_app_system_get_default (void);
|
|||||||
|
|
||||||
ShellApp *shell_app_system_lookup_app (ShellAppSystem *system,
|
ShellApp *shell_app_system_lookup_app (ShellAppSystem *system,
|
||||||
const char *id);
|
const char *id);
|
||||||
ShellApp *shell_app_system_lookup_app_for_path (ShellAppSystem *system,
|
|
||||||
const char *desktop_path);
|
|
||||||
ShellApp *shell_app_system_lookup_heuristic_basename (ShellAppSystem *system,
|
ShellApp *shell_app_system_lookup_heuristic_basename (ShellAppSystem *system,
|
||||||
const char *id);
|
const char *id);
|
||||||
|
|
||||||
|
@ -844,6 +844,7 @@ ShellApp *
|
|||||||
shell_startup_sequence_get_app (ShellStartupSequence *sequence)
|
shell_startup_sequence_get_app (ShellStartupSequence *sequence)
|
||||||
{
|
{
|
||||||
const char *appid;
|
const char *appid;
|
||||||
|
char *basename;
|
||||||
ShellAppSystem *appsys;
|
ShellAppSystem *appsys;
|
||||||
ShellApp *app;
|
ShellApp *app;
|
||||||
|
|
||||||
@ -851,8 +852,10 @@ shell_startup_sequence_get_app (ShellStartupSequence *sequence)
|
|||||||
if (!appid)
|
if (!appid)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
basename = g_path_get_basename (appid);
|
||||||
appsys = shell_app_system_get_default ();
|
appsys = shell_app_system_get_default ();
|
||||||
app = shell_app_system_lookup_app_for_path (appsys, appid);
|
app = shell_app_system_lookup_app (appsys, basename);
|
||||||
|
g_free (basename);
|
||||||
return app;
|
return app;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user