[gnome-software/wip/exalm/libadwaita-beta: 2/3] meson: Depend on libadwaita 1.0.1




commit cb1f906b8cb69cefc40813397fb78931a6703505
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Wed Dec 8 14:31:43 2021 +0500

    meson: Depend on libadwaita 1.0.1
    
    Co-authored-by: Milan Crha <mcrha redhat com>

 meson.build                 |  2 +-
 src/gs-app-details-page.c   | 13 -------------
 subprojects/libadwaita.wrap |  2 +-
 3 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/meson.build b/meson.build
index 709056a37..a294c104f 100644
--- a/meson.build
+++ b/meson.build
@@ -147,7 +147,7 @@ else
   libsoupapiversion = '3.0'
 endif
 libadwaita = dependency('libadwaita-1',
-  version: '>=1.0.0.alpha.3',
+  version: '>=1.0.1',
   fallback: ['libadwaita', 'libadwaita_dep'],
   default_options: [
     'examples=false',
diff --git a/src/gs-app-details-page.c b/src/gs-app-details-page.c
index 74421eaa5..3b74e84d0 100644
--- a/src/gs-app-details-page.c
+++ b/src/gs-app-details-page.c
@@ -115,10 +115,8 @@ set_updates_description_ui (GsAppDetailsPage *page, GsApp *app)
        g_autoptr(GIcon) icon = NULL;
        guint icon_size;
        const gchar *update_details;
-#if ADW_CHECK_VERSION(1, 0, 1)
        GdkDisplay *display;
        g_autoptr (GtkIconPaintable) paintable = NULL;
-#endif
 
        /* FIXME support app == NULL */
 
@@ -183,7 +181,6 @@ set_updates_description_ui (GsAppDetailsPage *page, GsApp *app)
                                                 "system-component-application");
        }
 
-#if ADW_CHECK_VERSION(1, 0, 1)
        display = gdk_display_get_default ();
        paintable = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_for_display (display),
                                                    icon,
@@ -192,16 +189,6 @@ set_updates_description_ui (GsAppDetailsPage *page, GsApp *app)
                                                    gtk_widget_get_direction (GTK_WIDGET (page)),
                                                    GTK_ICON_LOOKUP_FORCE_REGULAR);
        adw_status_page_set_paintable (ADW_STATUS_PAGE (page->status_page), GDK_PAINTABLE (paintable));
-#else
-       if (G_IS_THEMED_ICON (icon)) {
-               const gchar *const *names = g_themed_icon_get_names (G_THEMED_ICON (icon));
-
-               adw_status_page_set_icon_name (ADW_STATUS_PAGE (page->status_page),
-                                              names ? names[0] : NULL);
-       } else {
-               adw_status_page_set_icon_name (ADW_STATUS_PAGE (page->status_page), NULL);
-       }
-#endif
 
        if (gs_app_has_quirk (app, GS_APP_QUIRK_NEW_PERMISSIONS)) {
                gtk_widget_show (page->permissions_section);
diff --git a/subprojects/libadwaita.wrap b/subprojects/libadwaita.wrap
index 087282bf9..68312489c 100644
--- a/subprojects/libadwaita.wrap
+++ b/subprojects/libadwaita.wrap
@@ -1,5 +1,5 @@
 [wrap-git]
 directory=libadwaita
 url=https://gitlab.gnome.org/GNOME/libadwaita.git
-revision=1.0.0.alpha.3
+revision=1.0.1
 depth=1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]