[epiphany] shell: Init libhandy
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] shell: Init libhandy
- Date: Wed, 24 Jun 2020 17:33:43 +0000 (UTC)
commit 2a4397224e907c20ad6c289978123d3e90ac1b25
Author: Adrien Plazas <kekun plazas laposte net>
Date: Tue Jun 23 15:55:25 2020 +0200
shell: Init libhandy
hdy_init() has been introduced back to solve many corner cases, but this
time it must be called soon after gtk_init(), e.g. during the
GApplication::startup callback, and it doesn't need the arguments.
meson.build | 2 +-
src/ephy-shell.c | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index 05563d178..bcd8b2a23 100644
--- a/meson.build
+++ b/meson.build
@@ -92,7 +92,7 @@ hogweed_dep = dependency('hogweed', version: nettle_requirement)
iso_codes_dep = dependency('iso-codes', version: '>= 0.35')
json_glib_dep = dependency('json-glib-1.0', version: '>= 1.2.4')
libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.35.3')
-libhandy_dep = dependency('libhandy-1', version: '>= 0.80.0')
+libhandy_dep = dependency('libhandy-1', version: '>= 0.83.0')
libsecret_dep = dependency('libsecret-1', version: '>= 0.19.0')
libsoup_dep = dependency('libsoup-2.4', version: '>= 2.48.0')
libxml_dep = dependency('libxml-2.0', version: '>= 2.6.12')
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 421588cac..91be64ef3 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -50,6 +50,9 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#define HANDY_USE_UNSTABLE_API
+#include <handy.h>
+
struct _EphyShell {
EphyEmbedShell parent_instance;
@@ -475,6 +478,8 @@ ephy_shell_startup (GApplication *application)
G_APPLICATION_CLASS (ephy_shell_parent_class)->startup (application);
+ hdy_init ();
+
/* We're not remoting; start our services */
ephy_user_agent_init_sync ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]