summaryrefslogtreecommitdiff
path: root/src/file-manager
diff options
context:
space:
mode:
authorrbuj <[email protected]>2020-11-12 10:32:46 +0100
committerraveit65 <[email protected]>2020-11-15 13:23:29 +0100
commit2c61357fa601376e4ab4a1603f814f39315c59ad (patch)
tree41bee63a39e829a8031c5474fbd5ecdbe1747fcb /src/file-manager
parent47babe69871cd65b2fb3ae2d9f97b5c31331a28f (diff)
downloadcaja-2c61357fa601376e4ab4a1603f814f39315c59ad.tar.bz2
caja-2c61357fa601376e4ab4a1603f814f39315c59ad.tar.xz
fm-properties-window: make the location of system folders portable
Diffstat (limited to 'src/file-manager')
-rw-r--r--src/file-manager/Makefile.am2
-rw-r--r--src/file-manager/fm-properties-window.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/file-manager/Makefile.am b/src/file-manager/Makefile.am
index 9c14250a..98173976 100644
--- a/src/file-manager/Makefile.am
+++ b/src/file-manager/Makefile.am
@@ -9,6 +9,8 @@ AM_CPPFLAGS = \
$(WARN_CFLAGS) \
-DCAJA_DATADIR=\""$(datadir)/caja"\" \
-DDATADIR=\""$(datadir)"\" \
+ -DICONDIR=\""$(datadir)/icons"\" \
+ -DPIXMAPDIR=\""$(datadir)/pixmaps"\" \
$(DISABLE_DEPRECATED_CFLAGS) \
$(NULL)
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 941f4233..e132b60f 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -5769,8 +5769,8 @@ select_image_button_callback (GtkWidget *widget,
"process-stop", GTK_RESPONSE_CANCEL,
"document-open", GTK_RESPONSE_OK,
NULL);
- gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), "/usr/share/icons", NULL);
- gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), "/usr/share/pixmaps", NULL);
+ gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), ICONDIR, NULL);
+ gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), PIXMAPDIR, NULL);
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
filter = gtk_file_filter_new ();