[gnome-software/wip/origin-icons: 3/6] gs-details-page: Default to "package-x-generic-symbolic" origin icon

[Milan Crha <mcrha src gnome org>]

commit 83111c531d2daca0cd385318c91db0fb03d39e72
Author: Milan Crha <mcrha redhat com>
Date:   Mon Aug 8 10:27:17 2022 +0200

    gs-details-page: Default to "package-x-generic-symbolic" origin icon
    
    Let the default origin icon be "package-x-generic-symbolic", thus every
    origin will have set an icon.

 src/gs-details-page.c  | 24 ++++++++++--------------
 src/gs-details-page.ui |  2 +-
 2 files changed, 11 insertions(+), 15 deletions(-)
---
diff --git a/src/gs-details-page.c b/src/gs-details-page.c
index 6cc03d845..e59b602db 100644
--- a/src/gs-details-page.c
+++ b/src/gs-details-page.c
@@ -260,6 +260,8 @@ gs_details_page_update_origin_button (GsDetailsPage *self,
                                      gboolean sensitive)
 {
        const gchar *packaging_icon;
+       const gchar *packaging_base_css_color;
+       g_autofree gchar *css = NULL;
        g_autofree gchar *origin_ui = NULL;
 
        if (self->app == NULL ||
@@ -275,25 +277,19 @@ gs_details_page_update_origin_button (GsDetailsPage *self,
        gtk_widget_show (self->origin_box);
 
        packaging_icon = gs_app_get_metadata_item (self->app, "GnomeSoftware::PackagingIcon");
+       if (packaging_icon == NULL)
+               packaging_icon = "package-x-generic-symbolic";
 
-       if (packaging_icon != NULL) {
-               const gchar *packaging_base_css_color;
-               g_autofree gchar *css = NULL;
+       packaging_base_css_color = gs_app_get_metadata_item (self->app, 
"GnomeSoftware::PackagingBaseCssColor");
 
-               packaging_base_css_color = gs_app_get_metadata_item (self->app, 
"GnomeSoftware::PackagingBaseCssColor");
+       gtk_image_set_from_icon_name (GTK_IMAGE (self->origin_packaging_image), packaging_icon);
 
-               gtk_image_set_from_icon_name (GTK_IMAGE (self->origin_packaging_image), packaging_icon);
+       if (packaging_base_css_color == NULL)
+               packaging_base_css_color = "window_fg_color";
 
-               if (packaging_base_css_color == NULL)
-                       packaging_base_css_color = "window_fg_color";
+       css = g_strdup_printf ("color: @%s;\n", packaging_base_css_color);
 
-               css = g_strdup_printf ("color: @%s;\n", packaging_base_css_color);
-
-               gs_utils_widget_set_css (self->origin_packaging_image, &self->origin_css_provider, 
"packaging-color", css);
-               gtk_widget_show (self->origin_packaging_image);
-       } else {
-               gtk_widget_hide (self->origin_packaging_image);
-       }
+       gs_utils_widget_set_css (self->origin_packaging_image, &self->origin_css_provider, "packaging-color", 
css);
 }
 
 static void
diff --git a/src/gs-details-page.ui b/src/gs-details-page.ui
index 8b0e88bf1..fca12edc1 100644
--- a/src/gs-details-page.ui
+++ b/src/gs-details-page.ui
@@ -355,7 +355,7 @@
                                                         <child>
                                                           <object class="GtkImage" 
id="origin_packaging_image">
                                                             <property name="pixel_size">16</property>
-                                                            <property 
name="icon_name">flatpak-symbolic</property>
+                                                            <property 
name="icon_name">package-x-generic-symbolic</property>
                                                             <property name="valign">center</property>
                                                           </object>
                                                         </child>