app: Drop unnecessary wrappers

Since the port from libappstream-glib to libappstream, these wrappers
are trivially thin and can be dropped.

This commit introduces no functional changes.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

5 files changed, 6 insertions, 22 deletions

diff --git a/app/flatpak-builtins-remote-info.c b/app/flatpak-builtins-remote-info.c
index 5bd85882..7359eaee 100644
--- a/app/flatpak-builtins-remote-info.c
+++ b/app/flatpak-builtins-remote-info.c
@@ -197,8 +197,8 @@ flatpak_builtin_remote_info (int argc, char **argv, GCancellable *cancellable, G
       app = as_store_find_app (mdata, flatpak_decomposed_get_ref (ref));
       if (app)
         {
-          const char *name = as_app_get_localized_name (app);
-          const char *comment = as_app_get_localized_comment (app);
+          const char *name = as_component_get_name (app);
+          const char *comment = as_component_get_summary (app);
 
           print_wrapped (MIN (cols, 80), "\n%s - %s\n", name, comment);
 
diff --git a/app/flatpak-builtins-remote-ls.c b/app/flatpak-builtins-remote-ls.c
index 03103f58..ab8d4739 100644
--- a/app/flatpak-builtins-remote-ls.c
+++ b/app/flatpak-builtins-remote-ls.c
@@ -297,7 +297,7 @@ ls_remote (GHashTable *refs_hash, const char **arches, const char *app_runtime,
                   g_autofree char *readable_id = NULL;
 
                   if (app)
-                    name = as_app_get_localized_name (app);
+                    name = as_component_get_name (app);
 
                   if (name == NULL)
                     readable_id = flatpak_decomposed_dup_readable_id (ref);
@@ -308,7 +308,7 @@ ls_remote (GHashTable *refs_hash, const char **arches, const char *app_runtime,
                 {
                   const char *comment = NULL;
                   if (app)
-                      comment = as_app_get_localized_comment (app);
+                      comment = as_component_get_summary (app);
 
                   flatpak_table_printer_add_column (printer, comment);
                 }
diff --git a/app/flatpak-builtins-search.c b/app/flatpak-builtins-search.c
index 1318f819..b081b0aa 100644
--- a/app/flatpak-builtins-search.c
+++ b/app/flatpak-builtins-search.c
@@ -171,8 +171,8 @@ print_app (Column *columns, MatchResult *res, FlatpakTablePrinter *printer)
 {
   const char *version = as_app_get_version (res->app);
   const char *id = as_component_get_id (res->app);
-  const char *name = as_app_get_localized_name (res->app);
-  const char *comment = as_app_get_localized_comment (res->app);
+  const char *name = as_component_get_name (res->app);
+  const char *comment = as_component_get_summary (res->app);
   guint i;
 
   for (i = 0; columns[i].name; i++)
diff --git a/app/flatpak-builtins-utils.c b/app/flatpak-builtins-utils.c
index 9a9a9442..b5a957c6 100644
--- a/app/flatpak-builtins-utils.c
+++ b/app/flatpak-builtins-utils.c
@@ -1042,20 +1042,6 @@ ellipsize_string_full (const char *text, int len, FlatpakEllipsizeMode mode)
 }
 
 const char *
-as_app_get_localized_name (AsComponent *app)
-{
-  /* Automatically returns for the current locale */
-  return as_component_get_name (app);
-}
-
-const char *
-as_app_get_localized_comment (AsComponent *app)
-{
-  /* Automatically returns for the current locale */
-  return as_component_get_summary (app);
-}
-
-const char *
 as_app_get_version (AsComponent *app)
 {
   GPtrArray *releases = as_component_get_releases (app);
diff --git a/app/flatpak-builtins-utils.h b/app/flatpak-builtins-utils.h
index 7eea6c8e..ab77fa8a 100644
--- a/app/flatpak-builtins-utils.h
+++ b/app/flatpak-builtins-utils.h
@@ -156,8 +156,6 @@ void print_aligned_take (int         len,
 
 AsComponent *as_store_find_app (AsMetadata *mdata,
                                 const char *ref);
-const char *as_app_get_localized_name (AsComponent *component);
-const char *as_app_get_localized_comment (AsComponent *component);
 const char *as_app_get_version (AsComponent *component);
 
 gboolean    flatpak_dir_load_appstream_store (FlatpakDir   *self,