Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fdo: Explicitly set the backend implementation name #60

Merged
merged 1 commit into from
Sep 6, 2018
Merged

fdo: Explicitly set the backend implementation name #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions core/cog-platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@


G_DEFINE_QUARK (COG_PLATFORM_EGL_ERROR, cog_platform_egl_error)
G_DEFINE_QUARK (COG_PLATFORM_WPE_ERROR, cog_platform_wpe_error)


/* @FIXME: Move this implementation to use a GIO extension point. */
Expand Down
8 changes: 8 additions & 0 deletions core/cog-platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ G_BEGIN_DECLS
#define COG_PLATFORM_EGL_ERROR (cog_platform_egl_error_quark ())
GQuark cog_platform_egl_error_quark (void);

#define COG_PLATFORM_WPE_ERROR (cog_platform_wpe_error_quark ())
GQuark cog_platform_wpe_error_quark (void);


typedef enum {
COG_PLATFORM_WPE_ERROR_INIT,
} CogPlatformWpeError;


/* @FIXME: Eventually move this interface to GObject. */
typedef struct _CogPlatform CogPlatform;
Expand Down
8 changes: 8 additions & 0 deletions platform/cog-platform-fdo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1357,6 +1357,14 @@ cog_platform_setup (CogPlatform *platform,
g_assert_nonnull (platform);
g_return_val_if_fail (COG_IS_SHELL (shell), FALSE);

if (!wpe_loader_init ("libWPEBackend-fdo-0.1.so")) {
g_set_error_literal (error,
COG_PLATFORM_WPE_ERROR,
COG_PLATFORM_WPE_ERROR_INIT,
"Failed to set backend library name");
return FALSE;
}

if (!init_wayland (error))
return FALSE;

Expand Down