brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Make test backend inherit MetaBackendX11Nested

Browse Source 
The test backend must inherit the nested backend, as MetaBackendX11 is
not complete.

https://bugzilla.gnome.org/show_bug.cgi?id=779745
This commit is contained in:
Jonas Ådahl 2017-02-21 16:55:04 +08:00
parent 38c5a1610e
commit e20e60783a
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backends/x11/nested/meta-backend-x11-nested.c
View File

@ -27,11 +27,6 @@
#include "wayland/meta-wayland.h" #include "wayland/meta-wayland.h"
struct _MetaBackendX11Nested
{
MetaBackendX11 parent;
};
G_DEFINE_TYPE (MetaBackendX11Nested, meta_backend_x11_nested, G_DEFINE_TYPE (MetaBackendX11Nested, meta_backend_x11_nested,
META_TYPE_BACKEND_X11) META_TYPE_BACKEND_X11)

7
src/backends/x11/nested/meta-backend-x11-nested.h
View File

@ -25,7 +25,12 @@
#include "backends/x11/meta-backend-x11.h" #include "backends/x11/meta-backend-x11.h"
#define META_TYPE_BACKEND_X11_NESTED (meta_backend_x11_nested_get_type ()) #define META_TYPE_BACKEND_X11_NESTED (meta_backend_x11_nested_get_type ())
G_DECLARE_FINAL_TYPE (MetaBackendX11Nested, meta_backend_x11_nested, G_DECLARE_DERIVABLE_TYPE (MetaBackendX11Nested, meta_backend_x11_nested,
META, BACKEND_X11_NESTED, MetaBackendX11) META, BACKEND_X11_NESTED, MetaBackendX11)
struct _MetaBackendX11NestedClass
{
MetaBackendX11Class parent_class;
};
#endif /* META_BACKEND_X11_NESTED_H */ #endif /* META_BACKEND_X11_NESTED_H */

4
src/tests/meta-backend-test.c
View File

@ -25,10 +25,10 @@
struct _MetaBackendTest struct _MetaBackendTest
{ {
MetaBackendX11 parent; MetaBackendX11Nested parent;
}; };
G_DEFINE_TYPE (MetaBackendTest, meta_backend_test, META_TYPE_BACKEND_X11) G_DEFINE_TYPE (MetaBackendTest, meta_backend_test, META_TYPE_BACKEND_X11_NESTED)
static void static void
meta_backend_test_init (MetaBackendTest *backend_test) meta_backend_test_init (MetaBackendTest *backend_test)

4
src/tests/meta-backend-test.h
View File

@ -20,10 +20,10 @@
#ifndef META_BACKEND_TEST_H #ifndef META_BACKEND_TEST_H
#define META_BACKEND_TEST_H #define META_BACKEND_TEST_H
#include "backends/x11/meta-backend-x11.h" #include "backends/x11/nested/meta-backend-x11-nested.h"
#define META_TYPE_BACKEND_TEST (meta_backend_test_get_type ()) #define META_TYPE_BACKEND_TEST (meta_backend_test_get_type ())
G_DECLARE_FINAL_TYPE (MetaBackendTest, meta_backend_test, G_DECLARE_FINAL_TYPE (MetaBackendTest, meta_backend_test,
META, BACKEND_TEST, MetaBackendX11) META, BACKEND_TEST, MetaBackendX11Nested)
#endif /* META_BACKEND_TEST_H */ #endif /* META_BACKEND_TEST_H */