From: Tony Houghton <h@realh.co.uk>
Description: Use vte accessor functions instead of members.
 VteTerminal's members suddenly became unavailable so their accessor functions
 must be used instead.
Bug: https://bugs.launchpad.net/bugs/644572
--- a/src/roxterm.c
+++ b/src/roxterm.c
@@ -376,8 +376,8 @@
     {
         VteTerminal *vte = VTE_TERMINAL(old_gt->widget);
         
-        new_gt->columns = vte->column_count;
-        new_gt->rows = vte->row_count;
+        new_gt->columns = vte_terminal_get_column_count(vte);
+        new_gt->rows = vte_terminal_get_row_count(vte);
     }
 
     return new_gt;
@@ -1037,8 +1037,8 @@
         int req_w, req_h;
         
         roxterm_get_vte_padding(vte, &px, &py);
-        req_w = vte->char_width * columns + px;
-        req_h = vte->char_height * rows + py;
+        req_w = vte_terminal_get_char_width(vte) * columns + px;
+        req_h = vte_terminal_get_char_height(vte) * rows + py;
         /*
         g_debug("Child was %dx%d, window bigger by %dx%d; "
                 "resizing for child calc %dx%d",
@@ -1078,14 +1078,14 @@
             
             vte_terminal_set_size(vte, *pwidth, *pheight);
             roxterm_get_vte_padding(vte, &px, &py);
-            *pwidth = *pwidth * vte->char_width + px;
-            *pheight = *pheight * vte->char_height + py;
+            *pwidth = *pwidth * vte_terminal_get_char_width(vte) + px;
+            *pheight = *pheight * vte_terminal_get_char_height(vte) + py;
         }
     }
     else
     {
-        *pwidth = vte->column_count;
-        *pheight = vte->row_count;
+        *pwidth = vte_terminal_get_column_count(vte);
+        *pheight = vte_terminal_get_row_count(vte);
     }
 }
 
@@ -1138,8 +1138,8 @@
 {
     char *fdesc;
     PangoFontDescription *pango_desc = NULL;
-    int w = vte->column_count;
-    int h = vte->row_count;
+    int w = vte_terminal_get_column_count(vte);
+    int h = vte_terminal_get_row_count(vte);
 
     if (roxterm->pango_desc)
     {
@@ -1206,8 +1206,8 @@
         roxterm_apply_profile_font(roxterm, vte, update_geometry);
         return;
     }
-    w = vte->column_count;
-    h = vte->row_count;
+    w = vte_terminal_get_column_count(vte);
+    h = vte_terminal_get_row_count(vte);
     zf = roxterm->target_zoom_factor /
             (roxterm->current_zoom_factor ?
                     roxterm->current_zoom_factor : 1);
@@ -1242,8 +1242,8 @@
         return;
     vte = VTE_TERMINAL(roxterm->widget);
     other_vte = VTE_TERMINAL(other->widget);
-    width = other_vte->column_count;
-    height = other_vte->row_count;
+    width = vte_terminal_get_column_count(other_vte);
+    height = vte_terminal_get_row_count(other_vte);
     fd = vte_terminal_get_font(VTE_TERMINAL(other->widget));
     roxterm->target_zoom_factor = other->current_zoom_factor;
     roxterm->current_zoom_factor = other->current_zoom_factor;
@@ -1253,7 +1253,7 @@
     {
         vte_terminal_set_font(vte, fd);
     }
-    if (vte->column_count != width || vte->row_count != height)
+    if (vte_terminal_get_column_count(vte) != width || vte_terminal_get_row_count(vte) != height)
     {
         roxterm_set_vte_size(roxterm, VTE_TERMINAL(roxterm->widget),
                 width, height);
@@ -1292,8 +1292,8 @@
     roxterm_get_vte_padding(vte, &xpad, &ypad);
     g_free(roxterm->matched_url);
     roxterm->matched_url = vte_terminal_match_check(vte,
-        (event_x - ypad) / vte->char_width,
-        (event_y - ypad) / vte->char_height, &tag);
+        (event_x - ypad) / vte_terminal_get_char_width(vte),
+        (event_y - ypad) / vte_terminal_get_char_height(vte), &tag);
     if (roxterm->matched_url)
         roxterm->match_type = roxterm_get_match_type(roxterm, tag);
     return roxterm->matched_url != NULL;
@@ -1470,13 +1470,13 @@
         ROXTermData * roxterm)
 {
     multi_tab_set_window_title(roxterm->tab,
-        vte->window_title ? vte->window_title : _("ROXTerm"));
+        vte_terminal_get_window_title(vte) ? vte_terminal_get_window_title(vte) : _("ROXTerm"));
 }
 
 static void roxterm_icon_title_handler(VteTerminal *vte,
         ROXTermData * roxterm)
 {
-    multi_tab_set_icon_title(roxterm->tab, vte->icon_title);
+    multi_tab_set_icon_title(roxterm->tab, vte_terminal_get_icon_title(vte));
 }
 
 /* data is cast to char const **pname - indirect pointer to name to check for -
@@ -2725,7 +2725,7 @@
     if (vte_widget)
         *vte_widget = roxterm->widget;
     if (adjustment)
-        *adjustment = vte->adjustment;
+        *adjustment = vte_terminal_get_adjustment(vte);
 
     scrollbar_pos = multi_win_set_scroll_bar_position(win,
         options_lookup_int_with_default(roxterm_template->profile,
@@ -2733,7 +2733,7 @@
     if (scrollbar_pos)
     {
         roxterm->hbox = gtk_hbox_new(FALSE, 0);
-        roxterm->scrollbar = gtk_vscrollbar_new(vte->adjustment);
+        roxterm->scrollbar = gtk_vscrollbar_new(vte_terminal_get_adjustment(vte));
         if (scrollbar_pos == MultiWinScrollBar_Left)
         {
             gtk_box_pack_end_defaults(GTK_BOX(roxterm->hbox), roxterm->widget);
