diff options
author | Niels De Graef <nielsdegraef@gmail.com> | 2022-09-07 09:08:07 +0200 |
---|---|---|
committer | Niels De Graef <nielsdegraef@gmail.com> | 2022-09-08 07:16:50 +0200 |
commit | 1a16aafe01704ee4a5d5f9099e392983b2566f3a (patch) | |
tree | 15d6092541449c4b342d204c39b18fe7b08bf612 | |
parent | 3ae5790f0d884220e236725607a1f28f118e3ac7 (diff) | |
download | gnome-contacts-1a16aafe01704ee4a5d5f9099e392983b2566f3a.tar.gz |
Move TypeDescriptor related items to core
And remove an unused reference to `Gtk.TreeIter` in `TypeDescriptor`
-rw-r--r-- | po/POTFILES.in | 4 | ||||
-rw-r--r-- | po/POTFILES.skip | 4 | ||||
-rw-r--r-- | src/core/contacts-type-descriptor.vala (renamed from src/contacts-type-descriptor.vala) | 1 | ||||
-rw-r--r-- | src/core/contacts-type-set.vala (renamed from src/contacts-typeset.vala) | 0 | ||||
-rw-r--r-- | src/core/contacts-vcard-type-mapping.vala (renamed from src/contacts-vcard-type-mapping.vala) | 0 | ||||
-rw-r--r-- | src/meson.build | 6 |
6 files changed, 7 insertions, 8 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 1790c0f..ab97aef 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -34,8 +34,6 @@ src/contacts-preferences-window.vala src/contacts-settings.vala src/contacts-setup-window.vala src/contacts-type-combo.vala -src/contacts-type-descriptor.vala -src/contacts-typeset.vala src/contacts-unlink-operation.vala src/contacts-utils.vala src/core/contacts-addresses-chunk.vala @@ -53,6 +51,8 @@ src/core/contacts-notes-chunk.vala src/core/contacts-phones-chunk.vala src/core/contacts-roles-chunk.vala src/core/contacts-structured-name-chunk.vala +src/core/contacts-type-descriptor.vala +src/core/contacts-type-set.vala src/core/contacts-urls-chunk.vala src/io/contacts-io-parse-operation.vala src/main.vala diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 364046e..0e580c0 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -24,8 +24,6 @@ src/contacts-preferences-window.c src/contacts-settings.c src/contacts-setup-window.c src/contacts-type-combo.c -src/contacts-type-descriptor.c -src/contacts-typeset.c src/contacts-unlink-operation.c src/contacts-utils.c src/core/contacts-addresses-chunk.c @@ -43,6 +41,8 @@ src/core/contacts-notes-chunk.c src/core/contacts-phones-chunk.c src/core/contacts-roles-chunk.c src/core/contacts-structured-name-chunk.c +src/core/contacts-type-descriptor.c +src/core/contacts-type-set.c src/core/contacts-urls-chunk.c src/io/contacts-io-parse-operation.c src/main.c diff --git a/src/contacts-type-descriptor.vala b/src/core/contacts-type-descriptor.vala index c4e4dc0..f37a960 100644 --- a/src/contacts-type-descriptor.vala +++ b/src/core/contacts-type-descriptor.vala @@ -45,7 +45,6 @@ public class Contacts.TypeDescriptor : Object { private Source source; public string? name = null; public string[]? vcard_types = null; - public Gtk.TreeIter iter; /** * Returns the translated name for this property. diff --git a/src/contacts-typeset.vala b/src/core/contacts-type-set.vala index 8e46299..8e46299 100644 --- a/src/contacts-typeset.vala +++ b/src/core/contacts-type-set.vala diff --git a/src/contacts-vcard-type-mapping.vala b/src/core/contacts-vcard-type-mapping.vala index 13772d4..13772d4 100644 --- a/src/contacts-vcard-type-mapping.vala +++ b/src/core/contacts-vcard-type-mapping.vala diff --git a/src/meson.build b/src/meson.build index 3d97c53..5c2ef5d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -23,7 +23,10 @@ libcontacts_sources = files( 'core/contacts-phones-chunk.vala', 'core/contacts-roles-chunk.vala', 'core/contacts-structured-name-chunk.vala', + 'core/contacts-type-descriptor.vala', + 'core/contacts-type-set.vala', 'core/contacts-urls-chunk.vala', + 'core/contacts-vcard-type-mapping.vala', 'contacts-abstract-field-details-sorter.vala', 'contacts-chunk-filter.vala', @@ -42,11 +45,8 @@ libcontacts_sources = files( 'contacts-persona-sorter.vala', 'contacts-query-filter.vala', 'contacts-store.vala', - 'contacts-typeset.vala', - 'contacts-type-descriptor.vala', 'contacts-unlink-operation.vala', 'contacts-utils.vala', - 'contacts-vcard-type-mapping.vala', 'io/contacts-io-export-operation.vala', 'io/contacts-io-vcard-export-operation.vala', |