From af1b92ab347b134e63e406a98a373d9b409e3516 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Wed, 13 Feb 2013 00:32:25 +0100 Subject: Remove EphyWebView::visibility This once was likely used to toggle the visibility of popups, but it's now a no-op. When we re-introduce that feature we can do something similar again. --- embed/ephy-web-view.c | 59 --------------------------------------------------- src/ephy-window.c | 20 ----------------- 2 files changed, 79 deletions(-) diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c index ca5b170fd..a7a204f46 100644 --- a/embed/ephy-web-view.c +++ b/embed/ephy-web-view.c @@ -75,7 +75,6 @@ struct _EphyWebViewPrivate { /* Flags */ guint is_blank : 1; - guint visibility : 1; guint is_setting_zoom : 1; guint load_failed : 1; guint history_frozen : 1; @@ -133,7 +132,6 @@ enum { PROP_STATUS_MESSAGE, PROP_EMBED_TITLE, PROP_TYPED_ADDRESS, - PROP_VISIBLE, PROP_IS_BLANK, }; @@ -448,9 +446,6 @@ ephy_web_view_get_property (GObject *object, case PROP_STATUS_MESSAGE: g_value_set_string (value, priv->status_message); break; - case PROP_VISIBLE: - g_value_set_boolean (value, priv->visibility); - break; case PROP_IS_BLANK: g_value_set_boolean (value, priv->is_blank); break; @@ -482,7 +477,6 @@ ephy_web_view_set_property (GObject *object, case PROP_SECURITY: case PROP_STATUS_MESSAGE: case PROP_EMBED_TITLE: - case PROP_VISIBLE: case PROP_IS_BLANK: /* read only */ break; @@ -1525,19 +1519,6 @@ ephy_web_view_class_init (EphyWebViewClass *klass) FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); -/** - * EphyWebView:visibility: - * - * - **/ - g_object_class_install_property (gobject_class, - PROP_VISIBLE, - g_param_spec_boolean ("visibility", - "Visibility", - "The view's visibility", - FALSE, - G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); - /** * EphyWebView:is-blank: * @@ -3381,23 +3362,6 @@ ephy_web_view_get_link_message (EphyWebView *view) return view->priv->link_message; } -/** - * ephy_web_view_get_visibility: - * @view: an #EphyWebView - * - * Returns whether the @view's toplevel is visible or not. Used - * mostly for popup visibility management. - * - * Return value: %TRUE if @view's "visibility" property is set - **/ -gboolean -ephy_web_view_get_visibility (EphyWebView *view) -{ - g_return_val_if_fail (EPHY_IS_WEB_VIEW (view), FALSE); - - return view->priv->visibility; -} - /** * ephy_web_view_set_link_message: * @view: an #EphyWebView @@ -3446,29 +3410,6 @@ ephy_web_view_set_security_level (EphyWebView *view, } } -/** - * ephy_web_view_set_visibility: - * @view: an #EphyWebView - * @visibility: value for the visibility property of @view - * - * Sets whether the @view's toplevel is visible or not. See - * ephy_web_view_get_visibility(). - **/ -void -ephy_web_view_set_visibility (EphyWebView *view, - gboolean visibility) -{ - EphyWebViewPrivate *priv = view->priv; - - g_return_if_fail (EPHY_IS_WEB_VIEW (view)); - - if (priv->visibility != visibility) { - priv->visibility = visibility; - - g_object_notify (G_OBJECT (view), "visibility"); - } -} - /** * ephy_web_view_get_typed_address: * @view: an #EphyWebView diff --git a/src/ephy-window.c b/src/ephy-window.c index ea183594e..86503aeb1 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -2186,19 +2186,6 @@ ephy_window_mouse_target_changed_cb (WebKitWebView *web_view, } #endif -static void -ephy_window_visibility_cb (EphyEmbed *embed, GParamSpec *pspec, EphyWindow *window) -{ - gboolean visibility; - - visibility = ephy_web_view_get_visibility (ephy_embed_get_web_view (embed)); - - if (visibility) - gtk_widget_show (GTK_WIDGET (window)); - else - gtk_widget_hide (GTK_WIDGET (window)); -} - static void sync_embed_is_overview (EphyEmbed *embed, GParamSpec *pspec, EphyWindow *window) { @@ -2795,10 +2782,6 @@ ephy_window_connect_active_embed (EphyWindow *window) G_CALLBACK (ephy_window_dom_mouse_click_cb), window, G_CONNECT_AFTER); #endif - g_signal_connect_object (view, "notify::visibility", - G_CALLBACK (ephy_window_visibility_cb), - window, 0); - g_signal_connect_object (embed, "notify::overview-mode", G_CALLBACK (sync_embed_is_overview), window, 0); @@ -2887,9 +2870,6 @@ ephy_window_disconnect_active_embed (EphyWindow *window) g_signal_handlers_disconnect_by_func (view, G_CALLBACK (sync_tab_icon), window); - g_signal_handlers_disconnect_by_func (view, - G_CALLBACK (ephy_window_visibility_cb), - window); g_signal_handlers_disconnect_by_func (embed, G_CALLBACK (sync_embed_is_overview), -- cgit v1.2.3