diff --git a/src/backends/native/meta-kms-impl-device.c b/src/backends/native/meta-kms-impl-device.c index 68f6f4172..4f5aa9313 100644 --- a/src/backends/native/meta-kms-impl-device.c +++ b/src/backends/native/meta-kms-impl-device.c @@ -87,8 +87,6 @@ G_DEFINE_TYPE_WITH_CODE (MetaKmsImplDevice, meta_kms_impl_device, G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init)) -G_DEFINE_QUARK (-meta-kms-error-quark, meta_kms_error) - MetaKmsImpl * meta_kms_impl_device_get_impl (MetaKmsImplDevice *impl_device) { diff --git a/src/backends/native/meta-kms-impl-device.h b/src/backends/native/meta-kms-impl-device.h index 4beb7e03e..840ee60b9 100644 --- a/src/backends/native/meta-kms-impl-device.h +++ b/src/backends/native/meta-kms-impl-device.h @@ -100,22 +100,12 @@ struct _MetaKmsImplDeviceClass void (* prepare_shutdown) (MetaKmsImplDevice *impl_device); }; -enum -{ - META_KMS_ERROR_USER_INHIBITED, - META_KMS_ERROR_DENY_LISTED, - META_KMS_ERROR_NOT_SUPPORTED, -}; - enum { META_KMS_DEVICE_FILE_TAG_ATOMIC = 1 << 0, META_KMS_DEVICE_FILE_TAG_SIMPLE = 1 << 1, }; -#define META_KMS_ERROR meta_kms_error_quark () -GQuark meta_kms_error_quark (void); - MetaKmsImpl * meta_kms_impl_device_get_impl (MetaKmsImplDevice *impl_device); MetaKmsDevice * meta_kms_impl_device_get_device (MetaKmsImplDevice *impl_device); diff --git a/src/backends/native/meta-kms.c b/src/backends/native/meta-kms.c index ab724f982..2ff3b5eb0 100644 --- a/src/backends/native/meta-kms.c +++ b/src/backends/native/meta-kms.c @@ -158,6 +158,8 @@ struct _MetaKms G_DEFINE_TYPE (MetaKms, meta_kms, META_TYPE_THREAD) +G_DEFINE_QUARK (-meta-kms-error-quark, meta_kms_error) + static void invoke_result_listener (MetaThread *thread, gpointer user_data) diff --git a/src/backends/native/meta-kms.h b/src/backends/native/meta-kms.h index be7b68d6c..02374b78d 100644 --- a/src/backends/native/meta-kms.h +++ b/src/backends/native/meta-kms.h @@ -26,12 +26,22 @@ #include "backends/native/meta-kms-types.h" #include "backends/native/meta-thread.h" +enum +{ + META_KMS_ERROR_USER_INHIBITED, + META_KMS_ERROR_DENY_LISTED, + META_KMS_ERROR_NOT_SUPPORTED, +}; + typedef enum _MetaKmsFlags { META_KMS_FLAG_NONE = 0, META_KMS_FLAG_NO_MODE_SETTING = 1 << 0, } MetaKmsFlags; +#define META_KMS_ERROR meta_kms_error_quark () +GQuark meta_kms_error_quark (void); + #define META_TYPE_KMS (meta_kms_get_type ()) G_DECLARE_FINAL_TYPE (MetaKms, meta_kms, META, KMS, MetaThread)