From 54db8f05e1a371b2af9814d1584a384d5579278e Mon Sep 17 00:00:00 2001
From: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date: Mon, 16 Nov 2015 00:01:30 +0100
Subject: vte291: Remove the background image UI setting

Thank you
Author: egmont@gmail.com
---
 src/profile-editor.c       |  6 ++++++
 src/profile-preferences.ui | 29 +++++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/profile-editor.c b/src/profile-editor.c
index d66b5da..cbfc394 100644
--- a/src/profile-editor.c
+++ b/src/profile-editor.c
@@ -141,6 +141,11 @@ profile_notify_sensitivity_cb (TerminalProfile *profile,
 		               !terminal_profile_property_locked (profile, TERMINAL_PROFILE_CUSTOM_COMMAND));
 	}
 
+#if VTE_CHECK_VERSION (0, 38, 0)
+	gtk_widget_hide (profile_editor_get_widget (editor, "background-image"));
+	gtk_widget_hide (profile_editor_get_widget (editor, "darken-background-transparent-or-image-scale-label"));
+	gtk_widget_show (profile_editor_get_widget (editor, "darken-background-transparent-scale-label"));
+#else
 	if (!prop_name || prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TYPE))
 	{
 		gboolean bg_type_locked = terminal_profile_property_locked (profile, TERMINAL_PROFILE_BACKGROUND_TYPE);
@@ -168,6 +173,7 @@ profile_notify_sensitivity_cb (TerminalProfile *profile,
 			SET_SENSITIVE ("darken-background-vbox", FALSE);
 		}
 	}
+#endif
 
 	if (!prop_name ||
 	        prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT) ||
diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui
index a14d26b..83d1042 100644
--- a/src/profile-preferences.ui
+++ b/src/profile-preferences.ui
@@ -2202,7 +2202,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="vbox87">
+                  <object class="GtkVBox" id="background-image">
                     <property name="visible">True</property>
                     <property name="homogeneous">False</property>
                     <property name="spacing">6</property>
@@ -2354,7 +2354,7 @@
                     <property name="homogeneous">False</property>
                     <property name="spacing">6</property>
                     <child>
-                      <object class="GtkLabel" id="darken-background-scale-label">
+                      <object class="GtkLabel" id="darken-background-transparent-or-image-scale-label">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">S_hade transparent or image background:</property>
                         <property name="use_underline">True</property>
@@ -2378,6 +2378,31 @@
                         <property name="fill">False</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel" id="darken-background-transparent-scale-label">
+                        <property name="visible">False</property>
+                        <property name="label" translatable="yes">S_hade transparent background:</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_markup">False</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="mnemonic_widget">darken-background-scale</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
+                      </object>
+                      <packing>
+                        <property name="padding">1</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkHBox" id="hbox6">
                         <property name="visible">True</property>
-- 
cgit v1.2.1