[epiphany] Replace ephy_header_bar_get_page_menu_button() with ephy_header_bar_get_zoom_level_button()

[Carlos Garcia Campos <carlosgc src gnome org>]

commit 51dba7020550fe4484266b50215eb12cdcee5e5d
Author: Carlos Garcia Campos <cgarcia igalia com>
Date:   Wed Dec 7 17:33:42 2016 +0100

    Replace ephy_header_bar_get_page_menu_button() with ephy_header_bar_get_zoom_level_button()
    
    ephy_header_bar_get_page_menu_button() is only used to get the popover
    that is only used to get the zoom_level_button that was set by the
    header bar using g_object_set(). Simplify everything by saving the zoom
    level button in the header bar and just returning it with
    ephy_header_bar_get_zoom_level_button().

 src/ephy-header-bar.c |    7 ++++---
 src/ephy-header-bar.h |    2 +-
 src/ephy-window.c     |    6 +-----
 3 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/src/ephy-header-bar.c b/src/ephy-header-bar.c
index f68c1b7..38c061a 100644
--- a/src/ephy-header-bar.c
+++ b/src/ephy-header-bar.c
@@ -72,6 +72,7 @@ struct _EphyHeaderBar {
   GtkWidget *downloads_revealer;
   GtkWidget *downloads_button;
   GtkWidget *downloads_popover;
+  GtkWidget *zoom_level_button;
 
   guint navigation_buttons_menu_timeout;
 };
@@ -715,7 +716,7 @@ ephy_header_bar_constructed (GObject *object)
   g_type_ensure (G_TYPE_THEMED_ICON);
   builder = gtk_builder_new_from_resource ("/org/gnome/epiphany/gtk/page-menu-popover.ui");
   page_menu_popover = GTK_WIDGET (gtk_builder_get_object (builder, "page-menu-popover"));
-  g_object_set_data (G_OBJECT (page_menu_popover), "zoom-level-button", gtk_builder_get_object (builder, 
"zoom-level"));
+  header_bar->zoom_level_button = GTK_WIDGET (gtk_builder_get_object (builder, "zoom-level"));
   gtk_menu_button_set_popover (GTK_MENU_BUTTON (button), page_menu_popover);
   g_object_unref (builder);
 
@@ -832,9 +833,9 @@ ephy_header_bar_get_title_widget (EphyHeaderBar *header_bar)
 }
 
 GtkWidget *
-ephy_header_bar_get_page_menu_button (EphyHeaderBar *header_bar)
+ephy_header_bar_get_zoom_level_button (EphyHeaderBar *header_bar)
 {
-  return header_bar->page_menu_button;
+  return header_bar->zoom_level_button;
 }
 
 EphyWindow *
diff --git a/src/ephy-header-bar.h b/src/ephy-header-bar.h
index 1e6e87d..f509bda 100644
--- a/src/ephy-header-bar.h
+++ b/src/ephy-header-bar.h
@@ -38,7 +38,7 @@ void             ephy_header_bar_change_combined_stop_reload_state (GSimpleActio
                                                                     gpointer       user_data);
 
 EphyTitleWidget *ephy_header_bar_get_title_widget                  (EphyHeaderBar *header_bar);
-GtkWidget       *ephy_header_bar_get_page_menu_button              (EphyHeaderBar *header_bar);
+GtkWidget       *ephy_header_bar_get_zoom_level_button             (EphyHeaderBar *header_bar);
 EphyWindow      *ephy_header_bar_get_window                        (EphyHeaderBar *header_bar);
 
 G_END_DECLS
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 183a999..137bb95 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1006,8 +1006,6 @@ sync_tab_zoom (WebKitWebView *web_view, GParamSpec *pspec, EphyWindow *window)
   GAction *action;
   gboolean can_zoom_in = TRUE, can_zoom_out = TRUE, can_zoom_normal = FALSE;
   double zoom;
-  GtkWidget *page_menu_button;
-  GtkPopover *page_menu_popover;
   GtkWidget *zoom_level_button;
 
   if (window->closing)
@@ -1015,9 +1013,7 @@ sync_tab_zoom (WebKitWebView *web_view, GParamSpec *pspec, EphyWindow *window)
 
   zoom = webkit_web_view_get_zoom_level (web_view);
 
-  page_menu_button = ephy_header_bar_get_page_menu_button (EPHY_HEADER_BAR (window->header_bar));
-  page_menu_popover = gtk_menu_button_get_popover (GTK_MENU_BUTTON (page_menu_button));
-  zoom_level_button = g_object_get_data (G_OBJECT (page_menu_popover), "zoom-level-button");
+  zoom_level_button = ephy_header_bar_get_zoom_level_button (EPHY_HEADER_BAR (window->header_bar));
 
   gtk_button_set_label (GTK_BUTTON (zoom_level_button), ephy_zoom_get_zoom_level_name (zoom));