[epiphany] Avoid showing inaccurate message when lockdown.disable-fullscreen is set
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Avoid showing inaccurate message when lockdown.disable-fullscreen is set
- Date: Mon, 10 Feb 2014 08:50:28 +0000 (UTC)
commit 887eb67d5693a350e49d596ae4452b4409745991
Author: Lorenzo Tilve <ltilve igalia com>
Date: Mon Feb 3 13:54:44 2014 +0100
Avoid showing inaccurate message when lockdown.disable-fullscreen is set
On Web start, if fullscreen is locked down, the message "Press F11 to exit
fullscreen" is displayed while that action would not doable.
Don't show that wrong message when fullscren is locked.
https://bugzilla.gnome.org/show_bug.cgi?id=708862
embed/ephy-embed.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index b28cf00..5fd3f5f 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -290,15 +290,17 @@ fullscreen_message_label_hide (EphyEmbed *embed)
void
ephy_embed_entering_fullscreen (EphyEmbed *embed)
{
- gtk_widget_show (embed->priv->fullscreen_message_label);
+ if (!g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN, EPHY_PREFS_LOCKDOWN_FULLSCREEN)) {
+ gtk_widget_show (embed->priv->fullscreen_message_label);
- if (embed->priv->fullscreen_message_id)
- g_source_remove (embed->priv->fullscreen_message_id);
+ if (embed->priv->fullscreen_message_id)
+ g_source_remove (embed->priv->fullscreen_message_id);
- embed->priv->fullscreen_message_id = g_timeout_add_seconds (5,
- (GSourceFunc)fullscreen_message_label_hide,
- embed);
- g_source_set_name_by_id (embed->priv->fullscreen_message_id, "[epiphany] fullscreen_message_label_hide");
+ embed->priv->fullscreen_message_id = g_timeout_add_seconds (5,
+ (GSourceFunc)fullscreen_message_label_hide,
+ embed);
+ g_source_set_name_by_id (embed->priv->fullscreen_message_id, "[epiphany] fullscreen_message_label_hide");
+ }
}
void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]