diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/.cvsignore | 2 | ||||
| -rw-r--r-- | src/ephy-find-toolbar.c | 19 | ||||
| -rw-r--r-- | src/ephy-window.c | 16 |
3 files changed, 14 insertions, 23 deletions
diff --git a/src/.cvsignore b/src/.cvsignore index f480e275e..9278325f3 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -9,4 +9,4 @@ stamp-* ephy-type-builtins.? epiphany.c ephy-dbus-client-bindings.h -ephy-dbus-server-bindings.h
\ No newline at end of file +ephy-dbus-server-bindings.h diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c index d20aa8a2c..c18b47de5 100644 --- a/src/ephy-find-toolbar.c +++ b/src/ephy-find-toolbar.c @@ -57,7 +57,6 @@ struct _EphyFindToolbarPrivate guint preedit_changed : 1; guint prevent_activate : 1; guint activated : 1; - guint explicit_focus : 1; guint links_only : 1; guint typing_ahead : 1; }; @@ -232,7 +231,7 @@ entry_changed_cb (GtkEntry *entry, #ifdef HAVE_TYPEAHEADFIND result = ephy_embed_find_find (get_find (toolbar), text, priv->links_only); - found = result == EPHY_EMBED_FIND_FOUND; + found = result != EPHY_EMBED_FIND_NOTFOUND; set_status (toolbar, result); #endif set_controls (toolbar, found, found); @@ -309,7 +308,6 @@ set_focus_cb (EphyWindow *window, GtkWidget *widget, EphyFindToolbar *toolbar) { - EphyFindToolbarPrivate *priv = toolbar->priv; GtkWidget *wtoolbar = GTK_WIDGET (toolbar); while (widget != NULL && widget != wtoolbar) @@ -318,11 +316,7 @@ set_focus_cb (EphyWindow *window, } /* if widget == toolbar, the new focus widget is in the toolbar */ - if (widget == wtoolbar) - { - priv->explicit_focus = TRUE; - } - else if (priv->explicit_focus) + if (widget != wtoolbar) { ephy_find_toolbar_request_close (toolbar); } @@ -361,7 +355,6 @@ ephy_find_toolbar_grab_focus (GtkWidget *widget) EphyFindToolbarPrivate *priv = toolbar->priv; gtk_widget_grab_focus (GTK_WIDGET (priv->entry)); - g_return_if_fail (priv->explicit_focus); } static void @@ -635,7 +628,7 @@ ephy_find_toolbar_find_next (EphyFindToolbar *toolbar) result = ephy_embed_find_find_again (get_find (toolbar), TRUE); - found = result == EPHY_EMBED_FIND_FOUND; + found = result != EPHY_EMBED_FIND_NOTFOUND; set_controls (toolbar, found, found); set_status (toolbar, result); } @@ -647,7 +640,7 @@ ephy_find_toolbar_find_previous (EphyFindToolbar *toolbar) gboolean found; result = ephy_embed_find_find_again (get_find (toolbar), FALSE); - found = result == EPHY_EMBED_FIND_FOUND; + found = result != EPHY_EMBED_FIND_NOTFOUND; set_controls (toolbar, found, found); set_status (toolbar, result); } @@ -664,7 +657,6 @@ ephy_find_toolbar_open (EphyFindToolbar *toolbar, priv->typing_ahead = typing_ahead; priv->links_only = links_only; - priv->explicit_focus = FALSE; clear_status (toolbar); @@ -687,9 +679,6 @@ ephy_find_toolbar_close (EphyFindToolbar *toolbar) { EphyFindToolbarPrivate *priv = toolbar->priv; - /* first unset explicit_focus, else we get infinite recursion */ - priv->explicit_focus = FALSE; - gtk_widget_hide (GTK_WIDGET (toolbar)); if (priv->embed == NULL || priv->find == NULL) return; diff --git a/src/ephy-window.c b/src/ephy-window.c index bf8f98f0b..7f49315c8 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -365,20 +365,22 @@ static const struct { GDK_KP_Subtract, GDK_CONTROL_MASK, "ViewZoomOut", FALSE }, { GDK_equal, GDK_CONTROL_MASK, "ViewZoomIn", FALSE }, #ifdef HAVE_X11_XF86KEYSYM_H - { XF86XK_HomePage, 0, "GoHome", TRUE }, { XF86XK_Back, 0, "NavigationBack", TRUE }, - { XF86XK_Forward, 0, "NavigationForward", TRUE }, - { XF86XK_Stop, 0, "ViewStop", FALSE }, - { XF86XK_Refresh, 0, "ViewReload", FALSE }, - { XF86XK_Reload, 0, "ViewReload", FALSE }, { XF86XK_Favorites, 0, "GoBookmarks", FALSE }, + { XF86XK_Forward, 0, "NavigationForward", TRUE }, + { XF86XK_Go, 0, "GoLocation", FALSE }, { XF86XK_History, 0, "GoHistory", FALSE }, + { XF86XK_HomePage, 0, "GoHome", TRUE }, { XF86XK_OpenURL, 0, "GoLocation", FALSE }, - { XF86XK_Go, 0, "GoLocation", FALSE }, { XF86XK_AddFavorite, 0, "FileBookmarkPage", FALSE }, + { XF86XK_Refresh, 0, "ViewReload", FALSE }, + { XF86XK_Reload, 0, "ViewReload", FALSE }, + { XF86XK_Search, 0, "EditFind", FALSE }, { XF86XK_Send, 0, "FileSendTo", FALSE }, + { XF86XK_Start, 0, "GoHome", TRUE }, + { XF86XK_Stop, 0, "ViewStop", FALSE }, { XF86XK_ZoomIn, 0, "ViewZoomIn", FALSE }, - { XF86XK_ZoomOut, 0, "ViewZoomOut", FALSE }, + { XF86XK_ZoomOut, 0, "ViewZoomOut", FALSE } /* FIXME: what about ScrollUp, ScrollDown, Menu*, Option, LogOff, Save,.. any others? */ #endif /* HAVE_X11_XF86KEYSYM_H */ }; |