[Xfce4-commits] [apps/xfce4-terminal] 01/01: GtkColorButton show-editor property only available starting with GTK 3.20

noreply at xfce.org noreply at xfce.org
Thu Jan 5 17:58:59 CET 2017


This is an automated email from the git hooks/post-receive script.

f2404 pushed a commit to branch master
in repository apps/xfce4-terminal.

commit adeb89e0c1e7312d3874c9ee53fbc050a570e013
Author: Igor <f2404 at yandex.ru>
Date:   Thu Jan 5 19:57:24 2017 +0300

    GtkColorButton show-editor property only available starting with GTK 3.20
    
    Fixes https://bugzilla.xfce.org/show_bug.cgi?id=13278
---
 terminal/terminal-preferences-dialog.c |  5 +++++
 terminal/terminal-preferences.glade    | 16 ----------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index f299d0c..56d9be1 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -219,6 +219,11 @@ error:
       terminal_return_if_fail (G_IS_OBJECT (object));
       g_signal_connect (G_OBJECT (object), "color-set",
           G_CALLBACK (terminal_preferences_dialog_palette_changed), dialog);
+
+#if GTK_CHECK_VERSION (3, 20, 0)
+      /* don't show palette when editing colors */
+      g_object_set (object, "show-editor", TRUE, NULL);
+#endif
     }
 
   /* watch color changes in property */
diff --git a/terminal/terminal-preferences.glade b/terminal/terminal-preferences.glade
index 4def76b..0eda011 100644
--- a/terminal/terminal-preferences.glade
+++ b/terminal/terminal-preferences.glade
@@ -2224,7 +2224,6 @@ Opacity setting is not available.</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Black</property>
                             <property name="rgba">rgb(0,0,0)</property>
-                            <property name="show_editor">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="color-palette1-atkobject">
                                 <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
@@ -2245,7 +2244,6 @@ Opacity setting is not available.</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Dark Gray</property>
                             <property name="rgba">rgb(0,0,0)</property>
-                            <property name="show_editor">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="color-palette9-atkobject">
                                 <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
@@ -2266,7 +2264,6 @@ Opacity setting is not available.</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Red</property>
                             <property name="rgba">rgb(0,0,0)</property>
-                            <property name="show_editor">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="color-palette2-atkobject">
                                 <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
@@ -2287,7 +2284,6 @@ Opacity setting is not available.</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Light Red</property>
                             <property name="rgba">rgb(0,0,0)</property>
-                            <property name="show_editor">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="color-palette10-atkobject">
                                 <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
@@ -2308,7 +2304,6 @@ Opacity setting is not available.</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Green</property>
                             <property name="rgba">rgb(0,0,0)</property>
-                            <property name="show_editor">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="color-palette3-atkobject">
                                 <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
@@ -2329,7 +2324,6 @@ Opacity setting is not available.</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Light Green</property>
                             <property name="rgba">rgb(0,0,0)</property>
-                            <property name="show_editor">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="color-palette11-atkobject">
                                 <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
@@ -2350,7 +2344,6 @@ Opacity setting is not available.</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Brown / Yellow</property>
                             <property name="rgba">rgb(0,0,0)</property>
-                            <property name="show_editor">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="color-palette4-atkobject">
                                 <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
@@ -2371,7 +2364,6 @@ Opacity setting is not available.</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Yellow</property>
                             <property name="rgba">rgb(0,0,0)</property>
-                            <property name="show_editor">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="color-palette12-atkobject">
                                 <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
@@ -2392,7 +2384,6 @@ Opacity setting is not available.</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Blue</property>
                             <property name="rgba">rgb(0,0,0)</property>
-                            <property name="show_editor">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="color-palette5-atkobject">
                                 <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
@@ -2413,7 +2404,6 @@ Opacity setting is not available.</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Light Blue</property>
                             <property name="rgba">rgb(0,0,0)</property>
-                            <property name="show_editor">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="color-palette13-atkobject">
                                 <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
@@ -2434,7 +2424,6 @@ Opacity setting is not available.</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Magenta</property>
                             <property name="rgba">rgb(0,0,0)</property>
-                            <property name="show_editor">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="color-palette6-atkobject">
                                 <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
@@ -2455,7 +2444,6 @@ Opacity setting is not available.</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Light Magenta</property>
                             <property name="rgba">rgb(0,0,0)</property>
-                            <property name="show_editor">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="color-palette14-atkobject">
                                 <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
@@ -2476,7 +2464,6 @@ Opacity setting is not available.</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Cyan</property>
                             <property name="rgba">rgb(0,0,0)</property>
-                            <property name="show_editor">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="color-palette7-atkobject">
                                 <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
@@ -2497,7 +2484,6 @@ Opacity setting is not available.</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Light Cyan</property>
                             <property name="rgba">rgb(0,0,0)</property>
-                            <property name="show_editor">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="color-palette15-atkobject">
                                 <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
@@ -2518,7 +2504,6 @@ Opacity setting is not available.</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Light Gray</property>
                             <property name="rgba">rgb(0,0,0)</property>
-                            <property name="show_editor">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="color-palette8-atkobject">
                                 <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
@@ -2539,7 +2524,6 @@ Opacity setting is not available.</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">White</property>
                             <property name="rgba">rgb(0,0,0)</property>
-                            <property name="show_editor">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="color-palette16-atkobject">
                                 <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list