e88f08072c
The Shell is the only user of the magnifier, so there's no reason to keep using GConf for its settings. Since it's a session-wide tool, use a distinct schema, org.gnome.accessibility.magnifier, stored in /desktop/gnome/accessibility/magnifier just like before. Put these settings in a separate schema file for clarity. Old enums in GConf were stored as integers, we now use the facilities provided by GSettings to save them as strings, and convert them to integers automatically thanks to the mapping stored in the schemas. Remove hard-coded default values, which we can get from the schemas. https://bugzilla.gnome.org/show_bug.cgi?id=622414
93 lines
2.5 KiB
Makefile
93 lines
2.5 KiB
Makefile
desktopdir=$(datadir)/applications
|
|
desktop_DATA = gnome-shell.desktop gnome-shell-clock-preferences.desktop
|
|
|
|
# We substitute in bindir so it works as an autostart
|
|
# file when built in a non-system prefix
|
|
%.desktop.in:%.desktop.in.in
|
|
$(AM_V_GEN) sed -e "s|@bindir[@]|$(bindir)|" \
|
|
-e "s|@VERSION[@]|$(VERSION)|" \
|
|
$< > $@ || rm $@
|
|
|
|
# Placeholder until we add intltool
|
|
%.desktop:%.desktop.in
|
|
$(AM_V_GEN) sed s/^_// < $< > $@ || rm $@
|
|
|
|
dist_pkgdata_DATA = clock-preferences.ui
|
|
|
|
imagesdir = $(pkgdatadir)/images
|
|
dist_images_DATA = \
|
|
close-black.svg \
|
|
magnifier.svg
|
|
|
|
themedir = $(pkgdatadir)/theme
|
|
dist_theme_DATA = \
|
|
theme/add-workspace.svg \
|
|
theme/close-window.svg \
|
|
theme/close.svg \
|
|
theme/corner-ripple.png \
|
|
theme/dialog-error.svg \
|
|
theme/gnome-shell.css \
|
|
theme/mosaic-view-active.svg \
|
|
theme/mosaic-view.svg \
|
|
theme/move-window-on-new.svg \
|
|
theme/process-working.png \
|
|
theme/remove-workspace.svg \
|
|
theme/scroll-button-down-hover.png \
|
|
theme/scroll-button-down.png \
|
|
theme/scroll-button-up-hover.png \
|
|
theme/scroll-button-up.png \
|
|
theme/scroll-hhandle.svg \
|
|
theme/scroll-vhandle.svg \
|
|
theme/section-more.svg \
|
|
theme/section-more-open.svg \
|
|
theme/separator-white.png \
|
|
theme/single-view-active.svg \
|
|
theme/single-view.svg \
|
|
theme/ws-switch-arrow-left.svg \
|
|
theme/ws-switch-arrow-right.svg
|
|
|
|
gsettings_SCHEMAS = \
|
|
org.gnome.accessibility.magnifier.gschema.xml \
|
|
org.gnome.shell.gschema.xml
|
|
|
|
@INTLTOOL_XML_NOMERGE_RULE@
|
|
@GSETTINGS_RULES@
|
|
|
|
# We need to compile schemas at make time
|
|
# to run from source tree
|
|
gschemas.compiled: $(gsettings_SCHEMAS:.xml=.valid)
|
|
$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --targetdir=. .
|
|
|
|
all-local: gschemas.compiled
|
|
|
|
|
|
# GConf schemas: provide defaults for keys from Metacity we are overriding
|
|
gconfschemadir = @GCONF_SCHEMA_FILE_DIR@
|
|
gconfschema_DATA = gnome-shell.schemas
|
|
|
|
menudir = $(sysconfdir)/xdg/menus
|
|
|
|
menu_DATA = \
|
|
gs-applications.menu
|
|
|
|
install-data-local:
|
|
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(gconfschema_DATA)
|
|
|
|
|
|
|
|
EXTRA_DIST = \
|
|
gnome-shell.desktop.in.in \
|
|
gnome-shell-clock-preferences.desktop.in.in \
|
|
$(menu_DATA) \
|
|
$(gconfschema_DATA) \
|
|
org.gnome.accessibility.magnifier.xml.in \
|
|
org.gnome.shell.gschema.xml.in
|
|
|
|
CLEANFILES = \
|
|
gnome-shell.desktop.in \
|
|
gnome-shell-clock-preferences.desktop.in \
|
|
$(desktop_DATA) \
|
|
$(gsettings_SCHEMAS) \
|
|
gschemas.compiled
|
|
|