[gnome-settings-daemon] xsettings: Make Gtk/EnablePrimaryPaste configurable through gsettings



commit aad836ebcbf2a20f72188ced1cc8fe33da6d39ac
Author: Rui Matos <tiagomatos gmail com>
Date:   Thu Dec 8 18:12:09 2016 +0100

    xsettings: Make Gtk/EnablePrimaryPaste configurable through gsettings
    
    Instead of defaulting to true and relying on xsettings overrides to
    change it, let's make use of a proper gsetting newly added for this
    purpose that can also be used by gtk+ on the wayland backend.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=775845

 configure.ac                              |    2 +-
 plugins/xsettings/gsd-xsettings-manager.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d30c4d5..c82a080 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ LIBRSVG_REQUIRED_VERSION=2.36.2
 PANGO_REQUIRED_VERSION=1.20.0
 POLKIT_REQUIRED_VERSION=0.103
 UPOWER_REQUIRED_VERSION=0.99.0
-GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION=3.20.0
+GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION=3.23.3
 GEOCODE_GLIB_REQUIRED_VERSION=3.10.0
 GEOCLUE_REQUIRED_VERSION=2.3.1
 NM_REQUIRED_VERSION=1.0
diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
index 2d3d6f1..2b0d700 100644
--- a/plugins/xsettings/gsd-xsettings-manager.c
+++ b/plugins/xsettings/gsd-xsettings-manager.c
@@ -417,7 +417,6 @@ static FixedEntry fixed_entries [] = {
         { "Gtk/ShowInputMethodMenu", fixed_false_int },
         { "Gtk/ShowUnicodeMenu",     fixed_false_int },
         { "Gtk/AutoMnemonics",       fixed_true_int },
-        { "Gtk/EnablePrimaryPaste",  fixed_true_int },
         { "Gtk/DialogsUseHeader",    fixed_true_int },
         { "Gtk/SessionBusId",        fixed_bus_id },
 };
@@ -447,6 +446,7 @@ static TranslationEntry translations [] = {
         { "org.gnome.desktop.interface", "icon-theme",             "Net/IconThemeName",       
translate_string_string },
         { "org.gnome.desktop.interface", "menubar-accel",          "Gtk/MenuBarAccel",        
translate_string_string },
         { "org.gnome.desktop.interface", "cursor-theme",           "Gtk/CursorThemeName",     
translate_string_string },
+        { "org.gnome.desktop.interface", "gtk-enable-primary-paste", "Gtk/EnablePrimaryPaste", 
translate_bool_int },
         /* cursor-size is handled via the Xft side as it needs the scaling factor */
 
         { "org.gnome.desktop.sound", "theme-name",                 "Net/SoundThemeName",            
translate_string_string },


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]