aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-06-08 07:40:41 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-06-08 07:40:41 +0800
commit6ebb79fb36aa6dc04302bad4dc65d557b3da3f58 (patch)
treec5b555a1c950894d9cacc958ea7d3a06d3a77d28 /src
parent006bbddf1798bdb5490263cdc30fe2b0b8234a6c (diff)
downloadgsoc2013-epiphany-6ebb79fb36aa6dc04302bad4dc65d557b3da3f58.tar
gsoc2013-epiphany-6ebb79fb36aa6dc04302bad4dc65d557b3da3f58.tar.gz
gsoc2013-epiphany-6ebb79fb36aa6dc04302bad4dc65d557b3da3f58.tar.bz2
gsoc2013-epiphany-6ebb79fb36aa6dc04302bad4dc65d557b3da3f58.tar.lz
gsoc2013-epiphany-6ebb79fb36aa6dc04302bad4dc65d557b3da3f58.tar.xz
gsoc2013-epiphany-6ebb79fb36aa6dc04302bad4dc65d557b3da3f58.tar.zst
gsoc2013-epiphany-6ebb79fb36aa6dc04302bad4dc65d557b3da3f58.zip
Do not hide clipboard items for the input context (Bug #139040)
2004-06-08 Marco Pesenti Gritti <marco@gnome.org> * src/ephy-window.c: (show_embed_popup): Do not hide clipboard items for the input context (Bug #139040)
Diffstat (limited to 'src')
-rw-r--r--src/ephy-window.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c
index cdb4b6281..d9f241fa1 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1389,7 +1389,6 @@ show_embed_popup (EphyWindow *window, EphyTab *tab, EphyEmbedEvent *event)
gboolean framed, has_background, can_open_in_new;
GtkWidget *widget;
EphyEmbedEventType type;
- gboolean showing_edit_actions = FALSE;
/* Do not show the menu in print preview mode */
if (window->priv->mode == EPHY_WINDOW_MODE_PRINT_PREVIEW)
@@ -1414,8 +1413,8 @@ show_embed_popup (EphyWindow *window, EphyTab *tab, EphyEmbedEvent *event)
}
else if (context & EMBED_CONTEXT_LINK)
{
- showing_edit_actions = TRUE;
popup = "/EphyLinkPopup";
+ update_edit_actions_sensitivity (window, TRUE);
}
else if (context & EMBED_CONTEXT_IMAGE)
{
@@ -1423,14 +1422,14 @@ show_embed_popup (EphyWindow *window, EphyTab *tab, EphyEmbedEvent *event)
}
else if (context & EMBED_CONTEXT_INPUT)
{
- showing_edit_actions = TRUE;
popup = "/EphyInputPopup";
+ update_edit_actions_sensitivity (window, FALSE);
}
else
{
- showing_edit_actions = TRUE;
popup = framed ? "/EphyFramedDocumentPopup" :
"/EphyDocumentPopup";
+ update_edit_actions_sensitivity (window, TRUE);
}
widget = gtk_ui_manager_get_widget (GTK_UI_MANAGER (window->ui_merge),
@@ -1446,11 +1445,6 @@ show_embed_popup (EphyWindow *window, EphyTab *tab, EphyEmbedEvent *event)
action = gtk_action_group_get_action (action_group, "OpenLinkInNewTab");
g_object_set (action, "sensitive", can_open_in_new, FALSE);
- if (showing_edit_actions)
- {
- update_edit_actions_sensitivity (window, TRUE);
- }
-
g_object_set_data_full (G_OBJECT (window), "context_event",
g_object_ref (event),
(GDestroyNotify)g_object_unref);