[balsa/wip/gtk4: 178/351] address-book-osmo: Declare it final

[Peter Bloomfield <peterb src gnome org>]

commit 89b218915bc63a8cb6340eea6ae876a86047bd34
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Wed Feb 14 19:47:31 2018 -0500

    address-book-osmo: Declare it final
    
    Use G_DECLARE_FINAL_TYPE for LibBalsaAddressBookOsmo and take all members
    private.

 libbalsa/address-book-osmo.c |   19 +++++++++++++++----
 libbalsa/address-book-osmo.h |   21 +++------------------
 src/address-book-config.c    |    2 +-
 3 files changed, 19 insertions(+), 23 deletions(-)
---
diff --git a/libbalsa/address-book-osmo.c b/libbalsa/address-book-osmo.c
index 4014666..95dbb64 100644
--- a/libbalsa/address-book-osmo.c
+++ b/libbalsa/address-book-osmo.c
@@ -62,6 +62,16 @@ static GList *osmo_read_addresses(LibBalsaAddressBookOsmo *osmo,
                                                                  GError                                  
**error);
 
 
+struct _LibBalsaAddressBookOsmo {
+       LibBalsaAddressBook parent;
+
+       GDBusProxy *proxy;
+};
+
+struct _LibBalsaAddressBookOsmoClass {
+       LibBalsaAddressBookClass parent_class;
+};
+
 G_DEFINE_TYPE(LibBalsaAddressBookOsmo, libbalsa_address_book_osmo, LIBBALSA_TYPE_ADDRESS_BOOK);
 
 
@@ -88,9 +98,9 @@ libbalsa_address_book_osmo_class_init(LibBalsaAddressBookOsmoClass *klass)
 
 
 static void
-libbalsa_address_book_osmo_init(LibBalsaAddressBookOsmo *ab)
+libbalsa_address_book_osmo_init(LibBalsaAddressBookOsmo *osmo)
 {
-       LIBBALSA_ADDRESS_BOOK(ab)->is_expensive = FALSE;
+    libbalsa_address_book_set_is_expensive(LIBBALSA_ADDRESS_BOOK(osmo), FALSE);
 }
 
 
@@ -114,7 +124,7 @@ libbalsa_address_book_osmo_new(const gchar *name)
 
        osmo = LIBBALSA_ADDRESS_BOOK_OSMO(g_object_new(LIBBALSA_TYPE_ADDRESS_BOOK_OSMO, NULL));
        ab = LIBBALSA_ADDRESS_BOOK(osmo);
-       ab->name = g_strdup(name);
+        libbalsa_address_book_set_name(ab, name);
 
        return ab;
 }
@@ -218,7 +228,8 @@ libbalsa_address_book_osmo_alias_complete(LibBalsaAddressBook *ab,
 
        osmo = LIBBALSA_ADDRESS_BOOK_OSMO(ab);
 
-       if (!ab->expand_aliases || strlen(prefix) < LOOKUP_MIN_LEN) {
+       if (!libbalsa_address_book_get_expand_aliases(ab) ||
+            strlen(prefix) < LOOKUP_MIN_LEN) {
                return NULL;
        }
 
diff --git a/libbalsa/address-book-osmo.h b/libbalsa/address-book-osmo.h
index 0a020b2..411eb26 100644
--- a/libbalsa/address-book-osmo.h
+++ b/libbalsa/address-book-osmo.h
@@ -31,24 +31,9 @@
 #include <gio/gio.h>
 #include "address-book.h"
 
-#define LIBBALSA_TYPE_ADDRESS_BOOK_OSMO                (libbalsa_address_book_osmo_get_type())
-#define LIBBALSA_ADDRESS_BOOK_OSMO(obj)                (G_TYPE_CHECK_INSTANCE_CAST(obj, 
LIBBALSA_TYPE_ADDRESS_BOOK_OSMO, LibBalsaAddressBookOsmo))
-#define LIBBALSA_ADDRESS_BOOK_OSMO_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST(klass, 
LIBBALSA_TYPE_ADDRESS_BOOK_OSMO, LibBalsaAddressBookOsmoClass))
-#define LIBBALSA_IS_ADDRESS_BOOK_OSMO(obj)             (G_TYPE_CHECK_INSTANCE_TYPE(obj, 
LIBBALSA_TYPE_ADDRESS_BOOK_OSMO))
-#define LIBBALSA_IS_ADDRESS_BOOK_OSMO_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE(klass, 
LIBBALSA_TYPE_ADDRESS_BOOK_OSMO))
-
-typedef struct _LibBalsaAddressBookOsmo LibBalsaAddressBookOsmo;
-typedef struct _LibBalsaAddressBookOsmoClass LibBalsaAddressBookOsmoClass;
-
-struct _LibBalsaAddressBookOsmo {
-       LibBalsaAddressBook parent;
-
-       GDBusProxy *proxy;
-};
-
-struct _LibBalsaAddressBookOsmoClass {
-       LibBalsaAddressBookClass parent_class;
-};
+#define LIBBALSA_TYPE_ADDRESS_BOOK_OSMO (libbalsa_address_book_osmo_get_type())
+G_DECLARE_FINAL_TYPE(LibBalsaAddressBookOsmo, libbalsa_address_book_osmo,
+                     LIBBALSA, ADDRESS_BOOK_OSMO, LibBalsaAddressBook)
 
 GType libbalsa_address_book_osmo_get_type(void);
 
diff --git a/src/address-book-config.c b/src/address-book-config.c
index 913385a..bec572f 100644
--- a/src/address-book-config.c
+++ b/src/address-book-config.c
@@ -372,7 +372,7 @@ create_osmo_dialog(AddressBookConfig *abc)
     if (ab) {
         title = g_strdup_printf(_("Modify Osmo Address Book"));
         action = _("_Apply");
-        name = ab->name;
+        name = libbalsa_address_book_get_name(ab);
     } else {
         title = g_strdup_printf(_("Add Osmo Address Book"));
         action = _("_Add");