aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-history-window.c
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2003-11-09 01:35:30 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2003-11-09 01:35:30 +0800
commitcda65a33a1885e61cbaafb5e98e56c742a4828b0 (patch)
tree42bde5d0e4a66be6d60865e5ad4862ff3eb8408b /src/ephy-history-window.c
parent6b00de66025093218127fa74d9a423d58e377025 (diff)
downloadgsoc2013-epiphany-cda65a33a1885e61cbaafb5e98e56c742a4828b0.tar
gsoc2013-epiphany-cda65a33a1885e61cbaafb5e98e56c742a4828b0.tar.gz
gsoc2013-epiphany-cda65a33a1885e61cbaafb5e98e56c742a4828b0.tar.bz2
gsoc2013-epiphany-cda65a33a1885e61cbaafb5e98e56c742a4828b0.tar.lz
gsoc2013-epiphany-cda65a33a1885e61cbaafb5e98e56c742a4828b0.tar.xz
gsoc2013-epiphany-cda65a33a1885e61cbaafb5e98e56c742a4828b0.tar.zst
gsoc2013-epiphany-cda65a33a1885e61cbaafb5e98e56c742a4828b0.zip
Focus history entry on _show. Do not try to update paste menu item using
2003-11-08 Marco Pesenti Gritti <marco@gnome.org> * src/bookmarks/ephy-bookmarks-editor.c: (ephy_bookmarks_editor_update_menu): * src/ephy-history-window.c: (ephy_history_window_show), (ephy_history_window_class_init), (ephy_history_window_update_menu): Focus history entry on _show. Do not try to update paste menu item using the wait api, it can cause a crash on a timeout and anyway it's incosistent what we do in main window.
Diffstat (limited to 'src/ephy-history-window.c')
-rw-r--r--src/ephy-history-window.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index b541e91bd..115cb3ac0 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -613,9 +613,20 @@ ephy_history_window_get_type (void)
}
static void
+ephy_history_window_show (GtkWidget *widget)
+{
+ EphyHistoryWindow *window = EPHY_HISTORY_WINDOW (widget);
+
+ gtk_widget_grab_focus (window->priv->search_entry);
+
+ GTK_WIDGET_CLASS (parent_class)->show (widget);
+}
+
+static void
ephy_history_window_class_init (EphyHistoryWindowClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
@@ -625,6 +636,8 @@ ephy_history_window_class_init (EphyHistoryWindowClass *klass)
object_class->get_property = ephy_history_window_get_property;
object_class->dispose = ephy_history_window_dispose;
+ widget_class->show = ephy_history_window_show;
+
g_object_class_install_property (object_class,
PROP_HISTORY,
g_param_spec_object ("history",
@@ -695,16 +708,13 @@ ephy_history_window_update_menu (EphyHistoryWindow *editor)
if (GTK_IS_EDITABLE (focus_widget))
{
gboolean has_selection;
- gboolean clipboard_contains_text;
has_selection = gtk_editable_get_selection_bounds
(GTK_EDITABLE (focus_widget), NULL, NULL);
- clipboard_contains_text = gtk_clipboard_wait_is_text_available
- (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD));
cut = has_selection;
copy = has_selection;
- paste = clipboard_contains_text;
+ paste = TRUE;
select_all = TRUE;
}
else