diff options
| author | Xan Lopez <xan@src.gnome.org> | 2007-11-17 02:53:41 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@src.gnome.org> | 2007-11-17 02:53:41 +0800 |
| commit | bbc813a37feca5e67d2a69e6aba1cd39458660a6 (patch) | |
| tree | ce01afb782f13c99b3185872fa6620fc2809bfca /src/ephy-window.c | |
| parent | 7a04f9035bafcbaab6d01fe0cb65b0fa7bc7b6ad (diff) | |
| download | gsoc2013-epiphany-bbc813a37feca5e67d2a69e6aba1cd39458660a6.tar.gz gsoc2013-epiphany-bbc813a37feca5e67d2a69e6aba1cd39458660a6.tar.zst gsoc2013-epiphany-bbc813a37feca5e67d2a69e6aba1cd39458660a6.zip | |
Move active-tab property to the embed-container interface.
Rename it to active-child and fix a bug in the set_property function in
EphyWindow, where the wrong function was being called for this property.
svn path=/trunk/; revision=7703
Diffstat (limited to 'src/ephy-window.c')
| -rw-r--r-- | src/ephy-window.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c index 15d37776a..85067efef 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -463,7 +463,7 @@ struct _EphyWindowPrivate enum { PROP_0, - PROP_ACTIVE_TAB, + PROP_ACTIVE_CHILD, PROP_CHROME, PROP_PPV_MODE, PROP_SINGLE_TAB_MODE @@ -2534,7 +2534,7 @@ ephy_window_set_active_tab (EphyWindow *window, EphyEmbed *new_embed) G_CALLBACK (ephy_window_dom_mouse_click_cb), window, 0); - g_object_notify (G_OBJECT (window), "active-tab"); + g_object_notify (G_OBJECT (window), "active-child"); } } @@ -2976,8 +2976,8 @@ ephy_window_set_property (GObject *object, switch (prop_id) { - case PROP_ACTIVE_TAB: - ephy_window_set_active_tab (window, g_value_get_object (value)); + case PROP_ACTIVE_CHILD: + ephy_window_set_active_child (window, g_value_get_object (value)); break; case PROP_CHROME: ephy_window_set_chrome (window, g_value_get_flags (value)); @@ -3001,7 +3001,7 @@ ephy_window_get_property (GObject *object, switch (prop_id) { - case PROP_ACTIVE_TAB: + case PROP_ACTIVE_CHILD: g_value_set_object (value, window->priv->active_embed); break; case PROP_CHROME: @@ -3119,18 +3119,16 @@ ephy_window_class_init (EphyWindowClass *klass) widget_class->delete_event = ephy_window_delete_event; g_object_class_install_property (object_class, - PROP_ACTIVE_TAB, - g_param_spec_object ("active-tab", NULL, NULL, - GTK_TYPE_WIDGET /* Can't use an interface type here */, - G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); - - g_object_class_install_property (object_class, PROP_PPV_MODE, g_param_spec_boolean ("print-preview-mode", NULL, NULL, FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); g_object_class_override_property (object_class, + PROP_ACTIVE_CHILD, + "active-child"); + + g_object_class_override_property (object_class, PROP_SINGLE_TAB_MODE, "is-popup"); |