3 files changed, 4 insertions, 4 deletions
diff --git a/libdbusmenu-gtk/genericmenuitem-enum-types.h b/libdbusmenu-gtk/genericmenuitem-enum-types.h
index 3a8c50c..b5d8589 100644
--- a/libdbusmenu-gtk/genericmenuitem-enum-types.h
+++ b/libdbusmenu-gtk/genericmenuitem-enum-types.h
@@ -35,7 +35,7 @@ License version 3 and version 2.1 along with this program.  If not, see
 
 G_BEGIN_DECLS
 
-/* Enumerations from file: "./genericmenuitem.h" */
+/* Enumerations from file: "genericmenuitem.h" */
 #include "genericmenuitem.h"
 
 
diff --git a/libdbusmenu-gtk/genericmenuitem-enum-types.h.in b/libdbusmenu-gtk/genericmenuitem-enum-types.h.in
index 5758438..afd9132 100644
--- a/libdbusmenu-gtk/genericmenuitem-enum-types.h.in
+++ b/libdbusmenu-gtk/genericmenuitem-enum-types.h.in
@@ -43,7 +43,7 @@ G_END_DECLS
 /*** END file-tail ***/
 
 /*** BEGIN file-production ***/
-/* Enumerations from file: "@filename@" */
+/* Enumerations from file: "@basename@" */
 #include "@basename@"
 
 /*** END file-production ***/
diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c
index 4125828..ae6d4c0 100644
--- a/libdbusmenu-gtk/genericmenuitem.c
+++ b/libdbusmenu-gtk/genericmenuitem.c
@@ -242,7 +242,7 @@ has_mnemonic (const gchar * string, gboolean previous_underscore)
 }
 
 /* Sanitize the label by removing "__" meaning "_" */
-G_INLINE_FUNC gchar *
+static gchar *
 sanitize_label (const gchar * in_label)
 {
 	static GRegex * underscore_regex = NULL;
@@ -279,7 +279,7 @@ set_label (GtkMenuItem * menu_item, const gchar * in_label)
 	gchar * local_label = NULL;
 	switch (GENERICMENUITEM(menu_item)->priv->disposition) {
 	case GENERICMENUITEM_DISPOSITION_NORMAL:
-		local_label = g_strdup(in_label);
+		local_label = g_markup_escape_text(in_label, -1);
 		break;
 	case GENERICMENUITEM_DISPOSITION_INFORMATIONAL:
 	case GENERICMENUITEM_DISPOSITION_WARNING: