--- xfce4-panel-4.6.1/plugins/launcher/launcher.c	2009-04-18 16:40:09.000000000 +0200
+++ xfce4-panel-4.6.1/plugins/launcher/launcher.c.new	2009-10-04 13:10:20.331910497 +0200
@@ -254,13 +254,15 @@
     {
         if (entry->comment)
         {
-            string = g_strdup_printf ("<b>%s</b>\n%s", entry->name, entry->comment);
+            string = g_markup_printf_escaped ("<b>%s</b>\n%s", entry->name, entry->comment);
             gtk_tooltip_set_markup (tooltip, string);
             g_free (string);
         }
         else
         {
-            gtk_tooltip_set_text (tooltip, entry->name);
+            string = g_markup_escape_text (entry->name, -1);
+            gtk_tooltip_set_text (tooltip, string);
+            g_free (string);
         }
 
         if (G_LIKELY (entry->icon))