diff options
| author | rbuj <[email protected]> | 2020-01-30 20:28:03 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2020-02-04 12:36:29 +0100 |
| commit | 248162a4815b38300157d3053b190934df75c773 (patch) | |
| tree | 303d3c773f885b80b91987cfac43faf742205d8b | |
| parent | 668a520b2264365ab6da97f4ad83025f1a3f6a4e (diff) | |
| download | mate-control-center-248162a4815b38300157d3053b190934df75c773.tar.bz2 mate-control-center-248162a4815b38300157d3053b190934df75c773.tar.xz | |
appearance: backgrounds dir should be portable
| -rw-r--r-- | capplets/appearance/Makefile.am | 4 | ||||
| -rw-r--r-- | capplets/appearance/appearance-desktop.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/capplets/appearance/Makefile.am b/capplets/appearance/Makefile.am index 5e62573a..7b44070c 100644 --- a/capplets/appearance/Makefile.am +++ b/capplets/appearance/Makefile.am @@ -49,6 +49,7 @@ mate_appearance_properties_LDFLAGS = -export-dynamic pixmapdir = $(pkgdatadir)/pixmaps wallpaperdir = $(datadir)/mate-background-properties +backgrounddir = $(datadir)/backgrounds AM_CPPFLAGS = \ $(MARCO_CFLAGS) \ @@ -56,7 +57,8 @@ AM_CPPFLAGS = \ $(FONT_CAPPLET_CFLAGS) \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DMATECC_PIXMAP_DIR="\"$(pixmapdir)\"" \ - -DWALLPAPER_DATADIR="\"$(wallpaperdir)\"" + -DWALLPAPER_DATADIR="\"$(wallpaperdir)\"" \ + -DBACKGROUND_DATADIR="\"$(backgrounddir)\"" mate-appearance-properties-resources.h mate-appearance-properties-resources.c: org.mate.mcc.appearance.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.appearance.gresource.xml) $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name appearance $< diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c index 89e6fef2..b8b16e7c 100644 --- a/capplets/appearance/appearance-desktop.c +++ b/capplets/appearance/appearance-desktop.c @@ -627,10 +627,10 @@ wp_create_filechooser (AppearanceData *data) start_dir = g_get_home_dir (); - if (g_file_test ("/usr/share/backgrounds", G_FILE_TEST_IS_DIR)) { + if (g_file_test (BACKGROUND_DATADIR, G_FILE_TEST_IS_DIR)) { gtk_file_chooser_add_shortcut_folder (data->wp_filesel, - "/usr/share/backgrounds", NULL); - start_dir = "/usr/share/backgrounds"; + BACKGROUND_DATADIR, NULL); + start_dir = BACKGROUND_DATADIR; } pictures = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES); |