[epiphany] Add libdazzle test fix to investigate dazzle location entry bug
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Add libdazzle test fix to investigate dazzle location entry bug
- Date: Tue, 4 Dec 2018 19:37:57 +0000 (UTC)
commit 45ab6d7b390d46258ff7dfe3ee0469f66cded23f
Author: Jan-Michael Brummer <jan brummer tabos org>
Date: Tue Dec 4 18:42:20 2018 +0100
Add libdazzle test fix to investigate dazzle location entry bug
dazzle-dse-test-fix.patch | 68 +++++++++++++++++++++++++++++++++++++++++++++++
org.gnome.Epiphany.json | 6 ++++-
2 files changed, 73 insertions(+), 1 deletion(-)
---
diff --git a/dazzle-dse-test-fix.patch b/dazzle-dse-test-fix.patch
new file mode 100644
index 000000000..02436628a
--- /dev/null
+++ b/dazzle-dse-test-fix.patch
@@ -0,0 +1,68 @@
+diff --git a/src/suggestions/dzl-suggestion-entry.c b/src/suggestions/dzl-suggestion-entry.c
+index fc67fc4..bab0d6b 100644
+--- a/src/suggestions/dzl-suggestion-entry.c
++++ b/src/suggestions/dzl-suggestion-entry.c
+@@ -144,13 +144,17 @@ dzl_suggestion_entry_focus_out_event (GtkWidget *widget,
+ GdkEventFocus *event)
+ {
+ DzlSuggestionEntry *self = (DzlSuggestionEntry *)widget;
++ gboolean ret;
++
++ DZL_ENTRY;
+
+ g_assert (DZL_IS_SUGGESTION_ENTRY (self));
+ g_assert (event != NULL);
+
+ g_signal_emit (self, signals [HIDE_SUGGESTIONS], 0);
+
+- return GTK_WIDGET_CLASS (dzl_suggestion_entry_parent_class)->focus_out_event (widget, event);
++ ret = GTK_WIDGET_CLASS (dzl_suggestion_entry_parent_class)->focus_out_event (widget, event);
++ DZL_RETURN (ret);
+ }
+
+ static void
+diff --git a/src/suggestions/dzl-suggestion-popover.c b/src/suggestions/dzl-suggestion-popover.c
+index 06f259e..24942ba 100644
+--- a/src/suggestions/dzl-suggestion-popover.c
++++ b/src/suggestions/dzl-suggestion-popover.c
+@@ -788,38 +788,8 @@ dzl_suggestion_popover_items_changed (DzlSuggestionPopover *self,
+ DZL_EXIT;
+ }
+
+- if (self->popup_requested)
+- {
+- dzl_suggestion_popover_popup (self);
+- self->popup_requested = FALSE;
+- DZL_EXIT;
+- }
+-
+- /*
+- * If we are currently animating in the initial view of the popover,
+- * then we might need to cancel that animation and rely on the elastic
+- * bin for smooth resizing.
+- */
+- if (gtk_revealer_get_reveal_child (self->revealer) &&
+- !gtk_revealer_get_child_revealed (self->revealer) &&
+- (removed || added))
+- {
+- g_signal_handlers_block_by_func (self->revealer,
+- G_CALLBACK (dzl_suggestion_popover_notify_child_revealed),
+- self);
+- gtk_revealer_set_transition_duration (self->revealer, 0);
+- gtk_revealer_set_reveal_child (self->revealer, FALSE);
+- gtk_revealer_set_reveal_child (self->revealer, TRUE);
+- g_signal_handlers_unblock_by_func (self->revealer,
+- G_CALLBACK (dzl_suggestion_popover_notify_child_revealed),
+- self);
+- }
+- else
+- {
+- dzl_suggestion_popover_popup (self);
+- self->popup_requested = FALSE;
+- }
+-
++ dzl_suggestion_popover_popup (self);
++ self->popup_requested = FALSE;
+ DZL_EXIT;
+ }
+
diff --git a/org.gnome.Epiphany.json b/org.gnome.Epiphany.json
index d7a1fb90a..ff313d450 100644
--- a/org.gnome.Epiphany.json
+++ b/org.gnome.Epiphany.json
@@ -55,6 +55,10 @@
{
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/libdazzle.git"
+ },
+ {
+ "type" : "patch" ,
+ "path" : "dazzle-dse-test-fix.patch"
}
]
},
@@ -91,4 +95,4 @@
]
}
]
-}
+}
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]