GtkAppliation: setup icon theme resource path

If we have a resource base path for the application, set up an icon
theme search path based on it (within the default icon theme).

https://bugzilla.gnome.org/show_bug.cgi?id=722092
This commit is contained in:
Ryan Lortie 2014-07-07 14:32:10 -04:00
parent 868ee07f49
commit 687a846923

View File

@ -36,6 +36,7 @@
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkrecentmanager.h" #include "gtkrecentmanager.h"
#include "gtkaccelmapprivate.h" #include "gtkaccelmapprivate.h"
#include "gtkicontheme.h"
#include "gtkbuilder.h" #include "gtkbuilder.h"
#include "gtkintl.h" #include "gtkintl.h"
@ -514,6 +515,17 @@ gtk_application_load_resources (GtkApplication *application)
if (base_path == NULL) if (base_path == NULL)
return; return;
/* Expand the icon search path */
{
GtkIconTheme *default_theme;
gchar *iconspath;
default_theme = gtk_icon_theme_get_default ();
iconspath = g_strconcat (base_path, "/icons", NULL);
gtk_icon_theme_add_resource_path (default_theme, iconspath);
g_free (iconspath);
}
/* Load the menus */ /* Load the menus */
{ {
gchar *menuspath; gchar *menuspath;