]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtklabel.c
Deprecate flag macros for toplevel, state, no window and composite child
[~andy/gtk] / gtk / gtklabel.c
index 256fbe1e7499d31dd36470ab7b01552c4a04ea1e..98c77b04e9f31a75e8863a56aa0492852796de0a 100644 (file)
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#include <config.h>
+#include "config.h"
+
 #include <math.h>
 #include <string.h>
-#include "gtkalias.h"
+
 #include "gtklabel.h"
+#include "gtkaccellabel.h"
 #include "gtkdnd.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkwindow.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkclipboard.h"
-#include <pango/pango.h>
 #include "gtkimagemenuitem.h"
 #include "gtkintl.h"
 #include "gtkseparatormenuitem.h"
+#include "gtktextutil.h"
 #include "gtkmenuitem.h"
 #include "gtknotebook.h"
 #include "gtkstock.h"
 #include "gtkbindings.h"
+#include "gtkbuildable.h"
+#include "gtkimage.h"
+#include "gtkshow.h"
+#include "gtktooltip.h"
+#include "gtkprivate.h"
+#include "gtkalias.h"
 
 #define GTK_LABEL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_LABEL, GtkLabelPrivate))
 
 typedef struct
 {
+  gint wrap_width;
   gint width_chars;
   gint max_width_chars;
-  guint single_line_mode : 1;
-  guint have_transform : 1;
-  gdouble angle;
-}
-GtkLabelPrivate;
+
+  gboolean mnemonics_visible;
+} GtkLabelPrivate;
+
+/* Notes about the handling of links:
+ *
+ * Links share the GtkLabelSelectionInfo struct with selectable labels.
+ * There are some new fields for links. The links field contains the list
+ * of GtkLabelLink structs that describe the links which are embedded in
+ * the label. The active_link field points to the link under the mouse
+ * pointer. For keyboard navigation, the 'focus' link is determined by
+ * finding the link which contains the selection_anchor position.
+ * The link_clicked field is used with button press and release events
+ * to ensure that pressing inside a link and releasing outside of it
+ * does not activate the link.
+ *
+ * Links are rendered with the link-color/visited-link-color colors
+ * that are determined by the style and with an underline. When the mouse
+ * pointer is over a link, the pointer is changed to indicate the link,
+ * and the background behind the link is rendered with the base[PRELIGHT]
+ * color. While a button is pressed over a link, the background is rendered
+ * with the base[ACTIVE] color.
+ *
+ * Labels with links accept keyboard focus, and it is possible to move
+ * the focus between the embedded links using Tab/Shift-Tab. The focus
+ * is indicated by a focus rectangle that is drawn around the link text.
+ * Pressing Enter activates the focussed link, and there is a suitable
+ * context menu for links that can be opened with the Menu key. Pressing
+ * Control-C copies the link URI to the clipboard.
+ *
+ * In selectable labels with links, link functionality is only available
+ * when the selection is empty.
+ */
+typedef struct
+{
+  gchar *uri;
+  gchar *title;     /* the title attribute, used as tooltip */
+  gboolean visited; /* get set when the link is activated; this flag
+                     * gets preserved over later set_markup() calls
+                     */
+  gint start;       /* position of the link in the PangoLayout */
+  gint end;
+} GtkLabelLink;
 
 struct _GtkLabelSelectionInfo
 {
@@ -61,17 +108,25 @@ struct _GtkLabelSelectionInfo
   gint selection_anchor;
   gint selection_end;
   GtkWidget *popup_menu;
-  
+
+  GList *links;
+  GtkLabelLink *active_link;
+
   gint drag_start_x;
   gint drag_start_y;
 
-  guint in_drag : 1;
+  guint in_drag      : 1;
+  guint select_words : 1;
+  guint selectable   : 1;
+  guint link_clicked : 1;
 };
 
 enum {
   MOVE_CURSOR,
   COPY_CLIPBOARD,
   POPULATE_POPUP,
+  ACTIVATE_LINK,
+  ACTIVATE_CURRENT_LINK,
   LAST_SIGNAL
 };
 
