Move error codes and all GEnum types to main library

Now that tp_dbus_g_method_return_not_implemented() uses
g_dbus_method_invocation_return_dbus_error() to avoid depending
on a particular GError, these don't have to be core.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=76855
Reviewed-by: Xavier Claessens

4 files changed, 11 insertions, 14 deletions

diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am
index dd20cbf0c..d1503f9d5 100644
--- a/telepathy-glib/Makefile.am
+++ b/telepathy-glib/Makefile.am
@@ -194,7 +194,6 @@ libtelepathy_glib_core_internal_la_LIBADD = $(ALL_LIBS)
 libtelepathy_glib_core_internal_la_SOURCES = \
     core-dbus.c \
     core-proxy.c \
-    errors.c \
     $(NULL)
 
 libtelepathy_glib_dbus_internal_la_LIBADD = \
@@ -300,6 +299,7 @@ libtelepathy_glib_main_internal_la_SOURCES = \
     debug-message-internal.h \
     dtmf.c \
     debug-internal.h \
+    errors.c \
     exportable-channel.c \
     file-transfer-channel.c \
     gnio-unix.c \
diff --git a/telepathy-glib/codegen.am b/telepathy-glib/codegen.am
index ac1415683..1875bdae0 100644
--- a/telepathy-glib/codegen.am
+++ b/telepathy-glib/codegen.am
@@ -87,16 +87,13 @@ nodist_gendbusinclude_HEADERS += \
     _gen/tp-svc-logger.h \
     $(NULL)
 
-nodist_libtelepathy_glib_core_internal_la_SOURCES = \
-    _gen/genums.c \
-    $(NULL)
-
 nodist_libtelepathy_glib_dbus_internal_la_SOURCES = \
     _gen/gtypes-body.h \
     _gen/interfaces-body.h \
     $(NULL)
 
 nodist_libtelepathy_glib_main_internal_la_SOURCES = \
+    _gen/genums.c \
     _gen/error-str.c \
     $(NULL)
 
diff --git a/telepathy-glib/versions/core-1.0.abi b/telepathy-glib/versions/core-1.0.abi
index e17f2dfeb..2640b62dc 100644
--- a/telepathy-glib/versions/core-1.0.abi
+++ b/telepathy-glib/versions/core-1.0.abi
@@ -2,16 +2,7 @@ Version: TELEPATHY_GLIB_CORE_1.0
 Extends: -
 Release: 1.0
 
-tp_base_room_config_property_get_type
-tp_cm_info_source_get_type
-tp_dbus_error_get_type
 tp_dbus_g_method_return_not_implemented
-tp_dbus_name_type_get_type
-tp_dbus_properties_mixin_flags_get_type
-tp_error_get_type
-tp_error_quark
-tp_g_set_error_invalid_handle_type
-tp_g_set_error_unsupported_handle_type
 tp_private_proxy_set_implementation
 tp_proxy_check_interface_by_id
 tp_proxy_pending_call_v1_new
diff --git a/telepathy-glib/versions/main-1.0.abi b/telepathy-glib/versions/main-1.0.abi
index 5c129d0d1..8e25a4126 100644
--- a/telepathy-glib/versions/main-1.0.abi
+++ b/telepathy-glib/versions/main-1.0.abi
@@ -342,6 +342,7 @@ tp_base_room_config_dup_channel
 tp_base_room_config_emit_properties_changed
 tp_base_room_config_get_type
 tp_base_room_config_iface_init
+tp_base_room_config_property_get_type
 tp_base_room_config_register_class
 tp_base_room_config_set_can_update_configuration
 tp_base_room_config_set_property_mutable
@@ -554,6 +555,7 @@ tp_client_get_type
 tp_client_message_get_type
 tp_client_message_new
 tp_client_message_new_text
+tp_cm_info_source_get_type
 tp_cm_message_get_sender
 tp_cm_message_get_type
 tp_cm_message_new
@@ -755,12 +757,15 @@ tp_dbus_connection_release_name
 tp_dbus_connection_request_name
 tp_dbus_connection_try_register_object
 tp_dbus_connection_unregister_object
+tp_dbus_error_get_type
 tp_dbus_errors_quark
+tp_dbus_name_type_get_type
 tp_dbus_properties_mixin_class_init
 tp_dbus_properties_mixin_dup_all
 tp_dbus_properties_mixin_emit_properties_changed
 tp_dbus_properties_mixin_emit_properties_changed_varargs
 tp_dbus_properties_mixin_fill_properties_hash
+tp_dbus_properties_mixin_flags_get_type
 tp_dbus_properties_mixin_get
 tp_dbus_properties_mixin_getter_gobject_properties
 tp_dbus_properties_mixin_iface_init
@@ -810,6 +815,8 @@ tp_dynamic_handle_repo_get_type
 tp_dynamic_handle_repo_lookup_exact
 tp_dynamic_handle_repo_set_normalize_async
 tp_error_get_dbus_name
+tp_error_get_type
+tp_error_quark
 tp_errors_disconnected_quark
 tp_errors_removed_from_group_quark
 tp_escape_as_identifier
@@ -837,6 +844,8 @@ tp_file_transfer_channel_provide_file_finish
 tp_g_hash_table_update
 tp_g_ptr_array_contains
 tp_g_ptr_array_extend
+tp_g_set_error_invalid_handle_type
+tp_g_set_error_unsupported_handle_type
 tp_g_signal_connect_object
 tp_group_mixin_add_handle_owner
 tp_group_mixin_add_handle_owners