Make the command dbox properly resizable; fix markup in the shortcut dbox.

Signed-Off-By: Darren Salt <linux@youmustbejoking.demon.co.uk>


--- plugins/keyboard_plugin/shortcuts_plugin.c
+++ plugins/keyboard_plugin/shortcuts_plugin.c
@@ -1111,7 +1111,7 @@
         gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
 
         hbox_entry = gtk_hbox_new (FALSE, BORDER);
-        gtk_box_pack_start (GTK_BOX (hbox_entry), entry, FALSE, FALSE, 0);
+        gtk_box_pack_start (GTK_BOX (hbox_entry), entry, TRUE, TRUE, 0);
         img = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
         button = gtk_button_new ();
         gtk_container_add (GTK_CONTAINER (button), img);
@@ -1120,7 +1120,7 @@
 
         hbox = gtk_hbox_new (FALSE, BORDER);
         gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-        gtk_box_pack_start (GTK_BOX (hbox), hbox_entry, FALSE, TRUE, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), hbox_entry, TRUE, TRUE, 0);
         gtk_container_set_border_width (GTK_CONTAINER (hbox), BORDER);
 
         gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_command)->vbox), hbox, FALSE, TRUE, 0);
@@ -1173,7 +1173,7 @@
             g_free (launcher_data);
         }
 
-        dialog_text = g_strdup_printf ("<i>%s</i>\n<b>%s</b>", _("Set shortcut for command:"), command);
+        dialog_text = g_markup_printf_escaped ("<i>%s</i>\n<b>%s</b>", _("Set shortcut for command:"), command);
 
         /* Create dialog */
         dialog_compose = gtk_dialog_new_with_buttons (_("Set shortcut"), 
@@ -1197,7 +1197,7 @@
         }
 
         label = gtk_label_new (dialog_text);
-        gtk_label_set_markup (GTK_LABEL (label), dialog_text);
+        gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
         gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
         gtk_widget_show (label);
         gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);