[mousetweaks] Remove gconf schema and key definitions
- From: Gerd Kohlberger <gerdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mousetweaks] Remove gconf schema and key definitions
- Date: Wed, 13 Oct 2010 15:04:37 +0000 (UTC)
commit 3071b430faffcc058bfb43b1bac54a04be60bfeb
Author: Gerd Kohlberger <gerdk src gnome org>
Date: Wed Oct 13 17:04:30 2010 +0200
Remove gconf schema and key definitions
data/Makefile.am | 11 +---
data/mousetweaks.schemas.in | 148 -------------------------------------------
src/Makefile.am | 2 +
src/mt-common.h | 15 -----
4 files changed, 4 insertions(+), 172 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 7bc3818..36eebde 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,4 @@
if BUILD_PCA
-pca_schemas = pointer-capture-applet.schemas.in
pca_ui = pointer-capture-applet.ui
pca_server = PointerCapture_Factory.server.in
pca_menu = PointerCapture.xml
@@ -33,25 +32,19 @@ ui_DATA = mousetweaks.ui $(pca_ui) $(dca_ui)
menudir = $(datadir)/mousetweaks
menu_DATA = $(pca_menu) $(dca_menu)
+if BUILD_PCA
@INTLTOOL_SCHEMAS_RULE@
schemasdir = @GCONF_SCHEMA_FILE_DIR@
-schemas_in_files = mousetweaks.schemas.in $(pca_schemas)
+schemas_in_files = pointer-capture-applet.schemas.in
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
if GCONF_SCHEMAS_INSTALL
install-data-local:
-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
- $(GCONFTOOL) --makefile-install-rule mousetweaks.schemas
-if BUILD_PCA
- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
$(GCONFTOOL) --makefile-install-rule pointer-capture-applet.schemas
-endif
uninstall-local:
-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
- $(GCONFTOOL) --makefile-uninstall-rule mousetweaks.schemas
-if BUILD_PCA
- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
$(GCONFTOOL) --makefile-uninstall-rule pointer-capture-applet.schemas
endif
endif
diff --git a/src/Makefile.am b/src/Makefile.am
index f0c1c38..e210033 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,6 +46,8 @@ mousetweaks_LDADD = \
dwell_click_applet_SOURCES = \
dwell-click-applet.c \
+ mt-timer.c \
+ mt-timer.h \
mt-common.c \
mt-common.h
diff --git a/src/mt-common.h b/src/mt-common.h
index 86d452f..6b9525e 100644
--- a/src/mt-common.h
+++ b/src/mt-common.h
@@ -36,21 +36,6 @@ G_BEGIN_DECLS
#define MOUSETWEAKS_DBUS_IFACE "org.gnome.Mousetweaks"
#define MOUSETWEAKS_DBUS_PATH "/org/gnome/Mousetweaks"
-#define MT_GCONF_HOME "/desktop/gnome/accessibility/mouse"
-#define OPT_THRESHOLD MT_GCONF_HOME "/threshold"
-#define OPT_SSC MT_GCONF_HOME "/delay_enable"
-#define OPT_SSC_T MT_GCONF_HOME "/delay_time"
-#define OPT_DWELL MT_GCONF_HOME "/dwell_enable"
-#define OPT_DWELL_T MT_GCONF_HOME "/dwell_time"
-#define OPT_CTW MT_GCONF_HOME "/dwell_show_ctw"
-#define OPT_MODE MT_GCONF_HOME "/dwell_mode"
-#define OPT_G_SINGLE MT_GCONF_HOME "/dwell_gesture_single"
-#define OPT_G_DOUBLE MT_GCONF_HOME "/dwell_gesture_double"
-#define OPT_G_DRAG MT_GCONF_HOME "/dwell_gesture_drag"
-#define OPT_G_RIGHT MT_GCONF_HOME "/dwell_gesture_secondary"
-#define OPT_STYLE MT_GCONF_HOME "/button_layout"
-#define OPT_ANIMATE MT_GCONF_HOME "/animate_cursor"
-
/* GSettings */
#define MT_SCHEMA_ID "org.gnome.mousetweaks"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]