summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Pablo Ugarte <juanpablougarte@gmail.com>2017-10-01 21:21:38 -0300
committerJuan Pablo Ugarte <juanpablougarte@gmail.com>2017-12-30 21:22:08 -0300
commit80fa9267ad363489df928b3cbe4e952d62aad8c1 (patch)
treef0d7fe771eb40e0a59277852a45f343ba2cab0df
parent5d479663aa345d77c02e9149b781919ceee98ffc (diff)
downloadglade-80fa9267ad363489df928b3cbe4e952d62aad8c1.tar.gz
GladeApp: add GLADE_ENV_ICON_THEME_PATH
Add env variable to append extra icon theme search paths
-rw-r--r--gladeui/glade-app.c18
-rw-r--r--gladeui/glade-app.h1
2 files changed, 17 insertions, 2 deletions
diff --git a/gladeui/glade-app.c b/gladeui/glade-app.c
index e117d88f..5dfb37e2 100644
--- a/gladeui/glade-app.c
+++ b/gladeui/glade-app.c
@@ -371,8 +371,22 @@ glade_app_init (GladeApp *app)
if (!initialized)
{
- gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- pixmaps_dir);
+ GtkIconTheme *default_icon_theme = gtk_icon_theme_get_default ();
+ const gchar *path;
+
+ gtk_icon_theme_append_search_path (default_icon_theme, pixmaps_dir);
+
+ /* Handle extra icon theme paths. Needed for tests to work */
+ if ((path = g_getenv (GLADE_ENV_ICON_THEME_PATH)))
+ {
+ gchar **tokens = g_strsplit (path, ":", -1);
+ gint i;
+
+ for (i = 0; tokens[i]; i++)
+ gtk_icon_theme_append_search_path (default_icon_theme, tokens[i]);
+
+ g_strfreev (tokens);
+ }
glade_cursor_init ();
diff --git a/gladeui/glade-app.h b/gladeui/glade-app.h
index 5b5a81bc..5c10bff1 100644
--- a/gladeui/glade-app.h
+++ b/gladeui/glade-app.h
@@ -40,6 +40,7 @@ G_BEGIN_DECLS
#define GLADE_ENV_MODULE_PATH "GLADE_MODULE_SEARCH_PATH"
#define GLADE_ENV_TESTING "GLADE_TESTING"
#define GLADE_ENV_PIXMAP_DIR "GLADE_PIXMAP_DIR"
+#define GLADE_ENV_ICON_THEME_PATH "GLADE_ICON_THEME_PATH"
#define GLADE_ENV_BUNDLED "GLADE_BUNDLED"
typedef struct _GladeApp GladeApp;