@@ -84,6 +139,7 @@ enum {
   PROP_JUSTIFY,
   PROP_PATTERN,
   PROP_WRAP,
+  PROP_WRAP_MODE,
   PROP_SELECTABLE,
   PROP_MNEMONIC_KEYVAL,
   PROP_MNEMONIC_WIDGET,
@@ -93,13 +149,15 @@ enum {
   PROP_WIDTH_CHARS,
   PROP_SINGLE_LINE_MODE,
   PROP_ANGLE,
-  PROP_MAX_WIDTH_CHARS
+  PROP_MAX_WIDTH_CHARS,
+  PROP_TRACK_VISITED_LINKS
 };
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-static void gtk_label_class_init        (GtkLabelClass    *klass);
-static void gtk_label_init              (GtkLabel         *label);
+static const GdkColor default_link_color = { 0, 0, 0, 0xeeee };
+static const GdkColor default_visited_link_color = { 0, 0x5555, 0x1a1a, 0x8b8b };
+
 static void gtk_label_set_property      (GObject          *object,
                                         guint             prop_id,
                                         const GValue     *value,
@@ -122,6 +180,8 @@ static void gtk_label_direction_changed (GtkWidget        *widget,
                                         GtkTextDirection  previous_dir);
 static gint gtk_label_expose            (GtkWidget        *widget,
                                         GdkEventExpose   *event);
+static gboolean gtk_label_focus         (GtkWidget         *widget,
+                                         GtkDirectionType   direction);
 
 static void gtk_label_realize           (GtkWidget        *widget);
 static void gtk_label_unrealize         (GtkWidget        *widget);
@@ -134,7 +194,16 @@ static gboolean gtk_label_button_release    (GtkWidget        *widget,
                                             GdkEventButton   *event);
 static gboolean gtk_label_motion            (GtkWidget        *widget,
                                             GdkEventMotion   *event);
+static gboolean gtk_label_leave_notify      (GtkWidget        *widget,
+                                             GdkEventCrossing *event);
 
+static void     gtk_label_grab_focus        (GtkWidget        *widget);
+
+static gboolean gtk_label_query_tooltip     (GtkWidget        *widget,
+                                             gint              x,
+                                             gint              y,
+                                             gboolean          keyboard_tip,
+                                             GtkTooltip       *tooltip);
 
 static void gtk_label_set_text_internal          (GtkLabel      *label,
                                                  gchar         *str);
@@ -149,8 +218,9 @@ static void gtk_label_set_attributes_internal    (GtkLabel      *label,
 static void gtk_label_set_uline_text_internal    (GtkLabel      *label,
                                                  const gchar   *str);
 static void gtk_label_set_pattern_internal       (GtkLabel      *label,
-                                                 const gchar   *pattern);
-static void set_markup                           (GtkLabel      *label,
+                                                 const gchar   *pattern,
+                                                  gboolean       is_mnemonic);
+static void gtk_label_set_markup_internal        (GtkLabel      *label,
                                                  const gchar   *str,
                                                  gboolean       with_uline);
 static void gtk_label_recalculate                (GtkLabel      *label);
@@ -158,11 +228,16 @@ static void gtk_label_hierarchy_changed          (GtkWidget     *widget,
                                                  GtkWidget     *old_toplevel);
 static void gtk_label_screen_changed             (GtkWidget     *widget,
                                                  GdkScreen     *old_screen);
+static gboolean gtk_label_popup_menu             (GtkWidget     *widget);
 
 static void gtk_label_create_window       (GtkLabel *label);
 static void gtk_label_destroy_window      (GtkLabel *label);
+static void gtk_label_ensure_select_info  (GtkLabel *label);
+static void gtk_label_clear_select_info   (GtkLabel *label);
+static void gtk_label_update_cursor       (GtkLabel *label);
 static void gtk_label_clear_layout        (GtkLabel *label);
 static void gtk_label_ensure_layout       (GtkLabel *label);
+static void gtk_label_invalidate_wrap_width (GtkLabel *label);
 static void gtk_label_select_region_index (GtkLabel *label,
                                            gint      anchor_index,
                                            gint      end_index);
@@ -177,8 +252,29 @@ static void     gtk_label_drag_data_get     (GtkWidget         *widget,
                                             guint              info,
                                             guint              time);
 
+static void     gtk_label_buildable_interface_init     (GtkBuildableIface *iface);
+static gboolean gtk_label_buildable_custom_tag_start   (GtkBuildable     *buildable,
+                                                       GtkBuilder       *builder,
+                                                       GObject          *child,
+                                                       const gchar      *tagname,
+                                                       GMarkupParser    *parser,
+                                                       gpointer         *data);
+
+static void     gtk_label_buildable_custom_finished    (GtkBuildable     *buildable,
+                                                       GtkBuilder       *builder,
+                                                       GObject          *child,
+                                                       const gchar      *tagname,
+                                                       gpointer          user_data);
 
-/* For selectable lables: */
+
+static void connect_mnemonics_visible_notify    (GtkLabel   *label);
+static gboolean      separate_uline_pattern     (const gchar  *str,
+                                                 guint        *accel_key,
+                                                 gchar       **new_str,
+                                                 gchar       **pattern);
+
+
+/* For selectable labels: */
 static void gtk_label_move_cursor        (GtkLabel        *label,
                                          GtkMovementStep  step,
                                          gint             count,
@@ -187,41 +283,31 @@ static void gtk_label_copy_clipboard     (GtkLabel        *label);
 static void gtk_label_select_all         (GtkLabel        *label);
 static void gtk_label_do_popup           (GtkLabel        *label,
                                          GdkEventButton  *event);
-
 static gint gtk_label_move_forward_word  (GtkLabel        *label,
                                          gint             start);
 static gint gtk_label_move_backward_word (GtkLabel        *label,
                                          gint             start);
 
-static GtkMiscClass *parent_class = NULL;
+/* For links: */
+static void          gtk_label_rescan_links     (GtkLabel  *label);
+static void          gtk_label_clear_links      (GtkLabel  *label);
+static gboolean      gtk_label_activate_link    (GtkLabel    *label,
+                                                 const gchar *uri);
+static void          gtk_label_activate_current_link (GtkLabel *label);
+static GtkLabelLink *gtk_label_get_current_link (GtkLabel  *label);
+static void          gtk_label_get_link_colors  (GtkWidget  *widget,
+                                                 GdkColor  **link_color,
+                                                 GdkColor  **visited_link_color);
+static void          emit_activate_link         (GtkLabel     *label,
+                                                 GtkLabelLink *link);
 
+static GQuark quark_angle = 0;
 
-GType
-gtk_label_get_type (void)
-{
-  static GType label_type = 0;
-  
-  if (!label_type)
-    {
-      static const GTypeInfo label_info =
-      {
-       sizeof (GtkLabelClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_label_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkLabel),
-       32,             /* n_preallocs */
-       (GInstanceInitFunc) gtk_label_init,
-      };
+static GtkBuildableIface *buildable_parent_iface = NULL;
 
-      label_type = g_type_register_static (GTK_TYPE_MISC, "GtkLabel",
-                                          &label_info, 0);
-    }
-  
-  return label_type;
-}
+G_DEFINE_TYPE_WITH_CODE (GtkLabel, gtk_label, GTK_TYPE_MISC,
+                        G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
+                                               gtk_label_buildable_interface_init));
 
 static void
 add_move_binding (GtkBindingSet  *binding_set,
@@ -233,14 +319,14 @@ add_move_binding (GtkBindingSet  *binding_set,
   g_return_if_fail ((modmask & GDK_SHIFT_MASK) == 0);
   
   gtk_binding_entry_add_signal (binding_set, keyval, modmask,
-                               "move_cursor", 3,
+                               "move-cursor", 3,
                                G_TYPE_ENUM, step,
                                G_TYPE_INT, count,
                                G_TYPE_BOOLEAN, FALSE);
 
   /* Selection-extending version */
   gtk_binding_entry_add_signal (binding_set, keyval, modmask | GDK_SHIFT_MASK,
-                               "move_cursor", 3,
+                               "move-cursor", 3,
                                G_TYPE_ENUM, step,
                                G_TYPE_INT, count,
                                G_TYPE_BOOLEAN, TRUE);
@@ -254,18 +340,19 @@ gtk_label_class_init (GtkLabelClass *class)
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
   GtkBindingSet *binding_set;
 
-  parent_class = g_type_class_peek_parent (class);
-  
+  quark_angle = g_quark_from_static_string ("angle");
+
   gobject_class->set_property = gtk_label_set_property;
   gobject_class->get_property = gtk_label_get_property;
   gobject_class->finalize = gtk_label_finalize;
 
   object_class->destroy = gtk_label_destroy;
-  
+
   widget_class->size_request = gtk_label_size_request;
   widget_class->size_allocate = gtk_label_size_allocate;
   widget_class->state_changed = gtk_label_state_changed;
   widget_class->style_set = gtk_label_style_set;
+  widget_class->query_tooltip = gtk_label_query_tooltip;
   widget_class->direction_changed = gtk_label_direction_changed;
   widget_class->expose_event = gtk_label_expose;
   widget_class->realize = gtk_label_realize;
@@ -275,16 +362,48 @@ gtk_label_class_init (GtkLabelClass *class)
   widget_class->button_press_event = gtk_label_button_press;
   widget_class->button_release_event = gtk_label_button_release;
   widget_class->motion_notify_event = gtk_label_motion;
+  widget_class->leave_notify_event = gtk_label_leave_notify;
   widget_class->hierarchy_changed = gtk_label_hierarchy_changed;
   widget_class->screen_changed = gtk_label_screen_changed;
   widget_class->mnemonic_activate = gtk_label_mnemonic_activate;
   widget_class->drag_data_get = gtk_label_drag_data_get;
+  widget_class->grab_focus = gtk_label_grab_focus;
+  widget_class->popup_menu = gtk_label_popup_menu;
+  widget_class->focus = gtk_label_focus;
 
   class->move_cursor = gtk_label_move_cursor;
   class->copy_clipboard = gtk_label_copy_clipboard;
-  
+  class->activate_link = gtk_label_activate_link;
+
+  /**
+   * GtkLabel::move-cursor:
+   * @entry: the object which received the signal
+   * @step: the granularity of the move, as a #GtkMovementStep
+   * @count: the number of @step units to move
+   * @extend_selection: %TRUE if the move should extend the selection
+   *
+   * The ::move-cursor signal is a
+   * <link linkend="keybinding-signals">keybinding signal</link>
+   * which gets emitted when the user initiates a cursor movement.
+   * If the cursor is not visible in @entry, this signal causes
+   * the viewport to be moved instead.
+   *
+   * Applications should not connect to it, but may emit it with
+   * g_signal_emit_by_name() if they need to control the cursor
+   * programmatically.
+   *
+   * The default bindings for this signal come in two variants,
+   * the variant with the Shift modifier extends the selection,
+   * the variant without the Shift modifer does not.
+   * There are too many key combinations to list them all here.
+   * <itemizedlist>
+   * <listitem>Arrow keys move by individual characters/lines</listitem>
+   * <listitem>Ctrl-arrow key combinations move by words/paragraphs</listitem>
+   * <listitem>Home/End keys move to the ends of the buffer</listitem>
+   * </itemizedlist>
+   */
   signals[MOVE_CURSOR] = 
-    g_signal_new ("move_cursor",
+    g_signal_new (I_("move-cursor"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkLabelClass, move_cursor),
@@ -294,9 +413,19 @@ gtk_label_class_init (GtkLabelClass *class)
                  GTK_TYPE_MOVEMENT_STEP,
                  G_TYPE_INT,
                  G_TYPE_BOOLEAN);
-  
+
+   /**
+   * GtkLabel::copy-clipboard:
+   * @label: the object which received the signal
+   *
+   * The ::copy-clipboard signal is a
+   * <link linkend="keybinding-signals">keybinding signal</link>
+   * which gets emitted to copy the selection to the clipboard.
+   *
+   * The default binding for this signal is Ctrl-c.
+   */ 
   signals[COPY_CLIPBOARD] =
-    g_signal_new ("copy_clipboard",
+    g_signal_new (I_("copy-clipboard"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkLabelClass, copy_clipboard),
@@ -304,8 +433,20 @@ gtk_label_class_init (GtkLabelClass *class)
                  _gtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
   
+  /**
+   * GtkLabel::populate-popup:
+   * @label: The label on which the signal is emitted
+   * @menu: the menu that is being populated
+   *
+   * The ::populate-popup signal gets emitted before showing the
+   * context menu of the label. Note that only selectable labels
+   * have context menus.
+   *
+   * If you need to add items to the context menu, connect
+   * to this signal and append your menuitems to the @menu.
+   */
   signals[POPULATE_POPUP] =
-    g_signal_new ("populate_popup",
+    g_signal_new (I_("populate-popup"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkLabelClass, populate_popup),
@@ -314,34 +455,79 @@ gtk_label_class_init (GtkLabelClass *class)
                  G_TYPE_NONE, 1,
                  GTK_TYPE_MENU);
 
+    /**
+     * GtkLabel::activate-current-link:
+     * @label: The label on which the signal was emitted
+     *
+     * A <link linkend="keybinding-signals">keybinding signal</link>
+     * which gets emitted when the user activates a link in the label.
+     *
+     * Applications may also emit the signal with g_signal_emit_by_name()
+     * if they need to control activation of URIs programmatically.
+     *
+     * The default bindings for this signal are all forms of the Enter key.
+     *
+     * Since: 2.18
+     */
+    signals[ACTIVATE_CURRENT_LINK] =
+      g_signal_new_class_handler ("activate-current-link",
+                                  G_TYPE_FROM_CLASS (object_class),
+                                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                  G_CALLBACK (gtk_label_activate_current_link),
+                                  NULL, NULL,
+                                  _gtk_marshal_VOID__VOID,
+                                  G_TYPE_NONE, 0);
+
+    /**
+     * GtkLabel::activate-link:
+     * @label: The label on which the signal was emitted
+     * @uri: the URI that is activated
+     *
+     * The signal which gets emitted to activate a URI.
+     * Applications may connect to it to override the default behaviour,
+     * which is to call gtk_show_uri().
+     *
+     * Returns: %TRUE if the link has been activated
+     *
+     * Since: 2.18
+     */
+    signals[ACTIVATE_LINK] =
+      g_signal_new ("activate-link",
+                    G_TYPE_FROM_CLASS (object_class),
+                    G_SIGNAL_RUN_LAST,
+                    G_STRUCT_OFFSET (GtkLabelClass, activate_link),
+                    _gtk_boolean_handled_accumulator, NULL,
+                    _gtk_marshal_BOOLEAN__STRING,
+                    G_TYPE_BOOLEAN, 1, G_TYPE_STRING);
+
   g_object_class_install_property (gobject_class,
                                    PROP_LABEL,
                                    g_param_spec_string ("label",
                                                         P_("Label"),
                                                         P_("The text of the label"),
-                                                        NULL,
-                                                        G_PARAM_READWRITE));
+                                                        "",
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_ATTRIBUTES,
                                   g_param_spec_boxed ("attributes",
                                                       P_("Attributes"),
                                                       P_("A list of style attributes to apply to the text of the label"),
                                                       PANGO_TYPE_ATTR_LIST,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_USE_MARKUP,
-                                   g_param_spec_boolean ("use_markup",
+                                   g_param_spec_boolean ("use-markup",
                                                         P_("Use markup"),
                                                         P_("The text of the label includes XML markup. See pango_parse_markup()"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_USE_UNDERLINE,
-                                   g_param_spec_boolean ("use_underline",
+                                   g_param_spec_boolean ("use-underline",
                                                         P_("Use underline"),
                                                         P_("If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                   PROP_JUSTIFY,
@@ -350,7 +536,7 @@ gtk_label_class_init (GtkLabelClass *class)
                                                       P_("The alignment of the lines in the text of the label relative to each other. This does NOT affect the alignment of the label within its allocation. See GtkMisc::xalign for that"),
                                                      GTK_TYPE_JUSTIFICATION,
                                                      GTK_JUSTIFY_LEFT,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_PATTERN,
@@ -358,7 +544,7 @@ gtk_label_class_init (GtkLabelClass *class)
                                                         P_("Pattern"),
                                                         P_("A string with _ characters in positions correspond to characters in the text to underline"),
                                                         NULL,
-                                                        G_PARAM_WRITABLE));
+                                                        GTK_PARAM_WRITABLE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_WRAP,
@@ -366,64 +552,83 @@ gtk_label_class_init (GtkLabelClass *class)
                                                         P_("Line wrap"),
                                                         P_("If set, wrap lines if the text becomes too wide"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
+  /**
+   * GtkLabel:wrap-mode:
+   *
+   * If line wrapping is on (see the #GtkLabel:wrap property) this controls 
+   * how the line wrapping is done. The default is %PANGO_WRAP_WORD, which 
+   * means wrap on word boundaries.
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_WRAP_MODE,
+                                   g_param_spec_enum ("wrap-mode",
+                                                     P_("Line wrap mode"),
+                                                     P_("If wrap is set, controls how linewrapping is done"),
+                                                     PANGO_TYPE_WRAP_MODE,
+                                                     PANGO_WRAP_WORD,
+                                                     GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_SELECTABLE,
                                    g_param_spec_boolean ("selectable",
                                                         P_("Selectable"),
                                                         P_("Whether the label text can be selected with the mouse"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_MNEMONIC_KEYVAL,
-                                   g_param_spec_uint ("mnemonic_keyval",
+                                   g_param_spec_uint ("mnemonic-keyval",
                                                      P_("Mnemonic key"),
                                                      P_("The mnemonic accelerator key for this label"),
                                                      0,
                                                      G_MAXUINT,
                                                      GDK_VoidSymbol,
-                                                     G_PARAM_READABLE));
+                                                     GTK_PARAM_READABLE));
   g_object_class_install_property (gobject_class,
                                    PROP_MNEMONIC_WIDGET,
-                                   g_param_spec_object ("mnemonic_widget",
+                                   g_param_spec_object ("mnemonic-widget",
                                                        P_("Mnemonic widget"),
                                                        P_("The widget to be activated when the label's mnemonic "
                                                          "key is pressed"),
                                                        GTK_TYPE_WIDGET,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_CURSOR_POSITION,
-                                   g_param_spec_int ("cursor_position",
+                                   g_param_spec_int ("cursor-position",
                                                      P_("Cursor Position"),
                                                      P_("The current position of the insertion cursor in chars"),
                                                      0,
                                                      G_MAXINT,
                                                      0,
-                                                     G_PARAM_READABLE));
+                                                     GTK_PARAM_READABLE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_SELECTION_BOUND,
-                                   g_param_spec_int ("selection_bound",
+                                   g_param_spec_int ("selection-bound",
                                                      P_("Selection Bound"),
                                                      P_("The position of the opposite end of the selection from the cursor in chars"),
                                                      0,
                                                      G_MAXINT,
                                                      0,
-                                                     G_PARAM_READABLE));
+                                                     GTK_PARAM_READABLE));
   
   /**
    * GtkLabel:ellipsize:
    *
-   * The preferred place to ellipsize the string, if the label does not have 
-   * enough room to display the entire string, specified as a #PangoEllisizeMode. 
+   * The preferred place to ellipsize the string, if the label does 
+   * not have enough room to display the entire string, specified as a 
+   * #PangoEllisizeMode. 
    *
-   * Note that setting this property to a value other than %PANGO_ELLIPSIZE_NONE 
-   * has the side-effect that the label requests only enough space to display the
-   * ellipsis "...". In particular, this means that ellipsizing labels don't
-   * work well in notebook tabs, unless the tab's ::tab-expand property is set
-   * to %TRUE. Other means to set a label's width are
-   * gtk_widget_set_size_request() and gtk_label_set_width_chars().
+   * Note that setting this property to a value other than 
+   * %PANGO_ELLIPSIZE_NONE has the side-effect that the label requests 
+   * only enough space to display the ellipsis "...". In particular, this 
+   * means that ellipsizing labels do not work well in notebook tabs, unless 
+   * the tab's #GtkNotebook:tab-expand property is set to %TRUE. Other ways
+   * to set a label's width are gtk_widget_set_size_request() and
+   * gtk_label_set_width_chars().
    *
    * Since: 2.6
    */
@@ -431,10 +636,10 @@ gtk_label_class_init (GtkLabelClass *class)
                                   PROP_ELLIPSIZE,
                                    g_param_spec_enum ("ellipsize",
                                                       P_("Ellipsize"),
-                                                      P_("The preferred place to ellipsize the string, if the label does not have enough room to display the entire string, if at all"),
+                                                      P_("The preferred place to ellipsize the string, if the label does not have enough room to display the entire string"),
                                                      PANGO_TYPE_ELLIPSIZE_MODE,
                                                      PANGO_ELLIPSIZE_NONE,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   /**
    * GtkLabel:width-chars:
@@ -442,20 +647,20 @@ gtk_label_class_init (GtkLabelClass *class)
    * The desired width of the label, in characters. If this property is set to
    * -1, the width will be calculated automatically, otherwise the label will
    * request either 3 characters or the property value, whichever is greater.
-   * If the width-chars property is set to a positive value, then the 
-   * max-width-chars property is ignored. 
+   * If the "width-chars" property is set to a positive value, then the 
+   * #GtkLabel:max-width-chars property is ignored. 
    *
    * Since: 2.6
    **/
   g_object_class_install_property (gobject_class,
                                    PROP_WIDTH_CHARS,
-                                   g_param_spec_int ("width_chars",
+                                   g_param_spec_int ("width-chars",
                                                      P_("Width In Characters"),
                                                      P_("The desired width of the label, in characters"),
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   
   /**
    * GtkLabel:single-line-mode:
@@ -474,7 +679,7 @@ gtk_label_class_init (GtkLabelClass *class)
                                                         P_("Single Line Mode"),
                                                         P_("Whether the label is in single line mode"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   /**
    * GtkLabel:angle:
@@ -494,28 +699,45 @@ gtk_label_class_init (GtkLabelClass *class)
                                                        0.0,
                                                        360.0,
                                                        0.0, 
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
   
   /**
    * GtkLabel:max-width-chars:
    * 
-   * The desired width maximal of the label, in characters. If this property 
+   * The desired maximum width of the label, in characters. If this property 
    * is set to -1, the width will be calculated automatically, otherwise the 
    * label will request space for no more than the requested number of 
-   * characters. If the width-chars property is set to a positive value,
-   * then the max-width-chars property is ignored.
+   * characters. If the #GtkLabel:width-chars property is set to a positive 
+   * value, then the "max-width-chars" property is ignored.
    * 
    * Since: 2.6
    **/
   g_object_class_install_property (gobject_class,
                                    PROP_MAX_WIDTH_CHARS,
-                                   g_param_spec_int ("max_width_chars",
-                                                     P_("Maximal Width In Characters"),
-                                                     P_("The desired maximal width of the label, in characters"),
+                                   g_param_spec_int ("max-width-chars",
+                                                     P_("Maximum Width In Characters"),
+                                                     P_("The desired maximum width of the label, in characters"),
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
+
+  /**
+   * GtkLabel:track-visited-links:
+   *
+   * Set this property to %TRUE to make the label track which links
+   * have been clicked. It will then apply the ::visited-link-color
+   * color, instead of ::link-color.
+   *
+   * Since: 2.18
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_TRACK_VISITED_LINKS,
+                                   g_param_spec_boolean ("track-visited-links",
+                                                         P_("Track visited links"),
+                                                         P_("Whether visited links should be tracked"),
+                                                         TRUE,
+                                                         GTK_PARAM_READWRITE));
   /*
    * Key bindings
    */
@@ -552,12 +774,44 @@ gtk_label_class_init (GtkLabelClass *class)
 
   add_move_binding (binding_set, GDK_KP_Left, GDK_CONTROL_MASK,
                    GTK_MOVEMENT_WORDS, -1);
-  
-  add_move_binding (binding_set, GDK_a, GDK_CONTROL_MASK,
-                   GTK_MOVEMENT_PARAGRAPH_ENDS, -1);
 
-  add_move_binding (binding_set, GDK_e, GDK_CONTROL_MASK,
-                   GTK_MOVEMENT_PARAGRAPH_ENDS, 1);
+  /* select all */
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
+                               "move-cursor", 3,
+                               G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
+                               G_TYPE_INT, -1,
+                               G_TYPE_BOOLEAN, FALSE);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
+                               "move-cursor", 3,
+                               G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
+                               G_TYPE_INT, 1,
+                               G_TYPE_BOOLEAN, TRUE);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
+                               "move-cursor", 3,
+                               G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
+                               G_TYPE_INT, -1,
+                               G_TYPE_BOOLEAN, FALSE);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
+                               "move-cursor", 3,
+                               G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
+                               G_TYPE_INT, 1,
+                               G_TYPE_BOOLEAN, TRUE);
+
+  /* unselect all */
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+                               "move-cursor", 3,
+                               G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
+                               G_TYPE_INT, 0,
+                               G_TYPE_BOOLEAN, FALSE);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_backslash, GDK_CONTROL_MASK,
+                               "move-cursor", 3,
+                               G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
+                               G_TYPE_INT, 0,
+                               G_TYPE_BOOLEAN, FALSE);
 
   add_move_binding (binding_set, GDK_f, GDK_MOD1_MASK,
                    GTK_MOVEMENT_WORDS, 1);
@@ -591,7 +845,21 @@ gtk_label_class_init (GtkLabelClass *class)
 
   /* copy */
   gtk_binding_entry_add_signal (binding_set, GDK_c, GDK_CONTROL_MASK,
-                               "copy_clipboard", 0);
+                               "copy-clipboard", 0);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Return, 0,
+                               "activate-current-link", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0,
+                               "activate-current-link", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0,
+                               "activate-current-link", 0);
+
+  gtk_settings_install_property (g_param_spec_boolean ("gtk-label-select-on-focus",
+                                                      P_("Select on focus"),
+                                                      P_("Whether to select the contents of a selectable label when it is focused"),
+                                                      TRUE,
+                                                      GTK_PARAM_READWRITE));
+
                                
   g_type_class_add_private (class, sizeof (GtkLabelPrivate));
 }
@@ -629,6 +897,9 @@ gtk_label_set_property (GObject      *object,
     case PROP_WRAP:
       gtk_label_set_line_wrap (label, g_value_get_boolean (value));
       break;     
+    case PROP_WRAP_MODE:
+      gtk_label_set_line_wrap_mode (label, g_value_get_enum (value));
+      break;     
     case PROP_SELECTABLE:
       gtk_label_set_selectable (label, g_value_get_boolean (value));
       break;     
@@ -650,6 +921,9 @@ gtk_label_set_property (GObject      *object,
     case PROP_MAX_WIDTH_CHARS:
       gtk_label_set_max_width_chars (label, g_value_get_int (value));
       break;
+    case PROP_TRACK_VISITED_LINKS:
+      gtk_label_set_track_visited_links (label, g_value_get_boolean (value));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -686,6 +960,9 @@ gtk_label_get_property (GObject     *object,
     case PROP_WRAP:
       g_value_set_boolean (value, label->wrap);
       break;
+    case PROP_WRAP_MODE:
+      g_value_set_enum (value, label->wrap_mode);
+      break;
     case PROP_SELECTABLE:
       g_value_set_boolean (value, gtk_label_get_selectable (label));
       break;
@@ -696,7 +973,7 @@ gtk_label_get_property (GObject     *object,
       g_value_set_object (value, (GObject*) label->mnemonic_widget);
       break;
     case PROP_CURSOR_POSITION:
-      if (label->select_info)
+      if (label->select_info && label->select_info->selectable)
        {
          gint offset = g_utf8_pointer_to_offset (label->text,
                                                  label->text + label->select_info->selection_end);
@@ -706,7 +983,7 @@ gtk_label_get_property (GObject     *object,
        g_value_set_int (value, 0);
       break;
     case PROP_SELECTION_BOUND:
-      if (label->select_info)
+      if (label->select_info && label->select_info->selectable)
        {
          gint offset = g_utf8_pointer_to_offset (label->text,
                                                  label->text + label->select_info->selection_anchor);
@@ -730,7 +1007,9 @@ gtk_label_get_property (GObject     *object,
     case PROP_MAX_WIDTH_CHARS:
       g_value_set_int (value, gtk_label_get_max_width_chars (label));
       break;
-
+    case PROP_TRACK_VISITED_LINKS:
+      g_value_set_boolean (value, gtk_label_get_track_visited_links (label));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -746,17 +1025,20 @@ gtk_label_init (GtkLabel *label)
 
   priv = GTK_LABEL_GET_PRIVATE (label);
   priv->width_chars = -1;
-  priv->angle = 0.0;
   priv->max_width_chars = -1;
+  priv->wrap_width = -1;
   label->label = NULL;
 
   label->jtype = GTK_JUSTIFY_LEFT;
   label->wrap = FALSE;
+  label->wrap_mode = PANGO_WRAP_WORD;
   label->ellipsize = PANGO_ELLIPSIZE_NONE;
 
   label->use_underline = FALSE;
   label->use_markup = FALSE;
-  
+  label->pattern_set = FALSE;
+  label->track_links = TRUE;
+
   label->mnemonic_keyval = GDK_VoidSymbol;
   label->layout = NULL;
   label->text = NULL;
@@ -764,10 +1046,338 @@ gtk_label_init (GtkLabel *label)
 
   label->mnemonic_widget = NULL;
   label->mnemonic_window = NULL;
-  
+
+  priv->mnemonics_visible = TRUE;
+
   gtk_label_set_text (label, "");
 }
 
+
+static void
+gtk_label_buildable_interface_init (GtkBuildableIface *iface)
+{
+  buildable_parent_iface = g_type_interface_peek_parent (iface);
+
+  iface->custom_tag_start = gtk_label_buildable_custom_tag_start;
+  iface->custom_finished = gtk_label_buildable_custom_finished;
+}
+
+typedef struct {
+  GtkBuilder    *builder;
+  GObject       *object;
+  PangoAttrList *attrs;
+} PangoParserData;
+
+static PangoAttribute *
+attribute_from_text (GtkBuilder   *builder,
+                    const gchar  *name, 
+                    const gchar  *value,
+                    GError      **error)
+{
+  PangoAttribute *attribute = NULL;
+  PangoAttrType   type;
+  PangoLanguage  *language;
+  PangoFontDescription *font_desc;
+  GdkColor       *color;
+  GValue          val = { 0, };
+
+  if (!gtk_builder_value_from_string_type (builder, PANGO_TYPE_ATTR_TYPE, name, &val, error))
+    return NULL;
+
+  type = g_value_get_enum (&val);
+  g_value_unset (&val);
+
+  switch (type)
+    {
+      /* PangoAttrLanguage */
+    case PANGO_ATTR_LANGUAGE:
+      if ((language = pango_language_from_string (value)))
+       {
+         attribute = pango_attr_language_new (language);
+         g_value_init (&val, G_TYPE_INT);
+       }
+      break;
+      /* PangoAttrInt */
+    case PANGO_ATTR_STYLE:
+      if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_STYLE, value, &val, error))
+       attribute = pango_attr_style_new (g_value_get_enum (&val));
+      break;
+    case PANGO_ATTR_WEIGHT:
+      if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_WEIGHT, value, &val, error))
+       attribute = pango_attr_weight_new (g_value_get_enum (&val));
+      break;
+    case PANGO_ATTR_VARIANT:
+      if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_VARIANT, value, &val, error))
+       attribute = pango_attr_variant_new (g_value_get_enum (&val));
+      break;
+    case PANGO_ATTR_STRETCH:
+      if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_STRETCH, value, &val, error))
+       attribute = pango_attr_stretch_new (g_value_get_enum (&val));
+      break;
+    case PANGO_ATTR_UNDERLINE:
+      if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error))
+       attribute = pango_attr_underline_new (g_value_get_boolean (&val));
+      break;
+    case PANGO_ATTR_STRIKETHROUGH:     
+      if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error))
+       attribute = pango_attr_strikethrough_new (g_value_get_boolean (&val));
+      break;
+    case PANGO_ATTR_GRAVITY:
+      if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_GRAVITY, value, &val, error))
+       attribute = pango_attr_gravity_new (g_value_get_enum (&val));
+      break;
+    case PANGO_ATTR_GRAVITY_HINT:
+      if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_GRAVITY_HINT, 
+                                             value, &val, error))
+       attribute = pango_attr_gravity_hint_new (g_value_get_enum (&val));
+      break;
+
+      /* PangoAttrString */      
+    case PANGO_ATTR_FAMILY:
+      attribute = pango_attr_family_new (value);
+      g_value_init (&val, G_TYPE_INT);
+      break;
+
+      /* PangoAttrSize */        
+    case PANGO_ATTR_SIZE:
+      if (gtk_builder_value_from_string_type (builder, G_TYPE_INT, 
+                                             value, &val, error))
+       attribute = pango_attr_size_new (g_value_get_int (&val));
+      break;
+    case PANGO_ATTR_ABSOLUTE_SIZE:
+      if (gtk_builder_value_from_string_type (builder, G_TYPE_INT, 
+                                             value, &val, error))
+       attribute = pango_attr_size_new_absolute (g_value_get_int (&val));
+      break;
+    
+      /* PangoAttrFontDesc */
+    case PANGO_ATTR_FONT_DESC:
+      if ((font_desc = pango_font_description_from_string (value)))
+       {
+         attribute = pango_attr_font_desc_new (font_desc);
+         pango_font_description_free (font_desc);
+         g_value_init (&val, G_TYPE_INT);
+       }
+      break;
+
+      /* PangoAttrColor */
+    case PANGO_ATTR_FOREGROUND:
+      if (gtk_builder_value_from_string_type (builder, GDK_TYPE_COLOR, 
+                                             value, &val, error))
+       {
+         color = g_value_get_boxed (&val);
+         attribute = pango_attr_foreground_new (color->red, color->green, color->blue);
+       }
+      break;
+    case PANGO_ATTR_BACKGROUND: 
+      if (gtk_builder_value_from_string_type (builder, GDK_TYPE_COLOR, 
+                                             value, &val, error))
+       {
+         color = g_value_get_boxed (&val);
+         attribute = pango_attr_background_new (color->red, color->green, color->blue);
+       }
+      break;
+    case PANGO_ATTR_UNDERLINE_COLOR:
+      if (gtk_builder_value_from_string_type (builder, GDK_TYPE_COLOR, 
+                                             value, &val, error))
+       {
+         color = g_value_get_boxed (&val);
+         attribute = pango_attr_underline_color_new (color->red, color->green, color->blue);
+       }
+      break;
+    case PANGO_ATTR_STRIKETHROUGH_COLOR:
+      if (gtk_builder_value_from_string_type (builder, GDK_TYPE_COLOR, 
+                                             value, &val, error))
+       {
+         color = g_value_get_boxed (&val);
+         attribute = pango_attr_strikethrough_color_new (color->red, color->green, color->blue);
+       }
+      break;
+      
+      /* PangoAttrShape */
+    case PANGO_ATTR_SHAPE:
+      /* Unsupported for now */
+      break;
+      /* PangoAttrFloat */
+    case PANGO_ATTR_SCALE:
+      if (gtk_builder_value_from_string_type (builder, G_TYPE_DOUBLE, 
+                                             value, &val, error))
+       attribute = pango_attr_scale_new (g_value_get_double (&val));
+      break;
+
+    case PANGO_ATTR_INVALID:
+    case PANGO_ATTR_LETTER_SPACING:
+    case PANGO_ATTR_RISE:
+    case PANGO_ATTR_FALLBACK:
+    default:
+      break;
+    }
+
+  g_value_unset (&val);
+
+  return attribute;
+}
+
+
+static void
+pango_start_element (GMarkupParseContext *context,
+                    const gchar         *element_name,
+                    const gchar        **names,
+                    const gchar        **values,
+                    gpointer             user_data,
+                    GError             **error)
+{
+  PangoParserData *data = (PangoParserData*)user_data;
+  GValue val = { 0, };
+  guint i;
+  gint line_number, char_number;
+
+  if (strcmp (element_name, "attribute") == 0)
+    {
+      PangoAttribute *attr = NULL;
+      const gchar *name = NULL;
+      const gchar *value = NULL;
+      const gchar *start = NULL;
+      const gchar *end = NULL;
+      guint start_val = 0;
+      guint end_val   = G_MAXUINT;
+
+      for (i = 0; names[i]; i++)
+       {
+         if (strcmp (names[i], "name") == 0)
+           name = values[i];
+         else if (strcmp (names[i], "value") == 0)
+           value = values[i];
+         else if (strcmp (names[i], "start") == 0)
+           start = values[i];
+         else if (strcmp (names[i], "end") == 0)
+           end = values[i];
+         else
+           {
+             g_markup_parse_context_get_position (context,
+                                                  &line_number,
+                                                  &char_number);
+             g_set_error (error,
+                          GTK_BUILDER_ERROR,
+                          GTK_BUILDER_ERROR_INVALID_ATTRIBUTE,
+                          "%s:%d:%d '%s' is not a valid attribute of <%s>",
+                          "<input>",
+                          line_number, char_number, names[i], "attribute");
+             return;
+           }
+       }
+
+      if (!name || !value)
+       {
+         g_markup_parse_context_get_position (context,
+                                              &line_number,
+                                              &char_number);
+         g_set_error (error,
+                      GTK_BUILDER_ERROR,
+                      GTK_BUILDER_ERROR_MISSING_ATTRIBUTE,
+                      "%s:%d:%d <%s> requires attribute \"%s\"",
+                      "<input>",
+                      line_number, char_number, "attribute",
+                      name ? "value" : "name");
+         return;
+       }
+
+      if (start)
+       {
+         if (!gtk_builder_value_from_string_type (data->builder, G_TYPE_UINT, 
+                                                  start, &val, error))
+           return;
+         start_val = g_value_get_uint (&val);
+         g_value_unset (&val);
+       }
+
+      if (end)
+       {
+         if (!gtk_builder_value_from_string_type (data->builder, G_TYPE_UINT, 
+                                                  end, &val, error))
+           return;
+         end_val = g_value_get_uint (&val);
+         g_value_unset (&val);
+       }
+
+      attr = attribute_from_text (data->builder, name, value, error);
+      attr->start_index = start_val;
+      attr->end_index   = end_val;
+
+      if (attr)
+       {
+         if (!data->attrs)
+           data->attrs = pango_attr_list_new ();
+
+         pango_attr_list_insert (data->attrs, attr);
+       }
+    }
+  else if (strcmp (element_name, "attributes") == 0)
+    ;
+  else
+    g_warning ("Unsupported tag for GtkLabel: %s\n", element_name);
+}
+
+static const GMarkupParser pango_parser =
+  {
+    pango_start_element,
+  };
+
+static gboolean
+gtk_label_buildable_custom_tag_start (GtkBuildable     *buildable,
+                                     GtkBuilder       *builder,
+                                     GObject          *child,
+                                     const gchar      *tagname,
+                                     GMarkupParser    *parser,
+                                     gpointer         *data)
+{
+  if (buildable_parent_iface->custom_tag_start (buildable, builder, child, 
+                                               tagname, parser, data))
+    return TRUE;
+
+  if (strcmp (tagname, "attributes") == 0)
+    {
+      PangoParserData *parser_data;
+
+      parser_data = g_slice_new0 (PangoParserData);
+      parser_data->builder = g_object_ref (builder);
+      parser_data->object = g_object_ref (buildable);
+      *parser = pango_parser;
+      *data = parser_data;
+      return TRUE;
+    }
+  return FALSE;
+}
+
+static void
+gtk_label_buildable_custom_finished (GtkBuildable *buildable,
+                                    GtkBuilder   *builder,
+                                    GObject      *child,
+                                    const gchar  *tagname,
+                                    gpointer      user_data)
+{
+  PangoParserData *data;
+
+  buildable_parent_iface->custom_finished (buildable, builder, child, 
+                                          tagname, user_data);
+
+  if (strcmp (tagname, "attributes") == 0)
+    {
+      data = (PangoParserData*)user_data;
+
+      if (data->attrs)
+       {
+         gtk_label_set_attributes (GTK_LABEL (buildable), data->attrs);
+         pango_attr_list_unref (data->attrs);
+       }
+
+      g_object_unref (data->object);
+      g_object_unref (data->builder);
+      g_slice_free (PangoParserData, data);
+    }
+}
+
+
 /**
  * gtk_label_new:
  * @str: The text of the label
@@ -804,12 +1414,11 @@ gtk_label_new (const gchar *str)
  * to activate another widget, chosen automatically, or explicitly using
  * gtk_label_set_mnemonic_widget().
  * 
- * If gtk_label_set_mnemonic_widget()
- * is not called, then the first activatable ancestor of the #GtkLabel
- * will be chosen as the mnemonic widget. For instance, if the
- * label is inside a button or menu item, the button or menu item will
- * automatically become the mnemonic widget and be activated by
- * the mnemonic.
+ * If gtk_label_set_mnemonic_widget() is not called, then the first 
+ * activatable ancestor of the #GtkLabel will be chosen as the mnemonic 
+ * widget. For instance, if the label is inside a button or menu item, 
+ * the button or menu item will automatically become the mnemonic widget 
+ * and be activated by the mnemonic.
  *
  * Return value: the new #GtkLabel
  **/
@@ -840,23 +1449,23 @@ gtk_label_mnemonic_activate (GtkWidget *widget,
    */
   parent = widget->parent;
 
-  if (parent && GTK_IS_NOTEBOOK (parent))
+  if (GTK_IS_NOTEBOOK (parent))
     return FALSE;
   
   while (parent)
     {
       if (GTK_WIDGET_CAN_FOCUS (parent) ||
          (!group_cycling && GTK_WIDGET_GET_CLASS (parent)->activate_signal) ||
-          (parent->parent && GTK_IS_NOTEBOOK (parent->parent)) ||
-         (GTK_IS_MENU_ITEM (parent)))
+          GTK_IS_NOTEBOOK (parent->parent) ||
+         GTK_IS_MENU_ITEM (parent))
        return gtk_widget_mnemonic_activate (parent, group_cycling);
       parent = parent->parent;
     }
 
   /* barf if there was nothing to activate */
   g_warning ("Couldn't find a target for a mnemonic activation.");
-  gdk_display_beep (gtk_widget_get_display (widget));
-  
+  gtk_widget_error_bell (widget);
+
   return FALSE;
 }
 
@@ -889,10 +1498,12 @@ gtk_label_setup_mnemonic (GtkLabel *label,
     }
   
   if (label->mnemonic_keyval == GDK_VoidSymbol)
-    return;
+      goto done;
+
+  connect_mnemonics_visible_notify (GTK_LABEL (widget));
 
   toplevel = gtk_widget_get_toplevel (widget);
-  if (GTK_WIDGET_TOPLEVEL (toplevel))
+  if (gtk_widget_is_toplevel (toplevel))
     {
       GtkWidget *menu_shell;
       
@@ -907,7 +1518,7 @@ gtk_label_setup_mnemonic (GtkLabel *label,
          mnemonic_menu = menu_shell;
        }
       
-      if (!(menu_shell && GTK_IS_MENU (menu_shell)))
+      if (!GTK_IS_MENU (menu_shell))
        {
          gtk_window_add_mnemonic (GTK_WINDOW (toplevel),
                                   label->mnemonic_keyval,
@@ -916,7 +1527,8 @@ gtk_label_setup_mnemonic (GtkLabel *label,
        }
     }
   
-  g_object_set_data (G_OBJECT (label), "gtk-mnemonic-menu", mnemonic_menu);
+ done:
+  g_object_set_data (G_OBJECT (label), I_("gtk-mnemonic-menu"), mnemonic_menu);
 }
 
 static void
@@ -929,74 +1541,195 @@ gtk_label_hierarchy_changed (GtkWidget *widget,
 }
 
 static void
-gtk_label_screen_changed (GtkWidget *widget,
-                         GdkScreen *old_screen)
+label_shortcut_setting_apply (GtkLabel *label)
 {
-  gtk_label_clear_layout (GTK_LABEL (widget));
+  gtk_label_recalculate (label);
+  if (GTK_IS_ACCEL_LABEL (label))
+    gtk_accel_label_refetch (GTK_ACCEL_LABEL (label));
 }
 
 static void
-label_mnemonic_widget_weak_notify (gpointer      data,
-                                  GObject      *where_the_object_was)
+label_shortcut_setting_traverse_container (GtkWidget *widget,
+                                           gpointer   data)
 {
-  GtkLabel *label = data;
-
-  label->mnemonic_widget = NULL;
-  g_object_notify (G_OBJECT (label), "mnemonic_widget");
+  if (GTK_IS_LABEL (widget))
+    label_shortcut_setting_apply (GTK_LABEL (widget));
+  else if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget),
+                          label_shortcut_setting_traverse_container, data);
 }
 
-/**
- * gtk_label_set_mnemonic_widget:
- * @label: a #GtkLabel
- * @widget: the target #GtkWidget 
- *
- * If the label has been set so that it has an mnemonic key (using
- * i.e.  gtk_label_set_markup_with_mnemonic(),
- * gtk_label_set_text_with_mnemonic(), gtk_label_new_with_mnemonic()
- * or the "use_underline" property) the label can be associated with a
- * widget that is the target of the mnemonic. When the label is inside
- * a widget (like a #GtkButton or a #GtkNotebook tab) it is
- * automatically associated with the correct widget, but sometimes
- * (i.e. when the target is a #GtkEntry next to the label) you need to
- * set it explicitly using this function.
- *
- * The target widget will be accelerated by emitting "mnemonic_activate" on it.
- * The default handler for this signal will activate the widget if there are no
- * mnemonic collisions and toggle focus between the colliding widgets otherwise.
- **/
-void
-gtk_label_set_mnemonic_widget (GtkLabel  *label,
-                              GtkWidget *widget)
+static void
+label_shortcut_setting_changed (GtkSettings *settings)
 {
-  g_return_if_fail (GTK_IS_LABEL (label));
-  if (widget)
-    g_return_if_fail (GTK_IS_WIDGET (widget));
+  GList *list, *l;
 
-  if (label->mnemonic_widget)
-    {
-      gtk_widget_remove_mnemonic_label (label->mnemonic_widget, GTK_WIDGET (label));
-      g_object_weak_unref (G_OBJECT (label->mnemonic_widget),
-                          label_mnemonic_widget_weak_notify,
-                          label);
-    }
-  label->mnemonic_widget = widget;
-  if (label->mnemonic_widget)
+  list = gtk_window_list_toplevels ();
+
+  for (l = list; l ; l = l->next)
     {
-      g_object_weak_ref (G_OBJECT (label->mnemonic_widget),
-                        label_mnemonic_widget_weak_notify,
-                        label);
-      gtk_widget_add_mnemonic_label (label->mnemonic_widget, GTK_WIDGET (label));
+      GtkWidget *widget = l->data;
+
+      if (gtk_widget_get_settings (widget) == settings)
+        gtk_container_forall (GTK_CONTAINER (widget),
+                              label_shortcut_setting_traverse_container, NULL);
     }
-  
-  g_object_notify (G_OBJECT (label), "mnemonic_widget");
+
+  g_list_free (list);
 }
 
-/**
- * gtk_label_get_mnemonic_widget:
- * @label: a #GtkLabel
- *
- * Retrieves the target of the mnemonic (keyboard shortcut) of this
- * label. See gtk_label_set_mnemonic_widget ().
+static void
+mnemonics_visible_apply (GtkWidget *widget,
+                         gboolean   mnemonics_visible)
+{
+  GtkLabel *label;
+  GtkLabelPrivate *priv;
+
+  label = GTK_LABEL (widget);
+
+  priv = GTK_LABEL_GET_PRIVATE (label);
+
+  mnemonics_visible = mnemonics_visible != FALSE;
+
+  if (priv->mnemonics_visible != mnemonics_visible)
+    {
+      priv->mnemonics_visible = mnemonics_visible;
+
+      gtk_label_recalculate (label);
+    }
+}
+
+static void
+label_mnemonics_visible_traverse_container (GtkWidget *widget,
+                                            gpointer   data)
+{
+  gboolean mnemonics_visible = GPOINTER_TO_INT (data);
+
+  _gtk_label_mnemonics_visible_apply_recursively (widget, mnemonics_visible);
+}
+
+void
+_gtk_label_mnemonics_visible_apply_recursively (GtkWidget *widget,
+                                                gboolean   mnemonics_visible)
+{
+  if (GTK_IS_LABEL (widget))
+    mnemonics_visible_apply (widget, mnemonics_visible);
+  else if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget),
+                          label_mnemonics_visible_traverse_container,
+                          GINT_TO_POINTER (mnemonics_visible));
+}
+
+static void
+label_mnemonics_visible_changed (GtkWindow  *window,
+                                 GParamSpec *pspec,
+                                 gpointer    data)
+{
+  gboolean mnemonics_visible;
+
+  g_object_get (window, "mnemonics-visible", &mnemonics_visible, NULL);
+
+  gtk_container_forall (GTK_CONTAINER (window),
+                        label_mnemonics_visible_traverse_container,
+                        GINT_TO_POINTER (mnemonics_visible));
+}
+
+static void
+gtk_label_screen_changed (GtkWidget *widget,
+                         GdkScreen *old_screen)
+{
+  GtkSettings *settings;
+  gboolean shortcuts_connected;
+
+  if (!gtk_widget_has_screen (widget))
+    return;
+
+  settings = gtk_widget_get_settings (widget);
+
+  shortcuts_connected =
+    GPOINTER_TO_INT (g_object_get_data (G_OBJECT (settings),
+                                        "gtk-label-shortcuts-connected"));
+
+  if (! shortcuts_connected)
+    {
+      g_signal_connect (settings, "notify::gtk-enable-mnemonics",
+                        G_CALLBACK (label_shortcut_setting_changed),
+                        NULL);
+      g_signal_connect (settings, "notify::gtk-enable-accels",
+                        G_CALLBACK (label_shortcut_setting_changed),
+                        NULL);
+
+      g_object_set_data (G_OBJECT (settings), "gtk-label-shortcuts-connected",
+                         GINT_TO_POINTER (TRUE));
+    }
+
+  label_shortcut_setting_apply (GTK_LABEL (widget));
+}
+
+
+static void
+label_mnemonic_widget_weak_notify (gpointer      data,
+                                  GObject      *where_the_object_was)
+{
+  GtkLabel *label = data;
+
+  label->mnemonic_widget = NULL;
+  g_object_notify (G_OBJECT (label), "mnemonic-widget");
+}
+
+/**
+ * gtk_label_set_mnemonic_widget:
+ * @label: a #GtkLabel
+ * @widget: (allow-none): the target #GtkWidget
+ *
+ * If the label has been set so that it has an mnemonic key (using
+ * i.e. gtk_label_set_markup_with_mnemonic(),
+ * gtk_label_set_text_with_mnemonic(), gtk_label_new_with_mnemonic()
+ * or the "use_underline" property) the label can be associated with a
+ * widget that is the target of the mnemonic. When the label is inside
+ * a widget (like a #GtkButton or a #GtkNotebook tab) it is
+ * automatically associated with the correct widget, but sometimes
+ * (i.e. when the target is a #GtkEntry next to the label) you need to
+ * set it explicitly using this function.
+ *
+ * The target widget will be accelerated by emitting the 
+ * GtkWidget::mnemonic-activate signal on it. The default handler for 
+ * this signal will activate the widget if there are no mnemonic collisions 
+ * and toggle focus between the colliding widgets otherwise.
+ **/
+void
+gtk_label_set_mnemonic_widget (GtkLabel  *label,
+                              GtkWidget *widget)
+{
+  g_return_if_fail (GTK_IS_LABEL (label));
+  if (widget)
+    g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  if (label->mnemonic_widget)
+    {
+      gtk_widget_remove_mnemonic_label (label->mnemonic_widget, GTK_WIDGET (label));
+      g_object_weak_unref (G_OBJECT (label->mnemonic_widget),
+                          label_mnemonic_widget_weak_notify,
+                          label);
+    }
+  label->mnemonic_widget = widget;
+  if (label->mnemonic_widget)
+    {
+      g_object_weak_ref (G_OBJECT (label->mnemonic_widget),
+                        label_mnemonic_widget_weak_notify,
+                        label);
+      gtk_widget_add_mnemonic_label (label->mnemonic_widget, GTK_WIDGET (label));
+    }
+  
+  g_object_notify (G_OBJECT (label), "mnemonic-widget");
+}
+
+/**
+ * gtk_label_get_mnemonic_widget:
+ * @label: a #GtkLabel
+ *
+ * Retrieves the target of the mnemonic (keyboard shortcut) of this
+ * label. See gtk_label_set_mnemonic_widget().
  *
  * Return value: the target of the label's mnemonic, or %NULL if none
  *               has been set and the default algorithm will be used.
@@ -1056,8 +1789,9 @@ gtk_label_set_use_markup_internal (GtkLabel *label,
   val = val != FALSE;
   if (label->use_markup != val)
     {
-      g_object_notify (G_OBJECT (label), "use_markup");
       label->use_markup = val;
+
+      g_object_notify (G_OBJECT (label), "use-markup");
     }
 }
 
@@ -1068,8 +1802,42 @@ gtk_label_set_use_underline_internal (GtkLabel *label,
   val = val != FALSE;
   if (label->use_underline != val)
     {
-      g_object_notify (G_OBJECT (label), "use_underline");
       label->use_underline = val;
+
+      g_object_notify (G_OBJECT (label), "use-underline");
+    }
+}
+
+static void
+gtk_label_compose_effective_attrs (GtkLabel *label)
+{
+  PangoAttrIterator *iter;
+  PangoAttribute    *attr;
+  GSList            *iter_attrs, *l;
+
+  if (label->attrs)
+    {
+      if (label->effective_attrs)
+       {
+         if ((iter = pango_attr_list_get_iterator (label->attrs)))
+           {
+             do
+               {
+                 iter_attrs = pango_attr_iterator_get_attrs (iter);
+                 for (l = iter_attrs; l; l = l->next)
+                   {
+                     attr = l->data;
+                     pango_attr_list_insert (label->effective_attrs, attr);
+                   }
+                 g_slist_free (iter_attrs);
+               }
+             while (pango_attr_iterator_next (iter));
+             pango_attr_iterator_destroy (iter);
+           }
+       }
+      else
+       label->effective_attrs =
+         pango_attr_list_ref (label->attrs);
     }
 }
 
@@ -1082,17 +1850,8 @@ gtk_label_set_attributes_internal (GtkLabel      *label,
   
   if (label->attrs)
     pango_attr_list_unref (label->attrs);
-
-  if (!label->use_markup && !label->use_underline)
-    {
-      if (attrs)
-       pango_attr_list_ref (attrs);
-      if (label->effective_attrs)
-       pango_attr_list_unref (label->effective_attrs);
-      label->effective_attrs = attrs;
-    }
-
   label->attrs = attrs;
+
   g_object_notify (G_OBJECT (label), "attributes");
 }
 
@@ -1103,41 +1862,47 @@ gtk_label_set_attributes_internal (GtkLabel      *label,
 static void
 gtk_label_recalculate (GtkLabel *label)
 {
+  guint keyval = label->mnemonic_keyval;
+
   if (label->use_markup)
-    set_markup (label, label->label, label->use_underline);
+    {
+      gtk_label_set_markup_internal (label, label->label, label->use_underline);
+      gtk_label_compose_effective_attrs (label);
+    }
   else
     {
       if (label->use_underline)
-       gtk_label_set_uline_text_internal (label, label->label);
+       {
+         gtk_label_set_uline_text_internal (label, label->label);
+         gtk_label_compose_effective_attrs (label);
+       }
       else
        {
          gtk_label_set_text_internal (label, g_strdup (label->label));
-         if (label->attrs)
-           pango_attr_list_ref (label->attrs);
-         if (label->effective_attrs)
-           pango_attr_list_unref (label->effective_attrs);
-         label->effective_attrs = label->attrs;
+         gtk_label_compose_effective_attrs (label);
        }
     }
 
   if (!label->use_underline)
-    {
-      guint keyval = label->mnemonic_keyval;
+    label->mnemonic_keyval = GDK_VoidSymbol;
 
-      label->mnemonic_keyval = GDK_VoidSymbol;
+  if (keyval != label->mnemonic_keyval)
+    {
       gtk_label_setup_mnemonic (label, keyval);
+      g_object_notify (G_OBJECT (label), "mnemonic-keyval");
     }
 
-  gtk_label_clear_layout (label);  
+  gtk_label_clear_layout (label);
+  gtk_label_clear_select_info (label);
   gtk_widget_queue_resize (GTK_WIDGET (label));
 }
 
 /**
  * gtk_label_set_text:
  * @label: a #GtkLabel
- * @str: The text you want to set.
+ * @str: The text you want to set
  *
- * Sets the text within the #GtkLabel widget.  It overwrites any text that
+ * Sets the text within the #GtkLabel widget. It overwrites any text that
  * was there before.  
  *
  * This will also clear any previously set mnemonic accelerators.
@@ -1165,9 +1930,14 @@ gtk_label_set_text (GtkLabel    *label,
  * @attrs: a #PangoAttrList
  * 
  * Sets a #PangoAttrList; the attributes in the list are applied to the
- * label text. The attributes set with this function will be ignored
- * if the "use_underline" property or the "use_markup" property
- * is %TRUE.
+ * label text. 
+ *
+ * <note><para>The attributes set with this function will be applied
+ * and merged with any other attributes previously effected by way
+ * of the #GtkLabel:use-underline or #GtkLabel:use-markup properties.
+ * While it is not recommended to mix markup strings with manually set
+ * attributes, if you must; know that the attributes will be applied
+ * to the label after the markup string is parsed.</para></note>
  **/
 void
 gtk_label_set_attributes (GtkLabel         *label,
@@ -1176,7 +1946,9 @@ gtk_label_set_attributes (GtkLabel         *label,
   g_return_if_fail (GTK_IS_LABEL (label));
 
   gtk_label_set_attributes_internal (label, attrs);
-  
+
+  gtk_label_recalculate (label);
+
   gtk_label_clear_layout (label);  
   gtk_widget_queue_resize (GTK_WIDGET (label));
 }
@@ -1209,23 +1981,21 @@ gtk_label_get_attributes (GtkLabel *label)
  *
  * Sets the text of the label. The label is interpreted as
  * including embedded underlines and/or Pango markup depending
- * on the values of label->use_underline and label->use_markup.
+ * on the values of the #GtkLabel:use-underline" and
+ * #GtkLabel:use-markup properties.
  **/
 void
 gtk_label_set_label (GtkLabel    *label,
                     const gchar *str)
 {
-  guint last_keyval;
-
   g_return_if_fail (GTK_IS_LABEL (label));
-  g_return_if_fail (str != NULL);
 
-  last_keyval = label->mnemonic_keyval;
+  g_object_freeze_notify (G_OBJECT (label));
 
-  gtk_label_set_label_internal (label, g_strdup (str));
+  gtk_label_set_label_internal (label, g_strdup (str ? str : ""));
   gtk_label_recalculate (label);
-  if (last_keyval != label->mnemonic_keyval)
-    gtk_label_setup_mnemonic (label, last_keyval);
+
+  g_object_thaw_notify (G_OBJECT (label));
 }
 
 /**
@@ -1234,7 +2004,7 @@ gtk_label_set_label (GtkLabel    *label,
  *
  * Fetches the text from a label widget including any embedded
  * underlines indicating mnemonics and Pango markup. (See
- * gtk_label_get_text ()).
+ * gtk_label_get_text()).
  *
  * Return value: the text of the label widget. This string is
  *   owned by the widget and must not be modified or freed.
@@ -1247,17 +2017,348 @@ gtk_label_get_label (GtkLabel *label)
   return label->label;
 }
 
+typedef struct
+{
+  GtkLabel *label;
+  GList *links;
+  GString *new_str;
+  GdkColor *link_color;
+  GdkColor *visited_link_color;
+} UriParserData;
+
+static void
+start_element_handler (GMarkupParseContext  *context,
+                       const gchar          *element_name,
+                       const gchar         **attribute_names,
+                       const gchar         **attribute_values,
+                       gpointer              user_data,
+                       GError              **error)
+{
+  UriParserData *pdata = user_data;
+
+  if (strcmp (element_name, "a") == 0)
+    {
+      GtkLabelLink *link;
+      const gchar *uri = NULL;
+      const gchar *title = NULL;
+      gboolean visited = FALSE;
+      gint line_number;
+      gint char_number;
+      gint i;
+      GdkColor *color = NULL;
+
+      g_markup_parse_context_get_position (context, &line_number, &char_number);
+
+      for (i = 0; attribute_names[i] != NULL; i++)
+        {
+          const gchar *attr = attribute_names[i];
+
+          if (strcmp (attr, "href") == 0)
+            uri = attribute_values[i];
+          else if (strcmp (attr, "title") == 0)
+            title = attribute_values[i];
+          else
+            {
+              g_set_error (error,
+                           G_MARKUP_ERROR,
+                           G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
+                           "Attribute '%s' is not allowed on the <a> tag "
+                           "on line %d char %d",
+                            attr, line_number, char_number);
+              return;
+            }
+        }
+
+      if (uri == NULL)
+        {
+          g_set_error (error,
+                       G_MARKUP_ERROR,
+                       G_MARKUP_ERROR_INVALID_CONTENT,
+                       "Attribute 'href' was missing on the <a> tag "
+                       "on line %d char %d",
+                       line_number, char_number);
+          return;
+        }
+
+      visited = FALSE;
+      if (pdata->label->track_links && pdata->label->select_info)
+        {
+          GList *l;
+          for (l = pdata->label->select_info->links; l; l = l->next)
+            {
+              link = l->data;
+              if (strcmp (uri, link->uri) == 0)
+                {
+                  visited = link->visited;
+                  break;
+                }
+            }
+        }
+
+      if (visited)
+        color = pdata->visited_link_color;
+      else
+        color = pdata->link_color;
+
+      g_string_append_printf (pdata->new_str,
+                              "<span color=\"#%04x%04x%04x\" underline=\"single\">",
+                              color->red,
+                              color->green,
+                              color->blue);
+
+      link = g_new0 (GtkLabelLink, 1);
+      link->uri = g_strdup (uri);
+      link->title = g_strdup (title);
+      link->visited = visited;
+      pdata->links = g_list_append (pdata->links, link);
+    }
+  else
+    {
+      gint i;
+
+      g_string_append_c (pdata->new_str, '<');
+      g_string_append (pdata->new_str, element_name);
+
+      for (i = 0; attribute_names[i] != NULL; i++)
+        {
+          const gchar *attr  = attribute_names[i];
+          const gchar *value = attribute_values[i];
+          gchar *newvalue;
+
+          newvalue = g_markup_escape_text (value, -1);
+
+          g_string_append_c (pdata->new_str, ' ');
+          g_string_append (pdata->new_str, attr);
+          g_string_append (pdata->new_str, "=\"");
+          g_string_append (pdata->new_str, newvalue);
+          g_string_append_c (pdata->new_str, '\"');
+
+          g_free (newvalue);
+        }
+      g_string_append_c (pdata->new_str, '>');
+    }
+}
+
 static void
-set_markup (GtkLabel    *label,
-            const gchar *str,
-            gboolean     with_uline)
+end_element_handler (GMarkupParseContext  *context,
+                     const gchar          *element_name,
+                     gpointer              user_data,
+                     GError              **error)
+{
+  UriParserData *pdata = user_data;
+
+  if (!strcmp (element_name, "a"))
+    g_string_append (pdata->new_str, "</span>");
+  else
+    {
+      g_string_append (pdata->new_str, "</");
+      g_string_append (pdata->new_str, element_name);
+      g_string_append_c (pdata->new_str, '>');
+    }
+}
+
+static void
+text_handler (GMarkupParseContext  *context,
+              const gchar          *text,
+              gsize                 text_len,
+              gpointer              user_data,
+              GError              **error)
+{
+  UriParserData *pdata = user_data;
+  gchar *newtext;
+
+  newtext = g_markup_escape_text (text, text_len);
+  g_string_append (pdata->new_str, newtext);
+  g_free (newtext);
+}
+
+static const GMarkupParser markup_parser =
+{
+  start_element_handler,
+  end_element_handler,
+  text_handler,
+  NULL,
+  NULL
+};
+
+static gboolean
+xml_isspace (gchar c)
+{
+  return (c == ' ' || c == '\t' || c == '\n' || c == '\r');
+}
+
+static void
+link_free (GtkLabelLink *link)
+{
+  g_free (link->uri);
+  g_free (link->title);
+  g_free (link);
+}
+
+static void
+gtk_label_get_link_colors (GtkWidget  *widget,
+                           GdkColor  **link_color,
+                           GdkColor  **visited_link_color)
+{
+  gtk_widget_ensure_style (widget);
+  gtk_widget_style_get (widget,
+                        "link-color", link_color,
+                        "visited-link-color", visited_link_color,
+                        NULL);
+  if (!*link_color)
+    *link_color = gdk_color_copy (&default_link_color);
+  if (!*visited_link_color)
+    *visited_link_color = gdk_color_copy (&default_visited_link_color);
+}
+
+static gboolean
+parse_uri_markup (GtkLabel     *label,
+                  const gchar  *str,
+                  gchar       **new_str,
+                  GList       **links,
+                  GError      **error)
 {
+  GMarkupParseContext *context = NULL;
+  const gchar *p, *end;
+  gboolean needs_root = TRUE;
+  gsize length;
+  UriParserData pdata;
+
+  length = strlen (str);
+  p = str;
+  end = str + length;
+
+  pdata.label = label;
+  pdata.links = NULL;
+  pdata.new_str = g_string_sized_new (length);
+
+  gtk_label_get_link_colors (GTK_WIDGET (label), &pdata.link_color, &pdata.visited_link_color);
+
+  while (p != end && xml_isspace (*p))
+    p++;
+
+  if (end - p >= 8 && strncmp (p, "<markup>", 8) == 0)
+    needs_root = FALSE;
+
+  context = g_markup_parse_context_new (&markup_parser, 0, &pdata, NULL);
+
+  if (needs_root)
+    {
+      if (!g_markup_parse_context_parse (context, "<markup>", -1, error))
+        goto failed;
+    }
+
+  if (!g_markup_parse_context_parse (context, str, length, error))
+    goto failed;
+
+  if (needs_root)
+    {
+      if (!g_markup_parse_context_parse (context, "</markup>", -1, error))
+        goto failed;
+    }
+
+  if (!g_markup_parse_context_end_parse (context, error))
+    goto failed;
+
+  g_markup_parse_context_free (context);
+
+  *new_str = g_string_free (pdata.new_str, FALSE);
+  *links = pdata.links;
+
+  gdk_color_free (pdata.link_color);
+  gdk_color_free (pdata.visited_link_color);
+
+  return TRUE;
+
+failed:
+  g_markup_parse_context_free (context);
+  g_string_free (pdata.new_str, TRUE);
+  g_list_foreach (pdata.links, (GFunc)link_free, NULL);
+  g_list_free (pdata.links);
+  gdk_color_free (pdata.link_color);
+  gdk_color_free (pdata.visited_link_color);
+
+  return FALSE;
+}
+
+static void
+gtk_label_ensure_has_tooltip (GtkLabel *label)
+{
+  GList *l;
+  gboolean has_tooltip = FALSE;
+
+  for (l = label->select_info->links; l; l = l->next)
+    {
+      GtkLabelLink *link = l->data;
+      if (link->title)
+        {
+          has_tooltip = TRUE;
+          break;
+        }
+    }
+
+  gtk_widget_set_has_tooltip (GTK_WIDGET (label), has_tooltip);
+}
+
+static void
+gtk_label_set_markup_internal (GtkLabel    *label,
+                               const gchar *str,
+                               gboolean     with_uline)
+{
+  GtkLabelPrivate *priv = GTK_LABEL_GET_PRIVATE (label);
   gchar *text = NULL;
   GError *error = NULL;
   PangoAttrList *attrs = NULL;
   gunichar accel_char = 0;
+  gchar *new_str;
+  GList *links = NULL;
 
-  if (!pango_parse_markup (str,
+  if (!parse_uri_markup (label, str, &new_str, &links, &error))
+    {
+      g_warning ("Failed to set text from markup due to error parsing markup: %s",
+                 error->message);
+      g_error_free (error);
+      return;
+    }
+
+  gtk_label_clear_links (label);
+  if (links)
+    {
+      gtk_label_ensure_select_info (label);
+      label->select_info->links = links;
+      gtk_label_ensure_has_tooltip (label);
+    }
+
+  if (with_uline)
+    {
+      gboolean enable_mnemonics;
+      gboolean auto_mnemonics;
+
+      g_object_get (gtk_widget_get_settings (GTK_WIDGET (label)),
+                    "gtk-enable-mnemonics", &enable_mnemonics,
+                    "gtk-auto-mnemonics", &auto_mnemonics,
+                    NULL);
+
+      if (!(enable_mnemonics && priv->mnemonics_visible &&
+            (!auto_mnemonics ||
+             (GTK_WIDGET_IS_SENSITIVE (label) &&
+              (!label->mnemonic_widget ||
+               GTK_WIDGET_IS_SENSITIVE (label->mnemonic_widget))))))
+        {
+          gchar *tmp;
+          gchar *pattern;
+          guint key;
+
+          if (separate_uline_pattern (new_str, &key, &tmp, &pattern))
+            {
+              g_free (new_str);
+              new_str = tmp;
+              g_free (pattern);
+            }
+        }
+    }
+
+  if (!pango_parse_markup (new_str,
                            -1,
                            with_uline ? '_' : 0,
                            &attrs,
@@ -1265,12 +2366,15 @@ set_markup (GtkLabel    *label,
                            with_uline ? &accel_char : NULL,
                            &error))
     {
-      g_warning ("Failed to set label from markup due to error parsing markup: %s",
+      g_warning ("Failed to set text from markup due to error parsing markup: %s",
                  error->message);
+      g_free (new_str);
       g_error_free (error);
       return;
     }
 
+  g_free (new_str);
+
   if (text)
     gtk_label_set_text_internal (label, text);
 
@@ -1294,16 +2398,16 @@ set_markup (GtkLabel    *label,
  * 
  * Parses @str which is marked up with the <link
  * linkend="PangoMarkupFormat">Pango text markup language</link>, setting the
- * label's text and attribute list based on the parse results.  If the @str is
+ * label's text and attribute list based on the parse results. If the @str is
  * external data, you may need to escape it with g_markup_escape_text() or
  * g_markup_printf_escaped()<!-- -->:
- * <informalexample><programlisting>
+ * |[
  * char *markup;
- * <!-- -->
- * markup = g_markup_printf_escaped ("&lt;span style=\"italic\"&gt;%s&lt;/span&gt;", str);
+ *   
+ * markup = g_markup_printf_escaped ("&lt;span style=\"italic\"&gt;&percnt;s&lt;/span&gt;", str);
  * gtk_label_set_markup (GTK_LABEL (label), markup);
  * g_free (markup);
- * </programlisting></informalexample>
+ * ]|
  **/
 void
 gtk_label_set_markup (GtkLabel    *label,
@@ -1311,11 +2415,15 @@ gtk_label_set_markup (GtkLabel    *label,
 {  
   g_return_if_fail (GTK_IS_LABEL (label));
 
+  g_object_freeze_notify (G_OBJECT (label));
+
   gtk_label_set_label_internal (label, g_strdup (str ? str : ""));
   gtk_label_set_use_markup_internal (label, TRUE);
   gtk_label_set_use_underline_internal (label, FALSE);
   
   gtk_label_recalculate (label);
+
+  g_object_thaw_notify (G_OBJECT (label));
 }
 
 /**
@@ -1328,23 +2436,24 @@ gtk_label_set_markup (GtkLabel    *label,
  * If characters in @str are preceded by an underscore, they are underlined
  * indicating that they represent a keyboard accelerator called a mnemonic.
  *
- * The mnemonic key can be used to activate another widget, chosen automatically,
- * or explicitly using gtk_label_set_mnemonic_widget().
+ * The mnemonic key can be used to activate another widget, chosen 
+ * automatically, or explicitly using gtk_label_set_mnemonic_widget().
  **/
 void
 gtk_label_set_markup_with_mnemonic (GtkLabel    *label,
                                    const gchar *str)
 {
-  guint last_keyval;
   g_return_if_fail (GTK_IS_LABEL (label));
 
-  last_keyval = label->mnemonic_keyval;
+  g_object_freeze_notify (G_OBJECT (label));
+
   gtk_label_set_label_internal (label, g_strdup (str ? str : ""));
   gtk_label_set_use_markup_internal (label, TRUE);
   gtk_label_set_use_underline_internal (label, TRUE);
   
   gtk_label_recalculate (label);
-  gtk_label_setup_mnemonic (label, last_keyval);
+
+  g_object_thaw_notify (G_OBJECT (label));
 }
 
 /**
@@ -1408,15 +2517,37 @@ gtk_label_pattern_to_attrs (GtkLabel      *label,
 
 static void
 gtk_label_set_pattern_internal (GtkLabel    *label,
-                               const gchar *pattern)
+                               const gchar *pattern,
+                                gboolean     is_mnemonic)
 {
+  GtkLabelPrivate *priv = GTK_LABEL_GET_PRIVATE (label);
   PangoAttrList *attrs;
+  gboolean enable_mnemonics;
+  gboolean auto_mnemonics;
+
   g_return_if_fail (GTK_IS_LABEL (label));
-  
-  if (pattern)
-    attrs = gtk_label_pattern_to_attrs (label, pattern);
+
+  if (label->pattern_set)
+    return;
+
+  if (is_mnemonic)
+    {
+      g_object_get (gtk_widget_get_settings (GTK_WIDGET (label)),
+                   "gtk-enable-mnemonics", &enable_mnemonics,
+                   "gtk-auto-mnemonics", &auto_mnemonics,
+                   NULL);
+
+      if (enable_mnemonics && priv->mnemonics_visible && pattern &&
+          (!auto_mnemonics ||
+           (GTK_WIDGET_IS_SENSITIVE (label) &&
+            (!label->mnemonic_widget ||
+             GTK_WIDGET_IS_SENSITIVE (label->mnemonic_widget)))))
+        attrs = gtk_label_pattern_to_attrs (label, pattern);
+      else
+        attrs = NULL;
+    }
   else
-    attrs = NULL;
+    attrs = gtk_label_pattern_to_attrs (label, pattern);
 
   if (label->effective_attrs)
     pango_attr_list_unref (label->effective_attrs);
@@ -1429,9 +2560,17 @@ gtk_label_set_pattern (GtkLabel     *label,
 {
   g_return_if_fail (GTK_IS_LABEL (label));
   
-  gtk_label_set_pattern_internal (label, pattern);
+  label->pattern_set = FALSE;
 
-  gtk_label_clear_layout (label);  
+  if (pattern)
+    {
+      gtk_label_set_pattern_internal (label, pattern, FALSE);
+      label->pattern_set = TRUE;
+    }
+  else
+    gtk_label_recalculate (label);
+
+  gtk_label_clear_layout (label);
   gtk_widget_queue_resize (GTK_WIDGET (label));
 }
 
@@ -1442,7 +2581,7 @@ gtk_label_set_pattern (GtkLabel      *label,
  * @jtype: a #GtkJustification
  *
  * Sets the alignment of the lines in the text of the label relative to
- * each other.  %GTK_JUSTIFY_LEFT is the default value when the
+ * each other. %GTK_JUSTIFY_LEFT is the default value when the
  * widget is first created with gtk_label_new(). If you instead want
  * to set the alignment of the label as a whole, use
  * gtk_misc_set_alignment() instead. gtk_label_set_justify() has no
@@ -1471,7 +2610,7 @@ gtk_label_set_justify (GtkLabel        *label,
  * gtk_label_get_justify:
  * @label: a #GtkLabel
  *
- * Returns the justification of the label. See gtk_label_set_justify ().
+ * Returns the justification of the label. See gtk_label_set_justify().
  *
  * Return value: #GtkJustification
  **/
@@ -1488,8 +2627,8 @@ gtk_label_get_justify (GtkLabel *label)
  * @label: a #GtkLabel
  * @mode: a #PangoEllipsizeMode
  *
- * Sets the mode used to ellipsize (add an ellipsis: "...") to the text if there
- * is not enough space to render the entire string.
+ * Sets the mode used to ellipsize (add an ellipsis: "...") to the text 
+ * if there is not enough space to render the entire string.
  *
  * Since: 2.6
  **/
@@ -1553,6 +2692,7 @@ gtk_label_set_width_chars (GtkLabel *label,
     {
       priv->width_chars = n_chars;
       g_object_notify (G_OBJECT (label), "width-chars");
+      gtk_label_invalidate_wrap_width (label);
       gtk_widget_queue_resize (GTK_WIDGET (label));
     }
 }
@@ -1579,9 +2719,9 @@ gtk_label_get_width_chars (GtkLabel *label)
 /**
  * gtk_label_set_max_width_chars:
  * @label: a #GtkLabel
- * @n_chars: the new desired maximal width, in characters.
+ * @n_chars: the new desired maximum width, in characters.
  * 
- * Sets the desired maximal width in characters of @label to @n_chars.
+ * Sets the desired maximum width in characters of @label to @n_chars.
  * 
  * Since: 2.6
  **/
@@ -1600,6 +2740,7 @@ gtk_label_set_max_width_chars (GtkLabel *label,
       priv->max_width_chars = n_chars;
 
       g_object_notify (G_OBJECT (label), "max-width-chars");
+      gtk_label_invalidate_wrap_width (label);
       gtk_widget_queue_resize (GTK_WIDGET (label));
     }
 }
@@ -1608,10 +2749,10 @@ gtk_label_set_max_width_chars (GtkLabel *label,
  * gtk_label_get_max_width_chars:
  * @label: a #GtkLabel
  * 
- * Retrieves the desired maximal width of @label, in characters. See
+ * Retrieves the desired maximum width of @label, in characters. See
  * gtk_label_set_width_chars().
  * 
- * Return value: the maximal width of the label in characters.
+ * Return value: the maximum width of the label in characters.
  * 
  * Since: 2.6
  **/
@@ -1628,43 +2769,96 @@ gtk_label_get_max_width_chars (GtkLabel *label)
  * @label: a #GtkLabel
  * @wrap: the setting
  *
- * Toggles line wrapping within the #GtkLabel widget.  %TRUE makes it break
- * lines if text exceeds the widget's size.  %FALSE lets the text get cut off
- * by the edge of the widget if it exceeds the widget size.
+ * Toggles line wrapping within the #GtkLabel widget. %TRUE makes it break
+ * lines if text exceeds the widget's size. %FALSE lets the text get cut off
+ * by the edge of the widget if it exceeds the widget size.
+ *
+ * Note that setting line wrapping to %TRUE does not make the label
+ * wrap at its parent container's width, because GTK+ widgets
+ * conceptually can't make their requisition depend on the parent
+ * container's size. For a label that wraps at a specific position,
+ * set the label's width using gtk_widget_set_size_request().
+ **/
+void
+gtk_label_set_line_wrap (GtkLabel *label,
+                        gboolean  wrap)
+{
+  g_return_if_fail (GTK_IS_LABEL (label));
+  
+  wrap = wrap != FALSE;
+  
+  if (label->wrap != wrap)
+    {
+      label->wrap = wrap;
+
+      gtk_label_clear_layout (label);
+      gtk_widget_queue_resize (GTK_WIDGET (label));
+      g_object_notify (G_OBJECT (label), "wrap");
+    }
+}
+
+/**
+ * gtk_label_get_line_wrap:
+ * @label: a #GtkLabel
+ *
+ * Returns whether lines in the label are automatically wrapped. 
+ * See gtk_label_set_line_wrap().
+ *
+ * Return value: %TRUE if the lines of the label are automatically wrapped.
+ */
+gboolean
+gtk_label_get_line_wrap (GtkLabel *label)
+{
+  g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
+
+  return label->wrap;
+}
+
+/**
+ * gtk_label_set_line_wrap_mode:
+ * @label: a #GtkLabel
+ * @wrap_mode: the line wrapping mode
+ *
+ * If line wrapping is on (see gtk_label_set_line_wrap()) this controls how
+ * the line wrapping is done. The default is %PANGO_WRAP_WORD which means
+ * wrap on word boundaries.
+ *
+ * Since: 2.10
  **/
 void
-gtk_label_set_line_wrap (GtkLabel *label,
-                        gboolean  wrap)
+gtk_label_set_line_wrap_mode (GtkLabel *label,
+                             PangoWrapMode wrap_mode)
 {
   g_return_if_fail (GTK_IS_LABEL (label));
   
-  wrap = wrap != FALSE;
-  
-  if (label->wrap != wrap)
+  if (label->wrap_mode != wrap_mode)
     {
-      label->wrap = wrap;
-      g_object_notify (G_OBJECT (label), "wrap");
+      label->wrap_mode = wrap_mode;
+      g_object_notify (G_OBJECT (label), "wrap-mode");
       
       gtk_widget_queue_resize (GTK_WIDGET (label));
     }
 }
 
 /**
- * gtk_label_get_line_wrap:
+ * gtk_label_get_line_wrap_mode:
  * @label: a #GtkLabel
  *
- * Returns whether lines in the label are automatically wrapped. See gtk_label_set_line_wrap ().
+ * Returns line wrap mode used by the label. See gtk_label_set_line_wrap_mode().
  *
  * Return value: %TRUE if the lines of the label are automatically wrapped.
+ *
+ * Since: 2.10
  */
-gboolean
-gtk_label_get_line_wrap (GtkLabel *label)
+PangoWrapMode
+gtk_label_get_line_wrap_mode (GtkLabel *label)
 {
   g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
 
-  return label->wrap;
+  return label->wrap_mode;
 }
 
+
 void
 gtk_label_get (GtkLabel *label,
               gchar   **str)
@@ -1682,18 +2876,14 @@ gtk_label_destroy (GtkObject *object)
 
   gtk_label_set_mnemonic_widget (label, NULL);
 
-  GTK_OBJECT_CLASS (parent_class)->destroy (object);
+  GTK_OBJECT_CLASS (gtk_label_parent_class)->destroy (object);
 }
 
 static void
 gtk_label_finalize (GObject *object)
 {
-  GtkLabel *label;
-  
-  g_return_if_fail (GTK_IS_LABEL (object));
-  
-  label = GTK_LABEL (object);
-  
+  GtkLabel *label = GTK_LABEL (object);
+
   g_free (label->label);
   g_free (label->text);
 
@@ -1706,9 +2896,10 @@ gtk_label_finalize (GObject *object)
   if (label->effective_attrs)
     pango_attr_list_unref (label->effective_attrs);
 
+  gtk_label_clear_links (label);
   g_free (label->select_info);
 
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+  G_OBJECT_CLASS (gtk_label_parent_class)->finalize (object);
 }
 
 static void
@@ -1718,52 +2909,82 @@ gtk_label_clear_layout (GtkLabel *label)
     {
       g_object_unref (label->layout);
       label->layout = NULL;
+
+      //gtk_label_clear_links (label);
     }
 }
 
-typedef struct _LabelWrapWidth LabelWrapWidth;
-struct _LabelWrapWidth
+static gint
+get_label_char_width (GtkLabel *label)
 {
-  gint width;
-  PangoFontDescription *font_desc;
-};
+  GtkLabelPrivate *priv;
+  PangoContext *context;
+  PangoFontMetrics *metrics;
+  gint char_width, digit_width, char_pixels, w;
+  
+  priv = GTK_LABEL_GET_PRIVATE (label);
+  
+  context = pango_layout_get_context (label->layout);
+  metrics = pango_context_get_metrics (context, GTK_WIDGET (label)->style->font_desc, 
+                                      pango_context_get_language (context));
+  
+  char_width = pango_font_metrics_get_approximate_char_width (metrics);
+  digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
+  char_pixels = MAX (char_width, digit_width);
+  pango_font_metrics_unref (metrics);
+  
+  if (priv->width_chars < 0)
+    {
+      PangoRectangle rect;
+      
+      pango_layout_set_width (label->layout, -1);
+      pango_layout_get_extents (label->layout, NULL, &rect);
+      
+      w = char_pixels * MAX (priv->max_width_chars, 3);
+      w = MIN (rect.width, w);
+    }
+  else
+    {
+      /* enforce minimum width for ellipsized labels at ~3 chars */
+      w = char_pixels * MAX (priv->width_chars, 3);
+    }
+  
+  return w;
+}
 
 static void
-label_wrap_width_free (gpointer data)
+gtk_label_invalidate_wrap_width (GtkLabel *label)
 {
-  LabelWrapWidth *wrap_width = data;
-  pango_font_description_free (wrap_width->font_desc);
-  g_free (wrap_width);
+  GtkLabelPrivate *priv;
+
+  priv = GTK_LABEL_GET_PRIVATE (label);
+
+  priv->wrap_width = -1;
 }
 
 static gint
 get_label_wrap_width (GtkLabel *label)
 {
-  PangoLayout *layout;
-  GtkStyle *style = GTK_WIDGET (label)->style;
+  GtkLabelPrivate *priv;
 
-  LabelWrapWidth *wrap_width = g_object_get_data (G_OBJECT (style), "gtk-label-wrap-width");
-  if (!wrap_width)
+  priv = GTK_LABEL_GET_PRIVATE (label);
+  
+  if (priv->wrap_width < 0)
     {
-      wrap_width = g_new0 (LabelWrapWidth, 1);
-      g_object_set_data_full (G_OBJECT (style), "gtk-label-wrap-width",
-                             wrap_width, label_wrap_width_free);
+      if (priv->width_chars > 0 || priv->max_width_chars > 0)
+       priv->wrap_width = get_label_char_width (label);
+      else
+       {
+         PangoLayout *layout;
+  
+         layout = gtk_widget_create_pango_layout (GTK_WIDGET (label), 
+                                                  "This long string gives a good enough length for any line to have.");
+         pango_layout_get_size (layout, &priv->wrap_width, NULL);
+         g_object_unref (layout);
+       }
     }
 
-  if (wrap_width->font_desc && pango_font_description_equal (wrap_width->font_desc, style->font_desc))
-    return wrap_width->width;
-
-  if (wrap_width->font_desc)
-    pango_font_description_free (wrap_width->font_desc);
-
-  wrap_width->font_desc = pango_font_description_copy (style->font_desc);
-
-  layout = gtk_widget_create_pango_layout (GTK_WIDGET (label), 
-                                          "This long string gives a good enough length for any line to have.");
-  pango_layout_get_size (layout, &wrap_width->width, NULL);
-  g_object_unref (layout);
-
-  return wrap_width->width;
+  return priv->wrap_width;
 }
 
 static void
@@ -1771,21 +2992,18 @@ gtk_label_ensure_layout (GtkLabel *label)
 {
   GtkWidget *widget;
   PangoRectangle logical_rect;
-  gint rwidth, rheight;
   gboolean rtl;
 
   widget = GTK_WIDGET (label);
 
-  rtl = gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL;
-  rwidth = label->misc.xpad * 2;
-  rheight = label->misc.ypad * 2;
+  rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
 
   if (!label->layout)
     {
       PangoAlignment align = PANGO_ALIGN_LEFT; /* Quiet gcc */
-      GtkLabelPrivate *priv = GTK_LABEL_GET_PRIVATE (label);
+      gdouble angle = gtk_label_get_angle (label);
 
-      if (priv->angle != 0.0 && !label->wrap && !label->ellipsize && !label->select_info)
+      if (angle != 0.0 && !label->wrap && !label->ellipsize && !label->select_info)
        {
          /* We rotate the standard singleton PangoContext for the widget,
           * depending on the fact that it's meant pretty much exclusively
@@ -1793,25 +3011,27 @@ gtk_label_ensure_layout (GtkLabel *label)
           */
          PangoMatrix matrix = PANGO_MATRIX_INIT;
          
-         pango_matrix_rotate (&matrix, priv->angle);
+         pango_matrix_rotate (&matrix, angle);
 
          pango_context_set_matrix (gtk_widget_get_pango_context (widget), &matrix);
          
-         priv->have_transform = TRUE;
+         label->have_transform = TRUE;
        }
       else 
        {
-         if (priv->have_transform)
+         if (label->have_transform)
            pango_context_set_matrix (gtk_widget_get_pango_context (widget), NULL);
 
-         priv->have_transform = FALSE;
+         label->have_transform = FALSE;
        }
 
       label->layout = gtk_widget_create_pango_layout (widget, label->text);
 
       if (label->effective_attrs)
        pango_layout_set_attributes (label->layout, label->effective_attrs);
-      
+
+      gtk_label_rescan_links (label);
+
       switch (label->jtype)
        {
        case GTK_JUSTIFY_LEFT:
@@ -1824,7 +3044,6 @@ gtk_label_ensure_layout (GtkLabel *label)
          align = PANGO_ALIGN_CENTER;
          break;
        case GTK_JUSTIFY_FILL:
-         /* FIXME: This just doesn't work to do this */
          align = rtl ? PANGO_ALIGN_RIGHT : PANGO_ALIGN_LEFT;
          pango_layout_set_justify (label->layout, TRUE);
          break;
@@ -1834,7 +3053,7 @@ gtk_label_ensure_layout (GtkLabel *label)
 
       pango_layout_set_alignment (label->layout, align);
       pango_layout_set_ellipsize (label->layout, label->ellipsize);
-      pango_layout_set_single_paragraph_mode (label->layout, priv->single_line_mode);
+      pango_layout_set_single_paragraph_mode (label->layout, label->single_line_mode);
 
       if (label->ellipsize)
        pango_layout_set_width (label->layout, 
@@ -1844,6 +3063,8 @@ gtk_label_ensure_layout (GtkLabel *label)
          GtkWidgetAuxInfo *aux_info;
          gint longest_paragraph;
          gint width, height;
+
+         pango_layout_set_wrap (label->layout, label->wrap_mode);
          
          aux_info = _gtk_widget_get_aux_info (widget, FALSE);
          if (aux_info && aux_info->width > 0)
@@ -1911,76 +3132,23 @@ gtk_label_ensure_layout (GtkLabel *label)
     }
 }
 
-/* Gets the bounds of a layout in device coordinates. Note cut-and-paste
- * between here and gdkpango.c */
-static void
-get_rotated_layout_bounds (PangoLayout  *layout,
-                          GdkRectangle *rect)
-{
-  PangoContext *context = pango_layout_get_context (layout);
-  const PangoMatrix *matrix = pango_context_get_matrix (context);
-  gdouble x_min = 0, x_max = 0, y_min = 0, y_max = 0; /* quiet gcc */
-  PangoRectangle logical_rect;
-  gint i, j;
-
-  pango_layout_get_extents (layout, NULL, &logical_rect);
-  
-  for (i = 0; i < 2; i++)
-    {
-      gdouble x = (i == 0) ? logical_rect.x : logical_rect.x + logical_rect.width;
-      for (j = 0; j < 2; j++)
-       {
-         gdouble y = (j == 0) ? logical_rect.y : logical_rect.y + logical_rect.height;
-         
-         gdouble xt = (x * matrix->xx + y * matrix->xy) / PANGO_SCALE + matrix->x0;
-         gdouble yt = (x * matrix->yx + y * matrix->yy) / PANGO_SCALE + matrix->y0;
-         
-         if (i == 0 && j == 0)
-           {
-             x_min = x_max = xt;
-             y_min = y_max = yt;
-           }
-         else
-           {
-             if (xt < x_min)
-               x_min = xt;
-             if (yt < y_min)
-               y_min = yt;
-             if (xt > x_max)
-               x_max = xt;
-             if (yt > y_max)
-               y_max = yt;
-           }
-       }
-    }
-  
-  rect->x = floor (x_min);
-  rect->width = ceil (x_max) - rect->x;
-  rect->y = floor (y_min);
-  rect->height = floor (y_max) - rect->y;
-}
-
 static void
 gtk_label_size_request (GtkWidget      *widget,
                        GtkRequisition *requisition)
 {
-  GtkLabel *label;
+  GtkLabel *label = GTK_LABEL (widget);
   GtkLabelPrivate *priv;
   gint width, height;
   PangoRectangle logical_rect;
   GtkWidgetAuxInfo *aux_info;
-  
-  g_return_if_fail (GTK_IS_LABEL (widget));
-  g_return_if_fail (requisition != NULL);
-  
-  label = GTK_LABEL (widget);
+
   priv = GTK_LABEL_GET_PRIVATE (widget);
 
   /*  
    * If word wrapping is on, then the height requisition can depend
    * on:
    *
-   *   - Any width set on the widget via gtk_widget_set_usize().
+   *   - Any width set on the widget via gtk_widget_set_size_request().
    *   - The padding of the widget (xpad, set by gtk_misc_set_padding)
    *
    * Instead of trying to detect changes to these quantities, if we
@@ -1999,14 +3167,19 @@ gtk_label_size_request (GtkWidget      *widget,
 
   aux_info = _gtk_widget_get_aux_info (widget, FALSE);
 
-  if (priv->have_transform)
+  if (label->have_transform)
     {
-      GdkRectangle rect;
+      PangoRectangle rect;
+      PangoContext *context = pango_layout_get_context (label->layout);
+      const PangoMatrix *matrix = pango_context_get_matrix (context);
 
-      get_rotated_layout_bounds (label->layout, &rect);
+      pango_layout_get_extents (label->layout, NULL, &rect);
+      pango_matrix_transform_rectangle (matrix, &rect);
+      pango_extents_to_pixels (&rect, NULL);
       
       requisition->width = width + rect.width;
       requisition->height = height + rect.height;
+
       return;
     }
   else
@@ -2016,42 +3189,14 @@ gtk_label_size_request (GtkWidget      *widget,
        priv->width_chars > 0 || priv->max_width_chars > 0) && 
       aux_info && aux_info->width > 0)
     width += aux_info->width;
-  else if (label->ellipsize || priv->width_chars > 0 || priv->width_chars > 0)
+  else if (label->ellipsize || priv->width_chars > 0 || priv->max_width_chars > 0)
     {
-      PangoContext *context;
-      PangoFontMetrics *metrics;
-      gint char_width, digit_width, char_pixels, w;
-
-      context = pango_layout_get_context (label->layout);
-      metrics = pango_context_get_metrics (context, widget->style->font_desc, NULL);
-
-      char_width = pango_font_metrics_get_approximate_char_width (metrics);
-      digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
-      char_pixels = MAX (char_width, digit_width);
-      pango_font_metrics_unref (metrics);
-
-      if (priv->width_chars < 0)
-       {
-         PangoRectangle rect;
-
-         pango_layout_set_width (label->layout, -1);
-         pango_layout_get_extents (label->layout, NULL, &rect);
-
-         w = char_pixels * MAX (priv->max_width_chars, 3);
-         w = MIN (rect.width, w);
-       }
-      else
-       {
-         /* enforce minimum width for ellipsized labels at ~3 chars */
-         w = char_pixels * MAX (priv->width_chars, 3);
-       }
-
-      width += PANGO_PIXELS (w);
+      width += PANGO_PIXELS (get_label_char_width (label));
     }
   else
     width += PANGO_PIXELS (logical_rect.width);
 
-  if (priv->single_line_mode)
+  if (label->single_line_mode)
     {
       PangoContext *context;
       PangoFontMetrics *metrics;
@@ -2082,12 +3227,23 @@ gtk_label_size_allocate (GtkWidget     *widget,
 
   label = GTK_LABEL (widget);
 
-  (* GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
+  GTK_WIDGET_CLASS (gtk_label_parent_class)->size_allocate (widget, allocation);
 
   if (label->ellipsize)
     {
       if (label->layout)
-       pango_layout_set_width (label->layout, allocation->width * PANGO_SCALE);
+       {
+         gint width;
+         PangoRectangle logical;
+
+         width = (allocation->width - label->misc.xpad * 2) * PANGO_SCALE;
+
+         pango_layout_set_width (label->layout, -1);
+         pango_layout_get_extents (label->layout, NULL, &logical);
+
+         if (logical.width > width)
+           pango_layout_set_width (label->layout, width);
+       }
     }
 
   if (label->select_info && label->select_info->window)
@@ -2100,33 +3256,63 @@ gtk_label_size_allocate (GtkWidget     *widget,
     }
 }
 
+static void
+gtk_label_update_cursor (GtkLabel *label)
+{
+  if (!label->select_info)
+    return;
+
+  if (GTK_WIDGET_REALIZED (label))
+    {
+      GdkDisplay *display;
+      GdkCursor *cursor;
+
+      if (GTK_WIDGET_IS_SENSITIVE (label))
+        {
+          display = gtk_widget_get_display (GTK_WIDGET (label));
+
+          if (label->select_info->active_link)
+            cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
+          else if (label->select_info->selectable)
+            cursor = gdk_cursor_new_for_display (display, GDK_XTERM);
+          else
+            cursor = NULL;
+        }
+      else
+        cursor = NULL;
+
+      gdk_window_set_cursor (label->select_info->window, cursor);
+
+      if (cursor)
+        gdk_cursor_unref (cursor);
+    }
+}
+
 static void
 gtk_label_state_changed (GtkWidget   *widget,
                          GtkStateType prev_state)
 {
-  GtkLabel *label;
-  
-  label = GTK_LABEL (widget);
+  GtkLabel *label = GTK_LABEL (widget);
 
   if (label->select_info)
-    gtk_label_select_region (label, 0, 0);
+    {
+      gtk_label_select_region (label, 0, 0);
+      gtk_label_update_cursor (label);
+    }
 
-  if (GTK_WIDGET_CLASS (parent_class)->state_changed)
-    GTK_WIDGET_CLASS (parent_class)->state_changed (widget, prev_state);
+  if (GTK_WIDGET_CLASS (gtk_label_parent_class)->state_changed)
+    GTK_WIDGET_CLASS (gtk_label_parent_class)->state_changed (widget, prev_state);
 }
 
-static void 
+static void
 gtk_label_style_set (GtkWidget *widget,
                     GtkStyle  *previous_style)
 {
-  GtkLabel *label;
-  
-  g_return_if_fail (GTK_IS_LABEL (widget));
-  
-  label = GTK_LABEL (widget);
+  GtkLabel *label = GTK_LABEL (widget);
 
   /* We have to clear the layout, fonts etc. may have changed */
   gtk_label_clear_layout (label);
+  gtk_label_invalidate_wrap_width (label);
 }
 
 static void 
@@ -2138,7 +3324,7 @@ gtk_label_direction_changed (GtkWidget        *widget,
   if (label->layout)
     pango_layout_context_changed (label->layout);
 
-  GTK_WIDGET_CLASS (parent_class)->direction_changed (widget, previous_dir);
+  GTK_WIDGET_CLASS (gtk_label_parent_class)->direction_changed (widget, previous_dir);
 }
 
 static void
@@ -2147,43 +3333,66 @@ get_layout_location (GtkLabel  *label,
                      gint      *yp)
 {
   GtkMisc *misc;
-  GtkWidget *widget;
+  GtkWidget *widget; 
+  GtkLabelPrivate *priv;
   gfloat xalign;
   gint req_width, x, y;
+  PangoRectangle logical;
   
   misc = GTK_MISC (label);
   widget = GTK_WIDGET (label);
-  
+  priv = GTK_LABEL_GET_PRIVATE (label);
+
   if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
     xalign = misc->xalign;
   else
     xalign = 1.0 - misc->xalign;
 
-  if (label->ellipsize)
+  pango_layout_get_pixel_extents (label->layout, NULL, &logical);
+
+  if (label->ellipsize || priv->width_chars > 0)
     {
-      PangoRectangle ink_rect;
+      int width;
 
-      pango_layout_get_extents (label->layout, &ink_rect, NULL);
+      width = pango_layout_get_width (label->layout);
 
-      req_width = PANGO_PIXELS (ink_rect.width);
+      req_width = logical.width;
+      if (width != -1)
+       req_width = MIN(PANGO_PIXELS (width), req_width);
+      req_width += 2 * misc->xpad;
     }
   else
     req_width = widget->requisition.width;
 
   x = floor (widget->allocation.x + (gint)misc->xpad +
-             xalign * (widget->allocation.width - req_width)
-             + 0.5);
+             xalign * (widget->allocation.width - req_width));
 
   if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
     x = MAX (x, widget->allocation.x + misc->xpad);
   else
-    x = MIN (x,
-            widget->allocation.x + widget->allocation.width -
-            req_width - misc->xpad);
+    x = MIN (x, widget->allocation.x + widget->allocation.width - misc->xpad);
+  x -= logical.x;
 
-  y = floor (widget->allocation.y + (gint)misc->ypad 
-             + MAX (((widget->allocation.height - widget->requisition.height) * misc->yalign)
-                   + 0.5, 0));
+  /* bgo#315462 - For single-line labels, *do* align the requisition with
+   * respect to the allocation, even if we are under-allocated.  For multi-line
+   * labels, always show the top of the text when they are under-allocated.  The
+   * rationale is this:
+   *
+   * - Single-line labels appear in GtkButtons, and it is very easy to get them
+   *   to be smaller than their requisition.  The button may clip the label, but
+   *   the label will still be able to show most of itself and the focus
+   *   rectangle.  Also, it is fairly easy to read a single line of clipped text.
+   *
+   * - Multi-line labels should not be clipped to showing "something in the
+   *   middle".  You want to read the first line, at least, to get some context.
+   */
+  if (pango_layout_get_line_count (label->layout) == 1)
+    y = floor (widget->allocation.y + (gint)misc->ypad 
+              + (widget->allocation.height - widget->requisition.height) * misc->yalign);
+  else
+    y = floor (widget->allocation.y + (gint)misc->ypad 
+              + MAX (((widget->allocation.height - widget->requisition.height) * misc->yalign),
+                     0));
 
   if (xp)
     *xp = x;
@@ -2221,7 +3430,7 @@ get_cursor_direction (GtkLabel *label)
 
   gtk_label_ensure_layout (label);
 
-  for (l = pango_layout_get_lines (label->layout); l; l = l->next)
+  for (l = pango_layout_get_lines_readonly (label->layout); l; l = l->next)
     {
       PangoLayoutLine *line = l->data;
 
@@ -2315,18 +3524,36 @@ gtk_label_draw_cursor (GtkLabel  *label, gint xoffset, gint yoffset)
     }
 }
 
+static GtkLabelLink *
+gtk_label_get_focus_link (GtkLabel *label)
+{
+  GtkLabelSelectionInfo *info = label->select_info;
+  GList *l;
+
+  if (!info)
+    return NULL;
+
+  if (info->selection_anchor != info->selection_end)
+    return NULL;
+
+  for (l = info->links; l; l = l->next)
+    {
+      GtkLabelLink *link = l->data;
+      if (link->start <= info->selection_anchor &&
+          info->selection_anchor <= link->end)
+        return link;
+    }
+
+  return NULL;
+}
 
 static gint
 gtk_label_expose (GtkWidget      *widget,
                  GdkEventExpose *event)
 {
-  GtkLabel *label;
+  GtkLabel *label = GTK_LABEL (widget);
+  GtkLabelSelectionInfo *info = label->select_info;
   gint x, y;
-  
-  g_return_val_if_fail (GTK_IS_LABEL (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-  
-  label = GTK_LABEL (widget);
 
   gtk_label_ensure_layout (label);
   
@@ -2344,17 +3571,16 @@ gtk_label_expose (GtkWidget      *widget,
                         "label",
                         x, y,
                         label->layout);
-      
-      if (label->select_info &&
-          (label->select_info->selection_anchor !=
-           label->select_info->selection_end))
+
+      if (info &&
+          (info->selection_anchor != info->selection_end))
         {
           gint range[2];
           GdkRegion *clip;
          GtkStateType state;
-         
-          range[0] = label->select_info->selection_anchor;
-          range[1] = label->select_info->selection_end;
+
+          range[0] = info->selection_anchor;
+          range[1] = info->selection_end;
 
           if (range[0] > range[1])
             {
@@ -2368,7 +3594,7 @@ gtk_label_expose (GtkWidget      *widget,
                                                    range,
                                                    1);
          gdk_region_intersect (clip, event->region);
+
          /* FIXME should use gtk_paint, but it can't use a clip
            * region
            */
@@ -2379,7 +3605,7 @@ gtk_label_expose (GtkWidget      *widget,
          state = GTK_STATE_SELECTED;
          if (!GTK_WIDGET_HAS_FOCUS (widget))
            state = GTK_STATE_ACTIVE;
-             
+
           gdk_draw_layout_with_colors (widget->window,
                                        widget->style->black_gc,
                                        x, y,
@@ -2390,44 +3616,101 @@ gtk_label_expose (GtkWidget      *widget,
           gdk_gc_set_clip_region (widget->style->black_gc, NULL);
           gdk_region_destroy (clip);
         }
-      else if (label->select_info && GTK_WIDGET_HAS_FOCUS (widget))
-       gtk_label_draw_cursor (label, x, y);
+      else if (info)
+        {
+          GtkLabelLink *focus_link;
+          GtkLabelLink *active_link;
+          gint range[2];
+          GdkRegion *clip;
+          GdkRectangle rect;
+          GdkColor *text_color;
+          GdkColor *base_color;
+          GdkColor *link_color;
+          GdkColor *visited_link_color;
+
+          if (info->selectable && GTK_WIDGET_HAS_FOCUS (widget))
+           gtk_label_draw_cursor (label, x, y);
+
+          focus_link = gtk_label_get_focus_link (label);
+          active_link = info->active_link;
+
+          if (active_link)
+            {
+              range[0] = active_link->start;
+              range[1] = active_link->end;
+
+              clip = gdk_pango_layout_get_clip_region (label->layout,
+                                                       x, y,
+                                                       range,
+                                                       1);
+              gdk_gc_set_clip_region (widget->style->black_gc, clip);
+
+              gtk_label_get_link_colors (widget, &link_color, &visited_link_color);
+              if (active_link->visited)
+                text_color = visited_link_color;
+              else
+                text_color = link_color;
+              if (info->link_clicked)
+                base_color = &widget->style->base[GTK_STATE_ACTIVE];
+              else
+                base_color = &widget->style->base[GTK_STATE_PRELIGHT];
+              gdk_draw_layout_with_colors (widget->window,
+                                           widget->style->black_gc,
+                                           x, y,
+                                           label->layout,
+                                           text_color,
+                                           base_color);
+              gdk_color_free (link_color);
+              gdk_color_free (visited_link_color);
+
+              gdk_gc_set_clip_region (widget->style->black_gc, NULL);
+              gdk_region_destroy (clip);
+            }
+
+          if (focus_link && GTK_WIDGET_HAS_FOCUS (widget))
+            {
+              range[0] = focus_link->start;
+              range[1] = focus_link->end;
+
+              clip = gdk_pango_layout_get_clip_region (label->layout,
+                                                       x, y,
+                                                       range,
+                                                       1);
+              gdk_region_get_clipbox (clip, &rect);
+
+              gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
+                               &event->area, widget, "label",
+                               rect.x, rect.y, rect.width, rect.height);
+
+              gdk_region_destroy (clip);
+            }
+        }
     }
 
   return FALSE;
 }
 
-static void
-gtk_label_set_uline_text_internal (GtkLabel    *label,
-                                  const gchar *str)
+static gboolean
+separate_uline_pattern (const gchar  *str,
+                        guint        *accel_key,
+                        gchar       **new_str,
+                        gchar       **pattern)
 {
-  guint accel_key = GDK_VoidSymbol;
-
-  gchar *new_str;
-  gchar *pattern;
-  const gchar *src;
-  gchar *dest, *pattern_dest;
   gboolean underscore;
-      
-  g_return_if_fail (GTK_IS_LABEL (label));
-  g_return_if_fail (str != NULL);
+  gchar *src;
+  gchar *dest;
+  gchar *pattern_dest;
+
+  *accel_key = GDK_VoidSymbol;
+  *new_str = g_new (gchar, strlen (str) + 1);
+  *pattern = g_new (gchar, g_utf8_strlen (str, -1) + 1);
 
-  /* Split text into the base text and a separate pattern
-   * of underscores.
-   */
-  
-  new_str = g_new (gchar, strlen (str) + 1);
-  pattern = g_new (gchar, g_utf8_strlen (str, -1) + 1);
-  
   underscore = FALSE;
 
-  if (str == NULL)
-    str = "";
-  
   src = str;
-  dest = new_str;
-  pattern_dest = pattern;
-  
+  dest = *new_str;
+  pattern_dest = *pattern;
+
   while (*src)
     {
       gunichar c;
@@ -2437,12 +3720,13 @@ gtk_label_set_uline_text_internal (GtkLabel    *label,
       if (c == (gunichar)-1)
        {
          g_warning ("Invalid input string");
-         g_free (new_str);
-         g_free (pattern);
-         return;
+         g_free (*new_str);
+         g_free (*pattern);
+
+         return FALSE;
        }
       next_src = g_utf8_next_char (src);
-      
+
       if (underscore)
        {
          if (c == '_')
@@ -2450,13 +3734,13 @@ gtk_label_set_uline_text_internal (GtkLabel    *label,
          else
            {
              *pattern_dest++ = '_';
-             if (accel_key == GDK_VoidSymbol)
-               accel_key = gdk_keyval_to_lower (gdk_unicode_to_keyval (c));
+             if (*accel_key == GDK_VoidSymbol)
+               *accel_key = gdk_keyval_to_lower (gdk_unicode_to_keyval (c));
            }
 
          while (src < next_src)
            *dest++ = *src++;
-         
+
          underscore = FALSE;
        }
       else
@@ -2470,34 +3754,51 @@ gtk_label_set_uline_text_internal (GtkLabel    *label,
            {
              while (src < next_src)
                *dest++ = *src++;
-         
+
              *pattern_dest++ = ' ';
            }
        }
     }
+
   *dest = 0;
   *pattern_dest = 0;
-  
-  gtk_label_set_text_internal (label, new_str);
-  gtk_label_set_pattern_internal (label, pattern);
-  
-  g_free (pattern);
 
+  return TRUE;
+}
+
+static void
+gtk_label_set_uline_text_internal (GtkLabel    *label,
+                                  const gchar *str)
+{
+  guint accel_key = GDK_VoidSymbol;
+  gchar *new_str;
+  gchar *pattern;
+
+  g_return_if_fail (GTK_IS_LABEL (label));
+  g_return_if_fail (str != NULL);
+
+  /* Split text into the base text and a separate pattern
+   * of underscores.
+   */
+  if (!separate_uline_pattern (str, &accel_key, &new_str, &pattern))
+    return;
+
+  gtk_label_set_text_internal (label, new_str);
+  gtk_label_set_pattern_internal (label, pattern, TRUE);
   label->mnemonic_keyval = accel_key;
+
+  g_free (pattern);
 }
 
-guint      
+guint
 gtk_label_parse_uline (GtkLabel    *label,
                       const gchar *str)
 {
   guint keyval;
-  guint orig_keyval;
   
   g_return_val_if_fail (GTK_IS_LABEL (label), GDK_VoidSymbol);
   g_return_val_if_fail (str != NULL, GDK_VoidSymbol);
 
-  orig_keyval = label->mnemonic_keyval;
-
   g_object_freeze_notify (G_OBJECT (label));
   
   gtk_label_set_label_internal (label, g_strdup (str ? str : ""));
@@ -2507,9 +3808,12 @@ gtk_label_parse_uline (GtkLabel    *label,
   gtk_label_recalculate (label);
 
   keyval = label->mnemonic_keyval;
-  label->mnemonic_keyval = GDK_VoidSymbol;
-  
-  gtk_label_setup_mnemonic (label, orig_keyval);
+  if (keyval != GDK_VoidSymbol)
+    {
+      label->mnemonic_keyval = GDK_VoidSymbol;
+      gtk_label_setup_mnemonic (label, keyval);
+      g_object_notify (G_OBJECT (label), "mnemonic-keyval");
+    }
   
   g_object_thaw_notify (G_OBJECT (label));
 
@@ -2524,20 +3828,16 @@ gtk_label_parse_uline (GtkLabel    *label,
  * Sets the label's text from the string @str.
  * If characters in @str are preceded by an underscore, they are underlined
  * indicating that they represent a keyboard accelerator called a mnemonic.
- * The mnemonic key can be used to activate another widget, chosen automatically,
- * or explicitly using gtk_label_set_mnemonic_widget().
+ * The mnemonic key can be used to activate another widget, chosen 
+ * automatically, or explicitly using gtk_label_set_mnemonic_widget().
  **/
 void
 gtk_label_set_text_with_mnemonic (GtkLabel    *label,
                                  const gchar *str)
 {
-  guint last_keyval;
-  
   g_return_if_fail (GTK_IS_LABEL (label));
   g_return_if_fail (str != NULL);
 
-  last_keyval = label->mnemonic_keyval;
-
   g_object_freeze_notify (G_OBJECT (label));
 
   gtk_label_set_label_internal (label, g_strdup (str ? str : ""));
@@ -2546,8 +3846,6 @@ gtk_label_set_text_with_mnemonic (GtkLabel    *label,
   
   gtk_label_recalculate (label);
 
-  gtk_label_setup_mnemonic (label, last_keyval);
-
   g_object_thaw_notify (G_OBJECT (label));
 }
 
@@ -2557,8 +3855,8 @@ gtk_label_realize (GtkWidget *widget)
   GtkLabel *label;
 
   label = GTK_LABEL (widget);
-  
-  (* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
+
+  GTK_WIDGET_CLASS (gtk_label_parent_class)->realize (widget);
 
   if (label->select_info)
     gtk_label_create_window (label);
@@ -2573,8 +3871,8 @@ gtk_label_unrealize (GtkWidget *widget)
 
   if (label->select_info)
     gtk_label_destroy_window (label);
-  
-  (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+
+  GTK_WIDGET_CLASS (gtk_label_parent_class)->unrealize (widget);
 }
 
 static void
@@ -2583,9 +3881,9 @@ gtk_label_map (GtkWidget *widget)
   GtkLabel *label;
 
   label = GTK_LABEL (widget);
-  
-  (* GTK_WIDGET_CLASS (parent_class)->map) (widget);
-  
+
+  GTK_WIDGET_CLASS (gtk_label_parent_class)->map (widget);
+
   if (label->select_info)
     gdk_window_show (label->select_info->window);
 }
@@ -2599,8 +3897,8 @@ gtk_label_unmap (GtkWidget *widget)
 
   if (label->select_info)
     gdk_window_hide (label->select_info->window);
-  
-  (* GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
+
+  GTK_WIDGET_CLASS (gtk_label_parent_class)->unmap (widget);
 }
 
 static void
@@ -2657,7 +3955,7 @@ layout_to_window_coords (GtkLabel *label,
 }
 #endif
 
-static void
+static gboolean
 get_layout_index (GtkLabel *label,
                   gint      x,
                   gint      y,
@@ -2666,21 +3964,21 @@ get_layout_index (GtkLabel *label,
   gint trailing = 0;
   const gchar *cluster;
   const gchar *cluster_end;
+  gboolean inside;
 
   *index = 0;
-  
+
   gtk_label_ensure_layout (label);
-  
+
   window_to_layout_coords (label, &x, &y);
 
   x *= PANGO_SCALE;
   y *= PANGO_SCALE;
-  
-  pango_layout_xy_to_index (label->layout,
-                            x, y,
-                            index, &trailing);
 
-  
+  inside = pango_layout_xy_to_index (label->layout,
+                                     x, y,
+                                     index, &trailing);
+
   cluster = label->text + *index;
   cluster_end = cluster;
   while (trailing)
@@ -2690,6 +3988,8 @@ get_layout_index (GtkLabel *label,
     }
 
   *index += (cluster_end - cluster);
+
+  return inside;
 }
 
 static void
@@ -2711,52 +4011,217 @@ gtk_label_select_word (GtkLabel *label)
   gtk_label_select_region_index (label, min, max);
 }
 
+static void
+gtk_label_grab_focus (GtkWidget *widget)
+{
+  GtkLabel *label;
+  gboolean select_on_focus;
+  GtkLabelLink *link;
+
+  label = GTK_LABEL (widget);
+
+  if (label->select_info == NULL)
+    return;
+
+  GTK_WIDGET_CLASS (gtk_label_parent_class)->grab_focus (widget);
+
+  if (label->select_info->selectable)
+    {
+      g_object_get (gtk_widget_get_settings (widget),
+                    "gtk-label-select-on-focus",
+                    &select_on_focus,
+                    NULL);
+
+      if (select_on_focus && !label->in_click)
+        gtk_label_select_region (label, 0, -1);
+    }
+  else
+    {
+      if (label->select_info->links && !label->in_click)
+        {
+          link = label->select_info->links->data;
+          label->select_info->selection_anchor = link->start;
+          label->select_info->selection_end = link->start;
+        }
+    }
+}
+
+static gboolean
+gtk_label_focus (GtkWidget        *widget,
+                 GtkDirectionType  direction)
+{
+  GtkLabel *label = GTK_LABEL (widget);
+  GtkLabelSelectionInfo *info = label->select_info;
+  GtkLabelLink *focus_link;
+  GList *l;
+
+  if (!gtk_widget_is_focus (widget))
+    {
+      gtk_widget_grab_focus (widget);
+      if (info)
+        {
+          focus_link = gtk_label_get_focus_link (label);
+          if (focus_link && direction == GTK_DIR_TAB_BACKWARD)
+            {
+              l = g_list_last (info->links);
+              focus_link = l->data;
+              info->selection_anchor = focus_link->start;
+              info->selection_end = focus_link->start;
+            }
+        }
+
+      return TRUE;
+    }
+
+  if (!info)
+    return FALSE;
+
+  if (info->selectable)
+    {
+      gint index;
+
+      if (info->selection_anchor != info->selection_end)
+        goto out;
+
+      index = info->selection_anchor;
+
+      if (direction == GTK_DIR_TAB_FORWARD)
+        for (l = info->links; l; l = l->next)
+          {
+            GtkLabelLink *link = l->data;
+
+            if (link->start > index)
+              {
+                gtk_label_select_region_index (label, link->start, link->start);
+                return TRUE;
+              }
+          }
+      else if (direction == GTK_DIR_TAB_BACKWARD)
+        for (l = g_list_last (info->links); l; l = l->prev)
+          {
+            GtkLabelLink *link = l->data;
+
+            if (link->end < index)
+              {
+                gtk_label_select_region_index (label, link->start, link->start);
+                return TRUE;
+              }
+          }
+
+      goto out;
+    }
+  else
+    {
+      focus_link = gtk_label_get_focus_link (label);
+      switch (direction)
+        {
+        case GTK_DIR_TAB_FORWARD:
+          if (focus_link)
+            {
+              l = g_list_find (info->links, focus_link);
+              l = l->next;
+            }
+          else
+            l = info->links;
+          break;
+
+        case GTK_DIR_TAB_BACKWARD:
+          if (focus_link)
+            {
+              l = g_list_find (info->links, focus_link);
+              l = l->prev;
+            }
+          else
+            l = g_list_last (info->links);
+          break;
+
+        default:
+          goto out;
+        }
+
+      if (l)
+        {
+          focus_link = l->data;
+          info->selection_anchor = focus_link->start;
+          info->selection_end = focus_link->start;
+          gtk_widget_queue_draw (widget);
+
+          return TRUE;
+        }
+    }
+
+out:
+
+  return FALSE;
+}
+
 static gboolean
 gtk_label_button_press (GtkWidget      *widget,
                         GdkEventButton *event)
 {
-  GtkLabel *label;
+  GtkLabel *label = GTK_LABEL (widget);
+  GtkLabelSelectionInfo *info = label->select_info;
   gint index = 0;
-  gint min, max;  
-  
-  label = GTK_LABEL (widget);
+  gint min, max;
 
-  if (label->select_info == NULL)
+  if (info == NULL)
+    return FALSE;
+
+  if (info->active_link)
+    {
+      if (event->button == 1)
+        {
+          info->link_clicked = 1;
+          gtk_widget_queue_draw (widget);
+        }
+      else if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
+        {
+          info->link_clicked = 1;
+          gtk_label_do_popup (label, event);
+          return TRUE;
+        }
+    }
+
+  if (!info->selectable)
     return FALSE;
 
-  label->select_info->in_drag = FALSE;
+  info->in_drag = FALSE;
+  info->select_words = FALSE;
+
   if (event->button == 1)
     {
       if (!GTK_WIDGET_HAS_FOCUS (widget))
-       gtk_widget_grab_focus (widget);
+       {
+         label->in_click = TRUE;
+         gtk_widget_grab_focus (widget);
+         label->in_click = FALSE;
+       }
 
       if (event->type == GDK_3BUTTON_PRESS)
        {
          gtk_label_select_region_index (label, 0, strlen (label->text));
          return TRUE;
        }
-      
+
       if (event->type == GDK_2BUTTON_PRESS)
        {
+          info->select_words = TRUE;
          gtk_label_select_word (label);
          return TRUE;
        }
-      
+
       get_layout_index (label, event->x, event->y, &index);
-      
-      min = MIN (label->select_info->selection_anchor,
-                label->select_info->selection_end);
-      max = MAX (label->select_info->selection_anchor,
-                label->select_info->selection_end);
-         
-      if ((label->select_info->selection_anchor !=
-          label->select_info->selection_end) &&
+
+      min = MIN (info->selection_anchor, info->selection_end);
+      max = MAX (info->selection_anchor, info->selection_end);
+
+      if ((info->selection_anchor != info->selection_end) &&
          (event->state & GDK_SHIFT_MASK))
        {
          /* extend (same as motion) */
          min = MIN (min, index);
          max = MAX (max, index);
-         
+
          /* ensure the anchor is opposite index */
          if (index == min)
            {
@@ -2764,10 +4229,10 @@ gtk_label_button_press (GtkWidget      *widget,
              min = max;
              max = tmp;
            }
-         
+
          gtk_label_select_region_index (label, min, max);
        }
-      else 
+      else
        {
          if (event->type == GDK_3BUTTON_PRESS)
            gtk_label_select_region_index (label, 0, strlen (label->text));
@@ -2775,15 +4240,15 @@ gtk_label_button_press (GtkWidget      *widget,
            gtk_label_select_word (label);
          else if (min < max && min <= index && index <= max)
            {
-             label->select_info->in_drag = TRUE;
-             label->select_info->drag_start_x = event->x;
-             label->select_info->drag_start_y = event->y;
+             info->in_drag = TRUE;
+             info->drag_start_x = event->x;
+             info->drag_start_y = event->y;
            }
          else
            /* start a replacement */
            gtk_label_select_region_index (label, index, index);
        }
-  
+
       return TRUE;
     }
   else if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
@@ -2791,7 +4256,6 @@ gtk_label_button_press (GtkWidget      *widget,
       gtk_label_do_popup (label, event);
 
       return TRUE;
-      
     }
   return FALSE;
 }
@@ -2802,86 +4266,278 @@ gtk_label_button_release (GtkWidget      *widget,
 
 {
   GtkLabel *label = GTK_LABEL (widget);
+  GtkLabelSelectionInfo *info = label->select_info;
   gint index;
-  
-  if (label->select_info == NULL)
+
+  if (info == NULL)
     return FALSE;
-  
-  if (label->select_info->in_drag)
+
+  if (info->in_drag)
     {
-      label->select_info->in_drag = 0;
+      info->in_drag = 0;
 
       get_layout_index (label, event->x, event->y, &index);
       gtk_label_select_region_index (label, index, index);
-      
+
       return FALSE;
     }
 
   if (event->button != 1)
     return FALSE;
-  
+
+  if (info->active_link &&
+      info->selection_anchor == info->selection_end &&
+      info->link_clicked)
+    {
+      emit_activate_link (label, info->active_link);
+      info->link_clicked = 0;
+
+      return TRUE;
+    }
+
   /* The goal here is to return TRUE iff we ate the
    * button press to start selecting.
    */
-  
   return TRUE;
 }
 
+static void
+connect_mnemonics_visible_notify (GtkLabel *label)
+{
+  GtkLabelPrivate *priv = GTK_LABEL_GET_PRIVATE (label);
+  GtkWidget *toplevel;
+  gboolean connected;
+
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (label));
+
+  if (!GTK_IS_WINDOW (toplevel))
+    return;
+
+  /* always set up this widgets initial value */
+  priv->mnemonics_visible =
+    gtk_window_get_mnemonics_visible (GTK_WINDOW (toplevel));
+
+  connected =
+    GPOINTER_TO_INT (g_object_get_data (G_OBJECT (toplevel),
+                                        "gtk-label-mnemonics-visible-connected"));
+
+  if (!connected)
+    {
+      g_signal_connect (toplevel,
+                        "notify::mnemonics-visible",
+                        G_CALLBACK (label_mnemonics_visible_changed),
+                        label);
+      g_object_set_data (G_OBJECT (toplevel),
+                         "gtk-label-mnemonics-visible-connected",
+                         GINT_TO_POINTER (1));
+    }
+}
+
+static void
+drag_begin_cb (GtkWidget      *widget,
+               GdkDragContext *context,
+               gpointer        data)
+{
+  GtkLabel *label;
+  GdkPixmap *pixmap = NULL;
+
+  g_signal_handlers_disconnect_by_func (widget, drag_begin_cb, NULL);
+
+  label = GTK_LABEL (widget);
+
+  if ((label->select_info->selection_anchor !=
+       label->select_info->selection_end) &&
+      label->text)
+    {
+      gint start, end;
+      gint len;
+
+      start = MIN (label->select_info->selection_anchor,
+                   label->select_info->selection_end);
+      end = MAX (label->select_info->selection_anchor,
+                 label->select_info->selection_end);
+      
+      len = strlen (label->text);
+      
+      if (end > len)
+        end = len;
+      
+      if (start > len)
+        start = len;
+      
+      pixmap = _gtk_text_util_create_drag_icon (widget, 
+                                               label->text + start,
+                                               end - start);
+    }
+
+  if (pixmap)
+    gtk_drag_set_icon_pixmap (context,
+                              gdk_drawable_get_colormap (pixmap),
+                              pixmap,
+                              NULL,
+                              -2, -2);
+  else
+    gtk_drag_set_icon_default (context);
+  
+  if (pixmap)
+    g_object_unref (pixmap);
+}
+
 static gboolean
 gtk_label_motion (GtkWidget      *widget,
                   GdkEventMotion *event)
 {
-  GtkLabel *label;
+  GtkLabel *label = GTK_LABEL (widget);
+  GtkLabelSelectionInfo *info = label->select_info;
   gint index;
   gint x, y;
-  
-  label = GTK_LABEL (widget);
-  
-  if (label->select_info == NULL)
-    return FALSE;  
 
+  if (info == NULL)
+    return FALSE;
+
+  if (info->links && !info->in_drag)
+    {
+      GList *l;
+      GtkLabelLink *link;
+      gboolean found = FALSE;
+
+      if (info->selection_anchor == info->selection_end)
+        {
+          gdk_window_get_pointer (event->window, &x, &y, NULL);
+          if (get_layout_index (label, x, y, &index))
+            {
+              for (l = info->links; l != NULL; l = l->next)
+                {
+                  link = l->data;
+                  if (index >= link->start && index <= link->end)
+                    {
+                      found = TRUE;
+                      break;
+                    }
+                }
+            }
+        }
+
+      if (found)
+        {
+          if (info->active_link != link)
+            {
+              info->link_clicked = 0;
+              info->active_link = link;
+              gtk_label_update_cursor (label);
+              gtk_widget_queue_draw (widget);
+            }
+        }
+      else
+        {
+          if (info->active_link != NULL)
+            {
+              info->link_clicked = 0;
+              info->active_link = NULL;
+              gtk_label_update_cursor (label);
+              gtk_widget_queue_draw (widget);
+            }
+        }
+    }
+
+  if (!info->selectable)
+    return FALSE;
 
   if ((event->state & GDK_BUTTON1_MASK) == 0)
     return FALSE;
 
-  gdk_window_get_pointer (label->select_info->window,
-                          &x, &y, NULL);
-  
-  if (label->select_info->in_drag)
+  gdk_window_get_pointer (info->window, &x, &y, NULL);
+  if (info->in_drag)
     {
       if (gtk_drag_check_threshold (widget,
-                                   label->select_info->drag_start_x, 
-                                   label->select_info->drag_start_y,
+                                   info->drag_start_x,
+                                   info->drag_start_y,
                                    event->x, event->y))
        {
-         GdkDragContext *context;
          GtkTargetList *target_list = gtk_target_list_new (NULL, 0);
 
          gtk_target_list_add_text_targets (target_list, 0);
 
-         context = gtk_drag_begin (widget, target_list, 
-                                   GDK_ACTION_COPY,
-                                   1, (GdkEvent *)event);
+          g_signal_connect (widget, "drag-begin",
+                            G_CALLBACK (drag_begin_cb), NULL);
+         gtk_drag_begin (widget, target_list,
+                         GDK_ACTION_COPY,
+                         1, (GdkEvent *)event);
+
+         info->in_drag = FALSE;
 
-         
-         label->select_info->in_drag = FALSE;
-         
          gtk_target_list_unref (target_list);
-         gtk_drag_set_icon_default (context);
        }
     }
   else
     {
       get_layout_index (label, x, y, &index);
-      
-      gtk_label_select_region_index (label,
-                                    label->select_info->selection_anchor,
-                                    index);
+
+      if (info->select_words)
+        {
+          gint min, max;
+          gint old_min, old_max;
+          gint anchor, end;
+
+          min = gtk_label_move_backward_word (label, index);
+          max = gtk_label_move_forward_word (label, index);
+
+          anchor = info->selection_anchor;
+          end = info->selection_end;
+
+          old_min = MIN (anchor, end);
+          old_max = MAX (anchor, end);
+
+          if (min < old_min)
+            {
+              anchor = min;
+              end = old_max;
+            }
+          else if (old_max < max)
+            {
+              anchor = max;
+              end = old_min;
+            }
+          else if (anchor == old_min)
+            {
+              if (anchor != min)
+                anchor = max;
+            }
+          else
+            {
+              if (anchor != max)
+                anchor = min;
+            }
+
+          gtk_label_select_region_index (label, anchor, end);
+        }
+      else
+        gtk_label_select_region_index (label, info->selection_anchor, index);
     }
 
   return TRUE;
 }
 
+static gboolean
+gtk_label_leave_notify (GtkWidget        *widget,
+                        GdkEventCrossing *event)
+{
+  GtkLabel *label = GTK_LABEL (widget);
+
+  if (label->select_info)
+    {
+      label->select_info->active_link = NULL;
+      gtk_label_update_cursor (label);
+      gtk_widget_queue_draw (widget);
+    }
+
+  if (GTK_WIDGET_CLASS (gtk_label_parent_class)->leave_notify_event)
+    return GTK_WIDGET_CLASS (gtk_label_parent_class)->leave_notify_event (widget, event);
+
+ return FALSE;
+}
+
 static void
 gtk_label_create_window (GtkLabel *label)
 {
@@ -2901,23 +4557,31 @@ gtk_label_create_window (GtkLabel *label)
   attributes.y = widget->allocation.y;
   attributes.width = widget->allocation.width;
   attributes.height = widget->allocation.height;
-  attributes.window_type = GDK_WINDOW_TEMP;
+  attributes.window_type = GDK_WINDOW_CHILD;
   attributes.wclass = GDK_INPUT_ONLY;
   attributes.override_redirect = TRUE;
-  attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
-                                                 GDK_XTERM);
   attributes.event_mask = gtk_widget_get_events (widget) |
     GDK_BUTTON_PRESS_MASK        |
     GDK_BUTTON_RELEASE_MASK      |
-    GDK_BUTTON_MOTION_MASK;
+    GDK_LEAVE_NOTIFY_MASK        |
+    GDK_BUTTON_MOTION_MASK       |
+    GDK_POINTER_MOTION_MASK      |
+    GDK_POINTER_MOTION_HINT_MASK;
+  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_NOREDIR;
+  if (GTK_WIDGET_IS_SENSITIVE (widget))
+    {
+      attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
+                                                     GDK_XTERM);
+      attributes_mask |= GDK_WA_CURSOR;
+    }
 
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_NOREDIR | GDK_WA_CURSOR;
 
   label->select_info->window = gdk_window_new (widget->window,
                                                &attributes, attributes_mask);
   gdk_window_set_user_data (label->select_info->window, widget);
 
-  gdk_cursor_unref (attributes.cursor);
+  if (attributes_mask & GDK_WA_CURSOR)
+    gdk_cursor_unref (attributes.cursor);
 }
 
 static void
@@ -2927,12 +4591,46 @@ gtk_label_destroy_window (GtkLabel *label)
 
   if (label->select_info->window == NULL)
     return;
-  
+
   gdk_window_set_user_data (label->select_info->window, NULL);
   gdk_window_destroy (label->select_info->window);
   label->select_info->window = NULL;
 }
 
+static void
+gtk_label_ensure_select_info (GtkLabel *label)
+{
+  if (label->select_info == NULL)
+    {
+      label->select_info = g_new0 (GtkLabelSelectionInfo, 1);
+
+      GTK_WIDGET_SET_FLAGS (label, GTK_CAN_FOCUS);
+
+      if (GTK_WIDGET_REALIZED (label))
+       gtk_label_create_window (label);
+
+      if (GTK_WIDGET_MAPPED (label))
+        gdk_window_show (label->select_info->window);
+    }
+}
+
+static void
+gtk_label_clear_select_info (GtkLabel *label)
+{
+  if (label->select_info == NULL)
+    return;
+
+  if (!label->select_info->selectable && !label->select_info->links)
+    {
+      gtk_label_destroy_window (label);
+
+      g_free (label->select_info);
+      label->select_info = NULL;
+
+      GTK_WIDGET_UNSET_FLAGS (label, GTK_CAN_FOCUS);
+    }
+}
+
 /**
  * gtk_label_set_selectable:
  * @label: a #GtkLabel
@@ -2940,59 +4638,42 @@ gtk_label_destroy_window (GtkLabel *label)
  *
  * Selectable labels allow the user to select text from the label, for
  * copy-and-paste.
- * 
  **/
 void
 gtk_label_set_selectable (GtkLabel *label,
                           gboolean  setting)
 {
   gboolean old_setting;
-  
+
   g_return_if_fail (GTK_IS_LABEL (label));
-  
+
   setting = setting != FALSE;
-  old_setting = label->select_info != NULL;
-  
+  old_setting = label->select_info && label->select_info->selectable;
+
   if (setting)
     {
-      if (label->select_info == NULL)
-        {
-          label->select_info = g_new0 (GtkLabelSelectionInfo, 1);
-
-         GTK_WIDGET_SET_FLAGS (label, GTK_CAN_FOCUS);
-      
-          if (GTK_WIDGET_REALIZED (label))
-           gtk_label_create_window (label);
-
-          if (GTK_WIDGET_MAPPED (label))
-            gdk_window_show (label->select_info->window);
-        }
+      gtk_label_ensure_select_info (label);
+      label->select_info->selectable = TRUE;
+      gtk_label_update_cursor (label);
     }
   else
     {
-      if (label->select_info)
+      if (old_setting)
         {
           /* unselect, to give up the selection */
           gtk_label_select_region (label, 0, 0);
-          
-          if (label->select_info->window)
-           {
-             gtk_label_destroy_window (label);
-           }
-
-          g_free (label->select_info);
-
-          label->select_info = NULL;
 
-         GTK_WIDGET_UNSET_FLAGS (label, GTK_CAN_FOCUS);
+          label->select_info->selectable = FALSE;
+          gtk_label_clear_select_info (label);
+          gtk_label_update_cursor (label);
         }
     }
   if (setting != old_setting)
     {
       g_object_freeze_notify (G_OBJECT (label));
       g_object_notify (G_OBJECT (label), "selectable");
-      g_object_notify (G_OBJECT (label), "cursor_position");
-      g_object_notify (G_OBJECT (label), "selection_bound");
+      g_object_notify (G_OBJECT (label), "cursor-position");
+      g_object_notify (G_OBJECT (label), "selection-bound");
       g_object_thaw_notify (G_OBJECT (label));
       gtk_widget_queue_draw (GTK_WIDGET (label));
     }
@@ -3011,7 +4692,13 @@ gtk_label_get_selectable (GtkLabel *label)
 {
   g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
 
-  return label->select_info != NULL;
+  return label->select_info && label->select_info->selectable;
+}
+
+static void
+free_angle (gpointer angle)
+{
+  g_slice_free (gdouble, angle);
 }
 
 /**
@@ -3031,12 +4718,20 @@ void
 gtk_label_set_angle (GtkLabel *label,
                     gdouble   angle)
 {
-  GtkLabelPrivate *priv;
+  gdouble *label_angle;
 
   g_return_if_fail (GTK_IS_LABEL (label));
 
-  priv = GTK_LABEL_GET_PRIVATE (label);
+  label_angle = (gdouble *)g_object_get_qdata (G_OBJECT (label), quark_angle);
 
+  if (!label_angle)
+    {
+      label_angle = g_slice_new (gdouble);
+      *label_angle = 0.0;
+      g_object_set_qdata_full (G_OBJECT (label), quark_angle, 
+                              label_angle, free_angle);
+    }
+  
   /* Canonicalize to [0,360]. We don't canonicalize 360 to 0, because
    * double property ranges are inclusive, and changing 360 to 0 would
    * make a property editor behave strangely.
@@ -3044,9 +4739,9 @@ gtk_label_set_angle (GtkLabel *label,
   if (angle < 0 || angle > 360.0)
     angle = angle - 360. * floor (angle / 360.);
 
-  if (angle != priv->angle)
+  if (*label_angle != angle)
     {
-      priv->angle = angle;
+      *label_angle = angle;
       
       gtk_label_clear_layout (label);
       gtk_widget_queue_resize (GTK_WIDGET (label));
@@ -3060,7 +4755,7 @@ gtk_label_set_angle (GtkLabel *label,
  * @label: a #GtkLabel
  * 
  * Gets the angle of rotation for the label. See
- * gtk_label_set_angle.
+ * gtk_label_set_angle().
  * 
  * Return value: the angle of rotation for the label
  *
@@ -3069,13 +4764,16 @@ gtk_label_set_angle (GtkLabel *label,
 gdouble
 gtk_label_get_angle  (GtkLabel *label)
 {
-  GtkLabelPrivate *priv;
+  gdouble *angle;
 
   g_return_val_if_fail (GTK_IS_LABEL (label), 0.0);
+  
+  angle = (gdouble *)g_object_get_qdata (G_OBJECT (label), quark_angle);
 
-  priv = GTK_LABEL_GET_PRIVATE (label);
-
-  return priv->angle;
+  if (angle)
+    return *angle;
+  else
+    return 0.0;
 }
 
 static void
@@ -3148,16 +4846,9 @@ gtk_label_select_region_index (GtkLabel *label,
                                gint      anchor_index,
                                gint      end_index)
 {
-  static const GtkTargetEntry targets[] = {
-    { "STRING", 0, 0 },
-    { "TEXT",   0, 0 }, 
-    { "COMPOUND_TEXT", 0, 0 },
-    { "UTF8_STRING", 0, 0 }
-  };
-
   g_return_if_fail (GTK_IS_LABEL (label));
   
-  if (label->select_info)
+  if (label->select_info && label->select_info->selectable)
     {
       GtkClipboard *clipboard;
 
@@ -3169,16 +4860,26 @@ gtk_label_select_region_index (GtkLabel *label,
       label->select_info->selection_end = end_index;
 
       clipboard = gtk_widget_get_clipboard (GTK_WIDGET (label),
-                                           GDK_SELECTION_PRIMARY);      
-      
+                                           GDK_SELECTION_PRIMARY);
+
       if (anchor_index != end_index)
         {
+          GtkTargetList *list;
+          GtkTargetEntry *targets;
+          gint n_targets;
+
+          list = gtk_target_list_new (NULL, 0);
+          gtk_target_list_add_text_targets (list, 0);
+          targets = gtk_target_table_new_from_list (list, &n_targets);
+
           gtk_clipboard_set_with_owner (clipboard,
-                                        targets,
-                                        G_N_ELEMENTS (targets),
+                                        targets, n_targets,
                                         get_text_callback,
                                         clear_text_callback,
                                         G_OBJECT (label));
+
+          gtk_target_table_free (targets, n_targets);
+          gtk_target_list_unref (list);
         }
       else
         {
@@ -3189,8 +4890,8 @@ gtk_label_select_region_index (GtkLabel *label,
       gtk_widget_queue_draw (GTK_WIDGET (label));
 
       g_object_freeze_notify (G_OBJECT (label));
-      g_object_notify (G_OBJECT (label), "cursor_position");
-      g_object_notify (G_OBJECT (label), "selection_bound");
+      g_object_notify (G_OBJECT (label), "cursor-position");
+      g_object_notify (G_OBJECT (label), "selection-bound");
       g_object_thaw_notify (G_OBJECT (label));
     }
 }
@@ -3205,7 +4906,6 @@ gtk_label_select_region_index (GtkLabel *label,
  * See gtk_label_set_selectable(). If the label is not selectable,
  * this function has no effect. If @start_offset or
  * @end_offset are -1, then the end of the label will be substituted.
- * 
  **/
 void
 gtk_label_select_region  (GtkLabel *label,
@@ -3305,8 +5005,8 @@ gtk_label_get_selection_bounds (GtkLabel  *label,
  * pixel positions, in combination with gtk_label_get_layout_offsets().
  * The returned layout is owned by the label so need not be
  * freed by the caller.
- * 
- * Return value: the #PangoLayout for this label
+ *
+ * Return value: (transfer none): the #PangoLayout for this label
  **/
 PangoLayout*
 gtk_label_get_layout (GtkLabel *label)
@@ -3332,7 +5032,6 @@ gtk_label_get_layout (GtkLabel *label)
  * inside it, since labels are a #GTK_NO_WINDOW widget. Remember
  * when using the #PangoLayout functions you need to convert to
  * and from pixels using PANGO_PIXELS() or #PANGO_SCALE.
- * 
  **/
 void
 gtk_label_get_layout_offsets (GtkLabel *label,
@@ -3340,7 +5039,9 @@ gtk_label_get_layout_offsets (GtkLabel *label,
                               gint     *y)
 {
   g_return_if_fail (GTK_IS_LABEL (label));
-  
+
+  gtk_label_ensure_layout (label);
+
   get_layout_location (label, x, y);
 }
 
@@ -3397,8 +5098,6 @@ gtk_label_set_use_underline (GtkLabel *label,
 
   gtk_label_set_use_underline_internal (label, setting);
   gtk_label_recalculate (label);
-  if (label->use_underline)
-    gtk_label_setup_mnemonic (label, label->mnemonic_keyval);
 }
 
 /**
@@ -3406,7 +5105,7 @@ gtk_label_set_use_underline (GtkLabel *label,
  * @label: a #GtkLabel
  *
  * Returns whether an embedded underline in the label indicates a
- * mnemonic. See gtk_label_set_use_underline ().
+ * mnemonic. See gtk_label_set_use_underline().
  *
  * Return value: %TRUE whether an embedded underline in the label indicates
  *               the mnemonic accelerator keys.
@@ -3432,16 +5131,13 @@ void
 gtk_label_set_single_line_mode (GtkLabel *label,
                                 gboolean single_line_mode)
 {
-  GtkLabelPrivate *priv;
-
   g_return_if_fail (GTK_IS_LABEL (label));
 
   single_line_mode = single_line_mode != FALSE;
 
-  priv = GTK_LABEL_GET_PRIVATE (label);
-  if (priv->single_line_mode != single_line_mode)
+  if (label->single_line_mode != single_line_mode)
     {
-      priv->single_line_mode = single_line_mode;
+      label->single_line_mode = single_line_mode;
 
       gtk_label_clear_layout (label);
       gtk_widget_queue_resize (GTK_WIDGET (label));
@@ -3463,13 +5159,9 @@ gtk_label_set_single_line_mode (GtkLabel *label,
 gboolean
 gtk_label_get_single_line_mode  (GtkLabel *label)
 {
-  GtkLabelPrivate *priv;
-
   g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
 
-  priv = GTK_LABEL_GET_PRIVATE (label);
-
-  return priv->single_line_mode;
+  return label->single_line_mode;
 }
 
 /* Compute the X position for an offset that corresponds to the "more important
@@ -3652,10 +5344,7 @@ gtk_label_move_backward_word (GtkLabel *label,
 {
   gint new_pos = g_utf8_pointer_to_offset (label->text,
                                           label->text + start);
-  gint length;
 
-  length = g_utf8_strlen (label->text, -1);
-  
   if (new_pos > 0)
     {
       PangoLogAttr *log_attrs;
@@ -3683,12 +5372,13 @@ gtk_label_move_cursor (GtkLabel       *label,
                       gint            count,
                       gboolean        extend_selection)
 {
+  gint old_pos;
   gint new_pos;
   
   if (label->select_info == NULL)
     return;
-  
-  new_pos = label->select_info->selection_end;
+
+  old_pos = new_pos = label->select_info->selection_end;
 
   if (label->select_info->selection_end != label->select_info->selection_anchor &&
       !extend_selection)
@@ -3713,7 +5403,6 @@ gtk_label_move_cursor (GtkLabel       *label,
              new_pos = end_is_left ? label->select_info->selection_end : label->select_info->selection_anchor;
            else
              new_pos = !end_is_left ? label->select_info->selection_end : label->select_info->selection_anchor;
-
            break;
          }
        case GTK_MOVEMENT_LOGICAL_POSITIONS:
@@ -3745,6 +5434,27 @@ gtk_label_move_cursor (GtkLabel       *label,
          break;
        case GTK_MOVEMENT_VISUAL_POSITIONS:
          new_pos = gtk_label_move_visually (label, new_pos, count);
+          if (new_pos == old_pos)
+            {
+              if (!extend_selection)
+                {
+                  if (!gtk_widget_keynav_failed (GTK_WIDGET (label),
+                                                 count > 0 ?
+                                                 GTK_DIR_RIGHT : GTK_DIR_LEFT))
+                    {
+                      GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (label));
+
+                      if (toplevel)
+                        gtk_widget_child_focus (toplevel,
+                                                count > 0 ?
+                                                GTK_DIR_RIGHT : GTK_DIR_LEFT);
+                    }
+                }
+              else
+                {
+                  gtk_widget_error_bell (GTK_WIDGET (label));
+                }
+            }
          break;
        case GTK_MOVEMENT_WORDS:
          while (count > 0)
@@ -3757,12 +5467,16 @@ gtk_label_move_cursor (GtkLabel       *label,
              new_pos = gtk_label_move_backward_word (label, new_pos);
              count++;
            }
+          if (new_pos == old_pos)
+            gtk_widget_error_bell (GTK_WIDGET (label));
          break;
        case GTK_MOVEMENT_DISPLAY_LINE_ENDS:
        case GTK_MOVEMENT_PARAGRAPH_ENDS:
        case GTK_MOVEMENT_BUFFER_ENDS:
          /* FIXME: Can do better here */
          new_pos = count < 0 ? 0 : strlen (label->text);
+          if (new_pos == old_pos)
+            gtk_widget_error_bell (GTK_WIDGET (label));
          break;
        case GTK_MOVEMENT_DISPLAY_LINES:
        case GTK_MOVEMENT_PARAGRAPHS:
@@ -3787,7 +5501,8 @@ gtk_label_copy_clipboard (GtkLabel *label)
     {
       gint start, end;
       gint len;
-      
+      GtkClipboard *clipboard;
+
       start = MIN (label->select_info->selection_anchor,
                    label->select_info->selection_end);
       end = MAX (label->select_info->selection_anchor,
@@ -3801,10 +5516,18 @@ gtk_label_copy_clipboard (GtkLabel *label)
       if (start > len)
         start = len;
 
+      clipboard = gtk_widget_get_clipboard (GTK_WIDGET (label), GDK_SELECTION_CLIPBOARD);
+
       if (start != end)
-       gtk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (label),
-                                                         GDK_SELECTION_CLIPBOARD),
-                               label->text + start, end - start);
+       gtk_clipboard_set_text (clipboard, label->text + start, end - start);
+      else
+        {
+          GtkLabelLink *link;
+
+          link = gtk_label_get_focus_link (label);
+          if (link)
+            gtk_clipboard_set_text (clipboard, link->uri, -1);
+        }
     }
 }
 
@@ -3833,7 +5556,7 @@ append_action_signal (GtkLabel     *label,
 {
   GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL);
 
-  g_object_set_data (G_OBJECT (menuitem), "gtk-signal", (char *)signal);
+  g_object_set_data (G_OBJECT (menuitem), I_("gtk-signal"), (char *)signal);
   g_signal_connect (menuitem, "activate",
                    G_CALLBACK (activate_cb), label);
 
@@ -3847,8 +5570,7 @@ static void
 popup_menu_detach (GtkWidget *attach_widget,
                   GtkMenu   *menu)
 {
-  GtkLabel *label;
-  label = GTK_LABEL (attach_widget);
+  GtkLabel *label = GTK_LABEL (attach_widget);
 
   if (label->select_info)
     label->select_info->popup_menu = NULL;
@@ -3865,20 +5587,20 @@ popup_position_func (GtkMenu   *menu,
   GtkWidget *widget;
   GtkRequisition req;
   GdkScreen *screen;
-  
-  label = GTK_LABEL (user_data);  
+
+  label = GTK_LABEL (user_data);
   widget = GTK_WIDGET (label);
 
-  if (label->select_info == NULL)
-    return;
-  
   g_return_if_fail (GTK_WIDGET_REALIZED (label));
-  
+
   screen = gtk_widget_get_screen (widget);
-  gdk_window_get_origin (widget->window, x, y);      
+  gdk_window_get_origin (widget->window, x, y);
+
+  *x += widget->allocation.x;
+  *y += widget->allocation.y;
+
+  gtk_widget_size_request (GTK_WIDGET (menu), &req);
 
-  gtk_widget_size_request (label->select_info->popup_menu, &req);
-  
   *x += widget->allocation.width / 2;
   *y += widget->allocation.height;
 
@@ -3886,63 +5608,410 @@ popup_position_func (GtkMenu   *menu,
   *y = CLAMP (*y, 0, MAX (0, gdk_screen_get_height (screen) - req.height));
 }
 
+static void
+open_link_activate_cb (GtkMenuItem *menu_item,
+                       GtkLabel    *label)
+{
+  GtkLabelLink *link;
+
+  link = gtk_label_get_current_link (label);
+
+  if (link)
+    emit_activate_link (label, link);
+}
+
+static void
+copy_link_activate_cb (GtkMenuItem *menu_item,
+                       GtkLabel    *label)
+{
+  GtkClipboard *clipboard;
+  const gchar *uri;
+
+  uri = gtk_label_get_current_uri (label);
+  if (uri)
+    {
+      clipboard = gtk_widget_get_clipboard (GTK_WIDGET (label), GDK_SELECTION_CLIPBOARD);
+      gtk_clipboard_set_text (clipboard, uri, -1);
+    }
+}
+
+static gboolean
+gtk_label_popup_menu (GtkWidget *widget)
+{
+  gtk_label_do_popup (GTK_LABEL (widget), NULL);
+
+  return TRUE;
+}
 
 static void
 gtk_label_do_popup (GtkLabel       *label,
                     GdkEventButton *event)
 {
   GtkWidget *menuitem;
+  GtkWidget *menu;
+  GtkWidget *image;
   gboolean have_selection;
+  GtkLabelLink *link;
 
-  if (label->select_info == NULL)
+  if (!label->select_info)
     return;
-    
+
   if (label->select_info->popup_menu)
     gtk_widget_destroy (label->select_info->popup_menu);
-  
-  label->select_info->popup_menu = gtk_menu_new ();
 
-  gtk_menu_attach_to_widget (GTK_MENU (label->select_info->popup_menu),
-                             GTK_WIDGET (label),
-                             popup_menu_detach);
+  label->select_info->popup_menu = menu = gtk_menu_new ();
+
+  gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (label), popup_menu_detach);
 
   have_selection =
     label->select_info->selection_anchor != label->select_info->selection_end;
 
+  if (event)
+    {
+      if (label->select_info->link_clicked)
+        link = label->select_info->active_link;
+      else
+        link = NULL;
+    }
+  else
+    link = gtk_label_get_focus_link (label);
+
+  if (!have_selection && link)
+    {
+      /* Open Link */
+      menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Open Link"));
+      gtk_widget_show (menuitem);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 
-  append_action_signal (label, label->select_info->popup_menu, GTK_STOCK_CUT, "cut_clipboard",
-                        FALSE);
-  append_action_signal (label, label->select_info->popup_menu, GTK_STOCK_COPY, "copy_clipboard",
-                        have_selection);
-  append_action_signal (label, label->select_info->popup_menu, GTK_STOCK_PASTE, "paste_clipboard",
-                        FALSE);
-  
-  menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_DELETE, NULL);
-  gtk_widget_set_sensitive (menuitem, FALSE);
-  gtk_widget_show (menuitem);
-  gtk_menu_shell_append (GTK_MENU_SHELL (label->select_info->popup_menu), menuitem);
+      g_signal_connect (G_OBJECT (menuitem), "activate",
+                        G_CALLBACK (open_link_activate_cb), label);
 
-  menuitem = gtk_separator_menu_item_new ();
-  gtk_widget_show (menuitem);
-  gtk_menu_shell_append (GTK_MENU_SHELL (label->select_info->popup_menu), menuitem);
-      
-  menuitem = gtk_menu_item_new_with_label (_("Select All"));
-  g_signal_connect_swapped (menuitem, "activate",
-                           G_CALLBACK (gtk_label_select_all), label);
-  gtk_widget_show (menuitem);
-  gtk_menu_shell_append (GTK_MENU_SHELL (label->select_info->popup_menu), menuitem);
+      image = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_MENU);
+      gtk_widget_show (image);
+      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
+
+      /* Copy Link Address */
+      menuitem = gtk_image_menu_item_new_with_mnemonic (_("Copy _Link Address"));
+      gtk_widget_show (menuitem);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+
+      g_signal_connect (G_OBJECT (menuitem), "activate",
+                        G_CALLBACK (copy_link_activate_cb), label);
+
+      image = gtk_image_new_from_stock (GTK_STOCK_COPY, GTK_ICON_SIZE_MENU);
+      gtk_widget_show (image);
+      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
+    }
+  else
+    {
+      append_action_signal (label, menu, GTK_STOCK_CUT, "cut-clipboard", FALSE);
+      append_action_signal (label, menu, GTK_STOCK_COPY, "copy-clipboard", have_selection);
+      append_action_signal (label, menu, GTK_STOCK_PASTE, "paste-clipboard", FALSE);
+  
+      menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_DELETE, NULL);
+      gtk_widget_set_sensitive (menuitem, FALSE);
+      gtk_widget_show (menuitem);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+
+      menuitem = gtk_separator_menu_item_new ();
+      gtk_widget_show (menuitem);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+
+      menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_SELECT_ALL, NULL);
+      g_signal_connect_swapped (menuitem, "activate",
+                               G_CALLBACK (gtk_label_select_all), label);
+      gtk_widget_show (menuitem);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+    }
+
+  g_signal_emit (label, signals[POPULATE_POPUP], 0, menu);
 
-  g_signal_emit (label,
-                signals[POPULATE_POPUP],
-                0,
-                label->select_info->popup_menu);
-  
   if (event)
-    gtk_menu_popup (GTK_MENU (label->select_info->popup_menu), NULL, NULL,
+    gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
                     NULL, NULL,
                     event->button, event->time);
   else
-    gtk_menu_popup (GTK_MENU (label->select_info->popup_menu), NULL, NULL,
-                    popup_position_func, label,
-                    0, gtk_get_current_event_time ());
+    {
+      gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
+                      popup_position_func, label,
+                      0, gtk_get_current_event_time ());
+      gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE);
+    }
+}
+
+static void
+gtk_label_clear_links (GtkLabel *label)
+{
+  if (!label->select_info)
+    return;
+
+  g_list_foreach (label->select_info->links, (GFunc)link_free, NULL);
+  g_list_free (label->select_info->links);
+  label->select_info->links = NULL;
+  label->select_info->active_link = NULL;
+}
+
+static void
+gtk_label_rescan_links (GtkLabel *label)
+{
+  PangoLayout *layout = label->layout;
+  PangoAttrList *attlist;
+  PangoAttrIterator *iter;
+  GList *links;
+
+  if (!label->select_info || !label->select_info->links)
+    return;
+
+  attlist = pango_layout_get_attributes (layout);
+
+  if (attlist == NULL)
+    return;
+
+  iter = pango_attr_list_get_iterator (attlist);
+
+  links = label->select_info->links;
+
+  do
+    {
+      PangoAttribute *underline;
+      PangoAttribute *color;
+
+      underline = pango_attr_iterator_get (iter, PANGO_ATTR_UNDERLINE);
+      color = pango_attr_iterator_get (iter, PANGO_ATTR_FOREGROUND);
+
+      if (underline != NULL && color != NULL)
+        {
+          gint start, end;
+          PangoRectangle start_pos;
+          PangoRectangle end_pos;
+          GtkLabelLink *link;
+
+          pango_attr_iterator_range (iter, &start, &end);
+          pango_layout_index_to_pos (layout, start, &start_pos);
+          pango_layout_index_to_pos (layout, end, &end_pos);
+
+          if (links == NULL)
+            {
+              g_warning ("Ran out of links");
+              break;
+            }
+          link = links->data;
+          links = links->next;
+          link->start = start;
+          link->end = end;
+        }
+      } while (pango_attr_iterator_next (iter));
+
+    pango_attr_iterator_destroy (iter);
+}
+
+static gboolean
+gtk_label_activate_link (GtkLabel    *label,
+                         const gchar *uri)
+{
+  GtkWidget *widget = GTK_WIDGET (label);
+  GError *error = NULL;
+
+  if (!gtk_show_uri (gtk_widget_get_screen (widget),
+                     uri, gtk_get_current_event_time (), &error))
+    {
+      g_warning ("Unable to show '%s': %s", uri, error->message);
+      g_error_free (error);
+    }
+
+  return TRUE;
+}
+
+static void
+emit_activate_link (GtkLabel     *label,
+                    GtkLabelLink *link)
+{
+  gboolean handled;
+
+  g_signal_emit (label, signals[ACTIVATE_LINK], 0, link->uri, &handled);
+  if (handled && label->track_links && !link->visited)
+    {
+      link->visited = TRUE;
+      /* FIXME: shouldn't have to redo everything here */
+      gtk_label_recalculate (label);
+    }
+}
+
+static void
+gtk_label_activate_current_link (GtkLabel *label)
+{
+  GtkLabelLink *link;
+  GtkWidget *widget = GTK_WIDGET (label);
+
+  link = gtk_label_get_focus_link (label);
+
+  if (link)
+    {
+      emit_activate_link (label, link);
+    }
+  else
+    {
+      GtkWidget *toplevel;
+      GtkWindow *window;
+
+      toplevel = gtk_widget_get_toplevel (widget);
+      if (GTK_IS_WINDOW (toplevel))
+        {
+          window = GTK_WINDOW (toplevel);
+
+          if (window &&
+              window->default_widget != widget &&
+              !(widget == window->focus_widget &&
+                (!window->default_widget || !GTK_WIDGET_IS_SENSITIVE (window->default_widget))))
+            gtk_window_activate_default (window);
+        }
+    }
+}
+
+static GtkLabelLink *
+gtk_label_get_current_link (GtkLabel *label)
+{
+  GtkLabelLink *link;
+
+  if (!label->select_info)
+    return NULL;
+
+  if (label->select_info->link_clicked)
+    link = label->select_info->active_link;
+  else
+    link = gtk_label_get_focus_link (label);
+
+  return link;
 }
+
+/**
+ * gtk_label_get_current_uri:
+ * @label: a #GtkLabel
+ *
+ * Returns the URI for the currently active link in the label.
+ * The active link is the one under the mouse pointer or, in a
+ * selectable label, the link in which the text cursor is currently
+ * positioned.
+ *
+ * This function is intended for use in a #GtkLabel::activate-link handler
+ * or for use in a #GtkWidget::query-tooltip handler.
+ *
+ * Returns: the currently active URI. The string is owned by GTK+ and must
+ *   not be freed or modified.
+ *
+ * Since: 2.18
+ */
+G_CONST_RETURN gchar *
+gtk_label_get_current_uri (GtkLabel *label)
+{
+  GtkLabelLink *link;
+  g_return_val_if_fail (GTK_IS_LABEL (label), NULL);
+
+  link = gtk_label_get_current_link (label);
+
+  if (link)
+    return link->uri;
+
+  return NULL;
+}
+
+/**
+ * gtk_label_set_track_visited_links:
+ * @label: a #GtkLabel
+ * @track_links: %TRUE to track visited links
+ *
+ * Sets whether the label should keep track of clicked
+ * links (and use a different color for them).
+ *
+ * Since: 2.18
+ */
+void
+gtk_label_set_track_visited_links (GtkLabel *label,
+                                   gboolean  track_links)
+{
+  g_return_if_fail (GTK_IS_LABEL (label));
+
+  track_links = track_links != FALSE;
+
+  if (label->track_links != track_links)
+    {
+      label->track_links = track_links;
+
+      /* FIXME: shouldn't have to redo everything here */
+      gtk_label_recalculate (label);
+
+      g_object_notify (G_OBJECT (label), "track-visited-links");
+    }
+}
+
+/**
+ * gtk_label_get_track_visited_links:
+ * @label: a #GtkLabel
+ *
+ * Returns whether the label is currently keeping track
+ * of clicked links.
+ *
+ * Returns: %TRUE if clicked links are remembered
+ *
+ * Since: 2.18
+ */
+gboolean
+gtk_label_get_track_visited_links (GtkLabel *label)
+{
+  g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
+
+  return label->track_links;
+}
+
+static gboolean
+gtk_label_query_tooltip (GtkWidget  *widget,
+                         gint        x,
+                         gint        y,
+                         gboolean    keyboard_tip,
+                         GtkTooltip *tooltip)
+{
+  GtkLabel *label = GTK_LABEL (widget);
+  GtkLabelSelectionInfo *info = label->select_info;
+  gint index = -1;
+  GList *l;
+
+  if (info && info->links)
+    {
+      if (keyboard_tip)
+        {
+          if (info->selection_anchor == info->selection_end)
+            index = info->selection_anchor;
+        }
+      else
+        {
+          if (!get_layout_index (label, x, y, &index))
+            index = -1;
+        }
+
+      if (index != -1)
+        {
+          for (l = info->links; l != NULL; l = l->next)
+            {
+              GtkLabelLink *link = l->data;
+              if (index >= link->start && index <= link->end)
+                {
+                  if (link->title)
+                    {
+                      gtk_tooltip_set_markup (tooltip, link->title);
+                      return TRUE;
+                    }
+                  break;
+                }
+            }
+        }
+    }
+
+  return GTK_WIDGET_CLASS (gtk_label_parent_class)->query_tooltip (widget,
+                                                                   x, y,
+                                                                   keyboard_tip,
+                                                                   tooltip);
+}
+
+
+#define __GTK_LABEL_C__
+#include "gtkaliasdef.c"