diff --git a/midori/main.c b/midori/main.c index 2ec5599..9360a13 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1942,6 +1942,7 @@ main (int argc, gchar** uris; gchar* block_uris; gint inactivity_reset; + const gchar* icon_path; MidoriApp* app; gboolean result; GError* error; @@ -2352,6 +2353,12 @@ main (int argc, return 0; } + if ((icon_path = g_getenv ("MIDORI_ICON_PATH"))) + { + GtkIconTheme* icon_theme = gtk_icon_theme_get_default (); + gtk_icon_theme_append_search_path (icon_theme, icon_path); + } + /* FIXME: Inactivity reset is only supported for app mode */ if (inactivity_reset > 0) g_error ("--inactivity-reset is currently only supported with --app."); diff --git a/wscript b/wscript index c7a0c87..96871ca 100644 --- a/wscript +++ b/wscript @@ -608,6 +608,7 @@ def shutdown (): try: ext = 'MIDORI_EXTENSION_PATH=' + relfolder + os.sep + 'extensions' nls = 'MIDORI_NLSPATH=' + relfolder + os.sep + 'po' + icon = 'MIDORI_ICON_PATH=' + os.path.join (srcdir, 'icons', 'scalable') lang = os.environ['LANG'] try: for lang in os.listdir (folder + os.sep + 'po'): @@ -623,7 +624,7 @@ def shutdown (): 'LC_MESSAGES' + os.sep + APPNAME + '.mo') except: pass - command = ext + ' ' + nls + ' ' + command = ' '.join ([ext, nls, icon]) + ' ' if is_mingw (Build.bld.env): # This works only if everything is installed to that prefix os.chdir (Build.bld.env['PREFIX'] + os.sep + 'bin')