callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkApplication: load gtk/menus-common.ui resource

Browse Source 
Allow the app to install a resource called gtk/menus-common.ui which
will always be loaded, regardless of which type of menus we are using.

https://bugzilla.gnome.org/show_bug.cgi?id=733925
This commit is contained in:
Ryan Lortie 2014-07-29 17:29:09 +02:00
parent 8ad9cf8b8c
commit ffbfee0738
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkapplication.c
View File

@ -559,6 +559,20 @@ gtk_application_load_resources (GtkApplication *application)
g_free (menuspath); g_free (menuspath);
} }
/* Always load from -common as well, if we have it */
menuspath = g_strconcat (base_path, "/gtk/menus-common.ui", NULL);
if (g_resources_get_info (menuspath, G_RESOURCE_LOOKUP_FLAGS_NONE, NULL, NULL, NULL))
{
GError *error = NULL;
if (application->priv->menus_builder == NULL)
application->priv->menus_builder = gtk_builder_new ();
if (!gtk_builder_add_from_resource (application->priv->menus_builder, menuspath, &error))
g_error ("failed to load menus-common.ui: %s", error->message);
}
g_free (menuspath);
if (application->priv->menus_builder) if (application->priv->menus_builder)
{ {
GObject *menu; GObject *menu;