diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | embed/mozilla/EphyFind.cpp | 2 | ||||
| -rw-r--r-- | src/ephy-find-toolbar.c | 4 |
3 files changed, 15 insertions, 1 deletions
@@ -1,5 +1,15 @@ 2005-08-16 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/EphyFind.cpp: + + Return TRUE if the event was consumed. + + * embed/mozilla/mozilla-embed-single.cpp: + + More redundant code. + +2005-08-16 Christian Persch <chpe@cvs.gnome.org> + * embed/ephy-embed-find.c: (ephy_embed_find_activate_link): * embed/ephy-embed-find.h: * embed/mozilla/EphyFind.cpp: diff --git a/embed/mozilla/EphyFind.cpp b/embed/mozilla/EphyFind.cpp index 224e85081..5221be417 100644 --- a/embed/mozilla/EphyFind.cpp +++ b/embed/mozilla/EphyFind.cpp @@ -260,5 +260,5 @@ EphyFind::ActivateLink (GdkModifierType aMask) PRBool defaultPrevented = PR_FALSE; rv = target->DispatchEvent (event, &defaultPrevented); - return NS_SUCCEEDED (rv); + return NS_SUCCEEDED (rv) && defaultPrevented; } diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c index 59eee34c2..ac435ebf4 100644 --- a/src/ephy-find-toolbar.c +++ b/src/ephy-find-toolbar.c @@ -284,12 +284,14 @@ entry_changed_cb (GtkEntry *entry, set_controls (toolbar, found, found); } +#ifdef FIND_WHILE_TYPING_IN_EMBED static void entry_preedit_changed_cb (GtkIMContext *context, EphyFindToolbar *toolbar) { toolbar->priv->preedit_changed = TRUE; } +#endif static gboolean entry_key_press_event_cb (GtkEntry *entry, @@ -458,8 +460,10 @@ ephy_find_toolbar_init (EphyFindToolbar *toolbar) G_CALLBACK (entry_key_press_event_cb), toolbar); g_signal_connect_after (priv->entry, "changed", G_CALLBACK (entry_changed_cb), toolbar); +#ifdef FIND_WHILE_TYPING_IN_EMBED g_signal_connect (GTK_ENTRY (priv->entry)->im_context, "preedit-changed", G_CALLBACK (entry_preedit_changed_cb), toolbar); +#endif g_signal_connect (priv->entry, "activate", G_CALLBACK (entry_activate_cb), toolbar); g_signal_connect_swapped (priv->next, "clicked", |