Merge 'upstream/master'

2 files changed, 1 insertions, 12 deletions

diff --git a/main/src/ui/util/data_forms.vala b/main/src/ui/util/data_forms.vala
index 7fb9b87d..0b91da15 100644
--- a/main/src/ui/util/data_forms.vala
+++ b/main/src/ui/util/data_forms.vala
@@ -18,7 +18,7 @@ namespace Dino.Ui.Util {
     }
 
 public static ViewModel.PreferencesRow.Any? get_data_form_field_view_model(DataForms.DataForm.Field field) {
-    if (field.type_ == null) return null;
+    if (field.type_ == DataForms.DataForm.Type.UNKNOWN) return null;
 
     ViewModel.PreferencesRow.Any? view_model = null;
 
diff --git a/main/src/ui/util/helper.vala b/main/src/ui/util/helper.vala
index e9035be0..a126a196 100644
--- a/main/src/ui/util/helper.vala
+++ b/main/src/ui/util/helper.vala
@@ -415,18 +415,7 @@ public bool use_tooltips() {
 }
 
 public static void menu_button_set_icon_with_size(MenuButton menu_button, string icon_name, int pixel_size) {
-#if GTK_4_6 && VALA_0_52
     menu_button.set_child(new Image.from_icon_name(icon_name) { pixel_size=pixel_size });
-#else
-    menu_button.set_icon_name(icon_name);
-    var button = menu_button.get_first_child() as Button;
-    if (button == null) return;
-    var box = button.child as Box;
-    if (box == null) return;
-    var image = box.get_first_child() as Image;
-    if (image == null) return;
-    image.pixel_size = pixel_size;
-#endif
 }
 
 }