Add support for surrounding text and reset
Fix for changed GTK+ API