[caribou] Auto-load OSK GTK+ modules when OSK is enabled
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [caribou] Auto-load OSK GTK+ modules when OSK is enabled
- Date: Mon, 19 Sep 2011 11:33:14 +0000 (UTC)
commit 524b704349b4b9dc1d95188813eacfd5c6011daf
Author: Bastien Nocera <hadess hadess net>
Date: Thu Aug 4 15:42:41 2011 +0100
Auto-load OSK GTK+ modules when OSK is enabled
https://bugzilla.gnome.org/show_bug.cgi?id=655979
configure.ac | 2 ++
modules/Makefile.am | 7 +++++++
modules/caribou-gtk-module.desktop | 6 ++++++
3 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fe31be1..5f863ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,6 +92,8 @@ if test x"$enable_gtk2_module" = x"yes"; then
AC_SUBST(GTK2_MODULES_DIR)
fi
+AM_CONDITIONAL([ENABLE_GTK_MODULES], [test x"enable_gtk2_module" = x"yes" -o x"$enable_gtk3_module" = x"yes"])
+
dnl == GSettings ==
GLIB_GSETTINGS
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 47ecbb7..ca20e3b 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -7,3 +7,10 @@ endif
if ENABLE_GTK2_MODULES
SUBDIRS += gtk2
endif
+
+if ENABLE_GTK_MODULES
+gtk_modulesdir = $(libdir)/gnome-settings-daemon-3.0/gtk-modules/
+gtk_modules_DATA = caribou-gtk-module.desktop
+endif
+
+EXTRA_DIST = caribou-gtk-module.desktop
diff --git a/modules/caribou-gtk-module.desktop b/modules/caribou-gtk-module.desktop
new file mode 100644
index 0000000..f6498f4
--- /dev/null
+++ b/modules/caribou-gtk-module.desktop
@@ -0,0 +1,6 @@
+[GTK Module]
+Name=Caribou
+Description=Caribou On-Screen Keyboard GTK+ Module
+X-GTK-Module-Name=caribou-gtk-module
+X-GTK-Module-Enabled-Schema=org.gnome.desktop.a11y.applications
+X-GTK-Module-Enabled-Key=screen-keyboard-enabled
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]