[gnome-terminal] screen: Update for vte API

[Christian Persch <chpe src gnome org>]

commit ea837b33ed2ebd6bc30bdbb11c6036b649bc455f
Author: Christian Persch <chpe gnome org>
Date:   Mon Mar 24 21:02:28 2014 +0100

    screen: Update for vte API
    
    Corresponding to vte commit 165b0cf9c40cddf6235e42d86a434b9a1cffaea5.

 src/terminal-screen.c |   12 +++++++-----
 src/terminal-window.c |   24 +++++++++++++-----------
 2 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index b42a8dc..8b7bb6c 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -1494,16 +1494,18 @@ terminal_screen_button_press (GtkWidget      *widget,
   gs_free char *matched_string = NULL;
   int matched_flavor = 0;
   guint state;
-  GtkBorder *inner_border = NULL;
+  GtkBorder padding;
 
   state = event->state & gtk_accelerator_get_default_mod_mask ();
 
   terminal_screen_get_cell_size (screen, &char_width, &char_height);
 
-  gtk_widget_style_get (widget, "inner-border", &inner_border, NULL);
-  row = (event->x - (inner_border ? inner_border->left : 0)) / char_width;
-  col = (event->y - (inner_border ? inner_border->top : 0)) / char_height;
-  gtk_border_free (inner_border);
+  gtk_style_context_get_padding(gtk_widget_get_style_context(widget),
+                                gtk_widget_get_state_flags(widget),
+                                &padding);
+
+  row = (event->x - padding.left) / char_width;
+  col = (event->y - padding.top) / char_height;
 
   /* FIXMEchpe: add vte API to do this check by widget coords instead of grid coords */
   matched_string = terminal_screen_check_match (screen, row, col, &matched_flavor);
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 1abbfb2..731f68a 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -1864,8 +1864,8 @@ screen_resize_window_cb (TerminalScreen *screen,
   GtkWidget *widget = GTK_WIDGET (screen);
   guint grid_width, grid_height;
   int char_width, char_height;
-  GtkBorder *inner_border = NULL;
   GtkAllocation widget_allocation;
+  GtkBorder padding;
 
   gtk_widget_get_allocation (widget, &widget_allocation);
   /* Don't do anything if we're maximised or fullscreened */
@@ -1886,10 +1886,12 @@ screen_resize_window_cb (TerminalScreen *screen,
   char_width = vte_terminal_get_char_width (terminal);
   char_height = vte_terminal_get_char_height (terminal);
 
-  gtk_widget_style_get (GTK_WIDGET (terminal), "inner-border", &inner_border, NULL);
-  grid_width = (width - (inner_border ? (inner_border->left + inner_border->right) : 0)) / char_width;
-  grid_height = (height - (inner_border ? (inner_border->top + inner_border->bottom) : 0)) / char_height;
-  gtk_border_free (inner_border);
+  gtk_style_context_get_padding(gtk_widget_get_style_context(GTK_WIDGET(terminal)),
+                                gtk_widget_get_state_flags(widget),
+                                &padding);
+
+  grid_width = (width - padding.left) / char_width;
+  grid_height = (height - padding.top) / char_height;
 
   vte_terminal_set_size (terminal, grid_width, grid_height);
 
@@ -3531,18 +3533,18 @@ terminal_window_update_geometry (TerminalWindow *window)
       char_height != priv->old_char_height ||
       widget != (GtkWidget*) priv->old_geometry_widget)
     {
-      GtkBorder *inner_border = NULL;
+      GtkBorder padding;
       
       /* FIXME Since we're using xthickness/ythickness to compute
        * padding we need to change the hints when the theme changes.
        */
 
-      gtk_widget_style_get (widget, "inner-border", &inner_border, NULL);
-
-      hints.base_width = (inner_border ? (inner_border->left + inner_border->right) : 0);
-      hints.base_height = (inner_border ? (inner_border->top + inner_border->bottom) : 0);
+      gtk_style_context_get_padding(gtk_widget_get_style_context(widget),
+                                    gtk_widget_get_state_flags(widget),
+                                    &padding);
 
-      gtk_border_free (inner_border);
+      hints.base_width = padding.left + padding.right;
+      hints.base_height = padding.top + padding.bottom;
 
 #define MIN_WIDTH_CHARS 4
 #define MIN_HEIGHT_CHARS 1