[balsa/wip/gtk4: 237/351] GdkWindow has been renamed GdkSurface

[Peter Bloomfield <peterb src gnome org>]

commit 8754215290deb53433765cb316c3d5da6244acde
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Tue Mar 20 17:38:29 2018 -0400

    GdkWindow has been renamed GdkSurface
    
    along with companion renaming of functions, enums, etc.

 libbalsa/address-view.c      |    2 +-
 libbalsa/source-viewer.c     |   10 +++++-----
 src/balsa-cite-bar.c         |    2 +-
 src/balsa-index.c            |    6 +++---
 src/balsa-mblist.c           |   10 +++++-----
 src/balsa-message.c          |   14 +++++++-------
 src/balsa-mime-widget-text.c |   22 +++++++++++-----------
 src/main-window.c            |    4 ++--
 src/message-window.c         |   10 +++++-----
 src/sendmsg-window.c         |   12 ++++++------
 10 files changed, 46 insertions(+), 46 deletions(-)
---
diff --git a/libbalsa/address-view.c b/libbalsa/address-view.c
index 10d121d..9318163 100644
--- a/libbalsa/address-view.c
+++ b/libbalsa/address-view.c
@@ -845,7 +845,7 @@ lbav_entry_changed_cb(GtkEntry * entry, LibBalsaAddressView * address_view)
 
     completion = gtk_entry_get_completion(entry);
 
-    if (gtk_widget_get_window(GTK_WIDGET(entry)))
+    if (gtk_widget_get_has_surface(GTK_WIDGET(entry)))
         lbav_entry_setup_matches(address_view, entry, completion,
                                  LIBBALSA_ADDRESS_VIEW_MATCH_FAST);
     address_view->last_was_escape = FALSE;
