From 6e707d2aa56e3cd811956518fd27ffbcbc52ff6a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 25 Jul 2020 14:40:34 -0400
Subject: [PATCH 01/21] appinfo: Add properties

Give GAppInfo a bunch of readonly properties, and
support them in GDesktopAppInfo. This makes app infos
more convenient to work with in GTK4, and in general.
---
 gio/gappinfo.c        | 138 +++++++++++++++++++++++++++++++++++++++++-
 gio/gdesktopappinfo.c |  78 +++++++++++++++++++++++-
 2 files changed, 214 insertions(+), 2 deletions(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 6b0092502..9d698d8e8 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -108,8 +108,144 @@ G_DEFINE_INTERFACE (GAppInfo, g_app_info, G_TYPE_OBJECT)
 static void
 g_app_info_default_init (GAppInfoInterface *iface)
 {
-}
+  /**
+   * GAppInfo:id:
+   *
+   * The ID of an application -- a string that identifies the application.
+   *
+   * The exact format of the ID is platform dependent. For instance,
+   * on Unix this is the desktop file id from the xdg menu specification.
+   *
+   * May be %NULL, depending on how the GAppInfo has been constructed.
+   */
+  g_object_interface_install_property (iface,
+      g_param_spec_string ("id", "ID", "ID",
+                           NULL,
+                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
+  /**
+   * GAppInfo:name:
+   *
+   * The name of the application.
+   */
+  g_object_interface_install_property (iface,
+      g_param_spec_string ("name", "Name", "Name",
+                           NULL,
+                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GAppInfo:display-name:
+   *
+   * The display name of the application.
+   *
+   * This string is meant to be displayed to the user; it is often more
+   * descriptive than #GAppInfo:name.
+   */
+  g_object_interface_install_property (iface,
+      g_param_spec_string ("display-name", "Display Name", "Display Name",
+                           NULL,
+                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GAppInfo:description:
+   *
+   * A human-readable description of the application.
+   */
+  g_object_interface_install_property (iface,
+      g_param_spec_string ("description", "Description", "Description",
+                           NULL,
+                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GAppInfo:executable:
+   *
+   * The executable's name for the application.
+   */
+  g_object_interface_install_property (iface,
+      g_param_spec_string ("executable", "Executable", "Executable",
+                           NULL,
+                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GAppInfo:commandline:
+   *
+   * The commandline with which the application will be launched.
+   */
+  g_object_interface_install_property (iface,
+      g_param_spec_string ("commandline", "Commandline", "Commandline",
+                           NULL,
+                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GAppInfo:icon:
+   *
+   * The icon for the application.
+   *
+   * May be %NULL
+   */
+  g_object_interface_install_property (iface,
+      g_param_spec_object ("icon", "Icon", "Icon",
+                           G_TYPE_ICON,
+                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GAppInfo:supports-uris:
+   *
+   * %TRUE if the application supports reading files and directories
+   * from URIs when launched. See g_app_info_launch_uris().
+   */
+  g_object_interface_install_property (iface,
+      g_param_spec_boolean ("supports-uris", "Supports URIs", "Supports URIs",
+                            FALSE,
+                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GAppInfo:supports-files:
+   *
+   * %TRUE if the application supports files as arguments when launched.
+   * See g_app_info_launch_uris().
+   */
+  g_object_interface_install_property (iface,
+      g_param_spec_boolean ("supports-files", "Supports files", "Supports files",
+                            FALSE,
+                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GAppInfo:should-show:
+   *
+   * %TRUE if the application should be shown in menus that list
+   * available applications.
+   */
+  g_object_interface_install_property (iface,
+      g_param_spec_boolean ("should-show", "Should show", "Should show",
+                            FALSE,
+                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GAppInfo:supported-types:
+   *
+   * The list of content types that the application claims to support.
+   * Note that this property does not take into account associations
+   * added with g_app_info_add_supports_type().
+   *
+   * May be %NULL.
+   */
+  g_object_interface_install_property (iface,
+      g_param_spec_boxed ("supported-types", "Supported types", "Supported types",
+                          G_TYPE_STRV,
+                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GAppInfo:can-delete:
+   *
+   * %TRUE if it makes sense to call g_app_info_delete() for this
+   * GAppInfo.
+   */
+  g_object_interface_install_property (iface,
+      g_param_spec_boolean ("can-delete", "Can delete", "Can delete",
+                            FALSE,
+                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+}
 
 /**
  * g_app_info_dup:
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index e6bca46fe..fe0be5fd6 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -81,7 +81,20 @@
 
 enum {
   PROP_0,
-  PROP_FILENAME
+  PROP_FILENAME,
+  PROP_ID,
+  PROP_NAME,
+  PROP_DISPLAY_NAME,
+  PROP_DESCRIPTION,
+  PROP_EXECUTABLE,
+  PROP_COMMANDLINE,
+  PROP_ICON,
+  PROP_SUPPORTS_URIS,
+  PROP_SUPPORTS_FILES,
+  PROP_SHOULD_SHOW,
+  PROP_SUPPORTED_TYPES,
+  PROP_CAN_DELETE,
+  NUM_PROPERTIES
 };
 
 static void     g_desktop_app_info_iface_init         (GAppInfoIface    *iface);
@@ -1657,12 +1670,62 @@ g_desktop_app_info_get_property (GObject    *object,
                                  GParamSpec *pspec)
 {
   GDesktopAppInfo *self = G_DESKTOP_APP_INFO (object);
+  GAppInfo *app_info = G_APP_INFO (self);
 
   switch (prop_id)
     {
     case PROP_FILENAME:
       g_value_set_string (value, self->filename);
       break;
+
+    case PROP_ID:
+      g_value_set_string (value, g_app_info_get_id (app_info));
+      break;
+
+    case PROP_NAME:
+      g_value_set_string (value, g_app_info_get_name (app_info));
+      break;
+
+    case PROP_DISPLAY_NAME:
+      g_value_set_string (value, g_app_info_get_display_name (app_info));
+      break;
+
+    case PROP_DESCRIPTION:
+      g_value_set_string (value, g_app_info_get_description (app_info));
+      break;
+
+    case PROP_EXECUTABLE:
+      g_value_set_string (value, g_app_info_get_executable (app_info));
+      break;
+
+    case PROP_COMMANDLINE:
+      g_value_set_string (value, g_app_info_get_commandline (app_info));
+      break;
+
+    case PROP_ICON:
+      g_value_set_object (value, g_app_info_get_icon (app_info));
+      break;
+
+    case PROP_SUPPORTS_URIS:
+      g_value_set_boolean (value, g_app_info_supports_uris (app_info));
+      break;
+
+    case PROP_SUPPORTS_FILES:
+      g_value_set_boolean (value, g_app_info_supports_uris (app_info));
+      break;
+
+    case PROP_SHOULD_SHOW:
+      g_value_set_boolean (value, g_app_info_should_show (app_info));
+      break;
+
+    case PROP_SUPPORTED_TYPES:
+      g_value_set_boxed (value, g_app_info_get_supported_types (app_info));
+      break;
+
+    case PROP_CAN_DELETE:
+      g_value_set_boolean (value, g_app_info_can_delete (app_info));
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1687,6 +1750,19 @@ g_desktop_app_info_class_init (GDesktopAppInfoClass *klass)
                                    PROP_FILENAME,
                                    g_param_spec_string ("filename", "Filename", "", NULL,
                                                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_override_property (gobject_class, PROP_ID, "id");
+  g_object_class_override_property (gobject_class, PROP_NAME, "name");
+  g_object_class_override_property (gobject_class, PROP_DISPLAY_NAME, "display-name");
+  g_object_class_override_property (gobject_class, PROP_DESCRIPTION, "description");
+  g_object_class_override_property (gobject_class, PROP_EXECUTABLE, "executable");
+  g_object_class_override_property (gobject_class, PROP_COMMANDLINE, "commandline");
+  g_object_class_override_property (gobject_class, PROP_ICON, "icon");
+  g_object_class_override_property (gobject_class, PROP_SUPPORTS_URIS, "supports-uris");
+  g_object_class_override_property (gobject_class, PROP_SUPPORTS_FILES, "supports-files");
+  g_object_class_override_property (gobject_class, PROP_SHOULD_SHOW, "should-show");
+  g_object_class_override_property (gobject_class, PROP_SUPPORTED_TYPES, "supported-types");
+  g_object_class_override_property (gobject_class, PROP_CAN_DELETE, "can-delete");
 }
 
 static void

From 7a76fa5128f74b70c3e61229c6e0ea64fee0571d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 25 Jul 2020 21:59:07 +0000
Subject: [PATCH 02/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 9d698d8e8..76668282b 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -109,7 +109,7 @@ static void
 g_app_info_default_init (GAppInfoInterface *iface)
 {
   /**
-   * GAppInfo:id:
+   * GAppInfo:id: (nullable)
    *
    * The ID of an application -- a string that identifies the application.
    *

From 28dafe3b64d85d364607b85f3a5b029865f6b25b Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 25 Jul 2020 21:59:14 +0000
Subject: [PATCH 03/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 76668282b..09e15914e 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -114,7 +114,7 @@ g_app_info_default_init (GAppInfoInterface *iface)
    * The ID of an application -- a string that identifies the application.
    *
    * The exact format of the ID is platform dependent. For instance,
-   * on Unix this is the desktop file id from the xdg menu specification.
+   * on Unix this is the desktop file ID from the xdg menu specification.
    *
    * May be %NULL, depending on how the GAppInfo has been constructed.
    */

From 8d2f149f8476d64164ed47f5038d8753c927e0e1 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 25 Jul 2020 22:02:27 +0000
Subject: [PATCH 04/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 09e15914e..86f629e4f 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -177,7 +177,7 @@ g_app_info_default_init (GAppInfoInterface *iface)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
   /**
-   * GAppInfo:icon:
+   * GAppInfo:icon: (nullable)
    *
    * The icon for the application.
    *

From 38b5781c4b09737a48694b5b30a5d5a0e13b035a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 25 Jul 2020 22:03:12 +0000
Subject: [PATCH 05/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 86f629e4f..a88cfc78e 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -239,7 +239,7 @@ g_app_info_default_init (GAppInfoInterface *iface)
    * GAppInfo:can-delete:
    *
    * %TRUE if it makes sense to call g_app_info_delete() for this
-   * GAppInfo.
+   * #GAppInfo.
    */
   g_object_interface_install_property (iface,
       g_param_spec_boolean ("can-delete", "Can delete", "Can delete",

From 7994219b2632a0d520483c538deab0db8f2153dd Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 25 Jul 2020 18:36:54 -0400
Subject: [PATCH 06/21] Add more documentation

Add nullable annotations, Since tags and references to
relevant Desktop Entry spec keys.
---
 gio/gappinfo.c | 68 ++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 61 insertions(+), 7 deletions(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index a88cfc78e..f8be9fd13 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -117,6 +117,8 @@ g_app_info_default_init (GAppInfoInterface *iface)
    * on Unix this is the desktop file ID from the xdg menu specification.
    *
    * May be %NULL, depending on how the GAppInfo has been constructed.
+   *
+   * Since: 2.66
    */
   g_object_interface_install_property (iface,
       g_param_spec_string ("id", "ID", "ID",
@@ -127,6 +129,11 @@ g_app_info_default_init (GAppInfoInterface *iface)
    * GAppInfo:name:
    *
    * The name of the application.
+   *
+   * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
+   * this is the value of the Name key.
+   *
+   * Since: 2.66
    */
   g_object_interface_install_property (iface,
       g_param_spec_string ("name", "Name", "Name",
@@ -134,12 +141,19 @@ g_app_info_default_init (GAppInfoInterface *iface)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
   /**
-   * GAppInfo:display-name:
+   * GAppInfo:display-name: (nullable)
    *
    * The display name of the application.
    *
    * This string is meant to be displayed to the user; it is often more
    * descriptive than #GAppInfo:name.
+   *
+   * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
+   * this is the value of the X-GNOME-FullName key, falling back to the Name key.
+   *
+   * May be %NULL, depending on how the GAppInfo has been constructed.
+   *
+   * Since: 2.66
    */
   g_object_interface_install_property (iface,
       g_param_spec_string ("display-name", "Display Name", "Display Name",
@@ -147,9 +161,16 @@ g_app_info_default_init (GAppInfoInterface *iface)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
   /**
-   * GAppInfo:description:
+   * GAppInfo:description: (nullable)
    *
    * A human-readable description of the application.
+   *
+   * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
+   * this is the value of the Comment key.
+   *
+   * May be %NULL, depending on how the GAppInfo has been constructed.
+   *
+   * Since: 2.66
    */
   g_object_interface_install_property (iface,
       g_param_spec_string ("description", "Description", "Description",
@@ -157,9 +178,16 @@ g_app_info_default_init (GAppInfoInterface *iface)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
   /**
-   * GAppInfo:executable:
+   * GAppInfo:executable: (nullable)
    *
    * The executable's name for the application.
+   *
+   * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
+   * this is the first word of the Exec key.
+   *
+   * May be %NULL, depending on how the GAppInfo has been constructed.
+   *
+   * Since: 2.66
    */
   g_object_interface_install_property (iface,
       g_param_spec_string ("executable", "Executable", "Executable",
@@ -167,9 +195,16 @@ g_app_info_default_init (GAppInfoInterface *iface)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
   /**
-   * GAppInfo:commandline:
+   * GAppInfo:commandline: (nullable)
    *
    * The commandline with which the application will be launched.
+   *
+   * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
+   * this is the value of the Exec key.
+   *
+   * May be %NULL, depending on how the GAppInfo has been constructed.
+   *
+   * Since: 2.66
    */
   g_object_interface_install_property (iface,
       g_param_spec_string ("commandline", "Commandline", "Commandline",
@@ -181,7 +216,9 @@ g_app_info_default_init (GAppInfoInterface *iface)
    *
    * The icon for the application.
    *
-   * May be %NULL
+   * May be %NULL, depending on how the GAppInfo has been constructed.
+   *
+   * Since: 2.66
    */
   g_object_interface_install_property (iface,
       g_param_spec_object ("icon", "Icon", "Icon",
@@ -193,6 +230,8 @@ g_app_info_default_init (GAppInfoInterface *iface)
    *
    * %TRUE if the application supports reading files and directories
    * from URIs when launched. See g_app_info_launch_uris().
+   *
+   * Since: 2.66
    */
   g_object_interface_install_property (iface,
       g_param_spec_boolean ("supports-uris", "Supports URIs", "Supports URIs",
@@ -204,6 +243,8 @@ g_app_info_default_init (GAppInfoInterface *iface)
    *
    * %TRUE if the application supports files as arguments when launched.
    * See g_app_info_launch_uris().
+   *
+   * Since: 2.66
    */
   g_object_interface_install_property (iface,
       g_param_spec_boolean ("supports-files", "Supports files", "Supports files",
@@ -215,6 +256,11 @@ g_app_info_default_init (GAppInfoInterface *iface)
    *
    * %TRUE if the application should be shown in menus that list
    * available applications.
+   *
+   * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
+   * this is the (inverted) value of the NoDisplay key.
+   *
+   * Since: 2.66
    */
   g_object_interface_install_property (iface,
       g_param_spec_boolean ("should-show", "Should show", "Should show",
@@ -226,9 +272,15 @@ g_app_info_default_init (GAppInfoInterface *iface)
    *
    * The list of content types that the application claims to support.
    * Note that this property does not take into account associations
-   * added with g_app_info_add_supports_type().
+   * added with g_app_info_add_supports_type(), but only those exported
+   * directly by the application.
    *
-   * May be %NULL.
+   * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
+   * this is the (inverted) value of the MimeType key.
+   *
+   * May be %NULL, depending on how the GAppInfo has been constructed.
+   *
+   * Since: 2.66
    */
   g_object_interface_install_property (iface,
       g_param_spec_boxed ("supported-types", "Supported types", "Supported types",
@@ -240,6 +292,8 @@ g_app_info_default_init (GAppInfoInterface *iface)
    *
    * %TRUE if it makes sense to call g_app_info_delete() for this
    * #GAppInfo.
+   *
+   * Since: 2.66
    */
   g_object_interface_install_property (iface,
       g_param_spec_boolean ("can-delete", "Can delete", "Can delete",

From 75000b036df0e24d6000c999d653e63a56965926 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 27 Jul 2020 19:47:47 +0000
Subject: [PATCH 07/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index f8be9fd13..c3feb31e1 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -278,7 +278,7 @@ g_app_info_default_init (GAppInfoInterface *iface)
    * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
    * this is the (inverted) value of the MimeType key.
    *
-   * May be %NULL, depending on how the GAppInfo has been constructed.
+   * May be %NULL, depending on how the #GAppInfo has been constructed.
    *
    * Since: 2.66
    */

From d09bd8e5fbc788807703bab3abcdb8dbd93dc06c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 27 Jul 2020 19:47:51 +0000
Subject: [PATCH 08/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index c3feb31e1..62e6c9538 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -276,7 +276,7 @@ g_app_info_default_init (GAppInfoInterface *iface)
    * directly by the application.
    *
    * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
-   * this is the (inverted) value of the MimeType key.
+   * this is the value of the `MimeType` key.
    *
    * May be %NULL, depending on how the #GAppInfo has been constructed.
    *

From 10eb9744dff43ab13213f4596e270e5fda189927 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 27 Jul 2020 19:48:00 +0000
Subject: [PATCH 09/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 62e6c9538..21da06a7c 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -258,7 +258,7 @@ g_app_info_default_init (GAppInfoInterface *iface)
    * available applications.
    *
    * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
-   * this is the (inverted) value of the NoDisplay key.
+   * this is the (inverted) value of the `NoDisplay` key.
    *
    * Since: 2.66
    */

From e09594f500822a26058c355598e4ba6cf21a164c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 27 Jul 2020 19:48:04 +0000
Subject: [PATCH 10/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 21da06a7c..bed6c5bae 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -216,7 +216,7 @@ g_app_info_default_init (GAppInfoInterface *iface)
    *
    * The icon for the application.
    *
-   * May be %NULL, depending on how the GAppInfo has been constructed.
+   * May be %NULL, depending on how the #GAppInfo has been constructed.
    *
    * Since: 2.66
    */

From 98deeff3124003b8fb16eaca459fb06cdc98fb48 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 27 Jul 2020 19:48:08 +0000
Subject: [PATCH 11/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index bed6c5bae..982670626 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -202,7 +202,7 @@ g_app_info_default_init (GAppInfoInterface *iface)
    * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
    * this is the value of the Exec key.
    *
-   * May be %NULL, depending on how the GAppInfo has been constructed.
+   * May be %NULL, depending on how the #GAppInfo has been constructed.
    *
    * Since: 2.66
    */

From bad7efc0ea161f2569e0d4f52d676ac910566706 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 27 Jul 2020 19:48:11 +0000
Subject: [PATCH 12/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 982670626..6655d8695 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -200,7 +200,7 @@ g_app_info_default_init (GAppInfoInterface *iface)
    * The commandline with which the application will be launched.
    *
    * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
-   * this is the value of the Exec key.
+   * this is the value of the `Exec` key.
    *
    * May be %NULL, depending on how the #GAppInfo has been constructed.
    *

From 921e2ee6e32c2bc9ba62bf184f46defb4f05cd9f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 27 Jul 2020 19:48:15 +0000
Subject: [PATCH 13/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 6655d8695..0cd60ae51 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -185,7 +185,7 @@ g_app_info_default_init (GAppInfoInterface *iface)
    * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
    * this is the first word of the Exec key.
    *
-   * May be %NULL, depending on how the GAppInfo has been constructed.
+   * May be %NULL, depending on how the #GAppInfo has been constructed.
    *
    * Since: 2.66
    */

From d9757ab03323735ce092e67729fc36f330c68c25 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 27 Jul 2020 19:48:21 +0000
Subject: [PATCH 14/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 0cd60ae51..c9121c0a4 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -168,7 +168,7 @@ g_app_info_default_init (GAppInfoInterface *iface)
    * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
    * this is the value of the Comment key.
    *
-   * May be %NULL, depending on how the GAppInfo has been constructed.
+   * May be %NULL, depending on how the #GAppInfo has been constructed.
    *
    * Since: 2.66
    */

From c213000e2504ebc82ac0867efb3f904ca48957b6 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 27 Jul 2020 19:48:26 +0000
Subject: [PATCH 15/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index c9121c0a4..8a21e2a33 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -166,7 +166,7 @@ g_app_info_default_init (GAppInfoInterface *iface)
    * A human-readable description of the application.
    *
    * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
-   * this is the value of the Comment key.
+   * this is the value of the `Comment` key.
    *
    * May be %NULL, depending on how the #GAppInfo has been constructed.
    *

From 2301d75a94058771c87632e83453e834d1805d35 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 27 Jul 2020 19:48:31 +0000
Subject: [PATCH 16/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 8a21e2a33..2e2be75da 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -151,7 +151,7 @@ g_app_info_default_init (GAppInfoInterface *iface)
    * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
    * this is the value of the X-GNOME-FullName key, falling back to the Name key.
    *
-   * May be %NULL, depending on how the GAppInfo has been constructed.
+   * May be %NULL, depending on how the #GAppInfo has been constructed.
    *
    * Since: 2.66
    */

From 65263ced543599c5d30d79f1edac132dfd70a839 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 27 Jul 2020 19:48:36 +0000
Subject: [PATCH 17/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 2e2be75da..61c8b3ebf 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -149,7 +149,7 @@ g_app_info_default_init (GAppInfoInterface *iface)
    * descriptive than #GAppInfo:name.
    *
    * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
-   * this is the value of the X-GNOME-FullName key, falling back to the Name key.
+   * this is the value of the `X-GNOME-FullName` key, falling back to the `Name` key.
    *
    * May be %NULL, depending on how the #GAppInfo has been constructed.
    *

From c10a0a390a80a70d7737a77a90d7ce371df4cb5f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 27 Jul 2020 19:48:41 +0000
Subject: [PATCH 18/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 61c8b3ebf..49e44cb95 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -131,7 +131,7 @@ g_app_info_default_init (GAppInfoInterface *iface)
    * The name of the application.
    *
    * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
-   * this is the value of the Name key.
+   * this is the value of the `Name` key.
    *
    * Since: 2.66
    */

From b5fc5d6423f9472a7efb82f014ca37a51904451c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 27 Jul 2020 19:48:50 +0000
Subject: [PATCH 19/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gappinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 49e44cb95..5252b89f5 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -183,7 +183,7 @@ g_app_info_default_init (GAppInfoInterface *iface)
    * The executable's name for the application.
    *
    * In #GAppInfos created from [desktop files](https://specifications.freedesktop.org/desktop-entry-spec/latest/),
-   * this is the first word of the Exec key.
+   * this is the first word of the `Exec` key.
    *
    * May be %NULL, depending on how the #GAppInfo has been constructed.
    *

From df7f35e81a8c62585a6d24a7a8bd2fce30b55e9a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 27 Jul 2020 19:49:05 +0000
Subject: [PATCH 20/21] Apply 1 suggestion(s) to 1 file(s)

---
 gio/gdesktopappinfo.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index fe0be5fd6..1ed3c8fc7 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -94,7 +94,6 @@ enum {
   PROP_SHOULD_SHOW,
   PROP_SUPPORTED_TYPES,
   PROP_CAN_DELETE,
-  NUM_PROPERTIES
 };
 
 static void     g_desktop_app_info_iface_init         (GAppInfoIface    *iface);

From 9193fd529f7e18eb5b62f5b68847ddbd070037d1 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 28 Jul 2020 17:29:47 -0400
Subject: [PATCH 21/21] Add a missing include

---
 gio/gappinfo.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 5252b89f5..d60ea1760 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -25,6 +25,7 @@
 #include "gcontextspecificgroup.h"
 #include "gtask.h"
 #include "gcancellable.h"
+#include "gicon.h"
 
 #include "glibintl.h"
 #include "gmarshal-internal.h"