diff --git a/.gitignore b/.gitignore index 4f07153..fbf5275 100644 --- a/.gitignore +++ b/.gitignore @@ -9,8 +9,7 @@ *.pyc # generated files -dbus-interface-definitions.c -css-definitions.* +resources.* zathura.1 zathurarc.5 diff --git a/Makefile b/Makefile index 6b45f31..6f5207e 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ include common.mk # source files OSOURCE = $(sort $(wildcard ${PROJECT}/*.c) \ - ${PROJECT}/css-definitions.c) + ${PROJECT}/resources.c) SOURCE_FILTER = ifneq (${WITH_SQLITE},0) @@ -79,17 +79,17 @@ ${PROJECT}/version.h: ${PROJECT}/version.h.in config.mk -e 's/ZVABI/${ZATHURA_ABI_VERSION}/' ${PROJECT}/version.h.in > ${PROJECT}/version.h.tmp $(QUIET)mv ${PROJECT}/version.h.tmp ${PROJECT}/version.h -${PROJECT}/css-definitions.%: data/zathura-css.gresource.xml config.mk +${PROJECT}/resources.%: data/zathura.gresource.xml config.mk $(call colorecho,GEN,$@) @mkdir -p ${DEPENDDIR}/$(dir $@) - $(QUIET)$(GLIB_COMPILE_RESOURCES) --generate --c-name=zathura_css --internal \ + $(QUIET)$(GLIB_COMPILE_RESOURCES) --generate --c-name=zathura_resources --internal \ --dependency-file=$(DEPENDDIR)/$@.dep \ - --sourcedir=data --target=$@ data/zathura-css.gresource.xml + --sourcedir=data --target=$@ data/zathura.gresource.xml # common dependencies ${OBJECTS} ${OBJECTS_DEBUG} ${OBJECTS_GCOV}: config.mk \ - ${PROJECT}/version.h ${PROJECT}/css-definitions.h \ + ${PROJECT}/version.h ${PROJECT}/resources.h \ .version-checks/GIRARA .version-checks/GLIB .version-checks/GTK # rlease build @@ -169,8 +169,8 @@ clean: ${PROJECT}.pc \ ${PROJECT}/version.h \ ${PROJECT}/version.h.tmp \ - ${PROJECT}/css-definitions.c \ - ${PROJECT}/css-definitions.c.tmp \ + ${PROJECT}/resources.c \ + ${PROJECT}/resources.h \ $(PROJECT).info \ gcov \ .version-checks diff --git a/data/zathura-css.gresource.xml b/data/zathura.gresource.xml similarity index 100% rename from data/zathura-css.gresource.xml rename to data/zathura.gresource.xml diff --git a/zathura/zathura.c b/zathura/zathura.c index bf1faa8..938aed3 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -41,7 +41,7 @@ #include "plugin.h" #include "adjustment.h" #include "dbus-interface.h" -#include "css-definitions.h" +#include "resources.h" #include "synctex.h" #include "content-type.h" @@ -251,7 +251,7 @@ init_css(zathura_t* zathura) g_free(color); } - GResource* css_resource = zathura_css_get_resource(); + GResource* css_resource = zathura_resources_get_resource(); GBytes* css_data = g_resource_lookup_data(css_resource, "/org/pwmt/zathura/CSS/zathura.css_t", G_RESOURCE_LOOKUP_FLAGS_NONE, NULL);