Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass domain to the menu parser

Browse Source 
This is necessary to make translations in markup work.
This commit is contained in:
Matthias Clasen
2011-11-08 16:24:32 -05:00
committed by Ryan Lortie
parent b36198dbc2
commit f13083bf0d
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtkbuilderparser.c
View File

@@ -847,7 +847,7 @@ parse_menu (GMarkupParseContext *context,
object_info->tag.name = element_name;
state_push (data, object_info);
g_menu_markup_parser_start_menu (context, NULL);
g_menu_markup_parser_start_menu (context, data->domain, NULL);
return TRUE;
}
@@ -1131,17 +1131,19 @@ text (GMarkupParseContext *context,
static void
free_info (CommonInfo *info)
{
if (strcmp (info->tag.name, "object") == 0)
if (strcmp (info->tag.name, "object") == 0)
free_object_info ((ObjectInfo *)info);
else if (strcmp (info->tag.name, "child") == 0)
else if (strcmp (info->tag.name, "child") == 0)
free_child_info ((ChildInfo *)info);
else if (strcmp (info->tag.name, "property") == 0)
else if (strcmp (info->tag.name, "property") == 0)
free_property_info ((PropertyInfo *)info);
else if (strcmp (info->tag.name, "signal") == 0)
else if (strcmp (info->tag.name, "signal") == 0)
_free_signal_info ((SignalInfo *)info, NULL);
else if (strcmp (info->tag.name, "requires") == 0)
else if (strcmp (info->tag.name, "requires") == 0)
_free_requires_info ((RequiresInfo *)info, NULL);
else
else if (strcmp (info->tag.name, "menu") == 0)
free_object_info ((ObjectInfo *)info);
else
g_assert_not_reached ();
}
@@ -1150,7 +1152,6 @@ static const GMarkupParser parser = {
end_element,
text,
NULL,
NULL
};
void