components/desktop/libxklavier/patches/libxklavier-02-xklavier_config.patch
author Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Mon, 03 Oct 2016 12:09:09 -0700
changeset 7038 ec6c9e486ce6
permissions -rw-r--r--
23245484 Move libxklavier 5.0 to Userland PSARC/2009/483 libxklavier re-integration
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7038
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     1
Existing set of patches from the desktop gate for Solaris
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     2
Not suitable for upstream
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     3
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     4
--- libxklavier-5.0.orig/libxklavier/xklavier_config.c	2009-06-24 13:08:38.000000000 +0200
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     5
+++ libxklavier-5.0/libxklavier/xklavier_config.c	2012-06-05 14:10:30.908824990 +0200
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     6
@@ -1049,6 +1049,7 @@
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     7
 	object_class->set_property = xkl_config_registry_set_property;
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     8
 	object_class->get_property = xkl_config_registry_get_property;
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     9
 
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    10
+	bindtextdomain(XKB_DOMAIN, LOCALEDIR);
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    11
 	bind_textdomain_codeset(XKB_DOMAIN, "UTF-8");
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    12
 
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    13
 	engine_param_spec = g_param_spec_object("engine",
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    14