aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-04-19 18:59:55 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-03-08 20:09:09 +0800
commit66055e1a24adf38251805022bcf3509ccc5a757a (patch)
tree92fa76c5226f7da53a8ce9ca79634a3437b2c670
parent80eac7fd3c665f7960f07f9a8aaddbff8f4f9467 (diff)
downloadgsoc2013-empathy-66055e1a24adf38251805022bcf3509ccc5a757a.tar
gsoc2013-empathy-66055e1a24adf38251805022bcf3509ccc5a757a.tar.gz
gsoc2013-empathy-66055e1a24adf38251805022bcf3509ccc5a757a.tar.bz2
gsoc2013-empathy-66055e1a24adf38251805022bcf3509ccc5a757a.tar.lz
gsoc2013-empathy-66055e1a24adf38251805022bcf3509ccc5a757a.tar.xz
gsoc2013-empathy-66055e1a24adf38251805022bcf3509ccc5a757a.tar.zst
gsoc2013-empathy-66055e1a24adf38251805022bcf3509ccc5a757a.zip
empathy_gtk_init: add local copy of icons to the search path (#616159)
-rw-r--r--libempathy-gtk/empathy-ui-utils.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index f3761e5cd..d462403ff 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -64,6 +64,19 @@ empathy_gtk_init (void)
gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
PKGDATADIR G_DIR_SEPARATOR_S "icons");
+ /* Add icons from source dir if available */
+ if (g_getenv ("EMPATHY_SRCDIR") != NULL) {
+ gchar *path;
+
+ path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "data",
+ "icons", "local-copy", NULL);
+ if (g_file_test (path, G_FILE_TEST_EXISTS)) {
+ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), path);
+ }
+
+ g_free (path);
+ }
+
initialized = TRUE;
}