Commit a4123d15 authored by Alexander Mikhaylenko's avatar Alexander Mikhaylenko
Browse files

Import patches from amber-phone

Drop the libdazzle submodule stuff, as well as adjustments for older glib
and libsecret.
parent 58e0a5b1
Pipeline #64761 passed with stages
in 8 minutes and 35 seconds
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Thu, 15 Oct 2020 09:49:59 +0200
Subject: data: List compatible form-factors
This lists the form-factors the app was designed for in the AppStream
data and the desktop entry.
---
data/org.gnome.Epiphany.appdata.xml.in.in | 4 ++++
data/org.gnome.Epiphany.desktop.in.in | 1 +
2 files changed, 5 insertions(+)
diff --git a/data/org.gnome.Epiphany.appdata.xml.in.in b/data/org.gnome.Epiphany.appdata.xml.in.in
index 10c9de6..0e36bca 100644
--- a/data/org.gnome.Epiphany.appdata.xml.in.in
+++ b/data/org.gnome.Epiphany.appdata.xml.in.in
@@ -68,4 +68,8 @@
<release date="2019-08-05" version="3.33.90"/>
<release date="2019-07-14" version="3.33.4"/>
</releases>
+ <custom>
+ <value key="Purism::form_factor">workstation</value>
+ <value key="Purism::form_factor">mobile</value>
+ </custom>
</component>
diff --git a/data/org.gnome.Epiphany.desktop.in.in b/data/org.gnome.Epiphany.desktop.in.in
index a0f2723..7399806 100644
--- a/data/org.gnome.Epiphany.desktop.in.in
+++ b/data/org.gnome.Epiphany.desktop.in.in
@@ -13,6 +13,7 @@ Icon=@icon@
Categories=Network;GNOME;GTK;WebBrowser;
MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;multipart/related;application/x-mimearchive;message/rfc822;
Actions=new-window;Incognito;
+X-Purism-FormFactor=Workstation;Mobile;
[Desktop Action new-window]
Name=New Window
From: Alexander Mikhaylenko <alexander.mikhaylenko@puri.sm>
Date: Tue, 22 Sep 2020 17:43:19 +0500
Subject: librem5: Disable WebKit fullscreen
This lets WebKit and websites they don't have the right to make the
window fullscreen.
---
embed/ephy-embed-prefs.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/embed/ephy-embed-prefs.c b/embed/ephy-embed-prefs.c
index 3120897..e9ec876 100644
--- a/embed/ephy-embed-prefs.c
+++ b/embed/ephy-embed-prefs.c
@@ -566,6 +566,7 @@ ephy_embed_prefs_init (gpointer user_data)
webkit_settings = webkit_settings_new_with_settings ("enable-back-forward-navigation-gestures", TRUE,
"enable-developer-extras", TRUE,
"enable-dns-prefetching", TRUE,
+ "enable-fullscreen", FALSE,
"enable-plugins", FALSE,
NULL);
From: Alexander Mikhaylenko <alexander.mikhaylenko@puri.sm>
Date: Tue, 29 Sep 2020 13:13:55 +0500
Subject: librem5: Disable create_delete_dir test
While it works locally and on arm01, it fails in gitlab CI, presumably
because all 3 directories are writable there. Let's disable it for now.
---
tests/ephy-file-helpers-test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
index b3139b6..2cfef89 100644
--- a/tests/ephy-file-helpers-test.c
+++ b/tests/ephy-file-helpers-test.c
@@ -348,7 +348,7 @@ main (int argc,
g_test_add_func ("/lib/ephy-file-helpers/get_downloads_dir",
test_ephy_file_get_downloads_dir);
- if (!ephy_is_running_inside_flatpak ())
+ if (!ephy_is_running_inside_flatpak () && FALSE)
g_test_add_func ("/lib/ephy-file-helpers/create_delete_dir",
test_ephy_file_create_delete_dir);
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Wed, 10 Jul 2019 19:17:38 +0200
Subject: librem5: Disable fullscreen
This prevent the windows from going fullscreen, as we currently have no
way to exit fullscreen from a touch screen only.
---
src/ephy-lockdown.c | 18 ------------------
src/ephy-window.c | 40 ++++------------------------------------
src/window-commands.c | 24 ------------------------
src/window-commands.h | 3 ---
4 files changed, 4 insertions(+), 81 deletions(-)
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c
index 43f3113..fe08141 100644
--- a/src/ephy-lockdown.c
+++ b/src/ephy-lockdown.c
@@ -65,17 +65,6 @@ arbitrary_url_cb (GSettings *settings,
}
}
-static void
-fullscreen_cb (GSettings *settings,
- const char *key,
- EphyWindow *window)
-{
- if (g_settings_get_boolean (settings, key))
- gtk_window_fullscreen (GTK_WINDOW (window));
- else
- gtk_window_unfullscreen (GTK_WINDOW (window));
-}
-
typedef struct {
const char *key;
const char *action;
@@ -96,8 +85,6 @@ static const BindAction window_actions[] = {
{ EPHY_PREFS_LOCKDOWN_BOOKMARK_EDITING, "bookmark-page", "enabled" },
- { EPHY_PREFS_LOCKDOWN_FULLSCREEN, "fullscreen", "enabled" },
-
{ EPHY_PREFS_LOCKDOWN_PRINTING, "print", "enabled" },
{ EPHY_PREFS_LOCKDOWN_SAVE_TO_DISK, "save-as", "enabled" }
@@ -194,16 +181,11 @@ window_added_cb (GtkApplication *application,
if (!EPHY_IS_WINDOW (window))
return;
- g_signal_connect (EPHY_SETTINGS_LOCKDOWN,
- "changed::" EPHY_PREFS_LOCKDOWN_FULLSCREEN,
- G_CALLBACK (fullscreen_cb), window);
g_signal_connect (EPHY_SETTINGS_LOCKDOWN,
"changed::" EPHY_PREFS_LOCKDOWN_ARBITRARY_URL,
G_CALLBACK (arbitrary_url_cb), window);
/* Trigger an initial state on these elements. */
- fullscreen_cb (EPHY_SETTINGS_LOCKDOWN,
- EPHY_PREFS_LOCKDOWN_FULLSCREEN, EPHY_WINDOW (window));
arbitrary_url_cb (EPHY_SETTINGS_LOCKDOWN,
EPHY_PREFS_LOCKDOWN_ARBITRARY_URL, EPHY_WINDOW (window));
diff --git a/src/ephy-window.c b/src/ephy-window.c
index d6adfb2..46b592f 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -120,7 +120,6 @@ const struct {
/* Toggle actions */
{ "win.browse-with-caret", { "F7", NULL } },
- { "win.fullscreen", { "F11", NULL } },
/* Navigation */
{ "toolbar.stop", { "Escape", "Stop", NULL } },
@@ -554,23 +553,6 @@ update_adaptive_mode (EphyWindow *window)
ephy_window_close_pages_view (window);
}
-static void
-ephy_window_fullscreen (EphyWindow *window)
-{
- EphyEmbed *embed;
-
- window->is_fullscreen = TRUE;
-
- /* sync status */
- embed = window->active_embed;
- sync_tab_load_status (ephy_embed_get_web_view (embed), WEBKIT_LOAD_STARTED, window);
- sync_tab_security (ephy_embed_get_web_view (embed), NULL, window);
-
- update_adaptive_mode (window);
- sync_chromes_visibility (window);
- ephy_embed_entering_fullscreen (embed);
-}
-
static void
ephy_window_unfullscreen (EphyWindow *window)
{
@@ -871,7 +853,6 @@ static const GActionEntry window_entries [] = {
/* Toggle actions */
{ "browse-with-caret", NULL, NULL, "false", window_cmd_change_browse_with_caret_state },
- { "fullscreen", NULL, NULL, "false", window_cmd_change_fullscreen_state },
};
static const GActionEntry tab_entries [] = {
@@ -3309,28 +3290,15 @@ ephy_window_state_event (GtkWidget *widget,
}
if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
- GActionGroup *action_group;
- GAction *action;
- gboolean fullscreen;
+ if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)
+ gtk_window_unfullscreen (GTK_WINDOW (window));
- fullscreen = !!(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN);
-
- if (fullscreen) {
- ephy_window_fullscreen (window);
- } else {
- ephy_window_unfullscreen (window);
- }
+ ephy_window_unfullscreen (window);
if (window->show_fullscreen_header_bar)
- dzl_application_window_set_fullscreen (DZL_APPLICATION_WINDOW (window), fullscreen);
+ dzl_application_window_set_fullscreen (DZL_APPLICATION_WINDOW (window), FALSE);
window->show_fullscreen_header_bar = FALSE;
-
- action_group = gtk_widget_get_action_group (GTK_WIDGET (window), "win");
- action = g_action_map_lookup_action (G_ACTION_MAP (action_group), "fullscreen");
-
- g_simple_action_set_state (G_SIMPLE_ACTION (action),
- g_variant_new_boolean (fullscreen));
} else if (event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED) {
window->is_maximized = !!(event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED);
}
diff --git a/src/window-commands.c b/src/window-commands.c
index fd4dafc..4ed4184 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -2616,30 +2616,6 @@ window_cmd_change_browse_with_caret_state (GSimpleAction *action,
EPHY_PREFS_ENABLE_CARET_BROWSING, active);
}
-void
-window_cmd_change_fullscreen_state (GSimpleAction *action,
- GVariant *state,
- gpointer user_data)
-{
- EphyWindow *window = EPHY_WINDOW (user_data);
- gboolean active;
-
- active = g_variant_get_boolean (state);
-
- /* This is performed only here because we don't want it occuring when a window
- * enters fullscreen mode for some other reason other than action activation.
- * E.g. we don't want it appearing for fullscreen video.
- */
- ephy_window_show_fullscreen_header_bar (window);
-
- if (active)
- gtk_window_fullscreen (GTK_WINDOW (window));
- else
- gtk_window_unfullscreen (GTK_WINDOW (window));
-
- g_simple_action_set_state (action, g_variant_new_boolean (active));
-}
-
void
window_cmd_tabs_previous (GSimpleAction *action,
GVariant *variant,
diff --git a/src/window-commands.h b/src/window-commands.h
index ca80dcf..784363b 100644
--- a/src/window-commands.h
+++ b/src/window-commands.h
@@ -173,9 +173,6 @@ void window_cmd_go_tabs_view (GSimpleAction *action,
void window_cmd_change_browse_with_caret_state (GSimpleAction *action,
GVariant *state,
gpointer user_data);
-void window_cmd_change_fullscreen_state (GSimpleAction *action,
- GVariant *state,
- gpointer user_data);
void window_cmd_tabs_previous (GSimpleAction *action,
GVariant *state,
gpointer user_data);
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Wed, 10 Jul 2019 19:24:33 +0200
Subject: librem5: Drop the shortcuts window
The window doesn't fit on the screen and it's not very relevant.
---
src/resources/gtk/page-menu-popover.ui | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/resources/gtk/page-menu-popover.ui b/src/resources/gtk/page-menu-popover.ui
index 6942c99..a631085 100644
--- a/src/resources/gtk/page-menu-popover.ui
+++ b/src/resources/gtk/page-menu-popover.ui
@@ -305,7 +305,7 @@
<property name="can_focus">True</property>
<property name="text" translatable="yes">_Keyboard Shortcuts</property>
<property name="action-name">app.shortcuts</property>
- <property name="visible">True</property>
+ <property name="visible">False</property>
</object>
</child>
<!-- FRAGILE: This button is manually removed for app mode/Pantheon in ephy-header-bar.c. -->
From: Alexander Mikhaylenko <alexander.mikhaylenko@puri.sm>
Date: Fri, 25 Sep 2020 15:31:11 +0500
Subject: librem5: Hide web app preferences for system apps
Since system web apps have desktop file in /usr, they cannot be edited and
the preferences do nothing.
Introduce EPHY_WEB_APPLICATION_SYSTEM option, set it for any applications
created via ephy_web_application_ensure_for_app_info(). Hide preferences
for those apps.
Upstreamed in https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/835
---
data/org.gnome.epiphany.gschema.xml | 5 +++++
lib/ephy-prefs.h | 1 +
lib/ephy-web-app-utils.c | 11 ++++++++---
lib/ephy-web-app-utils.h | 1 +
src/preferences/prefs-general-page.c | 17 +++++++++++------
5 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
index be60ff9..d1341d4 100644
--- a/data/org.gnome.epiphany.gschema.xml
+++ b/data/org.gnome.epiphany.gschema.xml
@@ -257,6 +257,11 @@
<summary>Run in background</summary>
<description>If enabled, application continues running in the background after closing the window.</description>
</key>
+ <key type="b" name="system">
+ <default>false</default>
+ <summary>WebApp is system-wide</summary>
+ <description>If enabled, application cannot be edited or removed.</description>
+ </key>
</schema>
<schema id="org.gnome.Epiphany.state">
<key type="s" name="download-dir">
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index d423441..6158df1 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -198,6 +198,7 @@ static const char * const ephy_prefs_web_schema[] = {
#define EPHY_PREFS_WEB_APP_ADDITIONAL_URLS "additional-urls"
#define EPHY_PREFS_WEB_APP_MOBILE_CAPABLE "mobile-capable"
#define EPHY_PREFS_WEB_APP_RUN_IN_BACKGROUND "run-in-background"
+#define EPHY_PREFS_WEB_APP_SYSTEM "system"
static struct {
const char *schema;
diff --git a/lib/ephy-web-app-utils.c b/lib/ephy-web-app-utils.c
index aff0bc2..086d794 100644
--- a/lib/ephy-web-app-utils.c
+++ b/lib/ephy-web-app-utils.c
@@ -467,7 +467,7 @@ ephy_web_application_ensure_for_app_info (GAppInfo *app_info)
if (error)
g_warning ("Couldn't copy desktop file: %s", error->message);
- ephy_web_application_initialize_settings (profile_dir, EPHY_WEB_APPLICATION_NONE);
+ ephy_web_application_initialize_settings (profile_dir, EPHY_WEB_APPLICATION_SYSTEM);
}
return g_steal_pointer (&profile_dir);
@@ -793,12 +793,17 @@ ephy_web_application_initialize_settings (const char *profile_dir
g_object_unref (settings);
g_object_unref (web_app_settings);
- if (options & EPHY_WEB_APPLICATION_MOBILE_CAPABLE) {
+ if (options) {
path = g_build_path ("/", "/org/gnome/epiphany/web-apps/", name, "webapp/", NULL);
web_app_settings = g_settings_new_with_path (EPHY_PREFS_WEB_APP_SCHEMA, path);
g_free (path);
- g_settings_set_boolean (web_app_settings, EPHY_PREFS_WEB_APP_MOBILE_CAPABLE, TRUE);
+ if (options & EPHY_WEB_APPLICATION_MOBILE_CAPABLE)
+ g_settings_set_boolean (web_app_settings, EPHY_PREFS_WEB_APP_MOBILE_CAPABLE, TRUE);
+
+ if (options & EPHY_WEB_APPLICATION_SYSTEM)
+ g_settings_set_boolean (web_app_settings, EPHY_PREFS_WEB_APP_SYSTEM, TRUE);
+
g_object_unref (web_app_settings);
}
diff --git a/lib/ephy-web-app-utils.h b/lib/ephy-web-app-utils.h
index b51fdaf..0044abf 100644
--- a/lib/ephy-web-app-utils.h
+++ b/lib/ephy-web-app-utils.h
@@ -38,6 +38,7 @@ typedef struct {
typedef enum {
EPHY_WEB_APPLICATION_NONE,
EPHY_WEB_APPLICATION_MOBILE_CAPABLE,
+ EPHY_WEB_APPLICATION_SYSTEM,
} EphyWebApplicationOptions;
#define EPHY_WEB_APP_ICON_NAME "app-icon.png"
diff --git a/src/preferences/prefs-general-page.c b/src/preferences/prefs-general-page.c
index defb8a2..ac3d820 100644
--- a/src/preferences/prefs-general-page.c
+++ b/src/preferences/prefs-general-page.c
@@ -1209,9 +1209,12 @@ setup_general_page (PrefsGeneralPage *general_page)
if (ephy_embed_shell_get_mode (ephy_embed_shell_get_default ()) == EPHY_EMBED_SHELL_MODE_APPLICATION) {
general_page->webapp = ephy_web_application_for_profile_directory (ephy_profile_dir ());
g_assert (general_page->webapp);
- prefs_general_page_update_webapp_icon (general_page, general_page->webapp->icon_url);
- gtk_entry_set_text (GTK_ENTRY (general_page->webapp_url), general_page->webapp->url);
- gtk_entry_set_text (GTK_ENTRY (general_page->webapp_title), general_page->webapp->name);
+
+ if (!g_settings_get_boolean (EPHY_SETTINGS_WEB_APP, EPHY_PREFS_WEB_APP_SYSTEM)) {
+ prefs_general_page_update_webapp_icon (general_page, general_page->webapp->icon_url);
+ gtk_entry_set_text (GTK_ENTRY (general_page->webapp_url), general_page->webapp->url);
+ gtk_entry_set_text (GTK_ENTRY (general_page->webapp_title), general_page->webapp->name);
+ }
}
/* ======================================================================== */
@@ -1356,8 +1359,12 @@ prefs_general_page_init (PrefsGeneralPage *general_page)
gtk_widget_init_template (GTK_WIDGET (general_page));
+ setup_general_page (general_page);
+
gtk_widget_set_visible (general_page->webapp_box,
- mode == EPHY_EMBED_SHELL_MODE_APPLICATION);
+ mode == EPHY_EMBED_SHELL_MODE_APPLICATION &&
+ !g_settings_get_boolean (EPHY_SETTINGS_WEB_APP,
+ EPHY_PREFS_WEB_APP_SYSTEM));
gtk_widget_set_visible (general_page->homepage_box,
mode != EPHY_EMBED_SHELL_MODE_APPLICATION);
gtk_widget_set_visible (general_page->search_box,
@@ -1366,6 +1373,4 @@ prefs_general_page_init (PrefsGeneralPage *general_page)
mode != EPHY_EMBED_SHELL_MODE_APPLICATION);
gtk_widget_set_visible (general_page->browsing_box,
mode != EPHY_EMBED_SHELL_MODE_APPLICATION);
-
- setup_general_page (general_page);
}
From: Alexander Mikhaylenko <alexander.mikhaylenko@puri.sm>
Date: Fri, 25 Sep 2020 16:14:18 +0500
Subject: librem5: Skip system web apps for about:applications
They cannot be deleted as we don't control their desktop file. Don't show
them at all.
Upstreamed in https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/835
---
embed/ephy-about-handler.c | 3 +++
lib/ephy-web-app-utils.c | 17 +++++++++++++++++
lib/ephy-web-app-utils.h | 2 ++
3 files changed, 22 insertions(+)
diff --git a/embed/ephy-about-handler.c b/embed/ephy-about-handler.c
index 49dcd33..61deac0 100644
--- a/embed/ephy-about-handler.c
+++ b/embed/ephy-about-handler.c
@@ -264,6 +264,9 @@ handle_applications_finished_cb (EphyAboutHandler *handler,
for (p = applications; p; p = p->next) {
EphyWebApplication *app = (EphyWebApplication *)p->data;
+ if (ephy_web_application_is_system (app))
+ continue;
+
g_string_append_printf (data_str,
"<tbody><tr id =\"%s\">"
"<td class=\"icon\"><img width=64 height=64 src=\"file://%s\"></img></td>"
diff --git a/lib/ephy-web-app-utils.c b/lib/ephy-web-app-utils.c
index 086d794..d89bdca 100644
--- a/lib/ephy-web-app-utils.c
+++ b/lib/ephy-web-app-utils.c
@@ -963,3 +963,20 @@ ephy_web_application_save (EphyWebApplication *app)
return saved;
}
+
+gboolean
+ephy_web_application_is_system (EphyWebApplication *app)
+{
+ GSettings *web_app_settings;
+ g_autofree char *profile_directory = NULL;
+ g_autofree char *name = NULL;
+ g_autofree char *path = NULL;
+
+ profile_directory = ephy_web_application_get_profile_directory (app->id);
+ name = g_path_get_basename (profile_directory);
+
+ path = g_build_path ("/", "/org/gnome/epiphany/web-apps/", name, "webapp/", NULL);
+ web_app_settings = g_settings_new_with_path (EPHY_PREFS_WEB_APP_SCHEMA, path);
+
+ return g_settings_get_boolean (web_app_settings, EPHY_PREFS_WEB_APP_SYSTEM);
+}
diff --git a/lib/ephy-web-app-utils.h b/lib/ephy-web-app-utils.h
index 0044abf..3d68263 100644
--- a/lib/ephy-web-app-utils.h
+++ b/lib/ephy-web-app-utils.h
@@ -77,4 +77,6 @@ gboolean ephy_web_application_is_uri_allowed (const char *uri);
gboolean ephy_web_application_save (EphyWebApplication *app);
+gboolean ephy_web_application_is_system (EphyWebApplication *app);
+
G_END_DECLS
From: Alexander Mikhaylenko <alexander.mikhaylenko@puri.sm>
Date: Tue, 22 Sep 2020 20:42:48 +0500
Subject: librem5: bookmark-properties-grid: Fix tag grid alignment
Fill valign is fine when the dialog is not resizable, as it is upstream.
However, we have a patch to make it resizable and maximize it via
HdyDialog, so instead top-align the grid so the tags aren't stretched.
Upstreamed in https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/832
---
src/resources/gtk/bookmark-properties-grid.ui | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/resources/gtk/bookmark-properties-grid.ui b/src/resources/gtk/bookmark-properties-grid.ui
index ce12168..4e322fc 100644
--- a/src/resources/gtk/bookmark-properties-grid.ui
+++ b/src/resources/gtk/bookmark-properties-grid.ui
@@ -157,6 +157,7 @@
<property name="homogeneous">True</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="valign">start</property>
<property name="min_children_per_line">2</property>
<property name="max_children_per_line">3</property>
<property name="selection_mode">none</property>
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Mon, 2 Sep 2019 09:10:17 +0200
Subject: librem5: bookmarks-popover: Make the popover narrower
This helps it fit in narrow screens.
Upstreamed in https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/833
---
src/bookmarks/ephy-bookmarks-popover.c | 3 +++
src/resources/gtk/bookmarks-popover.ui | 3 +++
2 files changed, 6 insertions(+)
diff --git a/src/bookmarks/ephy-bookmarks-popover.c b/src/bookmarks/ephy-bookmarks-popover.c
index 4fc24f2..59aa6df 100644
--- a/src/bookmarks/ephy-bookmarks-popover.c
+++ b/src/bookmarks/ephy-bookmarks-popover.c
@@ -244,6 +244,9 @@ create_tag_row (const char *tag)
}
label = gtk_label_new (tag);
+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+ gtk_label_set_xalign (GTK_LABEL (label), 0);
+
gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE, 0);
diff --git a/src/resources/gtk/bookmarks-popover.ui b/src/resources/gtk/bookmarks-popover.ui
index 6ee426c..3e1498d 100644
--- a/src/resources/gtk/bookmarks-popover.ui
+++ b/src/resources/gtk/bookmarks-popover.ui
@@ -165,6 +165,9 @@
<object class="GtkLabel" id="title">
<property name="label" translatable="yes">No bookmarks yet?</property>
<property name="visible">true</property>
+ <property name="max-width-chars">40</property>
+ <property name="wrap">true</property>
+ <property name="justify">center</property>
<style>
<class name="dim-label"/>
</style>
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Mon, 2 Sep 2019 09:46:20 +0200
Subject: librem5: bookmarks-popover: Make the tag detail label adaptive
This helps the popover to fit in narrow screens.
Upstreamed in https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/833
---
src/resources/gtk/bookmarks-popover.ui | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/resources/gtk/bookmarks-popover.ui b/src/resources/gtk/bookmarks-popover.ui
index 3e1498d..4f9adf6 100644
--- a/src/resources/gtk/bookmarks-popover.ui
+++ b/src/resources/gtk/bookmarks-popover.ui
@@ -111,8 +111,9 @@
</child>
<child>
<object class="GtkLabel" id="tag_detail_label">
- <property name="halign">center</property>
+ <property name="ellipsize">end</property>
<property name="hexpand">true</property>
+ <property name="max-width-chars">0</property>
<property name="visible">true</property>
<attributes>
<attribute name="weight" value="bold"/>
From: Alexander Mikhaylenko <alexander.mikhaylenko@puri.sm>
Date: Wed, 23 Sep 2020 18:48:50 +0500
Subject: librem5: bookmarks-row: Make properties dialog resizable
Ensure it properly maximizes and keyboard doesn't overlap it.
Upstreamed in https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/832
---
src/bookmarks/ephy-bookmark-row.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/bookmarks/ephy-bookmark-row.c b/src/bookmarks/ephy-bookmark-row.c
index e060931..42f845a 100644