diff --git a/libbalsa/source-viewer.c b/libbalsa/source-viewer.c
index 132509a..ee4c53c 100644
--- a/libbalsa/source-viewer.c
+++ b/libbalsa/source-viewer.c
@@ -171,16 +171,16 @@ lsv_size_allocate_cb(GtkWidget * window, GtkAllocation * alloc,
                      gint baseline, GtkAllocation * clip,
                      LibBalsaSourceViewerInfo * lsvi)
 {
-    GdkWindow *gdk_window;
+    GdkSurface *surface;
     gboolean maximized;
 
-    gdk_window = gtk_widget_get_window(window);
-    if (gdk_window == NULL)
+    surface = gtk_widget_get_surface(window);
+    if (surface == NULL)
         return;
 
     maximized =
-        (gdk_window_get_state(gdk_window) &
-         (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) != 0;
+        (gdk_surface_get_state(surface) &
+         (GDK_SURFACE_STATE_MAXIMIZED | GDK_SURFACE_STATE_FULLSCREEN)) != 0;
 
     if (!maximized)
         gtk_window_get_size(GTK_WINDOW(window), lsvi->width, lsvi->height);
diff --git a/src/balsa-cite-bar.c b/src/balsa-cite-bar.c
index b44fbf1..a94985f 100644
--- a/src/balsa-cite-bar.c
+++ b/src/balsa-cite-bar.c
@@ -61,7 +61,7 @@ balsa_cite_bar_class_init(BalsaCiteBarClass * class)
 static void
 balsa_cite_bar_init(BalsaCiteBar * cite_bar)
 {
-    gtk_widget_set_has_window(GTK_WIDGET(cite_bar), FALSE);
+    gtk_widget_set_has_surface(GTK_WIDGET(cite_bar), FALSE);
 }
 
 GtkWidget *
diff --git a/src/balsa-index.c b/src/balsa-index.c
index 6c06709..8e4f990 100644
--- a/src/balsa-index.c
+++ b/src/balsa-index.c
@@ -1409,7 +1409,7 @@ bndx_mailbox_changed_idle(BalsaIndex * bindex)
 static void
 bndx_mailbox_changed_cb(LibBalsaMailbox * mailbox, BalsaIndex * bindex)
 {
-    if (!gtk_widget_get_window(GTK_WIDGET(bindex)))
+    if (!gtk_widget_get_has_surface(GTK_WIDGET(bindex)))
         return;
 
     /* Find the next message to be shown now, not later in the idle
@@ -2107,7 +2107,7 @@ bndx_expand_to_row(BalsaIndex * index, GtkTreePath * path)
     GtkTreePath *tmp;
     gint i, j;
 
-    if (!gtk_widget_get_window(GTK_WIDGET(index)))
+    if (!gtk_widget_get_has_surface(GTK_WIDGET(index)))
         return;
 
     tmp = gtk_tree_path_copy(path);
@@ -2660,7 +2660,7 @@ balsa_index_ensure_visible(BalsaIndex * index)
     GdkRectangle rect;
     GtkTreePath *path = NULL;
 
-    if (!gtk_widget_get_window(GTK_WIDGET(tree_view)))
+    if (!gtk_widget_get_has_surface(GTK_WIDGET(tree_view)))
         return;
 
     if (!bndx_find_current_msgno(index, &path, NULL)) {
diff --git a/src/balsa-mblist.c b/src/balsa-mblist.c
index 58c0692..d3a4f12 100644
--- a/src/balsa-mblist.c
+++ b/src/balsa-mblist.c
@@ -1754,17 +1754,17 @@ bmbl_mru_size_allocate_cb(GtkWidget * widget, GdkRectangle * allocation,
                           gint baseline, GtkAllocation * clip,
                           gpointer user_data)
 {
-    GdkWindow *gdk_window;
+    GdkSurface *surface;
     gboolean maximized;
 
-    gdk_window = gtk_widget_get_window(widget);
-    if (gdk_window == NULL)
+    surface = gtk_widget_get_surface(widget);
+    if (surface == NULL)
         return;
 
     /* Maximizing a GtkDialog may not be possible, but we check anyway. */
     maximized =
-        (gdk_window_get_state(gdk_window) &
-         (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) != 0;
+        (gdk_surface_get_state(surface) &
+         (GDK_SURFACE_STATE_MAXIMIZED | GDK_SURFACE_STATE_FULLSCREEN)) != 0;
 
     if (!maximized)
         gtk_window_get_size(GTK_WINDOW(widget),
diff --git a/src/balsa-message.c b/src/balsa-message.c
index 944fe25..8b90597 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -387,12 +387,12 @@ bm_find_scroll_to_selection(BalsaMessage * bm,
                                     &end_location);
     end_location.width = 0;
     gdk_rectangle_union(&begin_location, &end_location, &begin_location);
-    gtk_text_view_buffer_to_window_coords(text_view,
-                                          GTK_TEXT_WINDOW_WIDGET,
-                                          begin_location.x,
-                                          begin_location.y,
-                                          &begin_location.x,
-                                          &begin_location.y);
+    gtk_text_view_buffer_to_surface_coords(text_view,
+                                           GTK_TEXT_WINDOW_WIDGET,
+                                           begin_location.x,
+                                           begin_location.y,
+                                           &begin_location.x,
+                                           &begin_location.y);
 
     bm_find_scroll_to_rectangle(bm, GTK_WIDGET(text_view), &begin_location);
 }
@@ -3258,7 +3258,7 @@ balsa_message_find_in_message(BalsaMessage * bm)
         bm_find_set_status(bm, BM_FIND_STATUS_INIT);
 
         gtk_widget_show(bm->find_bar);
-        if (gtk_widget_get_window(bm->find_entry))
+        if (gtk_widget_get_has_surface(bm->find_entry))
             gtk_widget_grab_focus(bm->find_entry);
     }
 }
diff --git a/src/balsa-mime-widget-text.c b/src/balsa-mime-widget-text.c
index 0ecd9a8..2acf011 100644
--- a/src/balsa-mime-widget-text.c
+++ b/src/balsa-mime-widget-text.c
@@ -482,12 +482,12 @@ static gboolean
 fix_text_widget(GtkWidget *widget, gpointer data)
 {
     if (data != NULL) {
-        GdkWindow *window = gtk_widget_get_window(widget);
+        GdkSurface *surface = gtk_widget_get_surface(widget);
 
-        gdk_window_set_events(window,
-                              gdk_window_get_events(window) |
-                              GDK_POINTER_MOTION_MASK |
-                              GDK_LEAVE_NOTIFY_MASK);
+        gdk_surface_set_events(surface,
+                               gdk_surface_get_events(surface) |
+                               GDK_POINTER_MOTION_MASK |
+                               GDK_LEAVE_NOTIFY_MASK);
     }
 
     if (!url_cursor_normal || !url_cursor_over_url) {
@@ -982,13 +982,13 @@ draw_cite_bar_real(cite_bar_t * bar, BalsaMimeWidgetText * mwt)
 
     /* get the locations */
     gtk_text_view_get_iter_location(view, &bar->start_iter, &location);
-    gtk_text_view_buffer_to_window_coords(view, GTK_TEXT_WINDOW_TEXT,
-                                          location.x, location.y,
-                                          &x_pos, &y_pos);
+    gtk_text_view_buffer_to_surface_coords(view, GTK_TEXT_WINDOW_TEXT,
+                                           location.x, location.y,
+                                           &x_pos, &y_pos);
     gtk_text_view_get_iter_location(view, &bar->end_iter, &location);
-    gtk_text_view_buffer_to_window_coords(view, GTK_TEXT_WINDOW_TEXT,
-                                          location.x, location.y,
-                                          &x_pos, &height);
+    gtk_text_view_buffer_to_surface_coords(view, GTK_TEXT_WINDOW_TEXT,
+                                           location.x, location.y,
+                                           &x_pos, &height);
     height -= y_pos;
 
     /* add a new widget if necessary */
diff --git a/src/main-window.c b/src/main-window.c
index eb36031..c872a8c 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -3553,7 +3553,7 @@ bw_display_new_mail_notification(int num_new, int has_new)
             gtk_window_set_title(GTK_WINDOW(dlg), _("Balsa: New mail"));
             gtk_window_set_role(GTK_WINDOW(dlg), "new_mail_dialog");
             gtk_window_set_type_hint(GTK_WINDOW(dlg),
-                    GDK_WINDOW_TYPE_HINT_NORMAL);
+                    GDK_SURFACE_TYPE_HINT_NORMAL);
             g_signal_connect(G_OBJECT(dlg), "response",
                     G_CALLBACK(gtk_widget_destroy), NULL);
             g_object_add_weak_pointer(G_OBJECT(dlg), (gpointer) & dlg);
@@ -3588,7 +3588,7 @@ bw_display_new_mail_notification(int num_new, int has_new)
         gtk_window_set_title(GTK_WINDOW(dlg), _("Balsa: New mail"));
         gtk_window_set_role(GTK_WINDOW(dlg), "new_mail_dialog");
         gtk_window_set_type_hint(GTK_WINDOW(dlg),
-                                 GDK_WINDOW_TYPE_HINT_NORMAL);
+                                 GDK_SURFACE_TYPE_HINT_NORMAL);
         g_signal_connect(G_OBJECT(dlg), "response",
                          G_CALLBACK(gtk_widget_destroy), NULL);
         g_object_add_weak_pointer(G_OBJECT(dlg), (gpointer) & dlg);
diff --git a/src/message-window.c b/src/message-window.c
index 462ce7a..fa55c31 100644
--- a/src/message-window.c
+++ b/src/message-window.c
@@ -512,15 +512,15 @@ mw_close_activated(GSimpleAction * action, GVariant * parameter,
 static void
 size_alloc_cb(GtkWidget * window)
 {
-    GdkWindow *gdk_window;
+    GdkSurface *surface;
 
-    gdk_window = gtk_widget_get_window(window);
-    if (gdk_window == NULL)
+    surface = gtk_widget_get_surface(window);
+    if (surface == NULL)
         return;
 
     balsa_app.message_window_maximized =
-        (gdk_window_get_state(gdk_window) &
-         (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) != 0;
+        (gdk_surface_get_state(surface) &
+         (GDK_SURFACE_STATE_MAXIMIZED | GDK_SURFACE_STATE_FULLSCREEN)) != 0;
 
     if (!balsa_app.message_window_maximized)
         gtk_window_get_size(GTK_WINDOW(window),
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index cbd29a3..0e25e37 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -1310,15 +1310,15 @@ update_bsmsg_identity(BalsaSendmsg* bsmsg, LibBalsaIdentity* ident)
 static void
 sw_size_alloc_cb(GtkWidget * window)
 {
-    GdkWindow *gdk_window;
+    GdkSurface *surface;
 
-    gdk_window = gtk_widget_get_window(window);
-    if (gdk_window == NULL)
+    surface = gtk_widget_get_surface(window);
+    if (surface == NULL)
         return;
 
     balsa_app.sw_maximized =
-        (gdk_window_get_state(gdk_window) &
-         (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) != 0;
+        (gdk_surface_get_state(surface) &
+         (GDK_SURFACE_STATE_MAXIMIZED | GDK_SURFACE_STATE_FULLSCREEN)) != 0;
 
     if (!balsa_app.sw_maximized)
         gtk_window_get_size(GTK_WINDOW(window),
@@ -4989,7 +4989,7 @@ subject_not_empty(BalsaSendmsg * bsmsg)
                                     _("_Send"),   GTK_RESPONSE_OK,
                                     NULL);
     gtk_window_set_resizable (GTK_WINDOW (no_subj_dialog), FALSE);
-    gtk_window_set_type_hint (GTK_WINDOW (no_subj_dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
+    gtk_window_set_type_hint (GTK_WINDOW (no_subj_dialog), GDK_SURFACE_TYPE_HINT_DIALOG);
 
     dialog_vbox = gtk_dialog_get_content_area(GTK_DIALOG(no_subj_dialog));
     g_object_set(G_OBJECT(dialog_vbox), "margin", 6, NULL);