[epiphany/revert-c81abeab] Revert "Change ephy-window to DzlApplicationWindow"

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 5acfdd45a7ef6cc5afdee69b36af11816cb2a077
Author: Michael Catanzaro <mcatanzaro posteo net>
Date:   Mon Jul 23 14:33:36 2018 +0000

    Revert "Change ephy-window to DzlApplicationWindow"
    
    This reverts commit c81abeab99e2f8f48ab52557aa168eafa31677f4

 meson.build                | 2 +-
 src/ephy-window.c          | 9 +++++----
 src/ephy-window.h          | 2 +-
 subprojects/libdazzle.wrap | 4 ----
 4 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/meson.build b/meson.build
index 170cb6953..cd84e4825 100644
--- a/meson.build
+++ b/meson.build
@@ -70,7 +70,7 @@ nettle_requirement = '>= 3.2'
 webkitgtk_requirement = '>= 2.21.5'
 
 cairo_dep = dependency('cairo', version: '>= 1.2')
-dazzle_dep = dependency('libdazzle-1.0', version: '>= 3.29.4', fallback : ['libdazzle', 'libdazzle_dep'])
+dazzle_dep = dependency('libdazzle-1.0', version: '>= 3.28.0')
 gcr_dep = dependency('gcr-3', version: '>= 3.5.5')
 gdk_dep = dependency('gdk-3.0', version: gtk_requirement)
 gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: '>= 2.36.5')
diff --git a/src/ephy-window.c b/src/ephy-window.c
index ab7e0c000..a86fd45b2 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -136,7 +136,7 @@ const struct {
 #define SETTINGS_CONNECTION_DATA_KEY    "EphyWindowSettings"
 
 struct _EphyWindow {
-  DzlApplicationWindow parent_instance;
+  GtkApplicationWindow parent_instance;
 
   GtkWidget *header_bar;
   EphyBookmarksManager *bookmarks_manager;
@@ -392,7 +392,7 @@ ephy_window_link_iface_init (EphyLinkInterface *iface)
   iface->open_link = ephy_window_open_link;
 }
 
-G_DEFINE_TYPE_WITH_CODE (EphyWindow, ephy_window, DZL_TYPE_APPLICATION_WINDOW,
+G_DEFINE_TYPE_WITH_CODE (EphyWindow, ephy_window, GTK_TYPE_APPLICATION_WINDOW,
                          G_IMPLEMENT_INTERFACE (EPHY_TYPE_LINK,
                                                 ephy_window_link_iface_init)
                          G_IMPLEMENT_INTERFACE (EPHY_TYPE_EMBED_CONTAINER,
@@ -490,6 +490,7 @@ ephy_window_fullscreen (EphyWindow *window)
   sync_tab_security (ephy_embed_get_web_view (embed), NULL, window);
 
   sync_chromes_visibility (window);
+  gtk_widget_hide (window->header_bar);
   ephy_embed_entering_fullscreen (embed);
 }
 
@@ -498,6 +499,7 @@ ephy_window_unfullscreen (EphyWindow *window)
 {
   window->is_fullscreen = FALSE;
 
+  gtk_widget_show (window->header_bar);
   sync_chromes_visibility (window);
   ephy_embed_leaving_fullscreen (window->active_embed);
 }
@@ -2844,7 +2846,6 @@ ephy_window_state_event (GtkWidget           *widget,
     } else {
       ephy_window_unfullscreen (window);
     }
-    dzl_application_window_set_fullscreen (DZL_APPLICATION_WINDOW (window), fullscreen);
 
     action_group = gtk_widget_get_action_group (GTK_WIDGET (window), "win");
     action = g_action_map_lookup_action (G_ACTION_MAP (action_group), "fullscreen");
@@ -3074,7 +3075,7 @@ setup_header_bar (EphyWindow *window)
   EphyTitleWidget *title_widget;
 
   header_bar = ephy_header_bar_new (window);
-  dzl_application_window_set_titlebar (DZL_APPLICATION_WINDOW (window), header_bar);
+  gtk_window_set_titlebar (GTK_WINDOW (window), header_bar);
   gtk_widget_show (header_bar);
 
   app_mode = ephy_embed_shell_get_mode (ephy_embed_shell_get_default ());
diff --git a/src/ephy-window.h b/src/ephy-window.h
index db9fa5cdd..1a6feab4d 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 
 #define EPHY_TYPE_WINDOW (ephy_window_get_type ())
 
-G_DECLARE_FINAL_TYPE (EphyWindow, ephy_window, EPHY, WINDOW, DzlApplicationWindow)
+G_DECLARE_FINAL_TYPE (EphyWindow, ephy_window, EPHY, WINDOW, GtkApplicationWindow)
 
 typedef enum
 {