summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Unglaub <leo@leo-unglaub.net>2015-03-08 14:14:23 +0000
committerLeo Unglaub <leo@leo-unglaub.net>2015-03-08 14:14:23 +0000
commitd9e143ec66a7508e81bbf3b3ac4dedf74849bc1a (patch)
tree730120681bce1809ddfe8b457fbf079f6c68f115
parentc3843260c8784de419313971d3f0817262d5d45d (diff)
downloadxfce-d9e143ec66a7508e81bbf3b3ac4dedf74849bc1a.tar.gz
xfce-d9e143ec66a7508e81bbf3b3ac4dedf74849bc1a.tar.xz
garcon: Remove an old unused patch
The removed patch is now in upstream and is included in the download archive itself. Signed-off-by: Leo Unglaub <leo@leo-unglaub.net>
-rw-r--r--garcon/sysconfdir.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/garcon/sysconfdir.patch b/garcon/sysconfdir.patch
deleted file mode 100644
index 13fcba4..0000000
--- a/garcon/sysconfdir.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 799e206b6780ee6bab2bb56debf8412dca0346f5 Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@xfce.org>
-Date: Thu, 20 Jan 2011 10:31:10 +0000
-Subject: Also try the garcon install sysconfigdir for config lookups.
-
-Hard-code the $(sysconfdir)/xdg path in garcon_config_lookup(),
-so the chance we find xfce-applications.menu is higher on
-systems that do not have XDG_CONFIG_DIRS setup properly.
----
-diff --git a/garcon/Makefile.am b/garcon/Makefile.am
-index b524b38..3ba0b19 100644
---- a/garcon/Makefile.am
-+++ b/garcon/Makefile.am
-@@ -22,6 +22,7 @@ INCLUDES = \
- -DGARCON_COMPILATION \
- -DGARCON_VERSION_API=\"$(GARCON_VERSION_API)\" \
- -DG_LOG_DOMAIN=\"garcon\" \
-+ -DSYSCONFIGDIR=\"$(sysconfdir)/xdg\" \
- $(PLATFORM_CFLAGS)
-
- lib_LTLIBRARIES = \
-diff --git a/garcon/garcon-config.c b/garcon/garcon-config.c
-index a6917ee..9f69f58 100644
---- a/garcon/garcon-config.c
-+++ b/garcon/garcon-config.c
-@@ -169,7 +169,7 @@ garcon_config_lookup (const gchar *filename)
- path = g_build_filename (g_get_user_config_dir (), filename, NULL);
- if (g_path_is_absolute (path) && g_file_test (path, G_FILE_TEST_IS_REGULAR))
- return path;
--
-+
- g_free (path);
- path = NULL;
-
-@@ -186,6 +186,15 @@ garcon_config_lookup (const gchar *filename)
- }
- }
-
-+ /* Also try the install prefix of garcon in case XDG_CONFIG_DIRS is not
-+ * properly set (startxfce4 for exaple should take care of that) */
-+ path = g_build_filename (SYSCONFIGDIR, filename, NULL);
-+ if (g_path_is_absolute (path) && g_file_test (path, G_FILE_TEST_IS_REGULAR))
-+ return path;
-+
-+ g_free (path);
-+ path = NULL;
-+
- /* Return the path or NULL if the file could not be found */
- return path;
- }
---
-cgit v0.8.3.4

Generated by cgit