diff --git a/data/ui/contacts-main-window.ui b/data/ui/contacts-main-window.ui index 3ec8959c171e300a8350e4d0248a7ebd5ab0e992..fc70e16d51550b3e44ea3b29af42d708933decd9 100644 --- a/data/ui/contacts-main-window.ui +++ b/data/ui/contacts-main-window.ui @@ -179,25 +179,10 @@ SPDX-License-Identifier: GPL-2.0-or-later - - vertical - True - center - True - - - True - end - center - - - - - start - center - Loading - - + + diff --git a/meson.build b/meson.build index 750a185afe6f5883538e1456c6a0eb175539922a..1b319f7c23ddb3b5650f23aa150876f057316f36 100644 --- a/meson.build +++ b/meson.build @@ -48,7 +48,7 @@ gio_unix = dependency('gio-unix-2.0', version: '>=' + min_glib_version) glib = dependency('glib-2.0', version: '>=' + min_glib_version) gmodule_export = dependency('gmodule-export-2.0', version: '>=' + min_glib_version) gtk4_dep = dependency('gtk4', version: '>= 4.12') -libadwaita_dep = dependency('libadwaita-1', version: '>= 1.4.alpha') +libadwaita_dep = dependency('libadwaita-1', version: '>= 1.6.beta') # E-D-S libebook = dependency('libebook-1.2', version: '>=' + min_eds_version) libedataserver = dependency('libedataserver-1.2', version: '>=' + min_eds_version) diff --git a/src/contacts-import-dialog.vala b/src/contacts-import-dialog.vala index 1047b1a62fbe278790231fbd38170bda074c1ba8..f95ece198838565bfba899ae80439d56665ffac8 100644 --- a/src/contacts-import-dialog.vala +++ b/src/contacts-import-dialog.vala @@ -65,27 +65,23 @@ public class Contacts.ImportDialog : Adw.Window { group.title = file_name; // Now, parse the data and show a loading spinner while busy - var spinner = new Gtk.Spinner (); + var spinner = new Adw.Spinner (); group.add (spinner); GLib.ListModel parsed; uint n_parsed = 0; try { - spinner.start (); - var parse_op = new Io.ParseOperation (file); yield parse_op.execute (); debug ("Successfully parsed a contact"); parsed = parse_op.parsed; n_parsed = parsed.get_n_items (); this.parsed_results.append (parsed); - spinner.stop (); group.remove (spinner); } catch (GLib.Error err) { warning ("Couldn't parse file: %s", err.message); set_error_label (group, _("An error occurred reading the file '%s'".printf (file_name))); - spinner.stop (); group.remove (spinner); return; }