debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Keep a reference on the DOM element

Browse source
This commit is contained in:
Christian Dywan 2012-02-13 01:27:41 +01:00
parent 6c87ccc3b3
commit 93bec3142f
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
extensions/formhistory/formhistory-gdom-frontend.c
View file

@ -190,6 +190,8 @@ formhistory_suggestions_show (FormHistoryPriv* priv)
gchar* likedvalue; gchar* likedvalue;
int pos = 0; int pos = 0;
g_return_if_fail (priv->element);
g_object_get (priv->element, g_object_get (priv->element,
"name", &name, "name", &name,
"value", &value, "value", &value,
@ -260,12 +262,12 @@ formhistory_editbox_key_pressed_cb (WebKitDOMElement* element,
/* FIXME: Priv is still set after module is disabled */ /* FIXME: Priv is still set after module is disabled */
g_return_if_fail (priv); g_return_if_fail (priv);
g_return_if_fail (priv->element); g_return_if_fail (element);
if (priv->completion_timeout > 0) if (priv->completion_timeout > 0)
g_source_remove (priv->completion_timeout); g_source_remove (priv->completion_timeout);
priv->element = element; katze_object_assign (priv->element, g_object_ref (element));
key = webkit_dom_ui_event_get_key_code (WEBKIT_DOM_UI_EVENT (dom_event)); key = webkit_dom_ui_event_get_key_code (WEBKIT_DOM_UI_EVENT (dom_event));
switch (key) switch (key)
@ -354,15 +356,17 @@ formhistory_editbox_key_pressed_cb (WebKitDOMElement* element,
if (!(keyword && *keyword && *keyword != ' ')) if (!(keyword && *keyword && *keyword != ' '))
{ {
formhistory_suggestions_hide_cb (element, dom_event, priv); formhistory_suggestions_hide_cb (element, dom_event, priv);
return; goto free_data;
} }
/* If the same keyword is submitted there's no need to regenerate suggestions */ /* If the same keyword is submitted there's no need to regenerate suggestions */
if (gtk_widget_get_visible (priv->popup) && if (gtk_widget_get_visible (priv->popup) &&
!g_strcmp0 (keyword, priv->oldkeyword)) !g_strcmp0 (keyword, priv->oldkeyword))
return; goto free_data;
priv->completion_timeout = g_timeout_add (COMPLETION_DELAY, priv->completion_timeout = g_timeout_add (COMPLETION_DELAY,
(GSourceFunc)formhistory_suggestions_show, priv); (GSourceFunc)formhistory_suggestions_show, priv);
free_data:
g_free (keyword);
} }
static void static void
@ -462,6 +466,7 @@ formhistory_private_destroy (FormHistoryPriv *priv)
katze_assign (priv->oldkeyword, NULL); katze_assign (priv->oldkeyword, NULL);
gtk_widget_destroy (priv->popup); gtk_widget_destroy (priv->popup);
priv->popup = NULL; priv->popup = NULL;
katze_object_assign (priv->element, NULL);
g_slice_free (FormHistoryPriv, priv); g_slice_free (FormHistoryPriv, priv);
} }