Libguestfs - Apr 2019 - [PATCH] inspect: get icon of OpenMandriva guests

Followup of commit a4ef6716b4119e476949c55f1bc12d81e735f0c0.
---
 lib/inspect-icon.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lib/inspect-icon.c b/lib/inspect-icon.c
index 5c7da0476..725af574b 100644
--- a/lib/inspect-icon.c
+++ b/lib/inspect-icon.c
@@ -67,6 +67,7 @@ static char *icon_cirros (guestfs_h *g, size_t *size_r);
 static char *icon_voidlinux (guestfs_h *g, size_t *size_r);
 static char *icon_altlinux (guestfs_h *g, size_t *size_r);
 static char *icon_gentoo (guestfs_h *g, size_t *size_r);
+static char *icon_openmandriva (guestfs_h *g, size_t *size_r);
 #if CAN_DO_WINDOWS
 static char *icon_windows (guestfs_h *g, const char *root, size_t *size_r);
 #endif
@@ -170,6 +171,9 @@ guestfs_impl_inspect_get_icon (guestfs_h *g, const char
*root, size_t *size_r,
     else if (STREQ (distro, "gentoo")) {
       r = icon_gentoo (g, &size);
     }
+    else if (STREQ (distro, "openmandriva")) {
+      r = icon_openmandriva (g, &size);
+    }
   }
   else if (STREQ (type, "windows")) {
 #if CAN_DO_WINDOWS
@@ -453,6 +457,18 @@ icon_gentoo (guestfs_h *g, size_t *size_r)
   return get_png (g, GENTOO_ICON, size_r, 10240);
 }
 
+static char *
+icon_openmandriva (guestfs_h *g, size_t *size_r)
+{
+  const char *icons[] = {
+    "/usr/share/icons/large/mandriva.png",
+    "/usr/share/icons/mandriva.png",
+    NULL
+  };
+
+  return find_png (g, icons, size_r, 10240);
+}
+
 #if CAN_DO_WINDOWS
 
 /* Windows, as usual, has to be much more complicated and stupid than
-- 
2.20.1

On Mon, Apr 08, 2019 at 01:36:54PM +0200, Pino Toscano
wrote:
> Followup of commit a4ef6716b4119e476949c55f1bc12d81e735f0c0.
> ---
>  lib/inspect-icon.c | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
> 
> diff --git a/lib/inspect-icon.c b/lib/inspect-icon.c
> index 5c7da0476..725af574b 100644
> --- a/lib/inspect-icon.c
> +++ b/lib/inspect-icon.c
> @@ -67,6 +67,7 @@ static char *icon_cirros (guestfs_h *g, size_t *size_r);
>  static char *icon_voidlinux (guestfs_h *g, size_t *size_r);
>  static char *icon_altlinux (guestfs_h *g, size_t *size_r);
>  static char *icon_gentoo (guestfs_h *g, size_t *size_r);
> +static char *icon_openmandriva (guestfs_h *g, size_t *size_r);
>  #if CAN_DO_WINDOWS
>  static char *icon_windows (guestfs_h *g, const char *root, size_t
*size_r);
>  #endif
> @@ -170,6 +171,9 @@ guestfs_impl_inspect_get_icon (guestfs_h *g, const char
*root, size_t *size_r,
>      else if (STREQ (distro, "gentoo")) {
>        r = icon_gentoo (g, &size);
>      }
> +    else if (STREQ (distro, "openmandriva")) {
> +      r = icon_openmandriva (g, &size);
> +    }
>    }
>    else if (STREQ (type, "windows")) {
>  #if CAN_DO_WINDOWS
> @@ -453,6 +457,18 @@ icon_gentoo (guestfs_h *g, size_t *size_r)
>    return get_png (g, GENTOO_ICON, size_r, 10240);
>  }
>  
> +static char *
> +icon_openmandriva (guestfs_h *g, size_t *size_r)
> +{
> +  const char *icons[] = {
> +    "/usr/share/icons/large/mandriva.png",
> +    "/usr/share/icons/mandriva.png",
> +    NULL
> +  };
> +
> +  return find_png (g, icons, size_r, 10240);
> +}
> +
>  #if CAN_DO_WINDOWS
>  
>  /* Windows, as usual, has to be much more complicated and stupid than
> -- 
Looks good, ACK.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
Fedora Windows cross-compiler. Compile Windows programs, test, and
build Windows installers. Over 100 libraries supported.
http://fedoraproject.org/wiki/MinGW