[epiphany/dazzle] Switch to DzlApplication
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/dazzle] Switch to DzlApplication
- Date: Mon, 28 Aug 2017 00:05:20 +0000 (UTC)
commit 021ebb75cf06b604350b2caf478febba100f3f53
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Sun Aug 27 19:04:08 2017 -0500
Switch to DzlApplication
This ensures the CSS for DzlSuggestionEntry gets loaded. We could do
that manually but there's not really any reason not to use
DzlApplication now that we're going to depend on libdazzle.
embed/ephy-embed-shell.c | 3 ++-
embed/ephy-embed-shell.h | 5 +++--
embed/meson.build | 1 +
3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 72a94cc..a994e0a 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -41,6 +41,7 @@
#include "ephy-web-app-utils.h"
#include "ephy-web-extension-proxy.h"
+#include <dazzle.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <stdlib.h>
@@ -98,7 +99,7 @@ static EphyEmbedShell *embed_shell = NULL;
static void ephy_embed_shell_tabs_catalog_iface_init (EphyTabsCatalogInterface *iface);
-G_DEFINE_TYPE_WITH_CODE (EphyEmbedShell, ephy_embed_shell, GTK_TYPE_APPLICATION,
+G_DEFINE_TYPE_WITH_CODE (EphyEmbedShell, ephy_embed_shell, DZL_TYPE_APPLICATION,
G_ADD_PRIVATE (EphyEmbedShell)
G_IMPLEMENT_INTERFACE (EPHY_TYPE_TABS_CATALOG,
ephy_embed_shell_tabs_catalog_iface_init))
diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h
index 43f40b2..6d9b2d0 100644
--- a/embed/ephy-embed-shell.h
+++ b/embed/ephy-embed-shell.h
@@ -21,6 +21,7 @@
#pragma once
+#include <dazzle.h>
#include <webkit2/webkit2.h>
#include "ephy-downloads-manager.h"
@@ -33,7 +34,7 @@ G_BEGIN_DECLS
#define EPHY_TYPE_EMBED_SHELL (ephy_embed_shell_get_type ())
-G_DECLARE_DERIVABLE_TYPE (EphyEmbedShell, ephy_embed_shell, EPHY, EMBED_SHELL, GtkApplication)
+G_DECLARE_DERIVABLE_TYPE (EphyEmbedShell, ephy_embed_shell, EPHY, EMBED_SHELL, DzlApplication)
typedef enum
{
@@ -48,7 +49,7 @@ typedef enum
struct _EphyEmbedShellClass
{
- GtkApplicationClass parent_class;
+ DzlApplicationClass parent_class;
void (* restored_window) (EphyEmbedShell *shell);
};
diff --git a/embed/meson.build b/embed/meson.build
index 8d23845..8ec1ad0 100644
--- a/embed/meson.build
+++ b/embed/meson.build
@@ -37,6 +37,7 @@ libephyembed_deps = [
glib_dep,
gtk_dep,
icu_uc_dep,
+ libdazzle_dep,
libsecret_dep,
libsoup_dep,
m_dep,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]