← Back to branch summary

~noskcaj/ubuntu/wily/epiphany-browser/merge2

« back to all changes in this revision

Viewing changes to src/ephy-toolbar.c

Tags: upstream-2.28.0
Import upstream version 2.28.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ephy-toolbar.c
17
17
 *  along with this program; if not, write to the Free Software
18
18
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19
19
 *
20
 
 *  $Id$
21
20
 */
22
21
 
23
22
#include "config.h"
24
23
 
25
24
#include "ephy-embed-container.h"
 
25
#include "ephy-embed-utils.h"
26
26
#include "ephy-toolbar.h"
27
27
#include "ephy-link.h"
28
28
#include "ephy-go-action.h"
128
128
 
129
129
        show = priv->leave_fullscreen_visible;
130
130
        g_object_set (priv->sep_item, "visible", show, NULL);
131
 
        g_object_set (priv->exit_button, "visible", show,
132
 
                                         "sensitive", show, NULL);
 
131
        g_object_set (priv->fixed_toolbar, "visible", show, NULL);
133
132
}
134
133
 
135
134
static void
184
183
        address = ephy_location_action_get_address (action);
185
184
 
186
185
        priv->updating_address = TRUE;
187
 
        ephy_embed_set_typed_address (embed, address,
188
 
                                      EPHY_EMBED_ADDRESS_EXPIRE_CURRENT);
 
186
        ephy_web_view_set_typed_address (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed), address);
189
187
        priv->updating_address = FALSE;
190
188
}
191
189
 
524
522
/* Class implementation */
525
523
 
526
524
static void
527
 
ephy_toolbar_realize (GtkWidget *widget)
528
 
{
529
 
        GTK_WIDGET_CLASS (ephy_toolbar_parent_class)->realize (widget);
530
 
}
531
 
 
532
 
static void
533
 
ephy_toolbar_unrealize (GtkWidget *widget)
534
 
{
535
 
        GTK_WIDGET_CLASS (ephy_toolbar_parent_class)->unrealize (widget);
536
 
}
537
 
 
538
 
static void
539
525
ephy_toolbar_show (GtkWidget *widget)
540
526
{
541
527
        EphyToolbar *toolbar = EPHY_TOOLBAR (widget);
657
643
        object_class->set_property = ephy_toolbar_set_property;
658
644
        object_class->get_property = ephy_toolbar_get_property;
659
645
 
660
 
        widget_class->realize = ephy_toolbar_realize;
661
 
        widget_class->unrealize = ephy_toolbar_unrealize;
662
646
        widget_class->show = ephy_toolbar_show;
663
647
        widget_class->hide = ephy_toolbar_hide;
664
648