Blob Blame History Raw
diff -up /dev/null gnome-control-center-2.25.2/capplets/about-me/eel-accessibility.c
--- /dev/null	2008-12-16 15:36:17.645108819 -0500
+++ gnome-control-center-2.25.2/capplets/about-me/eel-accessibility.c	2008-12-16 21:16:16.000000000 -0500
@@ -0,0 +1,413 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* eel-accessibility.h - Utility functions for accessibility
+
+   Copyright (C) 2002 Anders Carlsson, Sun Microsystems, Inc.
+
+   The Eel Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Eel Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Eel Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors:
+	Anders Carlsson <andersca@gnu.org>
+	Michael Meeks   <michael@ximian.com>
+*/
+#include <config.h>
+#include <gtk/gtk.h>
+#include <atk/atkrelationset.h>
+#include "eel-accessibility.h"
+
+void
+eel_accessibility_set_up_label_widget_relation (GtkWidget *label, GtkWidget *widget)
+{
+	AtkObject *atk_widget, *atk_label;
+
+	atk_label = gtk_widget_get_accessible (label);
+	atk_widget = gtk_widget_get_accessible (widget);
+
+	/* Create the label -> widget relation */
+	atk_object_add_relationship (atk_label, ATK_RELATION_LABEL_FOR, atk_widget);
+
+	/* Create the widget -> label relation */
+	atk_object_add_relationship (atk_widget, ATK_RELATION_LABELLED_BY, atk_label);
+}
+
+/*
+ * Hacks to make re-using gail somewhat easier.
+ */
+
+/**
+ * eel_accessibility_create_derived_type:
+ * @type_name: the name for the new accessible type eg. NautilusIconCanvasItemAccessible
+ * @existing_gobject_with_proxy: the GType of an object that has a registered factory that
+ *      manufactures the type we want to inherit from. ie. to inherit from a GailCanvasItem
+ *      we need to pass GNOME_TYPE_CANVAS_ITEM - since GailCanvasItem is registered against
+ *      that type.
+ * @opt_gail_parent_class: the name of the Gail class to derive from eg. GailCanvasItem
+ * @class_init: the init function to run for this class
+ * 
+ * This should be run to register the type, it can subsequently be run with
+ * the same name and will not re-register it, but simply return it.
+ *
+ * NB. to do instance init, you prolly want to override AtkObject::initialize
+ * 
+ * Return value: the registered type, or 0 on failure.
+ **/
+GType
+eel_accessibility_create_derived_type (const char *type_name,
+				       GType existing_gobject_with_proxy,
+				       EelAccessibilityClassInitFn class_init)
+{
+	GType type;
+	GType parent_atk_type;
+	GTypeInfo tinfo = { 0 };
+	GTypeQuery query;
+	AtkObjectFactory *factory;
+
+	if ((type = g_type_from_name (type_name))) {
+		return type;
+	}
+
+	factory = atk_registry_get_factory
+		(atk_get_default_registry (),
+		 existing_gobject_with_proxy);
+	if (!factory) {
+		return G_TYPE_INVALID;
+	}
+	
+	parent_atk_type = atk_object_factory_get_accessible_type (factory);
+	if (!parent_atk_type) {
+		return G_TYPE_INVALID;
+	}
+
+	/*
+	 * Figure out the size of the class and instance 
+	 * we are deriving from
+	 */
+	g_type_query (parent_atk_type, &query);
+
+	if (class_init) {
+		tinfo.class_init = (GClassInitFunc) class_init;
+	}
+
+	tinfo.class_size    = query.class_size;
+	tinfo.instance_size = query.instance_size;
+
+	/* Register the type */
+	type = g_type_register_static (
+		parent_atk_type, type_name, &tinfo, 0);
+
+	return type;
+}
+
+
+static GQuark
+get_quark_accessible (void)
+{
+	static GQuark quark_accessible_object = 0;
+
+	if (!quark_accessible_object) {
+		quark_accessible_object = g_quark_from_static_string
+			("accessible-object");
+	}
+
+	return quark_accessible_object;
+}
+
+static GQuark
+get_quark_gobject (void)
+{
+	static GQuark quark_accessible_gobject = 0;
+
+	if (!quark_accessible_gobject) {
+		quark_accessible_gobject = g_quark_from_static_string
+			("object-for-accessible");
+	}
+
+	return quark_accessible_gobject;
+}
+
+/**
+ * eel_accessibility_get_atk_object:
+ * @object: a GObject of some sort
+ * 
+ * gets an AtkObject associated with a GObject
+ * 
+ * Return value: the associated accessible if one exists or NULL
+ **/
+AtkObject *
+eel_accessibility_get_atk_object (gpointer object)
+{
+	return g_object_get_qdata (object, get_quark_accessible ());
+}
+
+/**
+ * eel_accessibilty_for_object:
+ * @object: a GObject of some sort
+ * 
+ * gets an AtkObject associated with a GObject and if it doesn't
+ * exist creates a suitable accessible object.
+ * 
+ * Return value: an associated accessible.
+ **/
+AtkObject *
+eel_accessibility_for_object (gpointer object)
+{
+	if (GTK_IS_WIDGET (object))
+		return gtk_widget_get_accessible (object);
+
+	return atk_gobject_accessible_for_object (object);
+}
+
+/**
+ * eel_accessibility_get_gobject:
+ * @object: an AtkObject
+ * 
+ * gets the GObject associated with the AtkObject, for which
+ * @object provides accessibility support.
+ * 
+ * Return value: the accessible's associated GObject
+ **/
+gpointer
+eel_accessibility_get_gobject (AtkObject *object)
+{
+	return g_object_get_qdata (G_OBJECT (object), get_quark_gobject ());
+}
+
+static void
+eel_accessibility_destroy (gpointer data,
+			   GObject *where_the_object_was)
+{
+	atk_object_notify_state_change
+		(ATK_OBJECT (data), ATK_STATE_DEFUNCT, TRUE); 
+}
+
+/**
+ * eel_accessibility_set_atk_object_return:
+ * @object: a GObject
+ * @atk_object: it's AtkObject
+ * 
+ * used to register and return a new accessible object for something
+ * 
+ * Return value: @atk_object.
+ **/
+AtkObject *
+eel_accessibility_set_atk_object_return (gpointer   object,
+					 AtkObject *atk_object)
+{
+	atk_object_initialize (atk_object, object);
+
+	if (!ATK_IS_GOBJECT_ACCESSIBLE (atk_object)) {
+		g_object_set_qdata_full
+			(object, get_quark_accessible (), atk_object,
+			 (GDestroyNotify)eel_accessibility_destroy);
+		g_object_set_qdata
+			(G_OBJECT (atk_object), get_quark_gobject (), object);
+	}
+
+	return atk_object;
+}
+
+static GailTextUtil *
+get_simple_text (gpointer object)
+{
+	GObject *gobject;
+	EelAccessibleTextIface *aif;
+
+	if (GTK_IS_ACCESSIBLE (object)) {
+		gobject = G_OBJECT (GTK_ACCESSIBLE (object)->widget);
+	} else {
+		gobject = eel_accessibility_get_gobject (object);
+	}
+
+	if (!gobject) {
+		return NULL;
+	}
+
+	aif = EEL_ACCESSIBLE_TEXT_GET_IFACE (gobject);
+	if (!aif) {
+		g_warning ("No accessible text inferface on '%s'",
+			   g_type_name_from_instance ((gpointer) gobject));
+
+	} else if (aif->get_text) {
+		return aif->get_text (gobject);
+	}
+
+	return NULL;
+}
+
+char *
+eel_accessibility_text_get_text (AtkText *text,
+				 gint     start_pos,
+				 gint     end_pos)
+{
+	GailTextUtil *util = get_simple_text (text);
+	g_return_val_if_fail (util != NULL, NULL);
+
+	return gail_text_util_get_substring (util, start_pos, end_pos);
+}
+
+gunichar 
+eel_accessibility_text_get_character_at_offset (AtkText *text,
+						gint     offset)
+{
+	char *txt, *index;
+	gint sucks1 = 0, sucks2 = -1;
+	gunichar c;
+	GailTextUtil *util = get_simple_text (text);
+	g_return_val_if_fail (util != NULL, 0);
+
+	txt = gail_text_util_get_substring (util, sucks1, sucks2);
+
+	index = g_utf8_offset_to_pointer (txt, offset);
+	c = g_utf8_get_char (index);
+	g_free (txt);
+
+	return c;
+}
+
+char *
+eel_accessibility_text_get_text_before_offset (AtkText	      *text,
+					       gint            offset,
+					       AtkTextBoundary boundary_type,
+					       gint           *start_offset,
+					       gint           *end_offset)
+{
+	GailTextUtil *util = get_simple_text (text);
+	g_return_val_if_fail (util != NULL, NULL);
+
+	return gail_text_util_get_text (
+		util, NULL, GAIL_BEFORE_OFFSET, 
+		boundary_type, offset, start_offset, end_offset);
+}
+
+char *
+eel_accessibility_text_get_text_at_offset (AtkText        *text,
+					   gint            offset,
+					   AtkTextBoundary boundary_type,
+					   gint           *start_offset,
+					   gint           *end_offset)
+{
+	GailTextUtil *util = get_simple_text (text);
+	g_return_val_if_fail (util != NULL, NULL);
+
+	return gail_text_util_get_text (
+		util, NULL, GAIL_AT_OFFSET,
+		boundary_type, offset, start_offset, end_offset);
+}
+
+gchar*
+eel_accessibility_text_get_text_after_offset  (AtkText	      *text,
+					       gint            offset,
+					       AtkTextBoundary boundary_type,
+					       gint           *start_offset,
+					       gint           *end_offset)
+{
+	GailTextUtil *util = get_simple_text (text);
+	g_return_val_if_fail (util != NULL, NULL);
+
+	return gail_text_util_get_text (
+		util, NULL, GAIL_AFTER_OFFSET, 
+		boundary_type, offset, start_offset, end_offset);
+}
+
+gint
+eel_accessibility_text_get_character_count (AtkText *text)
+{
+	GailTextUtil *util = get_simple_text (text);
+	g_return_val_if_fail (util != NULL, -1);
+
+	return gtk_text_buffer_get_char_count (util->buffer);
+}
+
+static void
+eel_accessibility_simple_text_interface_init (AtkTextIface *iface)
+{
+	iface->get_text                = eel_accessibility_text_get_text;
+	iface->get_character_at_offset = eel_accessibility_text_get_character_at_offset;
+	iface->get_text_before_offset  = eel_accessibility_text_get_text_before_offset;
+	iface->get_text_at_offset      = eel_accessibility_text_get_text_at_offset;
+	iface->get_text_after_offset   = eel_accessibility_text_get_text_after_offset;
+	iface->get_character_count     = eel_accessibility_text_get_character_count;
+
+/*	iface->get_caret_offset = eel_accessibility_text_get_caret_offset;
+	iface->set_caret_offset = eel_accessibility_text_set_caret_offset;
+	iface->get_selection = eel_accessibility_text_get_selection;
+	iface->get_n_selections = eel_accessibility_text_get_n_selections;
+	iface->add_selection = eel_accessibility_text_add_selection;
+	iface->remove_selection = eel_accessibility_text_remove_selection;
+	iface->set_selection = eel_accessibility_text_set_selection;
+	iface->get_run_attributes = eel_accessibility_text_get_run_attributes;
+	iface->get_default_attributes = eel_accessibility_text_get_default_attributes;
+	iface->get_character_extents = eel_accessibility_text_get_character_extents;
+	iface->get_offset_at_point = eel_accessibility_text_get_offset_at_point; */
+}
+
+void
+eel_accessibility_add_simple_text (GType type)
+{
+	const GInterfaceInfo simple_text_info = {
+		(GInterfaceInitFunc)
+		eel_accessibility_simple_text_interface_init,
+		(GInterfaceFinalizeFunc) NULL,
+		NULL
+	};
+
+	g_return_if_fail (type != G_TYPE_INVALID);
+
+	g_type_add_interface_static (
+		type, ATK_TYPE_TEXT, &simple_text_info);
+}
+
+GType
+eel_accessible_text_get_type (void)
+{
+	static GType type = 0;
+
+	if (!type) {
+		const GTypeInfo tinfo = {
+			sizeof (AtkTextIface),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) NULL,
+			(GClassFinalizeFunc) NULL
+		};
+
+		type = g_type_register_static (
+			G_TYPE_INTERFACE, "EelAccessibleText", &tinfo, 0);
+	}
+
+	return type;
+}
+
+void
+eel_accessibility_set_name (gpointer    object,
+			    const char *name)
+{
+	AtkObject *atk_object = eel_accessibility_for_object (object);
+
+	if (atk_object) {
+		atk_object_set_name (atk_object, name);
+	}
+}
+
+void
+eel_accessibility_set_description (gpointer    object,
+				   const char *description)
+{
+	AtkObject *atk_object = eel_accessibility_for_object (object);
+
+	if (atk_object) {
+		atk_object_set_description (atk_object, description);
+	}
+}
diff -up /dev/null gnome-control-center-2.25.2/capplets/about-me/eel-accessibility.h
--- /dev/null	2008-12-16 15:36:17.645108819 -0500
+++ gnome-control-center-2.25.2/capplets/about-me/eel-accessibility.h	2008-12-16 21:16:16.000000000 -0500
@@ -0,0 +1,152 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* eel-accessibility.h - Utility functions for accessibility
+
+   Copyright (C) 2002 Anders Carlsson
+
+   The Eel Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Eel Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Eel Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Anders Carlsson <andersca@gnu.org>
+*/
+
+#ifndef EEL_ACCESSIBILITY_H
+#define EEL_ACCESSIBILITY_H
+
+#include <glib-object.h>
+#include <atk/atkobject.h>
+#include <atk/atkregistry.h>
+#include <atk/atkobjectfactory.h>
+#include <gtk/gtk.h>
+#include <libgail-util/gailtextutil.h>
+
+void eel_accessibility_set_up_label_widget_relation (GtkWidget *label, GtkWidget *widget);
+
+typedef void     (*EelAccessibilityClassInitFn)    (AtkObjectClass *klass);
+
+AtkObject    *eel_accessibility_get_atk_object        (gpointer              object);
+AtkObject    *eel_accessibility_for_object            (gpointer              object);
+gpointer      eel_accessibility_get_gobject           (AtkObject            *object);
+AtkObject    *eel_accessibility_set_atk_object_return (gpointer              object,
+						       AtkObject            *atk_object);
+GType         eel_accessibility_create_derived_type   (const char           *type_name,
+						       GType                 existing_gobject_with_proxy,
+						       EelAccessibilityClassInitFn class_init);
+void          eel_accessibility_set_name              (gpointer              object,
+						       const char           *name);
+void          eel_accessibility_set_description       (gpointer              object,
+						       const char           *description);
+
+char*         eel_accessibility_text_get_text         (AtkText              *text,
+                                                       gint                 start_pos,
+                                                       gint                 end_pos);
+gunichar      eel_accessibility_text_get_character_at_offset
+                                                      (AtkText              *text,
+                                                       gint                 offset);
+char*         eel_accessibility_text_get_text_before_offset
+                                                      (AtkText              *text,
+                                                       gint                 offset,
+                                                       AtkTextBoundary      boundary_type,
+                                                       gint                 *start_offset,
+                                                       gint                 *end_offset);
+char*         eel_accessibility_text_get_text_at_offset
+                                                      (AtkText              *text,
+                                                       gint                 offset,
+                                                       AtkTextBoundary      boundary_type,
+                                                       gint                 *start_offset,
+                                                       gint                 *end_offset);
+char*         eel_accessibility_text_get_text_after_offset
+                                                      (AtkText              *text,
+                                                       gint                 offset,
+                                                       AtkTextBoundary      boundary_type,
+                                                       gint                 *start_offset,
+                                                       gint                 *end_offset);
+gint          eel_accessibility_text_get_character_count
+                                                      (AtkText              *text);
+
+                     
+#define EEL_TYPE_ACCESSIBLE_TEXT           (eel_accessible_text_get_type ())
+#define EEL_IS_ACCESSIBLE_TEXT(obj)        G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEL_TYPE_ACCESSIBLE_TEXT)
+#define EEL_ACCESSIBLE_TEXT(obj)           G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_ACCESSIBLE_TEXT, EelAccessibleText)
+#define EEL_ACCESSIBLE_TEXT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), EEL_TYPE_ACCESSIBLE_TEXT, EelAccessibleTextIface))
+
+/* Instead of implementing the AtkText interface, implement this */
+typedef struct _EelAccessibleText EelAccessibleText;
+
+typedef struct {
+	GTypeInterface parent;
+	
+	GailTextUtil *(*get_text)   (GObject *text);
+	PangoLayout  *(*get_layout) (GObject *text);
+} EelAccessibleTextIface;
+
+GType eel_accessible_text_get_type      (void);
+void  eel_accessibility_add_simple_text (GType type);
+
+/* From gail - should be unneccessary when AtkObjectFactory is fixed */
+#define EEL_ACCESSIBLE_FACTORY(type, factory_name, type_as_function, opt_create_accessible)	\
+										\
+static GType									\
+type_as_function ## _factory_get_accessible_type (void)				\
+{										\
+  return type;									\
+}										\
+										\
+static AtkObject*								\
+type_as_function ## _factory_create_accessible (GObject *obj)			\
+{										\
+  AtkObject *accessible;							\
+										\
+  g_assert (G_IS_OBJECT (obj));  						\
+										\
+  accessible = opt_create_accessible (obj);					\
+										\
+  return accessible;								\
+}										\
+										\
+static void									\
+type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass)		\
+{										\
+  klass->create_accessible   = type_as_function ## _factory_create_accessible;	\
+  klass->get_accessible_type = type_as_function ## _factory_get_accessible_type;\
+}										\
+										\
+static GType									\
+type_as_function ## _factory_get_type (void)					\
+{										\
+  static GType t = 0;								\
+										\
+  if (!t)									\
+  {										\
+    static const GTypeInfo tinfo =						\
+    {										\
+      sizeof (AtkObjectFactoryClass),					\
+      NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init,			\
+      NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL			\
+    };										\
+										\
+    t = g_type_register_static (						\
+	    ATK_TYPE_OBJECT_FACTORY, factory_name, &tinfo, 0);			\
+  }										\
+										\
+  return t;									\
+}
+
+#define EEL_OBJECT_SET_FACTORY(object_type, type_as_function)			\
+	atk_registry_set_factory_type (atk_get_default_registry (),		\
+				       object_type,				\
+				       type_as_function ## _factory_get_type ())
+
+
+#endif /* EEL_ACCESSIBILITY_H */
diff -up /dev/null gnome-control-center-2.25.2/capplets/about-me/eel-editable-label.c
--- /dev/null	2008-12-16 15:36:17.645108819 -0500
+++ gnome-control-center-2.25.2/capplets/about-me/eel-editable-label.c	2008-12-16 21:17:57.000000000 -0500
@@ -0,0 +1,4410 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+ * 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/. 
+ */
+
+#include <config.h>
+#include <math.h>
+#include <string.h>
+
+#include "eel-editable-label.h"
+#include "glib/gi18n.h"
+#include "eel-marshal.h"
+#include "eel-accessibility.h"
+#include <libgail-util/gailmisc.h>
+
+#include <pango/pango.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+enum {
+  MOVE_CURSOR,
+  POPULATE_POPUP,
+  DELETE_FROM_CURSOR,
+  CUT_CLIPBOARD,
+  COPY_CLIPBOARD,
+  PASTE_CLIPBOARD,
+  TOGGLE_OVERWRITE,
+  LAST_SIGNAL
+};
+
+enum {
+  PROP_0,
+  PROP_TEXT,
+  PROP_JUSTIFY,
+  PROP_WRAP,
+  PROP_CURSOR_POSITION,
+  PROP_SELECTION_BOUND
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+static void     eel_editable_label_editable_init           (GtkEditableClass      *iface);
+static void     eel_editable_label_class_init              (EelEditableLabelClass *klass);
+static void     eel_editable_label_init                    (EelEditableLabel      *label);
+static void     eel_editable_label_set_property            (GObject               *object,
+							    guint                  prop_id,
+							    const GValue          *value,
+							    GParamSpec            *pspec);
+static void     eel_editable_label_get_property            (GObject               *object,
+							    guint                  prop_id,
+							    GValue                *value,
+							    GParamSpec            *pspec);
+static void     eel_editable_label_finalize                (GObject               *object);
+static void     eel_editable_label_size_request            (GtkWidget             *widget,
+							    GtkRequisition        *requisition);
+static void     eel_editable_label_size_allocate           (GtkWidget             *widget,
+							    GtkAllocation         *allocation);
+static void     eel_editable_label_state_changed           (GtkWidget             *widget,
+							    GtkStateType           state);
+static void     eel_editable_label_style_set               (GtkWidget             *widget,
+							    GtkStyle              *previous_style);
+static void     eel_editable_label_direction_changed       (GtkWidget             *widget,
+							    GtkTextDirection       previous_dir);
+static gint     eel_editable_label_expose                  (GtkWidget             *widget,
+							    GdkEventExpose        *event);
+static void     eel_editable_label_realize                 (GtkWidget             *widget);
+static void     eel_editable_label_unrealize               (GtkWidget             *widget);
+static void     eel_editable_label_map                     (GtkWidget             *widget);
+static void     eel_editable_label_unmap                   (GtkWidget             *widget);
+static gint     eel_editable_label_button_press            (GtkWidget             *widget,
+							    GdkEventButton        *event);
+static gint     eel_editable_label_button_release          (GtkWidget             *widget,
+							    GdkEventButton        *event);
+static gint     eel_editable_label_motion                  (GtkWidget             *widget,
+							    GdkEventMotion        *event);
+static gint     eel_editable_label_key_press               (GtkWidget             *widget,
+							    GdkEventKey           *event);
+static gint     eel_editable_label_key_release             (GtkWidget             *widget,
+							    GdkEventKey           *event);
+static gint     eel_editable_label_focus_in                (GtkWidget             *widget,
+							    GdkEventFocus         *event);
+static gint     eel_editable_label_focus_out               (GtkWidget             *widget,
+							    GdkEventFocus         *event);
+static AtkObject *eel_editable_label_get_accessible        (GtkWidget             *widget);
+static void     eel_editable_label_commit_cb               (GtkIMContext          *context,
+							    const gchar           *str,
+							    EelEditableLabel      *label);
+static void     eel_editable_label_preedit_changed_cb      (GtkIMContext          *context,
+							    EelEditableLabel      *label);
+static gboolean eel_editable_label_retrieve_surrounding_cb (GtkIMContext          *context,
+							    EelEditableLabel      *label);
+static gboolean eel_editable_label_delete_surrounding_cb   (GtkIMContext          *slave,
+							    gint                   offset,
+							    gint                   n_chars,
+							    EelEditableLabel      *label);
+static void     eel_editable_label_clear_layout            (EelEditableLabel      *label);
+static void     eel_editable_label_recompute               (EelEditableLabel      *label);
+static void     eel_editable_label_ensure_layout           (EelEditableLabel      *label,
+							    gboolean               include_preedit);
+static void     eel_editable_label_select_region_index     (EelEditableLabel      *label,
+							    gint                   anchor_index,
+							    gint                   end_index);
+static gboolean eel_editable_label_focus                   (GtkWidget             *widget,
+							    GtkDirectionType       direction);
+static void     eel_editable_label_move_cursor             (EelEditableLabel      *label,
+							    GtkMovementStep        step,
+							    gint                   count,
+							    gboolean               extend_selection);
+static void     eel_editable_label_delete_from_cursor      (EelEditableLabel      *label,
+							    GtkDeleteType          type,
+							    gint                   count);
+static void     eel_editable_label_copy_clipboard          (EelEditableLabel      *label);
+static void     eel_editable_label_cut_clipboard           (EelEditableLabel      *label);
+static void     eel_editable_label_paste                   (EelEditableLabel      *label,
+							    GdkAtom                selection);
+static void     eel_editable_label_paste_clipboard         (EelEditableLabel      *label);
+static void     eel_editable_label_select_all              (EelEditableLabel      *label);
+static void     eel_editable_label_do_popup                (EelEditableLabel      *label,
+							    GdkEventButton        *event);
+static void     eel_editable_label_toggle_overwrite        (EelEditableLabel      *label);
+static gint     eel_editable_label_move_forward_word       (EelEditableLabel      *label,
+							    gint                   start);
+static gint     eel_editable_label_move_backward_word      (EelEditableLabel      *label,
+							    gint                   start);
+static void     eel_editable_label_reset_im_context        (EelEditableLabel      *label);
+static void     eel_editable_label_check_cursor_blink      (EelEditableLabel      *label);
+static void     eel_editable_label_pend_cursor_blink       (EelEditableLabel      *label);
+
+/* Editable implementation: */
+static void     editable_insert_text_emit     (GtkEditable *editable,
+					       const gchar *new_text,
+					       gint         new_text_length,
+					       gint        *position);
+static void     editable_delete_text_emit     (GtkEditable *editable,
+					       gint         start_pos,
+					       gint         end_pos);
+static void     editable_insert_text          (GtkEditable *editable,
+					       const gchar *new_text,
+					       gint         new_text_length,
+					       gint        *position);
+static void     editable_delete_text          (GtkEditable *editable,
+					       gint         start_pos,
+					       gint         end_pos);
+static gchar *  editable_get_chars            (GtkEditable *editable,
+					       gint         start_pos,
+					       gint         end_pos);
+static void     editable_set_selection_bounds (GtkEditable *editable,
+					       gint         start,
+					       gint         end);
+static gboolean editable_get_selection_bounds (GtkEditable *editable,
+					       gint        *start,
+					       gint        *end);
+static void     editable_real_set_position    (GtkEditable *editable,
+					       gint         position);
+static gint     editable_get_position         (GtkEditable *editable);
+
+static GdkGC *  make_cursor_gc                (GtkWidget   *widget,
+					       const gchar *property_name,
+					       GdkColor    *fallback);
+
+
+
+static GtkMiscClass *parent_class = NULL;
+
+GType
+eel_editable_label_get_type (void)
+{
+  static GType label_type = 0;
+  
+  if (!label_type)
+    {
+      const GTypeInfo label_info =
+      {
+	sizeof (EelEditableLabelClass),
+	NULL,           /* base_init */
+	NULL,           /* base_finalize */
+	(GClassInitFunc) eel_editable_label_class_init,
+	NULL,           /* class_finalize */
+	NULL,           /* class_data */
+	sizeof (EelEditableLabel),
+	32,             /* n_preallocs */
+	(GInstanceInitFunc) eel_editable_label_init,
+      };
+
+      const GInterfaceInfo editable_info =
+      {
+	(GInterfaceInitFunc) eel_editable_label_editable_init,	/* interface_init */
+	NULL,							/* interface_finalize */
+	NULL							/* interface_data */
+      };
+
+      
+      label_type = g_type_register_static (GTK_TYPE_MISC, "EelEditableLabel", &label_info, 0);
+      g_type_add_interface_static (label_type,
+				   GTK_TYPE_EDITABLE,
+				   &editable_info);
+    }
+  
+  return label_type;
+}
+
+static void
+add_move_binding (GtkBindingSet  *binding_set,
+		  guint           keyval,
+		  guint           modmask,
+		  GtkMovementStep step,
+		  gint            count)
+{
+  g_assert ((modmask & GDK_SHIFT_MASK) == 0);
+  
+  gtk_binding_entry_add_signal (binding_set, keyval, modmask,
+				"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,
+				G_TYPE_ENUM, step,
+				G_TYPE_INT, count,
+                                G_TYPE_BOOLEAN, TRUE);
+}
+
+static void
+eel_editable_label_class_init (EelEditableLabelClass *class)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+  GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+  GtkBindingSet *binding_set;
+
+  parent_class = gtk_type_class (GTK_TYPE_MISC);
+  
+  gobject_class->set_property = eel_editable_label_set_property;
+  gobject_class->get_property = eel_editable_label_get_property;
+  gobject_class->finalize = eel_editable_label_finalize;
+
+  widget_class->size_request = eel_editable_label_size_request;
+  widget_class->size_allocate = eel_editable_label_size_allocate;
+  widget_class->state_changed = eel_editable_label_state_changed;
+  widget_class->style_set = eel_editable_label_style_set;
+  widget_class->direction_changed = eel_editable_label_direction_changed;
+  widget_class->expose_event = eel_editable_label_expose;
+  widget_class->realize = eel_editable_label_realize;
+  widget_class->unrealize = eel_editable_label_unrealize;
+  widget_class->map = eel_editable_label_map;
+  widget_class->unmap = eel_editable_label_unmap;
+  widget_class->button_press_event = eel_editable_label_button_press;
+  widget_class->button_release_event = eel_editable_label_button_release;
+  widget_class->motion_notify_event = eel_editable_label_motion;
+  widget_class->focus = eel_editable_label_focus;
+  widget_class->key_press_event = eel_editable_label_key_press;
+  widget_class->key_release_event = eel_editable_label_key_release;
+  widget_class->focus_in_event = eel_editable_label_focus_in;
+  widget_class->focus_out_event = eel_editable_label_focus_out;
+  widget_class->get_accessible = eel_editable_label_get_accessible;
+
+  class->move_cursor = eel_editable_label_move_cursor;
+  class->delete_from_cursor = eel_editable_label_delete_from_cursor;
+  class->copy_clipboard = eel_editable_label_copy_clipboard;
+  class->cut_clipboard = eel_editable_label_cut_clipboard;
+  class->paste_clipboard = eel_editable_label_paste_clipboard;
+  class->toggle_overwrite = eel_editable_label_toggle_overwrite;
+  
+  signals[MOVE_CURSOR] = 
+    g_signal_new ("move_cursor",
+		  G_TYPE_FROM_CLASS (object_class),
+		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		  G_STRUCT_OFFSET (EelEditableLabelClass, move_cursor),
+		  NULL, NULL,
+		  eel_marshal_VOID__ENUM_INT_BOOLEAN,
+		  G_TYPE_NONE, 3, GTK_TYPE_MOVEMENT_STEP, G_TYPE_INT, G_TYPE_BOOLEAN);
+  
+  signals[COPY_CLIPBOARD] =
+    g_signal_new ("copy_clipboard",
+		  G_TYPE_FROM_CLASS (object_class),
+		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		  G_STRUCT_OFFSET  (EelEditableLabelClass, copy_clipboard),
+		  NULL, NULL, 
+		  g_cclosure_marshal_VOID__VOID,
+		  G_TYPE_NONE, 0);
+  
+  signals[POPULATE_POPUP] =
+    g_signal_new ("populate_popup",
+		  G_TYPE_FROM_CLASS (object_class),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (EelEditableLabelClass, populate_popup),
+		  NULL, NULL, 
+		  g_cclosure_marshal_VOID__OBJECT,
+		  G_TYPE_NONE, 1, GTK_TYPE_MENU);
+
+  signals[DELETE_FROM_CURSOR] = 
+    g_signal_new ("delete_from_cursor",
+		  G_TYPE_FROM_CLASS (object_class),
+		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		  G_STRUCT_OFFSET (EelEditableLabelClass, delete_from_cursor),
+		  NULL, NULL, 
+		  eel_marshal_VOID__ENUM_INT,
+		  G_TYPE_NONE, 2, GTK_TYPE_DELETE_TYPE, G_TYPE_INT);
+  
+  signals[CUT_CLIPBOARD] =
+    g_signal_new ("cut_clipboard",
+		  G_TYPE_FROM_CLASS (object_class),
+		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		  G_STRUCT_OFFSET (EelEditableLabelClass, cut_clipboard),
+		  NULL, NULL, 
+		  g_cclosure_marshal_VOID__VOID,
+		  G_TYPE_NONE, 0);
+
+  signals[PASTE_CLIPBOARD] =
+    g_signal_new ("paste_clipboard",
+		  G_TYPE_FROM_CLASS (object_class),
+		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		  G_STRUCT_OFFSET (EelEditableLabelClass, paste_clipboard),
+		  NULL, NULL, 
+		  g_cclosure_marshal_VOID__VOID,
+		  G_TYPE_NONE, 0);
+
+  signals[TOGGLE_OVERWRITE] =
+    g_signal_new ("toggle_overwrite",
+		  G_TYPE_FROM_CLASS (object_class),
+		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		  G_STRUCT_OFFSET (EelEditableLabelClass, toggle_overwrite),
+		  NULL, NULL, 
+		  g_cclosure_marshal_VOID__VOID,
+		  G_TYPE_NONE, 0);
+
+  
+  g_object_class_install_property (G_OBJECT_CLASS(object_class),
+                                   PROP_TEXT,
+                                   g_param_spec_string ("text",
+                                                        _("Text"),
+                                                        _("The text of the label."),
+                                                        NULL,
+                                                        G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class,
+				   PROP_JUSTIFY,
+                                   g_param_spec_enum ("justify",
+                                                      _("Justification"),
+                                                      _("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));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_WRAP,
+                                   g_param_spec_boolean ("wrap",
+                                                        _("Line wrap"),
+                                                        _("If set, wrap lines if the text becomes too wide."),
+                                                        FALSE,
+                                                        G_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_CURSOR_POSITION,
+                                   g_param_spec_int ("cursor_position",
+                                                     _("Cursor Position"),
+                                                     _("The current position of the insertion cursor in chars."),
+                                                     0,
+                                                     G_MAXINT,
+                                                     0,
+                                                     G_PARAM_READABLE));
+  
+  g_object_class_install_property (gobject_class,
+                                   PROP_SELECTION_BOUND,
+                                   g_param_spec_int ("selection_bound",
+                                                     _("Selection Bound"),
+                                                     _("The position of the opposite end of the selection from the cursor in chars."),
+                                                     0,
+                                                     G_MAXINT,
+                                                     0,
+                                                     G_PARAM_READABLE));
+  
+  /*
+   * Key bindings
+   */
+
+  binding_set = gtk_binding_set_by_class (class);
+
+  /* Moving the insertion point */
+  add_move_binding (binding_set, GDK_Right, 0,
+		    GTK_MOVEMENT_VISUAL_POSITIONS, 1);
+  
+  add_move_binding (binding_set, GDK_Left, 0,
+		    GTK_MOVEMENT_VISUAL_POSITIONS, -1);
+
+  add_move_binding (binding_set, GDK_KP_Right, 0,
+		    GTK_MOVEMENT_VISUAL_POSITIONS, 1);
+  
+  add_move_binding (binding_set, GDK_KP_Left, 0,
+		    GTK_MOVEMENT_VISUAL_POSITIONS, -1);
+  
+  add_move_binding (binding_set, GDK_f, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_LOGICAL_POSITIONS, 1);
+  
+  add_move_binding (binding_set, GDK_b, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_LOGICAL_POSITIONS, -1);
+  
+  add_move_binding (binding_set, GDK_Right, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_WORDS, 1);
+
+  add_move_binding (binding_set, GDK_Left, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_WORDS, -1);
+
+  add_move_binding (binding_set, GDK_KP_Right, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_WORDS, 1);
+
+  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);
+
+  add_move_binding (binding_set, GDK_f, GDK_MOD1_MASK,
+		    GTK_MOVEMENT_WORDS, 1);
+
+  add_move_binding (binding_set, GDK_b, GDK_MOD1_MASK,
+		    GTK_MOVEMENT_WORDS, -1);
+
+  add_move_binding (binding_set, GDK_Home, 0,
+		    GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
+
+  add_move_binding (binding_set, GDK_End, 0,
+		    GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
+
+  add_move_binding (binding_set, GDK_KP_Home, 0,
+		    GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
+
+  add_move_binding (binding_set, GDK_KP_End, 0,
+		    GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
+  
+  add_move_binding (binding_set, GDK_Home, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_BUFFER_ENDS, -1);
+
+  add_move_binding (binding_set, GDK_End, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_BUFFER_ENDS, 1);
+
+  add_move_binding (binding_set, GDK_KP_Home, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_BUFFER_ENDS, -1);
+
+  add_move_binding (binding_set, GDK_KP_End, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_BUFFER_ENDS, 1);
+
+  add_move_binding (binding_set, GDK_Up, 0,
+                    GTK_MOVEMENT_DISPLAY_LINES, -1);
+
+  add_move_binding (binding_set, GDK_KP_Up, 0,
+                    GTK_MOVEMENT_DISPLAY_LINES, -1);
+  
+  add_move_binding (binding_set, GDK_Down, 0,
+                    GTK_MOVEMENT_DISPLAY_LINES, 1);
+
+  add_move_binding (binding_set, GDK_KP_Down, 0,
+                    GTK_MOVEMENT_DISPLAY_LINES, 1);
+  
+  /* Select all
+   */
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
+                                "move_cursor", 3,
+                                GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
+                                G_TYPE_INT, -1,
+				G_TYPE_BOOLEAN, FALSE);
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
+                                "move_cursor", 3,
+                                GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
+                                G_TYPE_INT, 1,
+				G_TYPE_BOOLEAN, TRUE);
+  
+  /* Deleting text */
+  gtk_binding_entry_add_signal (binding_set, GDK_Delete, 0,
+				"delete_from_cursor", 2,
+				G_TYPE_ENUM, GTK_DELETE_CHARS,
+				G_TYPE_INT, 1);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, 0,
+				"delete_from_cursor", 2,
+				G_TYPE_ENUM, GTK_DELETE_CHARS,
+				G_TYPE_INT, 1);
+  
+  gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0,
+				"delete_from_cursor", 2,
+				G_TYPE_ENUM, GTK_DELETE_CHARS,
+				G_TYPE_INT, -1);
+
+  /* Make this do the same as Backspace, to help with mis-typing */
+  gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_SHIFT_MASK,
+                                "delete_from_cursor", 2,
+                                G_TYPE_ENUM, GTK_DELETE_CHARS,
+                                G_TYPE_INT, -1);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_CONTROL_MASK,
+				"delete_from_cursor", 2,
+				G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
+				G_TYPE_INT, 1);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, GDK_CONTROL_MASK,
+				"delete_from_cursor", 2,
+				G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
+				G_TYPE_INT, 1);
+  
+  gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_CONTROL_MASK,
+				"delete_from_cursor", 2,
+				G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
+				G_TYPE_INT, -1);
+
+  /* Cut/copy/paste */
+
+  gtk_binding_entry_add_signal (binding_set, GDK_x, GDK_CONTROL_MASK,
+				"cut_clipboard", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_c, GDK_CONTROL_MASK,
+				"copy_clipboard", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_v, GDK_CONTROL_MASK,
+				"paste_clipboard", 0);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_SHIFT_MASK,
+				"cut_clipboard", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Insert, GDK_CONTROL_MASK,
+				"copy_clipboard", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Insert, GDK_SHIFT_MASK,
+				"paste_clipboard", 0);
+
+  /* Overwrite */
+  gtk_binding_entry_add_signal (binding_set, GDK_Insert, 0,
+				"toggle_overwrite", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Insert, 0,
+				"toggle_overwrite", 0);
+}
+
+static void
+eel_editable_label_editable_init (GtkEditableClass *iface)
+{
+  iface->do_insert_text = editable_insert_text_emit;
+  iface->do_delete_text = editable_delete_text_emit;
+  iface->insert_text = editable_insert_text;
+  iface->delete_text = editable_delete_text;
+  iface->get_chars = editable_get_chars;
+  iface->set_selection_bounds = editable_set_selection_bounds;
+  iface->get_selection_bounds = editable_get_selection_bounds;
+  iface->set_position = editable_real_set_position;
+  iface->get_position = editable_get_position;
+}
+
+
+static void 
+eel_editable_label_set_property (GObject      *object,
+				 guint         prop_id,
+				 const GValue *value,
+				 GParamSpec   *pspec)
+{
+  EelEditableLabel *label;
+
+  label = EEL_EDITABLE_LABEL (object);
+  
+  switch (prop_id)
+    {
+    case PROP_TEXT:
+      eel_editable_label_set_text (label, g_value_get_string (value));
+      break;
+    case PROP_JUSTIFY:
+      eel_editable_label_set_justify (label, g_value_get_enum (value));
+      break;
+    case PROP_WRAP:
+      eel_editable_label_set_line_wrap (label, g_value_get_boolean (value));
+      break;	  
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void 
+eel_editable_label_get_property (GObject     *object,
+				 guint        prop_id,
+				 GValue      *value,
+				 GParamSpec  *pspec)
+{
+  EelEditableLabel *label;
+  gint offset;
+  
+  label = EEL_EDITABLE_LABEL (object);
+  
+  switch (prop_id)
+    {
+    case PROP_TEXT:
+      g_value_set_string (value, label->text);
+      break;
+    case PROP_JUSTIFY:
+      g_value_set_enum (value, label->jtype);
+      break;
+    case PROP_WRAP:
+      g_value_set_boolean (value, label->wrap);
+      break;
+    case PROP_CURSOR_POSITION:
+      offset = g_utf8_pointer_to_offset (label->text,
+					 label->text + label->selection_end);
+      g_value_set_int (value, offset);
+      break;
+    case PROP_SELECTION_BOUND:
+      offset = g_utf8_pointer_to_offset (label->text,
+					 label->text + label->selection_anchor);
+      g_value_set_int (value, offset);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+eel_editable_label_init (EelEditableLabel *label)
+{
+  label->jtype = GTK_JUSTIFY_LEFT;
+  label->wrap = FALSE;
+  label->wrap_mode = PANGO_WRAP_WORD;
+
+  label->layout = NULL;
+  label->text_size = 1;
+  label->text = g_malloc (label->text_size);
+  label->text[0] = '\0';
+  label->n_bytes = 0;
+  
+  GTK_WIDGET_SET_FLAGS (label, GTK_CAN_FOCUS);
+
+    /* This object is completely private. No external entity can gain a reference
+   * to it; so we create it here and destroy it in finalize().
+   */
+  label->im_context = gtk_im_multicontext_new ();
+
+  g_signal_connect (G_OBJECT (label->im_context), "commit",
+		    G_CALLBACK (eel_editable_label_commit_cb), label);
+  g_signal_connect (G_OBJECT (label->im_context), "preedit_changed",
+		    G_CALLBACK (eel_editable_label_preedit_changed_cb), label);
+  g_signal_connect (G_OBJECT (label->im_context), "retrieve_surrounding",
+		    G_CALLBACK (eel_editable_label_retrieve_surrounding_cb), label);
+  g_signal_connect (G_OBJECT (label->im_context), "delete_surrounding",
+		    G_CALLBACK (eel_editable_label_delete_surrounding_cb), label);
+}
+
+/**
+ * eel_editable_label_new:
+ * @str: The text of the label
+ *
+ * Creates a new label with the given text inside it. You can
+ * pass %NULL to get an empty label widget.
+ *
+ * Return value: the new #EelEditableLabel
+ **/
+GtkWidget*
+eel_editable_label_new (const gchar *str)
+{
+  EelEditableLabel *label;
+  
+  label = g_object_new (EEL_TYPE_EDITABLE_LABEL, NULL);
+
+  if (str && *str)
+    eel_editable_label_set_text (label, str);
+  
+  return GTK_WIDGET (label);
+}
+
+/**
+ * eel_editable_label_set_text:
+ * @label: a #EelEditableLabel
+ * @str: The text you want to set.
+ *
+ * Sets the text within the #EelEditableLabel widget.  It overwrites any text that
+ * was there before.  
+ *
+ * This will also clear any previously set mnemonic accelerators.
+ **/
+void
+eel_editable_label_set_text (EelEditableLabel *label,
+			     const gchar *str)
+{
+  GtkEditable *editable;
+  int tmp_pos;
+  
+  g_return_if_fail (EEL_IS_EDITABLE_LABEL (label));
+  g_return_if_fail (str != NULL);
+  
+  if (strcmp (label->text, str) == 0)
+    return;
+
+  editable = GTK_EDITABLE (label);
+  gtk_editable_delete_text (editable, 0, -1);
+  tmp_pos = 0;
+  gtk_editable_insert_text (editable, str, strlen (str), &tmp_pos);
+}
+
+/**
+ * eel_editable_label_get_text:
+ * @label: a #EelEditableLabel
+ * 
+ * Fetches the text from a label widget, as displayed on the
+ * screen. This does not include any embedded underlines
+ * indicating mnemonics or Pango markup. (See eel_editable_label_get_label())
+ * 
+ * Return value: the text in the label widget. This is the internal
+ *   string used by the label, and must not be modified.
+ **/
+G_CONST_RETURN gchar *
+eel_editable_label_get_text (EelEditableLabel *label)
+{
+  g_return_val_if_fail (EEL_IS_EDITABLE_LABEL (label), NULL);
+
+  return label->text;
+}
+
+/**
+ * eel_editable_label_set_justify:
+ * @label: a #EelEditableLabel
+ * @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
+ * widget is first created with eel_editable_label_new(). If you instead want
+ * to set the alignment of the label as a whole, use
+ * gtk_misc_set_alignment() instead. eel_editable_label_set_justify() has no
+ * effect on labels containing only a single line.
+ **/
+void
+eel_editable_label_set_justify (EelEditableLabel        *label,
+				GtkJustification jtype)
+{
+  g_return_if_fail (EEL_IS_EDITABLE_LABEL (label));
+  g_return_if_fail (jtype >= GTK_JUSTIFY_LEFT && jtype <= GTK_JUSTIFY_FILL);
+  
+  if ((GtkJustification) label->jtype != jtype)
+    {
+      label->jtype = jtype;
+
+      /* No real need to be this drastic, but easier than duplicating the code */
+      eel_editable_label_recompute (label);
+      
+      g_object_notify (G_OBJECT (label), "justify");
+      gtk_widget_queue_resize (GTK_WIDGET (label));
+    }
+}
+
+/**
+ * eel_editable_label_get_justify:
+ * @label: a #EelEditableLabel
+ *
+ * Returns the justification of the label. See eel_editable_label_set_justify ().
+ *
+ * Return value: #GtkJustification
+ **/
+GtkJustification
+eel_editable_label_get_justify (EelEditableLabel *label)
+{
+  g_return_val_if_fail (EEL_IS_EDITABLE_LABEL (label), 0);
+
+  return label->jtype;
+}
+
+void
+eel_editable_label_set_draw_outline (EelEditableLabel *label,
+				     gboolean          draw_outline)
+{
+    draw_outline = draw_outline != FALSE;
+
+    if (label->draw_outline != draw_outline)
+    {
+      label->draw_outline = draw_outline;
+      
+      gtk_widget_queue_draw (GTK_WIDGET (label));
+    }
+
+}
+
+
+/**
+ * eel_editable_label_set_line_wrap:
+ * @label: a #EelEditableLabel
+ * @wrap: the setting
+ *
+ * Toggles line wrapping within the #EelEditableLabel 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.
+ **/
+void
+eel_editable_label_set_line_wrap (EelEditableLabel *label,
+				  gboolean  wrap)
+{
+  g_return_if_fail (EEL_IS_EDITABLE_LABEL (label));
+  
+  wrap = wrap != FALSE;
+  
+  if (label->wrap != wrap)
+    {
+      label->wrap = wrap;
+      g_object_notify (G_OBJECT (label), "wrap");
+      
+      gtk_widget_queue_resize (GTK_WIDGET (label));
+    }
+}
+
+
+void
+eel_editable_label_set_line_wrap_mode (EelEditableLabel *label,
+				       PangoWrapMode     mode)
+{
+  g_return_if_fail (EEL_IS_EDITABLE_LABEL (label));
+  
+  if (label->wrap_mode != mode)
+    {
+      label->wrap_mode = mode;
+      
+      gtk_widget_queue_resize (GTK_WIDGET (label));
+    }
+  
+}
+
+
+/**
+ * eel_editable_label_get_line_wrap:
+ * @label: a #EelEditableLabel
+ *
+ * Returns whether lines in the label are automatically wrapped. See eel_editable_label_set_line_wrap ().
+ *
+ * Return value: %TRUE if the lines of the label are automatically wrapped.
+ */
+gboolean
+eel_editable_label_get_line_wrap (EelEditableLabel *label)
+{
+  g_return_val_if_fail (EEL_IS_EDITABLE_LABEL (label), FALSE);
+
+  return label->wrap;
+}
+
+PangoFontDescription *
+eel_editable_label_get_font_description (EelEditableLabel *label)
+{
+  if (label->font_desc)
+    return pango_font_description_copy (label->font_desc);
+
+  return NULL;
+}
+
+void
+eel_editable_label_set_font_description (EelEditableLabel *label,
+					 const PangoFontDescription *desc)
+{
+  if (label->font_desc)
+    pango_font_description_free (label->font_desc);
+
+  if (desc)
+    label->font_desc = pango_font_description_copy (desc);
+  else
+    label->font_desc = NULL;
+
+  eel_editable_label_clear_layout (label);
+}
+
+static void
+eel_editable_label_finalize (GObject *object)
+{
+  EelEditableLabel *label;
+  
+  g_assert (EEL_IS_EDITABLE_LABEL (object));
+  
+  label = EEL_EDITABLE_LABEL (object);
+
+  if (label->font_desc)
+    {
+      pango_font_description_free (label->font_desc);
+      label->font_desc = NULL;
+    }
+  
+  g_object_unref (G_OBJECT (label->im_context));
+  label->im_context = NULL;
+  
+  g_free (label->text);
+  label->text = NULL;
+
+  if (label->layout)
+    {
+      g_object_unref (G_OBJECT (label->layout));
+      label->layout = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+eel_editable_label_clear_layout (EelEditableLabel *label)
+{
+  if (label->layout)
+    {
+      g_object_unref (G_OBJECT (label->layout));
+      label->layout = NULL;
+    }
+}
+
+static void
+eel_editable_label_recompute (EelEditableLabel *label)
+{
+  eel_editable_label_clear_layout (label);
+  eel_editable_label_check_cursor_blink (label);
+}
+
+typedef struct _LabelWrapWidth LabelWrapWidth;
+struct _LabelWrapWidth
+{
+  gint width;
+  PangoFontDescription *font_desc;
+};
+
+static void
+label_wrap_width_free (gpointer data)
+{
+  LabelWrapWidth *wrap_width = data;
+  pango_font_description_free (wrap_width->font_desc);
+  g_free (wrap_width);
+}
+
+static gint
+get_label_wrap_width (EelEditableLabel *label)
+{
+  PangoLayout *layout;
+  GtkStyle *style = GTK_WIDGET (label)->style;
+
+  LabelWrapWidth *wrap_width = g_object_get_data (G_OBJECT (style), "gtk-label-wrap-width");
+  if (!wrap_width)
+    {
+      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 (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;
+}
+
+static void
+eel_editable_label_ensure_layout (EelEditableLabel *label,
+				  gboolean        include_preedit)
+{
+  GtkWidget *widget;
+  PangoRectangle logical_rect;
+
+  /* Normalize for comparisons */
+  include_preedit = include_preedit != 0;
+
+  if (label->preedit_length > 0 &&
+      include_preedit != label->layout_includes_preedit)
+    eel_editable_label_clear_layout (label);
+  
+  widget = GTK_WIDGET (label);
+
+  if (label->layout == NULL)
+    {
+      gchar *preedit_string = NULL;
+      gint preedit_length = 0;
+      PangoAttrList *preedit_attrs = NULL;
+      PangoAlignment align = PANGO_ALIGN_LEFT; /* Quiet gcc */
+      PangoAttrList *tmp_attrs = pango_attr_list_new ();
+
+      if (include_preedit)
+	{
+	  gtk_im_context_get_preedit_string (label->im_context,
+					     &preedit_string, &preedit_attrs, NULL);
+	  preedit_length = label->preedit_length;
+	}
+
+      if (preedit_length)
+	{
+	  GString *tmp_string = g_string_new (NULL);
+	  
+	  g_string_prepend_len (tmp_string, label->text, label->n_bytes);
+	  g_string_insert (tmp_string, label->selection_anchor, preedit_string);
+      
+	  label->layout = gtk_widget_create_pango_layout (widget, tmp_string->str);
+      
+	  pango_attr_list_splice (tmp_attrs, preedit_attrs,
+				  label->selection_anchor, preedit_length);
+	  
+	  g_string_free (tmp_string, TRUE);
+	}
+      else
+	{
+	  label->layout = gtk_widget_create_pango_layout (widget, label->text);
+	}
+      label->layout_includes_preedit = include_preedit;
+
+      if (label->font_desc != NULL)
+	pango_layout_set_font_description (label->layout, label->font_desc);
+      
+      pango_layout_set_attributes (label->layout, tmp_attrs);
+      
+      if (preedit_string)
+	g_free (preedit_string);
+      if (preedit_attrs)
+	pango_attr_list_unref (preedit_attrs);
+      pango_attr_list_unref (tmp_attrs);
+
+      switch (label->jtype)
+	{
+	case GTK_JUSTIFY_LEFT:
+	  align = PANGO_ALIGN_LEFT;
+	  break;
+	case GTK_JUSTIFY_RIGHT:
+	  align = PANGO_ALIGN_RIGHT;
+	  break;
+	case GTK_JUSTIFY_CENTER:
+	  align = PANGO_ALIGN_CENTER;
+	  break;
+	case GTK_JUSTIFY_FILL:
+	  /* FIXME: This just doesn't work to do this */
+	  align = PANGO_ALIGN_LEFT;
+	  pango_layout_set_justify (label->layout, TRUE);
+	  break;
+	default:
+	  g_assert_not_reached();
+	}
+
+      pango_layout_set_alignment (label->layout, align);
+
+      if (label->wrap)
+	{
+	  gint longest_paragraph;
+	  gint width, height;
+	  gint set_width;
+
+	  gtk_widget_get_size_request (widget, &set_width, NULL);
+	  if (set_width > 0)
+	    pango_layout_set_width (label->layout, set_width * PANGO_SCALE);
+	  else
+	    {
+	      gint wrap_width;
+	      
+	      pango_layout_set_width (label->layout, -1);
+	      pango_layout_get_extents (label->layout, NULL, &logical_rect);
+
+	      width = logical_rect.width;
+	      
+	      /* Try to guess a reasonable maximum width */
+	      longest_paragraph = width;
+
+	      wrap_width = get_label_wrap_width (label);
+	      width = MIN (width, wrap_width);
+	      width = MIN (width,
+			   PANGO_SCALE * (gdk_screen_width () + 1) / 2);
+	      
+	      pango_layout_set_width (label->layout, width);
+	      pango_layout_get_extents (label->layout, NULL, &logical_rect);
+	      width = logical_rect.width;
+	      height = logical_rect.height;
+	      
+	      /* Unfortunately, the above may leave us with a very unbalanced looking paragraph,
+	       * so we try short search for a narrower width that leaves us with the same height
+	       */
+	      if (longest_paragraph > 0)
+		{
+		  gint nlines, perfect_width;
+		  
+		  nlines = pango_layout_get_line_count (label->layout);
+		  perfect_width = (longest_paragraph + nlines - 1) / nlines;
+		  
+		  if (perfect_width < width)
+		    {
+		      pango_layout_set_width (label->layout, perfect_width);
+		      pango_layout_get_extents (label->layout, NULL, &logical_rect);
+		      
+		      if (logical_rect.height <= height)
+			width = logical_rect.width;
+		      else
+			{
+			  gint mid_width = (perfect_width + width) / 2;
+			  
+			  if (mid_width > perfect_width)
+			    {
+			      pango_layout_set_width (label->layout, mid_width);
+			      pango_layout_get_extents (label->layout, NULL, &logical_rect);
+			      
+			      if (logical_rect.height <= height)
+				width = logical_rect.width;
+			    }
+			}
+		    }
+		}
+	      pango_layout_set_width (label->layout, width);
+	    }
+	  pango_layout_set_wrap (label->layout, label->wrap_mode);
+	}
+      else		/* !label->wrap */
+	pango_layout_set_width (label->layout, -1);
+    }
+}
+
+static void
+eel_editable_label_size_request (GtkWidget      *widget,
+				 GtkRequisition *requisition)
+{
+  EelEditableLabel *label;
+  gint width, height;
+  PangoRectangle logical_rect;
+  gint set_width;
+
+  g_assert (EEL_IS_EDITABLE_LABEL (widget));
+  g_assert (requisition != NULL);
+  
+  label = EEL_EDITABLE_LABEL (widget);
+
+  /*  
+   * If word wrapping is on, then the height requisition can depend
+   * on:
+   *
+   *   - Any width set on the widget via gtk_widget_set_usize().
+   *   - The padding of the widget (xpad, set by gtk_misc_set_padding)
+   *
+   * Instead of trying to detect changes to these quantities, if we
+   * are wrapping, we just rewrap for each size request. Since
+   * size requisitions are cached by the GTK+ core, this is not
+   * expensive.
+   */
+
+  if (label->wrap)
+    eel_editable_label_recompute (label);
+
+  eel_editable_label_ensure_layout (label, TRUE);
+
+  width = label->misc.xpad * 2;
+  height = label->misc.ypad * 2;
+
+  pango_layout_get_extents (label->layout, NULL, &logical_rect);
+  
+  gtk_widget_get_size_request (widget, &set_width, NULL);
+  if (label->wrap && set_width > 0)
+    width += set_width;
+  else 
+    width += PANGO_PIXELS (logical_rect.width);
+  
+  height += PANGO_PIXELS (logical_rect.height);
+
+  requisition->width = width;
+  requisition->height = height;
+}
+
+static void
+eel_editable_label_size_allocate (GtkWidget     *widget,
+				  GtkAllocation *allocation)
+{
+  (* GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
+}
+
+static void
+eel_editable_label_state_changed (GtkWidget   *widget,
+				  GtkStateType prev_state)
+{
+  EelEditableLabel *label;
+  
+  label = EEL_EDITABLE_LABEL (widget);
+
+  eel_editable_label_select_region (label, 0, 0);
+
+  if (GTK_WIDGET_CLASS (parent_class)->state_changed)
+    GTK_WIDGET_CLASS (parent_class)->state_changed (widget, prev_state);
+}
+
+static void 
+eel_editable_label_style_set (GtkWidget *widget,
+			      GtkStyle  *previous_style)
+{
+  EelEditableLabel *label;
+  static GdkColor gray = { 0, 0x8888, 0x8888, 0x8888 };
+  
+  g_assert (EEL_IS_EDITABLE_LABEL (widget));
+  
+  label = EEL_EDITABLE_LABEL (widget);
+
+  /* We have to clear the layout, fonts etc. may have changed */
+  eel_editable_label_recompute (label);
+
+  /* Set the background, foreground and cursor colors based on 
+   * the new theme selected.
+   */
+  if (GTK_WIDGET_REALIZED (widget))
+    {
+	gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+
+	if (label->primary_cursor_gc != NULL) 
+	  {
+		gtk_gc_release (label->primary_cursor_gc);
+		label->primary_cursor_gc = NULL;
+	  }
+
+	if (label->secondary_cursor_gc != NULL) 
+	  {
+		gtk_gc_release (label->secondary_cursor_gc);
+		label->secondary_cursor_gc = NULL;
+	  }
+
+	label->primary_cursor_gc = make_cursor_gc (widget,
+						   "cursor-color",
+						   &widget->style->black);
+
+	label->secondary_cursor_gc = make_cursor_gc (widget,
+						     "secondary-cursor-color",
+						     &gray);
+    }
+}
+
+static void 
+eel_editable_label_direction_changed (GtkWidget        *widget,
+				      GtkTextDirection previous_dir)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (widget);
+
+  if (label->layout)
+    pango_layout_context_changed (label->layout);
+
+  GTK_WIDGET_CLASS (parent_class)->direction_changed (widget, previous_dir);
+}
+
+static void
+get_layout_location (EelEditableLabel  *label,
+                     gint      *xp,
+                     gint      *yp)
+{
+  GtkMisc *misc;
+  GtkWidget *widget;
+  gfloat xalign;
+  GtkRequisition req;
+  gint x, y;
+  
+  misc = GTK_MISC (label);
+  widget = GTK_WIDGET (label);
+  
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+    xalign = misc->xalign;
+  else
+    xalign = 1.0 - misc->xalign;
+
+  gtk_widget_get_child_requisition (widget, &req);
+  
+  x = floor ((gint)misc->xpad
+             + ((widget->allocation.width - req.width) * xalign)
+             + 0.5);
+  
+  y = floor ((gint)misc->ypad 
+             + ((widget->allocation.height - req.height) * misc->yalign)
+             + 0.5);
+
+  if (xp)
+    *xp = x;
+
+  if (yp)
+    *yp = y;
+}
+
+static void
+eel_editable_label_get_cursor_pos (EelEditableLabel  *label,
+				   PangoRectangle *strong_pos,
+				   PangoRectangle *weak_pos)
+{
+  const gchar *text;
+  const gchar *preedit_text;
+  gint index;
+  
+  eel_editable_label_ensure_layout (label, TRUE);
+  
+  text = pango_layout_get_text (label->layout);
+  preedit_text = text + label->selection_anchor;
+  index = label->selection_anchor +
+    g_utf8_offset_to_pointer (preedit_text, label->preedit_cursor) - preedit_text;
+      
+  pango_layout_get_cursor_pos (label->layout, index, strong_pos, weak_pos);
+}
+
+/* Copied from gtkutil private function */
+static gboolean
+eel_editable_label_get_block_cursor_location (EelEditableLabel  *label,
+					      gint *index,
+					      PangoRectangle *pos,
+					      gboolean *at_line_end)
+{
+  const gchar *text;
+  const gchar *preedit_text;
+  PangoLayoutLine *layout_line;
+  PangoRectangle strong_pos, weak_pos;
+  gint line_no;
+  gboolean rtl;
+  PangoContext *context;
+  PangoFontMetrics *metrics;
+  const PangoFontDescription *font_desc;
+  
+  eel_editable_label_ensure_layout (label, TRUE);
+  
+  text = pango_layout_get_text (label->layout);
+  preedit_text = text + label->selection_anchor;
+  text = g_utf8_offset_to_pointer (preedit_text, label->preedit_cursor);
+  index[0] = label->selection_anchor + text - preedit_text;
+
+  pango_layout_index_to_pos (label->layout, index[0], pos);
+
+  index[1] = label->selection_anchor + g_utf8_next_char (text) - preedit_text;
+
+  if (pos->width != 0)
+    {
+      if (at_line_end)
+	*at_line_end = FALSE;
+      if (pos->width < 0) /* RTL char, shift x value back to top left of rect */
+	{
+	  pos->x += pos->width;
+	  pos->width = -pos->width;
+	}
+      return TRUE;
+    }
+
+  pango_layout_index_to_line_x (label->layout, index[0], FALSE, &line_no, NULL);
+  layout_line = pango_layout_get_line_readonly (label->layout, line_no);
+  if (layout_line == NULL)
+    return FALSE;
+
+    text = pango_layout_get_text (label->layout);
+  if (index[0] < layout_line->start_index + layout_line->length)
+    {
+      /* this may be a zero-width character in the middle of the line,
+       * or it could be a character where line is wrapped, we do want
+       * block cursor in latter case */
+      if (g_utf8_next_char (text + index[0]) - text !=
+	  layout_line->start_index + layout_line->length)
+	{
+	  /* zero-width character in the middle of the line, do not
+	   * bother with block cursor */
+	  return FALSE;
+	}
+    }
+
+  /* Cursor is at the line end. It may be an empty line, or it could
+   * be on the left or on the right depending on text direction, or it
+   * even could be in the middle of visual layout in bidi text. */
+
+  pango_layout_get_cursor_pos (label->layout, index[0], &strong_pos, &weak_pos);
+
+  if (strong_pos.x != weak_pos.x)
+    {
+      /* do not show block cursor in this case, since the character typed
+       * in may or may not appear at the cursor position */
+      return FALSE;
+    }
+
+  context = pango_layout_get_context (label->layout);
+
+  /* In case when index points to the end of line, pos->x is always most right
+   * pixel of the layout line, so we need to correct it for RTL text. */
+  if (layout_line->length)
+    {
+      if (layout_line->resolved_dir == PANGO_DIRECTION_RTL)
+	{
+	  PangoLayoutIter *iter;
+	  PangoRectangle line_rect;
+	  gint i;
+	  gint left, right;
+	  const gchar *p;
+
+	  p = g_utf8_prev_char (text + index[0]);
+
+	  pango_layout_line_index_to_x (layout_line, p - text, FALSE, &left);
+	  pango_layout_line_index_to_x (layout_line, p - text, TRUE, &right);
+	  pos->x = MIN (left, right);
+
+	  iter = pango_layout_get_iter (label->layout);
+	  for (i = 0; i < line_no; i++)
+	    pango_layout_iter_next_line (iter);
+	  pango_layout_iter_get_line_extents (iter, NULL, &line_rect);
+	  pango_layout_iter_free (iter);
+
+          rtl = TRUE;
+	  pos->x += line_rect.x;
+	}
+      else
+	rtl = FALSE;
+    }
+  else
+    {
+      rtl = pango_context_get_base_dir (context) == PANGO_DIRECTION_RTL;
+    }
+  
+  font_desc = pango_layout_get_font_description (label->layout);
+  if (!font_desc)
+    font_desc = pango_context_get_font_description (context);
+
+  metrics = pango_context_get_metrics (context, font_desc, NULL);
+  pos->width = pango_font_metrics_get_approximate_char_width (metrics);
+  pango_font_metrics_unref (metrics);
+
+  if (rtl)
+    pos->x -= pos->width - 1;
+
+  if (at_line_end)
+    *at_line_end = TRUE;
+
+  return pos->width != 0;
+}
+
+
+/* These functions are copies from gtk+, as they are not exported from gtk+ */
+
+static GdkGC *
+make_cursor_gc (GtkWidget   *widget,
+		const gchar *property_name,
+		GdkColor    *fallback)
+{
+  GdkGCValues gc_values;
+  GdkGCValuesMask gc_values_mask;
+  GdkColor *cursor_color;
+
+  gtk_widget_style_get (widget, property_name, &cursor_color, NULL);
+  
+  gc_values_mask = GDK_GC_FOREGROUND;
+  if (cursor_color)
+    {
+      gc_values.foreground = *cursor_color;
+      gdk_color_free (cursor_color);
+    }
+  else
+    gc_values.foreground = *fallback;
+  
+  gdk_rgb_find_color (widget->style->colormap, &gc_values.foreground);
+  return gtk_gc_get (widget->style->depth, widget->style->colormap, &gc_values, gc_values_mask);
+}
+
+static void
+_eel_draw_insertion_cursor (GtkWidget        *widget,
+			    GdkDrawable      *drawable,
+			    GdkGC            *gc,
+                            GdkRectangle     *location,
+                            GtkTextDirection  direction,
+                            gboolean          draw_arrow)
+{
+  gint stem_width;
+  gint arrow_width;
+  gint x, y;
+  gint i;
+  gfloat cursor_aspect_ratio;
+  gint offset;
+  
+  g_assert (direction != GTK_TEXT_DIR_NONE);
+  
+  gtk_widget_style_get (widget, "cursor-aspect-ratio", &cursor_aspect_ratio, NULL);
+  
+  stem_width = location->height * cursor_aspect_ratio + 1;
+  arrow_width = stem_width + 1;
+
+  /* put (stem_width % 2) on the proper side of the cursor */
+  if (direction == GTK_TEXT_DIR_LTR)
+    offset = stem_width / 2;
+  else
+    offset = stem_width - stem_width / 2;
+  
+  for (i = 0; i < stem_width; i++)
+    gdk_draw_line (drawable, gc,
+		   location->x + i - offset, location->y,
+		   location->x + i - offset, location->y + location->height - 1);
+
+  if (draw_arrow)
+    {
+      if (direction == GTK_TEXT_DIR_RTL)
+        {
+          x = location->x - offset - 1;
+          y = location->y + location->height - arrow_width * 2 - arrow_width + 1;
+  
+          for (i = 0; i < arrow_width; i++)
+            {
+              gdk_draw_line (drawable, gc,
+                             x, y + i + 1,
+                             x, y + 2 * arrow_width - i - 1);
+              x --;
+            }
+        }
+      else if (direction == GTK_TEXT_DIR_LTR)
+        {
+          x = location->x + stem_width - offset;
+          y = location->y + location->height - arrow_width * 2 - arrow_width + 1;
+  
+          for (i = 0; i < arrow_width; i++) 
+            {
+              gdk_draw_line (drawable, gc,
+                             x, y + i + 1,
+                             x, y + 2 * arrow_width - i - 1);
+              x++;
+            }
+        }
+    }
+}
+
+static void
+eel_editable_label_draw_cursor (EelEditableLabel  *label, gint xoffset, gint yoffset)
+{
+  if (GTK_WIDGET_DRAWABLE (label))
+    {
+      GtkWidget *widget = GTK_WIDGET (label);
+
+      GtkTextDirection keymap_direction;
+      GtkTextDirection widget_direction;
+      gboolean split_cursor;
+      gboolean block;
+      gboolean block_at_line_end;
+      gint range[2];
+      PangoRectangle strong_pos, weak_pos;
+      PangoRectangle *cursor1 = NULL;
+      PangoRectangle *cursor2 = NULL;
+      GdkRectangle cursor_location;
+      GtkTextDirection dir1 = GTK_TEXT_DIR_NONE;
+      GtkTextDirection dir2 = GTK_TEXT_DIR_NONE;
+
+      keymap_direction =
+	(gdk_keymap_get_direction (gdk_keymap_get_default ()) == PANGO_DIRECTION_LTR) ?
+	GTK_TEXT_DIR_LTR : GTK_TEXT_DIR_RTL;
+
+      widget_direction = gtk_widget_get_direction (widget);
+
+      if (label->overwrite_mode &&
+	  eel_editable_label_get_block_cursor_location (label, range,
+							&strong_pos,
+							&block_at_line_end))
+	block = TRUE;
+      else
+	block = FALSE;
+
+      if (!block)
+	{ 
+          eel_editable_label_get_cursor_pos (label, &strong_pos, &weak_pos);
+
+          g_object_get (gtk_widget_get_settings (widget),
+			"gtk-split-cursor", &split_cursor,
+			NULL);
+
+          dir1 = widget_direction;
+      
+	  if (split_cursor)
+	    {
+	      cursor1 = &strong_pos;
+
+	      if (strong_pos.x != weak_pos.x ||
+		  strong_pos.y != weak_pos.y)
+		{
+		  dir2 = (widget_direction == GTK_TEXT_DIR_LTR) ? GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR;
+		  cursor2 = &weak_pos;
+		}
+	    }
+	  else
+	    {
+	      if (keymap_direction == widget_direction)
+		  cursor1 = &strong_pos;
+	      else
+		  cursor1 = &weak_pos;
+	    }
+      
+          cursor_location.x = xoffset + PANGO_PIXELS (cursor1->x);
+	  cursor_location.y = yoffset + PANGO_PIXELS (cursor1->y);
+	  cursor_location.width = 0;
+	  cursor_location.height = PANGO_PIXELS (cursor1->height);
+
+	  _eel_draw_insertion_cursor (widget, widget->window,
+				      label->primary_cursor_gc,
+				      &cursor_location, dir1,
+				      dir2 != GTK_TEXT_DIR_NONE);
+
+	  if (dir2 != GTK_TEXT_DIR_NONE)
+	    {
+	      cursor_location.x = xoffset + PANGO_PIXELS (cursor2->x);
+	      cursor_location.y = yoffset + PANGO_PIXELS (cursor2->y);
+	      cursor_location.width = 0;
+	      cursor_location.height = PANGO_PIXELS (cursor2->height);
+
+	      _eel_draw_insertion_cursor (widget, widget->window,
+					  label->secondary_cursor_gc,
+					  &cursor_location, dir2, TRUE);
+	    }
+	}
+      else /* Block cursor */
+	{
+          GdkRegion *clip;
+
+	  gdk_draw_rectangle (widget->window, label->primary_cursor_gc, TRUE,
+			      xoffset + PANGO_PIXELS (strong_pos.x),
+			      yoffset + PANGO_PIXELS (strong_pos.y),
+			      PANGO_PIXELS (strong_pos.width),
+			      PANGO_PIXELS (strong_pos.height));
+
+	  if (!block_at_line_end)
+	    {
+	      clip = gdk_pango_layout_get_clip_region (label->layout,
+						       xoffset, yoffset,
+						       range, 1);
+
+	      /* FIXME should use gtk_paint, but it can't use a clip
+	       * region
+	       */
+
+	      gdk_gc_set_clip_region (label->primary_cursor_gc, clip);
+
+	      gdk_draw_layout_with_colors (widget->window,
+		                           label->primary_cursor_gc,
+					   xoffset, yoffset,
+					   label->layout,
+					   &widget->style->base[GTK_STATE_NORMAL],
+					   NULL);
+
+	      gdk_gc_set_clip_region (label->primary_cursor_gc, NULL);
+	      gdk_region_destroy (clip);
+	    }
+	}	  
+    }
+}
+
+
+static gint
+eel_editable_label_expose (GtkWidget      *widget,
+			   GdkEventExpose *event)
+{
+  EelEditableLabel *label;
+  gint x, y;
+  
+  g_assert (EEL_IS_EDITABLE_LABEL (widget));
+  g_assert (event != NULL);
+  
+  label = EEL_EDITABLE_LABEL (widget);
+
+  eel_editable_label_ensure_layout (label, TRUE);
+  
+  if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget) &&
+      label->text)
+    {
+      get_layout_location (label, &x, &y);
+      
+      gtk_paint_layout (widget->style,
+                        widget->window,
+                        GTK_WIDGET_STATE (widget),
+			FALSE,
+                        &event->area,
+                        widget,
+                        "label",
+                        x, y,
+                        label->layout);
+      
+      if (label->selection_anchor != label->selection_end)
+        {
+          gint range[2];
+	  const char *text;
+          GdkRegion *clip;
+	  GtkStateType state;
+	  
+          range[0] = label->selection_anchor;
+          range[1] = label->selection_end;
+
+	  /* Handle possible preedit string */
+	  if (label->preedit_length > 0 &&
+	      range[1] > label->selection_anchor)
+	    {
+	      text = pango_layout_get_text (label->layout) + label->selection_anchor;
+	      range[1] += g_utf8_offset_to_pointer (text, label->preedit_length) - text;
+	    }
+	  
+          if (range[0] > range[1])
+            {
+              gint tmp = range[0];
+              range[0] = range[1];
+              range[1] = tmp;
+            }
+
+          clip = gdk_pango_layout_get_clip_region (label->layout,
+                                                   x, y,
+                                                   range,
+                                                   1);
+
+          /* FIXME should use gtk_paint, but it can't use a clip
+           * region
+           */
+
+          gdk_gc_set_clip_region (widget->style->black_gc, clip);
+
+
+	  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,
+                                       label->layout,
+                                       &widget->style->text[state],
+                                       &widget->style->base[state]);
+
+          gdk_gc_set_clip_region (widget->style->black_gc, NULL);
+          gdk_region_destroy (clip);
+        }
+      else if (GTK_WIDGET_HAS_FOCUS (widget))
+	eel_editable_label_draw_cursor (label, x, y);
+
+      if (label->draw_outline)
+	gdk_draw_rectangle (widget->window,
+			    widget->style->fg_gc [GTK_WIDGET_STATE (widget)],
+			    FALSE,
+			    0, 0,
+			    widget->allocation.width - 1,
+			    widget->allocation.height - 1);
+    }
+
+  return FALSE;
+}
+
+static void
+eel_editable_label_realize (GtkWidget *widget)
+{
+  EelEditableLabel *label;
+  GdkWindowAttr attributes;
+  gint attributes_mask;
+  static GdkColor gray = { 0, 0x8888, 0x8888, 0x8888 };
+
+  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  label = EEL_EDITABLE_LABEL (widget);
+
+  attributes.wclass = GDK_INPUT_OUTPUT;
+  attributes.window_type = GDK_WINDOW_CHILD;
+  attributes.x = widget->allocation.x;
+  attributes.y = widget->allocation.y;
+  attributes.width = widget->allocation.width;
+  attributes.height = widget->allocation.height;
+  attributes.visual = gtk_widget_get_visual (widget);
+  attributes.colormap = gtk_widget_get_colormap (widget);
+  attributes.cursor = gdk_cursor_new (GDK_XTERM);
+  attributes.event_mask = gtk_widget_get_events (widget) |
+    (GDK_EXPOSURE_MASK |
+     GDK_BUTTON_PRESS_MASK |
+     GDK_BUTTON_RELEASE_MASK |
+     GDK_BUTTON1_MOTION_MASK |
+     GDK_BUTTON3_MOTION_MASK |
+     GDK_POINTER_MOTION_HINT_MASK |
+     GDK_POINTER_MOTION_MASK |
+     GDK_ENTER_NOTIFY_MASK |
+     GDK_LEAVE_NOTIFY_MASK);
+
+  attributes_mask = GDK_WA_X | GDK_WA_Y  | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_CURSOR;
+
+  widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
+				   &attributes, attributes_mask);
+  gdk_window_set_user_data (widget->window, widget);
+
+  gdk_cursor_unref (attributes.cursor);
+
+  widget->style = gtk_style_attach (widget->style, widget->window);
+  
+  gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+
+  gtk_im_context_set_client_window (label->im_context, widget->window);
+
+  label->primary_cursor_gc = make_cursor_gc (widget,
+					     "cursor-color",
+					     &widget->style->black);
+      
+  label->secondary_cursor_gc = make_cursor_gc (widget,
+					       "secondary-cursor-color",
+					       &gray);
+}
+
+static void
+eel_editable_label_unrealize (GtkWidget *widget)
+{
+  EelEditableLabel *label;
+
+  label = EEL_EDITABLE_LABEL (widget);
+
+  gtk_gc_release (label->primary_cursor_gc);
+  label->primary_cursor_gc = NULL;
+  
+  gtk_gc_release (label->secondary_cursor_gc);
+  label->secondary_cursor_gc = NULL;
+
+  /* Strange. Copied from GtkEntry, should be NULL? */
+  gtk_im_context_set_client_window (label->im_context, NULL);
+  
+  (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+}
+
+static void
+eel_editable_label_map (GtkWidget *widget)
+{
+  (* GTK_WIDGET_CLASS (parent_class)->map) (widget);
+}
+
+static void
+eel_editable_label_unmap (GtkWidget *widget)
+{
+  (* GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
+}
+
+static void
+window_to_layout_coords (EelEditableLabel *label,
+                         gint     *x,
+                         gint     *y)
+{
+  gint lx, ly;
+
+  /* get layout location in widget->window coords */
+  get_layout_location (label, &lx, &ly);
+  
+  if (x)
+    *x -= lx;                   /* go to layout */
+
+  if (y)
+    *y -= ly;                   /* go to layout */
+}
+
+static void
+get_layout_index (EelEditableLabel *label,
+                  gint      x,
+                  gint      y,
+                  gint     *index)
+{
+  gint trailing = 0;
+  const gchar *cluster;
+  const gchar *cluster_end;
+
+  *index = 0;
+  
+  eel_editable_label_ensure_layout (label, TRUE);
+  
+  window_to_layout_coords (label, &x, &y);
+
+  x *= PANGO_SCALE;
+  y *= PANGO_SCALE;
+  
+  pango_layout_xy_to_index (label->layout,
+                            x, y,
+                            index, &trailing);
+
+  if (*index >= label->selection_anchor && label->preedit_length)
+    {
+      if (*index >= label->selection_anchor + label->preedit_length)
+	*index -= label->preedit_length;
+      else
+	{
+	  *index = label->selection_anchor;
+	  trailing = 0;
+	}
+    }
+  
+  cluster = label->text + *index;
+  cluster_end = cluster;
+  while (trailing)
+    {
+      cluster_end = g_utf8_next_char (cluster_end);
+      --trailing;
+    }
+
+  *index += (cluster_end - cluster);
+}
+
+static void
+eel_editable_label_select_word (EelEditableLabel *label)
+{
+  gint min, max;
+  
+  gint start_index = eel_editable_label_move_backward_word (label, label->selection_end);
+  gint end_index = eel_editable_label_move_forward_word (label, label->selection_end);
+
+  min = MIN (label->selection_anchor,
+	     label->selection_end);
+  max = MAX (label->selection_anchor,
+	     label->selection_end);
+
+  min = MIN (min, start_index);
+  max = MAX (max, end_index);
+
+  eel_editable_label_select_region_index (label, min, max);
+}
+
+static gint
+eel_editable_label_button_press (GtkWidget      *widget,
+				 GdkEventButton *event)
+{
+  EelEditableLabel *label;
+  gint index = 0;
+  
+  label = EEL_EDITABLE_LABEL (widget);
+
+  if (event->button == 1)
+    {
+      if (!GTK_WIDGET_HAS_FOCUS (widget))
+	gtk_widget_grab_focus (widget);
+
+      if (event->type == GDK_3BUTTON_PRESS)
+	{
+	  eel_editable_label_select_region_index (label, 0, strlen (label->text));
+	  return TRUE;
+	}
+      
+      if (event->type == GDK_2BUTTON_PRESS)
+	{
+	  eel_editable_label_select_word (label);
+	  return TRUE;
+	}
+      
+      get_layout_index (label, event->x, event->y, &index);
+      
+      if ((label->selection_anchor !=
+	   label->selection_end) &&
+	  (event->state & GDK_SHIFT_MASK))
+	{
+	  gint min, max;
+	  
+	  /* extend (same as motion) */
+	  min = MIN (label->selection_anchor,
+		     label->selection_end);
+	  max = MAX (label->selection_anchor,
+		     label->selection_end);
+	  
+	  min = MIN (min, index);
+	  max = MAX (max, index);
+	  
+	  /* ensure the anchor is opposite index */
+	  if (index == min)
+	    {
+	      gint tmp = min;
+	      min = max;
+	      max = tmp;
+	    }
+	  
+	  eel_editable_label_select_region_index (label, min, max);
+	}
+      else
+	{
+	  if (event->type == GDK_3BUTTON_PRESS)
+	      eel_editable_label_select_region_index (label, 0, strlen (label->text));
+	  else if (event->type == GDK_2BUTTON_PRESS)
+	      eel_editable_label_select_word (label);
+	  else 
+	    /* start a replacement */
+	    eel_editable_label_select_region_index (label, index, index);
+	}
+  
+      return TRUE;
+    }
+  else if (event->button == 2 && event->type == GDK_BUTTON_PRESS)
+    {
+      get_layout_index (label, event->x, event->y, &index);
+      
+      eel_editable_label_select_region_index (label, index, index);
+      eel_editable_label_paste (label, GDK_SELECTION_PRIMARY);
+      
+      return TRUE;
+    }
+  else if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
+    {
+      eel_editable_label_do_popup (label, event);
+
+      return TRUE;
+      
+    }
+  return FALSE;
+}
+
+static gint
+eel_editable_label_button_release (GtkWidget      *widget,
+				   GdkEventButton *event)
+
+{
+  if (event->button != 1)
+    return FALSE;
+  
+  /* The goal here is to return TRUE iff we ate the
+   * button press to start selecting.
+   */
+  
+  return TRUE;
+}
+
+static gint
+eel_editable_label_motion (GtkWidget      *widget,
+			   GdkEventMotion *event)
+{
+  EelEditableLabel *label;
+  gint index;
+  gint x, y;
+  
+  label = EEL_EDITABLE_LABEL (widget);
+  
+  if ((event->state & GDK_BUTTON1_MASK) == 0)
+    return FALSE;
+
+  gdk_window_get_pointer (widget->window,
+                          &x, &y, NULL);
+  
+  get_layout_index (label, x, y, &index);
+
+  eel_editable_label_select_region_index (label,
+					  label->selection_anchor,
+					  index);
+  
+  return TRUE;
+}
+
+static void
+get_text_callback (GtkClipboard     *clipboard,
+                   GtkSelectionData *selection_data,
+                   guint             info,
+                   gpointer          user_data_or_owner)
+{
+  EelEditableLabel *label;
+  
+  label = EEL_EDITABLE_LABEL (user_data_or_owner);
+  
+  if ((label->selection_anchor != label->selection_end) &&
+      label->text)
+    {
+      gint start, end;
+      gint len;
+      
+      start = MIN (label->selection_anchor,
+                   label->selection_end);
+      end = MAX (label->selection_anchor,
+                 label->selection_end);
+
+      len = strlen (label->text);
+
+      if (end > len)
+        end = len;
+
+      if (start > len)
+        start = len;
+
+      gtk_selection_data_set_text (selection_data,
+				   label->text + start,
+				   end - start);
+    }
+}
+
+static void
+clear_text_callback (GtkClipboard     *clipboard,
+                     gpointer          user_data_or_owner)
+{
+  EelEditableLabel *label;
+
+  label = EEL_EDITABLE_LABEL (user_data_or_owner);
+
+  label->selection_anchor = label->selection_end;
+      
+  gtk_widget_queue_draw (GTK_WIDGET (label));
+}
+
+static void
+eel_editable_label_select_region_index (EelEditableLabel *label,
+					gint      anchor_index,
+					gint      end_index)
+{
+  GtkClipboard *clipboard;
+
+  g_assert (EEL_IS_EDITABLE_LABEL (label));
+  
+
+  if (label->selection_anchor == anchor_index &&
+      label->selection_end == end_index)
+    return;
+
+  eel_editable_label_reset_im_context (label);
+
+  label->selection_anchor = anchor_index;
+  label->selection_end = end_index;
+
+  clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);      
+      
+  if (anchor_index != end_index)
+    {
+      GtkTargetList *list;
+      GtkTargetEntry *targets;
+      guint 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, n_targets,
+				    get_text_callback,
+				    clear_text_callback,
+				    G_OBJECT (label));
+
+      gtk_clipboard_set_can_store (clipboard, NULL, 0);
+      gtk_target_table_free (targets, n_targets);
+      gtk_target_list_unref (list);
+    }
+  else
+    {
+      if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (label))
+	gtk_clipboard_clear (clipboard);
+    }
+  
+  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_thaw_notify (G_OBJECT (label));
+}
+
+/**
+ * eel_editable_label_select_region:
+ * @label: a #EelEditableLabel
+ * @start_offset: start offset (in characters not bytes)
+ * @end_offset: end offset (in characters not bytes)
+ *
+ * Selects a range of characters in the label, if the label is selectable.
+ * See eel_editable_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
+eel_editable_label_select_region  (EelEditableLabel *label,
+				   gint      start_offset,
+				   gint      end_offset)
+{
+  g_return_if_fail (EEL_IS_EDITABLE_LABEL (label));
+  
+  if (label->text)
+    {
+      if (start_offset < 0)
+        start_offset = g_utf8_strlen (label->text, -1);
+      
+      if (end_offset < 0)
+        end_offset = g_utf8_strlen (label->text, -1);
+      
+      eel_editable_label_select_region_index (label,
+					      g_utf8_offset_to_pointer (label->text, start_offset) - label->text,
+					      g_utf8_offset_to_pointer (label->text, end_offset) - label->text);
+    }
+}
+
+/**
+ * eel_editable_label_get_selection_bounds:
+ * @label: a #EelEditableLabel
+ * @start: return location for start of selection, as a character offset
+ * @end: return location for end of selection, as a character offset
+ * 
+ * Gets the selected range of characters in the label, returning %TRUE
+ * if there's a selection.
+ * 
+ * Return value: %TRUE if selection is non-empty
+ **/
+gboolean
+eel_editable_label_get_selection_bounds (EelEditableLabel  *label,
+					 gint      *start,
+					 gint      *end)
+{
+  gint start_index, end_index;
+  gint start_offset, end_offset;
+  gint len;
+  
+  g_return_val_if_fail (EEL_IS_EDITABLE_LABEL (label), FALSE);
+
+      
+  start_index = MIN (label->selection_anchor,
+		     label->selection_end);
+  end_index = MAX (label->selection_anchor,
+		   label->selection_end);
+
+  len = strlen (label->text);
+  
+  if (end_index > len)
+    end_index = len;
+  
+  if (start_index > len)
+    start_index = len;
+  
+  start_offset = g_utf8_strlen (label->text, start_index);
+  end_offset = g_utf8_strlen (label->text, end_index);
+  
+  if (start_offset > end_offset)
+    {
+      gint tmp = start_offset;
+      start_offset = end_offset;
+      end_offset = tmp;
+    }
+  
+  if (start)
+    *start = start_offset;
+  
+  if (end)
+    *end = end_offset;
+  
+  return start_offset != end_offset;
+}
+
+
+/**
+ * eel_editable_label_get_layout:
+ * @label: a #EelEditableLabel
+ * 
+ * Gets the #PangoLayout used to display the label.
+ * The layout is useful to e.g. convert text positions to
+ * pixel positions, in combination with eel_editable_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
+ **/
+PangoLayout*
+eel_editable_label_get_layout (EelEditableLabel *label)
+{
+  g_return_val_if_fail (EEL_IS_EDITABLE_LABEL (label), NULL);
+
+  eel_editable_label_ensure_layout (label, TRUE);
+
+  return label->layout;
+}
+
+/**
+ * eel_editable_label_get_layout_offsets:
+ * @label: a #EelEditableLabel
+ * @x: location to store X offset of layout, or %NULL
+ * @y: location to store Y offset of layout, or %NULL
+ *
+ * Obtains the coordinates where the label will draw the #PangoLayout
+ * representing the text in the label; useful to convert mouse events
+ * into coordinates inside the #PangoLayout, e.g. to take some action
+ * if some part of the label is clicked. Of course you will need to
+ * create a #GtkEventBox to receive the events, and pack the 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
+eel_editable_label_get_layout_offsets (EelEditableLabel *label,
+				       gint     *x,
+				       gint     *y)
+{
+  g_return_if_fail (EEL_IS_EDITABLE_LABEL (label));
+  
+  get_layout_location (label, x, y);
+}
+
+static void
+eel_editable_label_pend_cursor_blink (EelEditableLabel *label)
+{
+  /* TODO */
+}
+
+static void
+eel_editable_label_check_cursor_blink (EelEditableLabel *label)
+{
+  /* TODO */
+}
+
+static gint
+eel_editable_label_key_press (GtkWidget   *widget,
+			      GdkEventKey *event)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (widget);
+
+  eel_editable_label_pend_cursor_blink (label);
+
+  if (gtk_im_context_filter_keypress (label->im_context, event))
+    {
+      /*TODO eel_editable_label_obscure_mouse_cursor (label);*/
+      label->need_im_reset = TRUE;
+      return TRUE;
+    }
+
+  if (GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event))
+    /* Activate key bindings
+     */
+    return TRUE;
+
+  return FALSE;
+}
+
+static gint
+eel_editable_label_key_release (GtkWidget   *widget,
+				GdkEventKey *event)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (widget);
+
+  if (gtk_im_context_filter_keypress (label->im_context, event))
+    {
+      label->need_im_reset = TRUE;
+      return TRUE;
+    }
+
+  return GTK_WIDGET_CLASS (parent_class)->key_release_event (widget, event);
+}
+
+static void
+eel_editable_label_keymap_direction_changed (GdkKeymap *keymap,
+					     EelEditableLabel  *label)
+{
+  gtk_widget_queue_draw (GTK_WIDGET (label));
+}
+
+static gint
+eel_editable_label_focus_in (GtkWidget     *widget,
+			     GdkEventFocus *event)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (widget);
+  
+  gtk_widget_queue_draw (widget);
+  
+  label->need_im_reset = TRUE;
+  gtk_im_context_focus_in (label->im_context);
+
+  g_signal_connect (gdk_keymap_get_default (),
+		    "direction_changed",
+		    G_CALLBACK (eel_editable_label_keymap_direction_changed), label);
+
+  eel_editable_label_check_cursor_blink (label);
+
+  return FALSE;
+}
+
+static gint
+eel_editable_label_focus_out (GtkWidget     *widget,
+			      GdkEventFocus *event)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (widget);
+  
+  gtk_widget_queue_draw (widget);
+
+  label->need_im_reset = TRUE;
+  gtk_im_context_focus_out (label->im_context);
+
+  eel_editable_label_check_cursor_blink (label);
+  
+  g_signal_handlers_disconnect_by_func (gdk_keymap_get_default (),
+                                        (gpointer) eel_editable_label_keymap_direction_changed,
+                                        label);
+  
+  return FALSE;
+}
+
+static void
+eel_editable_label_delete_text (EelEditableLabel *label,
+				int start_pos,
+				int end_pos)
+{
+  int anchor, end;
+  
+  if (start_pos < 0)
+    start_pos = 0;
+  if (end_pos < 0 || end_pos > label->n_bytes)
+    end_pos = label->n_bytes;
+  
+  if (start_pos < end_pos)
+    {
+      g_memmove (label->text + start_pos, label->text + end_pos, label->n_bytes + 1 - end_pos);
+      label->n_bytes -= (end_pos - start_pos);
+
+      anchor = label->selection_anchor;
+      if (anchor > start_pos)
+	anchor -= MIN (anchor, end_pos) - start_pos;
+
+      end = label->selection_end;
+      if (end > start_pos)
+	end -= MIN (end, end_pos) - start_pos;
+      
+      /* We might have changed the selection */
+      eel_editable_label_select_region_index (label, anchor, end);
+      
+      eel_editable_label_recompute (label);  
+      gtk_widget_queue_resize (GTK_WIDGET (label));
+      
+      g_object_notify (G_OBJECT (label), "text");
+      g_signal_emit_by_name (GTK_EDITABLE (label), "changed");
+    }
+}
+
+static void
+eel_editable_label_insert_text (EelEditableLabel *label,
+				const gchar *new_text,
+				gint         new_text_length,
+				gint        *index)
+{
+  if (new_text_length + label->n_bytes + 1 > label->text_size)
+    {
+      while (new_text_length + label->n_bytes + 1 > label->text_size)
+	{
+	  if (label->text_size == 0)
+	    label->text_size = 16;
+	  else
+	    label->text_size *= 2;
+	}
+
+      label->text = g_realloc (label->text, label->text_size);
+    }
+
+  g_object_freeze_notify (G_OBJECT (label));
+
+  g_memmove (label->text + *index + new_text_length, label->text + *index, label->n_bytes - *index);
+  memcpy (label->text + *index, new_text, new_text_length);
+  
+  label->n_bytes += new_text_length;
+
+  /* NUL terminate for safety and convenience */
+  label->text[label->n_bytes] = '\0';
+
+  g_object_notify (G_OBJECT (label), "text");
+
+  if (label->selection_anchor > *index)
+    {
+      g_object_notify (G_OBJECT (label), "cursor_position");
+      g_object_notify (G_OBJECT (label), "selection_bound");
+      label->selection_anchor += new_text_length;
+    }
+  
+  if (label->selection_end > *index)
+    {
+      label->selection_end += new_text_length;
+      g_object_notify (G_OBJECT (label), "selection_bound");
+    }
+
+  *index += new_text_length;
+
+  eel_editable_label_recompute (label);  
+  gtk_widget_queue_resize (GTK_WIDGET (label));
+
+  g_object_thaw_notify (G_OBJECT (label));
+  g_signal_emit_by_name (GTK_EDITABLE (label), "changed");
+}
+
+/* Used for im_commit_cb and inserting Unicode chars */
+static void
+eel_editable_label_enter_text (EelEditableLabel *label,
+			       const gchar    *str)
+{
+  GtkEditable *editable = GTK_EDITABLE (label);
+  gint tmp_pos;
+  gboolean old_need_im_reset;
+
+  /* Never reset the im while commiting, as that resets possible im state */
+  old_need_im_reset = label->need_im_reset;
+  label->need_im_reset = FALSE;
+
+  if (label->selection_end != label->selection_anchor)
+    gtk_editable_delete_selection (editable);
+  else
+    {
+      if (label->overwrite_mode)
+        eel_editable_label_delete_from_cursor (label, GTK_DELETE_CHARS, 1);
+    }
+  
+  tmp_pos = g_utf8_pointer_to_offset (label->text,
+                                      label->text + label->selection_anchor);
+  gtk_editable_insert_text (GTK_EDITABLE (label), str, strlen (str), &tmp_pos);
+  tmp_pos = g_utf8_offset_to_pointer (label->text, tmp_pos) - label->text;
+  eel_editable_label_select_region_index (label, tmp_pos, tmp_pos);
+
+  label->need_im_reset = old_need_im_reset;
+}
+
+/* IM Context Callbacks
+ */
+
+static void
+eel_editable_label_commit_cb (GtkIMContext *context,
+			      const gchar  *str,
+			      EelEditableLabel  *label)
+{
+  eel_editable_label_enter_text (label, str);
+}
+
+static void 
+eel_editable_label_preedit_changed_cb (GtkIMContext *context,
+				       EelEditableLabel  *label)
+{
+  gchar *preedit_string;
+  gint cursor_pos;
+  
+  gtk_im_context_get_preedit_string (label->im_context,
+				     &preedit_string, NULL,
+				     &cursor_pos);
+  label->preedit_length = strlen (preedit_string);
+  cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
+  label->preedit_cursor = cursor_pos;
+  g_free (preedit_string);
+
+  eel_editable_label_recompute (label);  
+  gtk_widget_queue_resize (GTK_WIDGET (label));
+}
+
+static gboolean
+eel_editable_label_retrieve_surrounding_cb (GtkIMContext *context,
+					    EelEditableLabel  *label)
+{
+  gtk_im_context_set_surrounding (context,
+				  label->text,
+				  strlen (label->text) + 1,
+				  label->selection_end);
+
+  return TRUE;
+}
+
+static gboolean
+eel_editable_label_delete_surrounding_cb (GtkIMContext *slave,
+					  gint          offset,
+					  gint          n_chars,
+					  EelEditableLabel  *label)
+{
+  gint current_pos;
+
+  current_pos = g_utf8_pointer_to_offset (label->text, label->text + label->selection_anchor);
+  gtk_editable_delete_text (GTK_EDITABLE (label), 
+			    current_pos + offset, 
+			    current_pos + offset + n_chars);
+
+  return TRUE;
+}
+
+static gboolean
+eel_editable_label_focus (GtkWidget         *widget,
+			  GtkDirectionType   direction)
+{
+  /* We never want to be in the tab chain */
+  return FALSE;
+}
+
+/* Compute the X position for an offset that corresponds to the "more important
+ * cursor position for that offset. We use this when trying to guess to which
+ * end of the selection we should go to when the user hits the left or
+ * right arrow key.
+ */
+static void
+get_better_cursor (EelEditableLabel *label,
+		   gint      index,
+		   gint      *x,
+		   gint      *y)
+{
+  GtkTextDirection keymap_direction =
+    (gdk_keymap_get_direction (gdk_keymap_get_default ()) == PANGO_DIRECTION_LTR) ?
+    GTK_TEXT_DIR_LTR : GTK_TEXT_DIR_RTL;
+  GtkTextDirection widget_direction = gtk_widget_get_direction (GTK_WIDGET (label));
+  gboolean split_cursor;
+  PangoRectangle strong_pos, weak_pos;
+  
+  g_object_get (gtk_widget_get_settings (GTK_WIDGET (label)),
+		"gtk-split-cursor", &split_cursor,
+		NULL);
+
+  eel_editable_label_get_cursor_pos (label, &strong_pos, &weak_pos);
+
+  if (split_cursor)
+    {
+      *x = strong_pos.x / PANGO_SCALE;
+      *y = strong_pos.y / PANGO_SCALE;
+    }
+  else
+    {
+      if (keymap_direction == widget_direction)
+	{
+	  *x = strong_pos.x / PANGO_SCALE;
+	  *y = strong_pos.y / PANGO_SCALE;
+	}
+      else
+	{
+	  *x = weak_pos.x / PANGO_SCALE;
+	  *y = weak_pos.y / PANGO_SCALE;
+	}
+    }
+}
+
+
+static gint
+eel_editable_label_move_logically (EelEditableLabel *label,
+				   gint      start,
+				   gint      count)
+{
+  gint offset = g_utf8_pointer_to_offset (label->text,
+					  label->text + start);
+
+  if (label->text)
+    {
+      PangoLogAttr *log_attrs;
+      gint n_attrs;
+      gint length;
+
+      eel_editable_label_ensure_layout (label, FALSE);
+      
+      length = g_utf8_strlen (label->text, -1);
+
+      pango_layout_get_log_attrs (label->layout, &log_attrs, &n_attrs);
+
+      while (count > 0 && offset < length)
+	{
+	  do
+	    offset++;
+	  while (offset < length && !log_attrs[offset].is_cursor_position);
+	  
+	  count--;
+	}
+      while (count < 0 && offset > 0)
+	{
+	  do
+	    offset--;
+	  while (offset > 0 && !log_attrs[offset].is_cursor_position);
+	  
+	  count++;
+	}
+      
+      g_free (log_attrs);
+    }
+
+  return g_utf8_offset_to_pointer (label->text, offset) - label->text;
+}
+
+static gint
+eel_editable_label_move_visually (EelEditableLabel *label,
+				  gint      start,
+				  gint      count)
+{
+  gint index;
+
+  index = start;
+  
+  while (count != 0)
+    {
+      int new_index, new_trailing;
+      gboolean split_cursor;
+      gboolean strong;
+
+      eel_editable_label_ensure_layout (label, FALSE);
+
+      g_object_get (gtk_widget_get_settings (GTK_WIDGET (label)),
+		    "gtk-split-cursor", &split_cursor,
+		    NULL);
+
+      if (split_cursor)
+	strong = TRUE;
+      else
+	{
+	  GtkTextDirection keymap_direction =
+	    (gdk_keymap_get_direction (gdk_keymap_get_default ()) == PANGO_DIRECTION_LTR) ?
+	    GTK_TEXT_DIR_LTR : GTK_TEXT_DIR_RTL;
+
+	  strong = keymap_direction == gtk_widget_get_direction (GTK_WIDGET (label));
+	}
+      
+      if (count > 0)
+	{
+	  pango_layout_move_cursor_visually (label->layout, strong, index, 0, 1, &new_index, &new_trailing);
+	  count--;
+	}
+      else
+	{
+	  pango_layout_move_cursor_visually (label->layout, strong, index, 0, -1, &new_index, &new_trailing);
+	  count++;
+	}
+
+      if (new_index < 0 || new_index == G_MAXINT)
+	break;
+
+      index = new_index;
+      
+      while (new_trailing--)
+	index = g_utf8_next_char (label->text + new_index) - label->text;
+    }
+  
+  return index;
+}
+
+static gint
+eel_editable_label_move_line (EelEditableLabel *label,
+			      gint      start,
+			      gint      count)
+{
+  int n_lines, i;
+  int x;
+  PangoLayoutLine *line;
+  int index;
+  
+  eel_editable_label_ensure_layout (label, FALSE);
+
+  n_lines = pango_layout_get_line_count (label->layout);
+
+  for (i = 0; i < n_lines; i++)
+    {
+      line = pango_layout_get_line (label->layout, i);
+      if (start >= line->start_index &&
+	  start <= line->start_index + line->length)
+	{
+	  pango_layout_line_index_to_x (line, start, FALSE, &x);
+	  break;
+	}
+    }
+  if (i == n_lines)
+    i = n_lines - 1;
+  
+  i += count;
+  i = CLAMP (i, 0, n_lines - 1);
+
+  line = pango_layout_get_line (label->layout, i);
+  if (pango_layout_line_x_to_index (line,
+				    x,
+				    &index, NULL))
+    return index;
+  else
+    {
+      if (i == n_lines - 1)
+	return line->start_index + line->length;
+      else
+	return line->start_index + line->length - 1;
+    }
+}
+
+static gint
+eel_editable_label_move_forward_word (EelEditableLabel *label,
+				      gint      start)
+{
+  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 < length)
+    {
+      PangoLogAttr *log_attrs;
+      gint n_attrs;
+
+      eel_editable_label_ensure_layout (label, FALSE);
+      
+      pango_layout_get_log_attrs (label->layout, &log_attrs, &n_attrs);
+      
+      /* Find the next word end */
+      new_pos++;
+      while (new_pos < n_attrs && !log_attrs[new_pos].is_word_end)
+	new_pos++;
+
+      g_free (log_attrs);
+    }
+
+  return g_utf8_offset_to_pointer (label->text, new_pos) - label->text;
+}
+
+
+static gint
+eel_editable_label_move_backward_word (EelEditableLabel *label,
+				       gint      start)
+{
+  gint new_pos = g_utf8_pointer_to_offset (label->text,
+					   label->text + start);
+  
+  if (new_pos > 0)
+    {
+      PangoLogAttr *log_attrs;
+      gint n_attrs;
+
+      eel_editable_label_ensure_layout (label, FALSE);
+      
+      pango_layout_get_log_attrs (label->layout, &log_attrs, &n_attrs);
+      
+      new_pos -= 1;
+
+      /* Find the previous word beginning */
+      while (new_pos > 0 && !log_attrs[new_pos].is_word_start)
+	new_pos--;
+
+      g_free (log_attrs);
+    }
+
+  return g_utf8_offset_to_pointer (label->text, new_pos) - label->text;
+}
+
+static void
+eel_editable_label_move_cursor (EelEditableLabel    *label,
+				GtkMovementStep      step,
+				gint                 count,
+				gboolean             extend_selection)
+{
+  gint new_pos;
+  
+  new_pos = label->selection_end;
+
+  if (label->selection_end != label->selection_anchor &&
+      !extend_selection)
+    {
+      /* If we have a current selection and aren't extending it, move to the
+       * start/or end of the selection as appropriate
+       */
+      switch (step)
+	{
+	case GTK_MOVEMENT_DISPLAY_LINES:
+	case GTK_MOVEMENT_VISUAL_POSITIONS:
+	  {
+	    gint end_x, end_y;
+	    gint anchor_x, anchor_y;
+	    gboolean end_is_left;
+	    
+	    get_better_cursor (label, label->selection_end, &end_x, &end_y);
+	    get_better_cursor (label, label->selection_anchor, &anchor_x, &anchor_y);
+
+	    end_is_left = (end_y < anchor_y) || (end_y == anchor_y && end_x < anchor_x);
+	    
+	    if (count < 0)
+	      new_pos = end_is_left ? label->selection_end : label->selection_anchor;
+	    else
+	      new_pos = !end_is_left ? label->selection_end : label->selection_anchor;
+
+	    break;
+	  }
+	case GTK_MOVEMENT_LOGICAL_POSITIONS:
+	case GTK_MOVEMENT_WORDS:
+	  if (count < 0)
+	    new_pos = MIN (label->selection_end, label->selection_anchor);
+	  else
+	    new_pos = MAX (label->selection_end, label->selection_anchor);
+	  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);
+	  break;
+	case GTK_MOVEMENT_PARAGRAPHS:
+	case GTK_MOVEMENT_PAGES:
+	  break;
+	default:
+	  g_assert_not_reached ();
+	  break;
+	}
+    }
+  else
+    {
+      switch (step)
+	{
+	case GTK_MOVEMENT_LOGICAL_POSITIONS:
+	  new_pos = eel_editable_label_move_logically (label, new_pos, count);
+	  break;
+	case GTK_MOVEMENT_VISUAL_POSITIONS:
+	  new_pos = eel_editable_label_move_visually (label, new_pos, count);
+	  break;
+	case GTK_MOVEMENT_WORDS:
+	  while (count > 0)
+	    {
+	      new_pos = eel_editable_label_move_forward_word (label, new_pos);
+	      count--;
+	    }
+	  while (count < 0)
+	    {
+	      new_pos = eel_editable_label_move_backward_word (label, new_pos);
+	      count++;
+	    }
+	  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);
+	  break;
+	case GTK_MOVEMENT_DISPLAY_LINES:
+	  new_pos = eel_editable_label_move_line (label, new_pos, count);
+	  break;
+	  break;
+	case GTK_MOVEMENT_PARAGRAPHS:
+	case GTK_MOVEMENT_PAGES:
+	  break;
+	default:
+	  g_assert_not_reached ();
+	  break;
+	}
+    }
+
+  if (extend_selection)
+    eel_editable_label_select_region_index (label,
+					    label->selection_anchor,
+					    new_pos);
+  else
+    eel_editable_label_select_region_index (label, new_pos, new_pos);
+}
+
+static void
+eel_editable_label_reset_im_context (EelEditableLabel  *label)
+{
+  if (label->need_im_reset)
+    {
+      label->need_im_reset = 0;
+      gtk_im_context_reset (label->im_context);
+    }
+}
+
+
+static void
+eel_editable_label_delete_from_cursor (EelEditableLabel *label,
+				       GtkDeleteType     type,
+				       gint              count)
+{
+  GtkEditable *editable = GTK_EDITABLE (label);
+  gint start_pos = label->selection_anchor;
+  gint end_pos = label->selection_anchor;
+  
+  eel_editable_label_reset_im_context (label);
+
+  if (label->selection_anchor != label->selection_end)
+    {
+      gtk_editable_delete_selection (editable);
+      return;
+    }
+  
+  switch (type)
+    {
+    case GTK_DELETE_CHARS:
+      end_pos = eel_editable_label_move_logically (label, start_pos, count);
+      start_pos = g_utf8_pointer_to_offset (label->text, label->text + start_pos);
+      end_pos = g_utf8_pointer_to_offset (label->text, label->text + end_pos);
+      gtk_editable_delete_text (GTK_EDITABLE (label), MIN (start_pos, end_pos), MAX (start_pos, end_pos));
+      break;
+    case GTK_DELETE_WORDS:
+      if (count < 0)
+	{
+	  /* Move to end of current word, or if not on a word, end of previous word */
+	  end_pos = eel_editable_label_move_backward_word (label, end_pos);
+	  end_pos = eel_editable_label_move_forward_word (label, end_pos);
+	}
+      else if (count > 0)
+	{
+	  /* Move to beginning of current word, or if not on a word, begining of next word */
+	  start_pos = eel_editable_label_move_forward_word (label, start_pos);
+	  start_pos = eel_editable_label_move_backward_word (label, start_pos);
+	}
+	
+      /* Fall through */
+    case GTK_DELETE_WORD_ENDS:
+      while (count < 0)
+	{
+	  start_pos = eel_editable_label_move_backward_word (label, start_pos);
+	  count++;
+	}
+      while (count > 0)
+	{
+	  end_pos = eel_editable_label_move_forward_word (label, end_pos);
+	  count--;
+	}
+      start_pos = g_utf8_pointer_to_offset (label->text, label->text + start_pos);
+      end_pos = g_utf8_pointer_to_offset (label->text, label->text + end_pos);
+ 
+      gtk_editable_delete_text (GTK_EDITABLE (label), start_pos, end_pos);
+      break;
+    case GTK_DELETE_DISPLAY_LINE_ENDS:
+    case GTK_DELETE_PARAGRAPH_ENDS:
+      end_pos = g_utf8_pointer_to_offset (label->text, label->text + label->selection_anchor);
+      if (count < 0)
+	gtk_editable_delete_text (GTK_EDITABLE (label), 0, end_pos);
+      else
+	gtk_editable_delete_text (GTK_EDITABLE (label), end_pos, -1);
+      break;
+    case GTK_DELETE_DISPLAY_LINES:
+    case GTK_DELETE_PARAGRAPHS:
+      gtk_editable_delete_text (GTK_EDITABLE (label), 0, -1);  
+      break;
+    case GTK_DELETE_WHITESPACE:
+      /* TODO eel_editable_label_delete_whitespace (label); */
+      break;
+    }
+  
+  eel_editable_label_pend_cursor_blink (label);
+}
+
+
+static void
+eel_editable_label_copy_clipboard (EelEditableLabel *label)
+{
+  if (label->text)
+    {
+      gint start, end;
+      gint len;
+      
+      start = MIN (label->selection_anchor,
+                   label->selection_end);
+      end = MAX (label->selection_anchor,
+                 label->selection_end);
+
+      len = strlen (label->text);
+
+      if (end > len)
+        end = len;
+
+      if (start > len)
+        start = len;
+
+      if (start != end)
+	gtk_clipboard_set_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
+				label->text + start, end - start);
+    }
+}
+
+static void
+eel_editable_label_cut_clipboard (EelEditableLabel *label)
+{
+  if (label->text)
+    {
+      gint start, end;
+      gint len;
+      
+      start = MIN (label->selection_anchor,
+                   label->selection_end);
+      end = MAX (label->selection_anchor,
+                 label->selection_end);
+
+      len = strlen (label->text);
+
+      if (end > len)
+        end = len;
+
+      if (start > len)
+        start = len;
+
+      if (start != end)
+	{
+	  gtk_clipboard_set_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
+				  label->text + start, end - start);
+          start = g_utf8_pointer_to_offset (label->text, label->text + start);
+          end = g_utf8_pointer_to_offset (label->text, label->text + end);
+	  gtk_editable_delete_text (GTK_EDITABLE (label), start, end);
+	}
+    }
+}
+
+static void
+paste_received (GtkClipboard *clipboard,
+		const gchar  *text,
+		gpointer      data)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (data);
+  GtkEditable *editable = GTK_EDITABLE (label);
+  gint tmp_pos;
+      
+  if (text)
+    {
+      if (label->selection_end != label->selection_anchor)
+	gtk_editable_delete_selection (editable);
+
+      tmp_pos = g_utf8_pointer_to_offset (label->text,
+                                      label->text + label->selection_anchor);
+      gtk_editable_insert_text (GTK_EDITABLE (label), text, strlen (text), &tmp_pos);
+      tmp_pos = g_utf8_offset_to_pointer (label->text, tmp_pos) - label->text;
+      eel_editable_label_select_region_index (label, tmp_pos, tmp_pos);
+    }
+
+  g_object_unref (G_OBJECT (label));
+}
+
+static void
+eel_editable_label_paste (EelEditableLabel *label,
+			  GdkAtom   selection)
+{
+  g_object_ref (G_OBJECT (label));
+  gtk_clipboard_request_text (gtk_widget_get_clipboard (GTK_WIDGET (label), selection),
+			      paste_received, label);
+}
+
+static void
+eel_editable_label_paste_clipboard (EelEditableLabel *label)
+{
+  eel_editable_label_paste (label, GDK_NONE);
+}
+
+static void
+eel_editable_label_select_all (EelEditableLabel *label)
+{
+  eel_editable_label_select_region_index (label, 0, strlen (label->text));
+}
+
+/* Quick hack of a popup menu
+ */
+static void
+activate_cb (GtkWidget *menuitem,
+	     EelEditableLabel  *label)
+{
+  const gchar *signal = g_object_get_data (G_OBJECT (menuitem), "gtk-signal");
+  g_signal_emit_by_name (GTK_OBJECT (label), signal);
+}
+
+static void
+append_action_signal (EelEditableLabel     *label,
+		      GtkWidget    *menu,
+		      const gchar  *stock_id,
+		      const gchar  *signal,
+                      gboolean      sensitive)
+{
+  GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL);
+
+  g_object_set_data (G_OBJECT (menuitem), "gtk-signal", (char *)signal);
+  g_signal_connect (GTK_OBJECT (menuitem), "activate",
+		    GTK_SIGNAL_FUNC (activate_cb), label);
+
+  gtk_widget_set_sensitive (menuitem, sensitive);
+  
+  gtk_widget_show (menuitem);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+}
+
+static void
+popup_menu_detach (GtkWidget *attach_widget,
+		   GtkMenu   *menu)
+{
+  EelEditableLabel *label;
+  label = EEL_EDITABLE_LABEL (attach_widget);
+
+  label->popup_menu = NULL;
+}
+
+static void
+popup_position_func (GtkMenu   *menu,
+                     gint      *x,
+                     gint      *y,
+                     gboolean  *push_in,
+                     gpointer	user_data)
+{
+  EelEditableLabel *label;
+  GtkWidget *widget;
+  GtkRequisition req;
+  
+  label = EEL_EDITABLE_LABEL (user_data);  
+  widget = GTK_WIDGET (label);
+
+  g_assert (GTK_WIDGET_REALIZED (label));
+
+  gdk_window_get_origin (widget->window, x, y);      
+
+  /*gtk_widget_size_request (label->popup_menu, &req);*/
+  req = widget->requisition;
+  
+  *x += widget->allocation.width / 2;
+  *y += widget->allocation.height;
+
+  *x = CLAMP (*x, 0, MAX (0, gdk_screen_width () - req.width));
+  *y = CLAMP (*y, 0, MAX (0, gdk_screen_height () - req.height));
+}
+
+static void
+eel_editable_label_toggle_overwrite (EelEditableLabel *label)
+{
+  label->overwrite_mode = !label->overwrite_mode;
+  gtk_widget_queue_draw (GTK_WIDGET (label));
+}
+
+typedef struct
+{
+  EelEditableLabel *label;
+  gint button;
+  guint time;
+} PopupInfo;
+
+static void
+popup_targets_received (GtkClipboard     *clipboard,
+			GtkSelectionData *data,
+			gpointer          user_data)
+{
+  GtkWidget *menuitem, *submenu;
+  gboolean have_selection;
+  gboolean clipboard_contains_text;
+  PopupInfo *info;
+  EelEditableLabel *label;
+
+  info = user_data;
+  label = info->label;
+
+  if (GTK_WIDGET_REALIZED (label))
+    {
+      if (label->popup_menu)
+	gtk_widget_destroy (label->popup_menu);
+  
+      label->popup_menu = gtk_menu_new ();
+
+      gtk_menu_attach_to_widget (GTK_MENU (label->popup_menu),
+				 GTK_WIDGET (label),
+				 popup_menu_detach);
+
+      have_selection =
+	label->selection_anchor != label->selection_end;
+  
+      clipboard_contains_text = gtk_selection_data_targets_include_text (data);
+
+      append_action_signal (label, label->popup_menu, GTK_STOCK_CUT, "cut_clipboard",
+			    have_selection);
+      append_action_signal (label, label->popup_menu, GTK_STOCK_COPY, "copy_clipboard",
+			    have_selection);
+      append_action_signal (label, label->popup_menu, GTK_STOCK_PASTE, "paste_clipboard",
+			    clipboard_contains_text);
+  
+      menuitem = gtk_menu_item_new_with_label (_("Select All"));
+      g_signal_connect_object (GTK_OBJECT (menuitem), "activate",
+			       GTK_SIGNAL_FUNC (eel_editable_label_select_all), label,
+			       G_CONNECT_SWAPPED);
+      gtk_widget_show (menuitem);
+      gtk_menu_shell_append (GTK_MENU_SHELL (label->popup_menu), menuitem);
+
+      menuitem = gtk_separator_menu_item_new ();
+      gtk_widget_show (menuitem);
+      gtk_menu_shell_append (GTK_MENU_SHELL (label->popup_menu), menuitem);
+      
+      menuitem = gtk_menu_item_new_with_label (_("Input Methods"));
+      gtk_widget_show (menuitem);
+      submenu = gtk_menu_new ();
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
+      
+      gtk_menu_shell_append (GTK_MENU_SHELL (label->popup_menu), menuitem);
+  
+      gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (label->im_context),
+					    GTK_MENU_SHELL (submenu));
+
+      g_signal_emit (GTK_OBJECT (label),
+		     signals[POPULATE_POPUP], 0,
+		     label->popup_menu);
+
+      if (info->button)
+	gtk_menu_popup (GTK_MENU (label->popup_menu), NULL, NULL,
+			NULL, NULL,
+			info->button, info->time);
+      else
+	{
+	  gtk_menu_popup (GTK_MENU (label->popup_menu), NULL, NULL,
+			  popup_position_func, label,
+			  info->button, info->time);
+	  gtk_menu_shell_select_first (GTK_MENU_SHELL (label->popup_menu), FALSE);
+	}
+    }
+
+  g_object_unref (label);
+  g_free (info);
+}
+
+static void
+eel_editable_label_do_popup (EelEditableLabel *label,
+			     GdkEventButton   *event)
+{
+  PopupInfo *info = g_new (PopupInfo, 1);
+
+  /* In order to know what entries we should make sensitive, we
+   * ask for the current targets of the clipboard, and when
+   * we get them, then we actually pop up the menu.
+   */
+  info->label = g_object_ref (label);
+  
+  if (event)
+    {
+      info->button = event->button;
+      info->time = event->time;
+    }
+  else
+    {
+      info->button = 0;
+      info->time = gtk_get_current_event_time ();
+    }
+
+  gtk_clipboard_request_contents (gtk_widget_get_clipboard (GTK_WIDGET (label), GDK_SELECTION_CLIPBOARD),
+				  gdk_atom_intern ("TARGETS", FALSE),
+				  popup_targets_received,
+				  info);
+}
+
+/************ Editable implementation ****************/
+
+static void
+editable_insert_text_emit  (GtkEditable *editable,
+			    const gchar *new_text,
+			    gint         new_text_length,
+			    gint        *position)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+  gchar buf[64];
+  gchar *text;
+  int text_length;
+
+  text_length = g_utf8_strlen (label->text, -1);
+
+  if (*position < 0 || *position > text_length)
+    *position = text_length;
+  
+  g_object_ref (G_OBJECT (editable));
+  
+  if (new_text_length <= 63)
+    text = buf;
+  else
+    text = g_new (gchar, new_text_length + 1);
+
+  text[new_text_length] = '\0';
+  strncpy (text, new_text, new_text_length);
+  
+  g_signal_emit_by_name (editable, "insert_text", text, new_text_length, position);
+
+  if (new_text_length > 63)
+    g_free (text);
+
+  g_object_unref (G_OBJECT (editable));
+}
+
+static void
+editable_delete_text_emit (GtkEditable *editable,
+			   gint         start_pos,
+			   gint         end_pos)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+  int text_length;
+
+  text_length = g_utf8_strlen (label->text, -1);
+
+  if (end_pos < 0 || end_pos > text_length)
+    end_pos = text_length;
+  if (start_pos < 0)
+    start_pos = 0;
+  if (start_pos > end_pos)
+    start_pos = end_pos;
+  
+  g_object_ref (G_OBJECT (editable));
+
+  g_signal_emit_by_name (editable, "delete_text", start_pos, end_pos);
+
+  g_object_unref (G_OBJECT (editable));
+}
+
+static void
+editable_insert_text (GtkEditable *editable,
+		      const gchar *new_text,
+		      gint         new_text_length,
+		      gint        *position)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+  gint index;
+
+  if (new_text_length < 0)
+    new_text_length = strlen (new_text);
+
+  index = g_utf8_offset_to_pointer (label->text, *position) - label->text;
+
+  eel_editable_label_insert_text (label,
+				  new_text,
+				  new_text_length,
+				  &index);
+  
+  *position = g_utf8_pointer_to_offset (label->text, label->text + index);
+}
+
+static void
+editable_delete_text (GtkEditable *editable,
+		      gint         start_pos,
+		      gint         end_pos)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+  int text_length;
+  gint start_index, end_index;
+
+  text_length = g_utf8_strlen (label->text, -1);
+
+  if (end_pos < 0 || end_pos > text_length)
+    end_pos = text_length;
+  if (start_pos < 0)
+    start_pos = 0;
+  if (start_pos > end_pos)
+    start_pos = end_pos;
+
+  start_index = g_utf8_offset_to_pointer (label->text, start_pos) - label->text;
+  end_index = g_utf8_offset_to_pointer (label->text, end_pos) - label->text;
+  
+  eel_editable_label_delete_text (label, start_index, end_index);
+}
+
+static gchar *    
+editable_get_chars (GtkEditable   *editable,
+		    gint           start_pos,
+		    gint           end_pos)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+  int text_length;
+  gint start_index, end_index;
+  
+  text_length = g_utf8_strlen (label->text, -1);
+
+  if (end_pos < 0 || end_pos > text_length)
+    end_pos = text_length;
+  if (start_pos < 0)
+    start_pos = 0;
+  if (start_pos > end_pos)
+    start_pos = end_pos;
+
+  start_index = g_utf8_offset_to_pointer (label->text, start_pos) - label->text;
+  end_index = g_utf8_offset_to_pointer (label->text, end_pos) - label->text;
+
+  return g_strndup (label->text + start_index, end_index - start_index);
+}
+
+static void
+editable_set_selection_bounds (GtkEditable *editable,
+			       gint         start,
+			       gint         end)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+  int text_length;
+  gint start_index, end_index;
+  
+  text_length = g_utf8_strlen (label->text, -1);
+
+  if (end < 0 || end > text_length)
+    end = text_length;
+  if (start < 0)
+    start = text_length;
+  if (start > text_length)
+    start = text_length;
+  
+  eel_editable_label_reset_im_context (label);
+
+  start_index = g_utf8_offset_to_pointer (label->text, start) - label->text;
+  end_index = g_utf8_offset_to_pointer (label->text, end) - label->text;
+
+  eel_editable_label_select_region_index (label, start_index, end_index);
+}
+
+static gboolean
+editable_get_selection_bounds (GtkEditable *editable,
+			       gint        *start,
+			       gint        *end)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+
+  *start = g_utf8_pointer_to_offset (label->text, label->text + label->selection_anchor);
+  *end = g_utf8_pointer_to_offset (label->text, label->text + label->selection_end);
+
+  return (label->selection_anchor != label->selection_end);
+}
+
+static void
+editable_real_set_position (GtkEditable *editable,
+			    gint         position)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+  int text_length;
+  int index;
+  
+  text_length = g_utf8_strlen (label->text, -1);
+  
+  if (position < 0 || position > text_length)
+    position = text_length;
+
+  index = g_utf8_offset_to_pointer (label->text, position) - label->text;
+  
+  if (index != label->selection_anchor ||
+      index != label->selection_end)
+    {
+      eel_editable_label_select_region_index (label, index, index);
+    }
+}
+
+static gint
+editable_get_position (GtkEditable *editable)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+  
+  return g_utf8_pointer_to_offset (label->text, label->text + label->selection_anchor);
+}
+
+
+static AtkObjectClass *a11y_parent_class = NULL;
+
+static const char* eel_editable_label_accessible_data = "eel-editable-label-accessible-data";
+
+/************ Accessible implementation ****************/
+
+typedef struct {
+	GailTextUtil *textutil;
+        gint         selection_anchor;
+        gint         selection_end;
+        gchar        *signal_name;
+        gint         position;
+        gint         length;
+} EelEditableLabelAccessiblePrivate;
+
+typedef struct
+{
+  EelEditableLabel* label;
+  gint position;
+} EelEditableLabelAccessiblePaste;
+
+
+static gchar*
+eel_editable_label_accessible_get_text (AtkText *text,
+					gint    start_pos,
+					gint    end_pos)
+{
+  GtkWidget *widget;
+  EelEditableLabelAccessiblePrivate *priv;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+  /* State is defunct */
+    return NULL;
+
+  priv = g_object_get_data (G_OBJECT (text), eel_editable_label_accessible_data);
+  return gail_text_util_get_substring (priv->textutil, start_pos, end_pos);
+}
+
+static gunichar 
+eel_editable_label_accessible_get_character_at_offset (AtkText *text,
+						       gint     offset)
+{
+  GtkWidget *widget;
+  EelEditableLabelAccessiblePrivate *priv;
+  gchar *string;
+  gchar *index;
+  gunichar unichar;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return '\0';
+
+  priv = g_object_get_data (G_OBJECT (text), eel_editable_label_accessible_data);
+  string = gail_text_util_get_substring (priv->textutil, 0, -1);
+  if (offset >= g_utf8_strlen (string, -1))
+    {
+      unichar = '\0';
+    }
+  else
+    {
+      index = g_utf8_offset_to_pointer (string, offset);
+
+      unichar = g_utf8_get_char(index);
+    }
+
+  g_free(string);
+  return unichar;
+}
+
+static gchar*
+eel_editable_label_accessible_get_text_before_offset (AtkText         *text,
+						      gint            offset,
+						      AtkTextBoundary boundary_type,
+						      gint            *start_offset,
+						      gint            *end_offset)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  EelEditableLabelAccessiblePrivate *priv;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+  /* State is defunct */
+    return NULL;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  priv = g_object_get_data (G_OBJECT (text), eel_editable_label_accessible_data);
+
+  return gail_text_util_get_text (priv->textutil,
+                                  eel_editable_label_get_layout (label),
+                                  GAIL_BEFORE_OFFSET, 
+                                  boundary_type, offset,
+                                  start_offset, end_offset);
+}
+
+static gchar*
+eel_editable_label_accessible_get_text_at_offset (AtkText          *text,
+						  gint             offset,
+						  AtkTextBoundary  boundary_type,
+						  gint             *start_offset,
+    						  gint             *end_offset)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  EelEditableLabelAccessiblePrivate *priv;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return NULL;
+
+
+  label = EEL_EDITABLE_LABEL (widget);
+  priv = g_object_get_data (G_OBJECT (text), eel_editable_label_accessible_data);
+  return gail_text_util_get_text (priv->textutil,
+                                  eel_editable_label_get_layout (label),
+                                  GAIL_AT_OFFSET, 
+                                  boundary_type, offset,
+                                  start_offset, end_offset);
+}
+
+static gchar*
+eel_editable_label_accessible_get_text_after_offset  (AtkText          *text,
+						      gint             offset,
+						      AtkTextBoundary  boundary_type,
+						      gint             *start_offset,
+						      gint             *end_offset)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  EelEditableLabelAccessiblePrivate *priv;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return NULL;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  priv = g_object_get_data (G_OBJECT (text), eel_editable_label_accessible_data);
+  return gail_text_util_get_text (priv->textutil,
+                                  eel_editable_label_get_layout (label),
+                                  GAIL_AFTER_OFFSET, 
+                                  boundary_type, offset,
+                                  start_offset, end_offset);
+}
+
+static gint
+eel_editable_label_accessible_get_caret_offset (AtkText *text)
+{
+  GtkWidget *widget;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return 0;
+
+  return gtk_editable_get_position (GTK_EDITABLE (widget));
+}
+
+static gboolean
+eel_editable_label_accessible_set_caret_offset (AtkText *text, gint offset)
+{
+  GtkWidget *widget;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return FALSE;
+
+  gtk_editable_set_position (GTK_EDITABLE (widget), offset);
+  return TRUE;
+}
+
+static gint
+eel_editable_label_accessible_get_character_count (AtkText *text)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return 0;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  return g_utf8_strlen (eel_editable_label_get_text (label), -1);
+}
+
+static gint
+eel_editable_label_accessible_get_n_selections (AtkText *text)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  gint select_start, select_end;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return -1;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  gtk_editable_get_selection_bounds (GTK_EDITABLE (label), &select_start, 
+                                     &select_end);
+
+  if (select_start != select_end)
+    return 1;
+  else
+    return 0;
+}
+
+static gchar*
+eel_editable_label_accessible_get_selection (AtkText *text,
+					    gint    selection_num,
+					    gint    *start_pos,
+					    gint    *end_pos)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return NULL;
+
+ /* Only let the user get the selection if one is set, and if the
+  * selection_num is 0.
+  */
+  if (selection_num != 0)
+     return NULL;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  gtk_editable_get_selection_bounds (GTK_EDITABLE (label), start_pos, end_pos);
+
+  if (*start_pos != *end_pos)
+     return gtk_editable_get_chars (GTK_EDITABLE (label), *start_pos, *end_pos);
+  else
+     return NULL;
+}
+
+static gboolean
+eel_editable_label_accessible_add_selection (AtkText *text,
+					     gint    start_pos,
+					     gint    end_pos)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  gint select_start, select_end;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return FALSE;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  gtk_editable_get_selection_bounds (GTK_EDITABLE (label), &select_start, 
+                                     &select_end);
+
+ /* If there is already a selection, then don't allow another to be added,
+  * since EelEditableLabel only supports one selected region.
+  */
+  if (select_start == select_end)
+    {
+       gtk_editable_select_region (GTK_EDITABLE (label), start_pos, end_pos);
+       return TRUE;
+    }
+  else
+   return FALSE;
+}
+
+static gboolean
+eel_editable_label_accessible_remove_selection (AtkText *text,
+						gint    selection_num)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  gint select_start, select_end, caret_pos;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return FALSE;
+
+  if (selection_num != 0)
+     return FALSE;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  gtk_editable_get_selection_bounds (GTK_EDITABLE (label), &select_start, 
+                                     &select_end);
+
+  if (select_start != select_end)
+    {
+     /* Setting the start & end of the selected region to the caret position
+      * turns off the selection.
+      */
+      caret_pos = gtk_editable_get_position (GTK_EDITABLE (label));
+      gtk_editable_select_region (GTK_EDITABLE (label), caret_pos, caret_pos);
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+static gboolean
+eel_editable_label_accessible_set_selection (AtkText *text,
+					     gint    selection_num,
+					     gint    start_pos,
+					     gint    end_pos)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  gint select_start, select_end;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return FALSE;
+
+ /* Only let the user move the selection if one is set, and if the
+  * selection_num is 0
+  */
+  if (selection_num != 0)
+     return FALSE;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  gtk_editable_get_selection_bounds (GTK_EDITABLE (label), &select_start, 
+                                     &select_end);
+
+  if (select_start != select_end)
+    {
+      gtk_editable_select_region (GTK_EDITABLE (label), start_pos, end_pos);
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+static AtkAttributeSet*
+eel_editable_label_accessible_get_run_attributes (AtkText *text,
+						  gint    offset,
+						  gint    *start_offset,
+						  gint    *end_offset)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  AtkAttributeSet *at_set = NULL;
+  GtkTextDirection dir;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return NULL;
+
+  label = EEL_EDITABLE_LABEL (widget);
+ 
+  dir = gtk_widget_get_direction (widget);
+  if (dir == GTK_TEXT_DIR_RTL)
+    {
+      at_set = gail_misc_add_attribute (at_set,
+                                        ATK_TEXT_ATTR_DIRECTION,
+       g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_DIRECTION, dir)));
+    }
+
+  at_set = gail_misc_layout_get_run_attributes (at_set,
+                                                eel_editable_label_get_layout (label),
+                                                label->text,
+                                                offset,
+                                                start_offset,
+                                                end_offset);
+  return at_set;
+}
+
+static AtkAttributeSet*
+eel_editable_label_accessible_get_default_attributes (AtkText *text)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  AtkAttributeSet *at_set = NULL;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return NULL;
+
+  label = EEL_EDITABLE_LABEL (widget);
+
+  at_set = gail_misc_get_default_attributes (at_set,
+                                             eel_editable_label_get_layout (label),
+                                             widget);
+  return at_set;
+}
+
+static void
+eel_editable_label_accessible_get_character_extents (AtkText      *text,
+						     gint         offset,
+						     gint         *x,
+						     gint         *y,
+						     gint         *width,
+						     gint         *height,
+						     AtkCoordType coords)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  PangoRectangle char_rect;
+  gint index, cursor_index, x_layout, y_layout;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  eel_editable_label_get_layout_offsets (label, &x_layout, &y_layout);
+  index = g_utf8_offset_to_pointer (label->text, offset) - label->text;
+  cursor_index = label->selection_anchor;
+  if (index > cursor_index)
+    index += label->preedit_length;
+  pango_layout_index_to_pos (eel_editable_label_get_layout(label), index, &char_rect);
+ 
+  gail_misc_get_extents_from_pango_rectangle (widget, &char_rect, 
+                        x_layout, y_layout, x, y, width, height, coords);
+} 
+
+static gint 
+eel_editable_label_accessible_get_offset_at_point (AtkText      *text,
+						   gint         x,
+						   gint         y,
+						   AtkCoordType coords)
+{ 
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  gint index, cursor_index, x_layout, y_layout;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return -1;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  
+  eel_editable_label_get_layout_offsets (label, &x_layout, &y_layout);
+  
+  index = gail_misc_get_index_at_point_in_layout (widget, 
+               eel_editable_label_get_layout(label), x_layout, y_layout, x, y, coords);
+  if (index == -1)
+    {
+      if (coords == ATK_XY_SCREEN || coords == ATK_XY_WINDOW)
+        return g_utf8_strlen (label->text, -1);
+
+      return index;  
+    }
+  else
+    {
+      cursor_index = label->selection_anchor;
+      if (index >= cursor_index && label->preedit_length)
+        {
+          if (index >= cursor_index + label->preedit_length)
+            index -= label->preedit_length;
+          else
+            index = cursor_index;
+        }
+      return g_utf8_pointer_to_offset (label->text, label->text + index);
+    }
+}
+
+static void
+atk_text_interface_init (AtkTextIface *iface)
+{
+  g_assert (iface != NULL);
+
+  iface->get_text = eel_editable_label_accessible_get_text;
+  iface->get_character_at_offset = eel_editable_label_accessible_get_character_at_offset;
+  iface->get_text_before_offset = eel_editable_label_accessible_get_text_before_offset;
+  iface->get_text_at_offset = eel_editable_label_accessible_get_text_at_offset;
+  iface->get_text_after_offset = eel_editable_label_accessible_get_text_after_offset;
+  iface->get_caret_offset = eel_editable_label_accessible_get_caret_offset;
+  iface->set_caret_offset = eel_editable_label_accessible_set_caret_offset;
+  iface->get_character_count = eel_editable_label_accessible_get_character_count;
+  iface->get_n_selections = eel_editable_label_accessible_get_n_selections;
+  iface->get_selection = eel_editable_label_accessible_get_selection;
+  iface->add_selection = eel_editable_label_accessible_add_selection;
+  iface->remove_selection = eel_editable_label_accessible_remove_selection;
+  iface->set_selection = eel_editable_label_accessible_set_selection;
+  iface->get_run_attributes = eel_editable_label_accessible_get_run_attributes;
+  iface->get_default_attributes = eel_editable_label_accessible_get_default_attributes;
+  iface->get_character_extents = eel_editable_label_accessible_get_character_extents;
+  iface->get_offset_at_point = eel_editable_label_accessible_get_offset_at_point;
+}
+
+static void
+eel_editable_label_accessible_set_text_contents (AtkEditableText *text,
+						 const gchar     *string)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return;
+
+  label = EEL_EDITABLE_LABEL (widget);
+
+  eel_editable_label_set_text (label, string);
+}
+
+static void
+eel_editable_label_accessible_insert_text (AtkEditableText *text,
+					   const gchar     *string,
+					   gint            length,
+					   gint            *position)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  GtkEditable *editable;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  editable = GTK_EDITABLE (label);
+
+  gtk_editable_insert_text (editable, string, length, position);
+}
+
+static void
+eel_editable_label_accessible_copy_text   (AtkEditableText *text,
+					   gint            start_pos,
+					   gint            end_pos)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  GtkEditable *editable;
+  gchar *str;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  editable = GTK_EDITABLE (label);
+  str = gtk_editable_get_chars (editable, start_pos, end_pos);
+  gtk_clipboard_set_text (gtk_clipboard_get (GDK_NONE), str, -1);
+}
+
+static void
+eel_editable_label_accessible_cut_text (AtkEditableText *text,
+					gint            start_pos,
+					gint            end_pos)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  GtkEditable *editable;
+  gchar *str;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  editable = GTK_EDITABLE (label);
+  str = gtk_editable_get_chars (editable, start_pos, end_pos);
+  gtk_clipboard_set_text (gtk_clipboard_get (GDK_NONE), str, -1);
+  gtk_editable_delete_text (editable, start_pos, end_pos);
+}
+
+static void
+eel_editable_label_accessible_delete_text (AtkEditableText *text,
+					   gint            start_pos,
+					   gint            end_pos)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  GtkEditable *editable;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  editable = GTK_EDITABLE (label);
+
+  gtk_editable_delete_text (editable, start_pos, end_pos);
+}
+
+static void
+eel_editable_label_accessible_paste_received (GtkClipboard *clipboard,
+					      const gchar  *text,
+					      gpointer     data)
+{
+  EelEditableLabelAccessiblePaste* paste_struct = (EelEditableLabelAccessiblePaste *)data;
+
+  if (text)
+    gtk_editable_insert_text (GTK_EDITABLE (paste_struct->label), text, -1,
+       &(paste_struct->position));
+
+  g_object_unref (paste_struct->label);
+}
+
+static void
+eel_editable_label_accessible_paste_text (AtkEditableText *text,
+					  gint            position)
+{
+  GtkWidget *widget;
+  GtkEditable *editable;
+  EelEditableLabelAccessiblePaste paste_struct;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return;
+
+  editable = GTK_EDITABLE (widget);
+  if (!gtk_editable_get_editable (editable))
+    return;
+  paste_struct.label = EEL_EDITABLE_LABEL (widget);
+  paste_struct.position = position;
+
+  g_object_ref (paste_struct.label);
+  gtk_clipboard_request_text (gtk_clipboard_get (GDK_NONE),
+    eel_editable_label_accessible_paste_received, &paste_struct);
+}
+
+static void
+atk_editable_text_interface_init (AtkEditableTextIface *iface)
+{
+  g_assert (iface != NULL);
+
+  iface->set_text_contents = eel_editable_label_accessible_set_text_contents;
+  iface->insert_text = eel_editable_label_accessible_insert_text;
+  iface->copy_text = eel_editable_label_accessible_copy_text;
+  iface->cut_text = eel_editable_label_accessible_cut_text;
+  iface->delete_text = eel_editable_label_accessible_delete_text;
+  iface->paste_text = eel_editable_label_accessible_paste_text;
+}
+
+static void
+eel_editable_label_accessible_notify_insert (AtkObject *accessible)
+{
+  EelEditableLabelAccessiblePrivate *priv;
+
+  priv = g_object_get_data (G_OBJECT (accessible), eel_editable_label_accessible_data);
+  if (priv->signal_name)
+    {
+      g_signal_emit_by_name (accessible, 
+                             priv->signal_name,
+                             priv->position,
+                             priv->length);
+      priv->signal_name = NULL;
+    }
+}
+
+static gboolean
+eel_editable_label_accessible_idle_notify_insert (gpointer data)
+{
+  eel_editable_label_accessible_notify_insert (data);
+  return FALSE;
+}
+
+/* Note arg1 returns the character at the start of the insert.
+ * arg2 returns the number of characters inserted.
+ */
+static void 
+eel_editable_label_accessible_insert_text_cb (EelEditableLabel *label, 
+                                              gchar            *arg1, 
+                                              gint             arg2,
+                                              gpointer         arg3)
+{
+  AtkObject *accessible;
+  EelEditableLabelAccessiblePrivate *priv;
+  gint *position = (gint *) arg3;
+
+  accessible = gtk_widget_get_accessible (GTK_WIDGET (label));
+  priv = g_object_get_data (G_OBJECT (accessible), eel_editable_label_accessible_data);
+  if (!priv->signal_name)
+    {
+      priv->signal_name = "text_changed::insert";
+      priv->position = *position;
+      priv->length = arg2;
+    }
+  /*
+   * The signal will be emitted when the cursor position is updated.
+   * or in an idle handler if it not updated.
+   */
+   g_idle_add (eel_editable_label_accessible_idle_notify_insert, accessible);
+}
+
+/* Note arg1 returns the start of the delete range, arg2 returns the
+ * end of the delete range if multiple characters are deleted.	
+ */
+static void 
+eel_editable_label_accessible_delete_text_cb (EelEditableLabel *label,
+					      gint             arg1, 
+					      gint             arg2)
+{
+  AtkObject *accessible;
+
+  accessible = gtk_widget_get_accessible (GTK_WIDGET (label));
+
+  /*
+   * Zero length text deleted so ignore
+   */
+  if (arg2 - arg1 == 0)
+    return;
+
+  g_signal_emit_by_name (accessible, "text_changed::delete", arg1, arg2 - arg1);
+}
+
+static void
+eel_editable_label_accessible_changed_cb (EelEditableLabel *label)
+{
+  AtkObject *accessible;
+  EelEditableLabelAccessiblePrivate *priv;
+
+  accessible = gtk_widget_get_accessible (GTK_WIDGET (label));
+  priv = g_object_get_data (G_OBJECT (accessible), eel_editable_label_accessible_data);
+  gail_text_util_text_setup (priv->textutil, eel_editable_label_get_text (label));
+}
+
+static gboolean 
+check_for_selection_change (AtkObject   *accessible,
+                            GtkWidget   *widget)
+{
+  EelEditableLabelAccessiblePrivate *priv;
+  EelEditableLabel *label;
+  gboolean ret_val = FALSE;
+
+  priv = g_object_get_data (G_OBJECT (accessible), eel_editable_label_accessible_data);
+  label = EEL_EDITABLE_LABEL (widget);
+ 
+  if (label->selection_anchor != label->selection_end)
+    {
+      if (label->selection_anchor != priv->selection_anchor ||
+          label->selection_end != priv->selection_end)
+        /*
+         * This check is here as this function can be called
+         * for notification of selection_end and selection_anchor.
+         * The values of selection_anchor and selection_end may be the same 
+         * for both notifications and we only want to generate one
+         * text_selection_changed signal.
+         */
+        ret_val = TRUE;
+    }
+  else 
+    {
+      /* We had a selection */
+      ret_val = (priv->selection_anchor != priv->selection_end);
+    }
+  priv->selection_anchor = label->selection_anchor;
+  priv->selection_end = label->selection_end;
+
+  return ret_val;
+}
+
+static void
+eel_editable_label_accessible_notify_gtk (GObject    *obj,
+                                          GParamSpec *pspec)
+{
+  GtkWidget *widget;
+  AtkObject *accessible;
+  EelEditableLabel *label;
+
+  widget = GTK_WIDGET (obj);
+  label = EEL_EDITABLE_LABEL (widget);
+  accessible = gtk_widget_get_accessible (widget);
+
+  if (strcmp (pspec->name, "cursor-position") == 0)
+    {
+      eel_editable_label_accessible_notify_insert (accessible);
+      if (check_for_selection_change (accessible, widget))
+        g_signal_emit_by_name (accessible, "text_selection_changed");
+      /*
+       * The label cursor position has moved so generate the signal.
+       */
+      g_signal_emit_by_name (accessible, "text_caret_moved",
+                             g_utf8_pointer_to_offset (label->text,
+					 label->text + label->selection_anchor));
+    }
+  else if (strcmp (pspec->name, "selection-bound") == 0)
+    {
+      eel_editable_label_accessible_notify_insert (accessible);
+
+      if (check_for_selection_change (accessible, widget))
+        g_signal_emit_by_name (accessible, "text_selection_changed");
+    }
+}
+
+static void
+eel_editable_label_accessible_initialize (AtkObject *accessible,
+                                          gpointer   widget)
+{
+  EelEditableLabelAccessiblePrivate *priv;
+  EelEditableLabel *label;
+
+  a11y_parent_class->initialize (accessible, widget);
+
+  label = EEL_EDITABLE_LABEL (widget);
+  priv = g_new0 (EelEditableLabelAccessiblePrivate, 1);
+  priv->textutil = gail_text_util_new ();
+  gail_text_util_text_setup (priv->textutil, eel_editable_label_get_text (EEL_EDITABLE_LABEL (widget)));
+  priv->selection_anchor = label->selection_anchor;
+  priv->selection_end = label->selection_end;
+  g_object_set_data (G_OBJECT (accessible), eel_editable_label_accessible_data, priv);
+  g_signal_connect (widget, "insert-text",
+        G_CALLBACK (eel_editable_label_accessible_insert_text_cb), NULL);
+  g_signal_connect (widget, "delete-text",
+        G_CALLBACK (eel_editable_label_accessible_delete_text_cb), NULL);
+  g_signal_connect (widget, "changed",
+        G_CALLBACK (eel_editable_label_accessible_changed_cb), NULL);
+
+  g_signal_connect (widget,
+                    "notify",
+                    G_CALLBACK (eel_editable_label_accessible_notify_gtk),
+                    NULL);
+  atk_object_set_role (accessible, ATK_ROLE_TEXT);
+}
+
+static G_CONST_RETURN gchar*
+eel_editable_label_accessible_get_name (AtkObject *accessible)
+{
+  if (accessible->name != NULL)
+    return accessible->name;
+  else
+    {
+      GtkWidget *widget;
+
+      widget = GTK_ACCESSIBLE (accessible)->widget;
+      if (widget == NULL)
+      /* State is defunct */
+        return NULL;
+
+      g_assert (EEL_IS_EDITABLE_LABEL (widget));
+      return eel_editable_label_get_text (EEL_EDITABLE_LABEL (widget));
+    }
+}
+
+static AtkStateSet*
+eel_editable_label_accessible_ref_state_set (AtkObject *accessible)
+{
+  AtkStateSet *state_set;
+  GtkWidget *widget;
+
+  state_set = a11y_parent_class->ref_state_set (accessible);
+  widget = GTK_ACCESSIBLE (accessible)->widget;
+ 
+  if (widget == NULL)
+    return state_set;
+
+  atk_state_set_add_state (state_set, ATK_STATE_EDITABLE);
+  atk_state_set_add_state (state_set, ATK_STATE_MULTI_LINE);
+  return state_set;
+}
+
+static void 
+eel_editable_label_accessible_finalize (GObject *object)
+{
+  EelEditableLabelAccessiblePrivate *priv;
+
+  priv = g_object_get_data (object, eel_editable_label_accessible_data);
+  g_object_unref (priv->textutil);
+  g_free (priv);
+  G_OBJECT_CLASS (a11y_parent_class)->finalize (object);
+}
+
+static void
+eel_editable_label_accessible_class_init (AtkObjectClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  a11y_parent_class = g_type_class_peek_parent (klass);
+
+  klass->initialize = eel_editable_label_accessible_initialize;
+  klass->get_name = eel_editable_label_accessible_get_name;
+  klass->ref_state_set = eel_editable_label_accessible_ref_state_set;
+  gobject_class->finalize = eel_editable_label_accessible_finalize;
+}
+
+static AtkObject *
+eel_editable_label_get_accessible (GtkWidget *widget)
+{
+  static GType type = 0;
+  AtkObject *accessible;
+
+  if ((accessible = eel_accessibility_get_atk_object (widget)))
+    return accessible;
+
+  if (!type)
+    {
+      const GInterfaceInfo atk_editable_text_info = 
+      {
+        (GInterfaceInitFunc) atk_editable_text_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+      };
+      const GInterfaceInfo atk_text_info =
+      {
+        (GInterfaceInitFunc) atk_text_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+      };
+
+      type = eel_accessibility_create_derived_type ("EelEditableLabelAccessible",
+		       G_TYPE_FROM_INSTANCE (widget),
+		       eel_editable_label_accessible_class_init);
+
+      if (!type)
+        return NULL;
+
+      g_type_add_interface_static (type, ATK_TYPE_EDITABLE_TEXT, &atk_editable_text_info);
+      g_type_add_interface_static (type, ATK_TYPE_TEXT, &atk_text_info);
+    }
+
+  accessible = g_object_new (type, NULL);
+
+  return eel_accessibility_set_atk_object_return (widget, accessible);
+}
+
diff -up /dev/null gnome-control-center-2.25.2/capplets/about-me/eel-editable-label.h
--- /dev/null	2008-12-16 15:36:17.645108819 -0500
+++ gnome-control-center-2.25.2/capplets/about-me/eel-editable-label.h	2008-12-16 21:16:16.000000000 -0500
@@ -0,0 +1,142 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+ * 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/. 
+ */
+
+#ifndef __EEL_EDITABLE_LABEL_H__
+#define __EEL_EDITABLE_LABEL_H__
+
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+#define EEL_TYPE_EDITABLE_LABEL		  (eel_editable_label_get_type ())
+#define EEL_EDITABLE_LABEL(obj)		  (GTK_CHECK_CAST ((obj), EEL_TYPE_EDITABLE_LABEL, EelEditableLabel))
+#define EEL_EDITABLE_LABEL_CLASS(klass)	  (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_EDITABLE_LABEL, EelEditableLabelClass))
+#define EEL_IS_EDITABLE_LABEL(obj)	  (GTK_CHECK_TYPE ((obj), EEL_TYPE_EDITABLE_LABEL))
+#define EEL_IS_EDITABLE_LABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_EDITABLE_LABEL))
+#define EEL_EDITABLE_LABEL_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), EEL_TYPE_EDITABLE_LABEL, EelEditableLabelClass))
+       
+
+typedef struct _EelEditableLabel       EelEditableLabel;
+typedef struct _EelEditableLabelClass  EelEditableLabelClass;
+
+typedef struct _EelEditableLabelSelectionInfo EelEditableLabelSelectionInfo;
+
+struct _EelEditableLabel
+{
+  GtkMisc misc;
+
+  /*< private >*/
+  guint   jtype : 2;
+  guint   wrap : 1;
+  guint   overwrite_mode : 1;
+  guint   draw_outline : 1;
+  PangoWrapMode  wrap_mode;
+  
+  gchar  *text;
+  int text_size; /* allocated size, in bytes */
+  int n_bytes;	 /* length in use (not including terminating zero), in bytes */
+
+  PangoLayout *layout;
+  guint        layout_includes_preedit : 1;
+
+  int selection_anchor; /* cursor pos, byte index */
+  int selection_end; /* byte index */
+  
+  GtkWidget *popup_menu;
+
+  GtkIMContext *im_context;
+  gboolean need_im_reset;
+  int preedit_length;	/* length of preedit string, in bytes */
+  int preedit_cursor;	/* offset of cursor within preedit string, in chars */
+
+  GdkGC *primary_cursor_gc;
+  GdkGC *secondary_cursor_gc;
+  
+  PangoFontDescription *font_desc;
+};
+
+struct _EelEditableLabelClass
+{
+  GtkMiscClass parent_class;
+
+  void (* move_cursor)        (EelEditableLabel  *label,
+			       GtkMovementStep    step,
+			       gint               count,
+			       gboolean           extend_selection);
+  void (* insert_at_cursor)   (EelEditableLabel  *label,
+			       const gchar       *str);
+  void (* delete_from_cursor) (EelEditableLabel  *label,
+			       GtkDeleteType      type,
+			       gint               count);
+  void (* cut_clipboard)      (EelEditableLabel  *label);
+  void (* copy_clipboard)     (EelEditableLabel  *label);
+  void (* paste_clipboard)    (EelEditableLabel  *label);
+  void (* toggle_overwrite)   (EelEditableLabel  *label);
+  
+  /* Hook to customize right-click popup for selectable labels */
+  void (* populate_popup)   (EelEditableLabel  *label,
+                             GtkMenu           *menu);
+};
+
+GType                 eel_editable_label_get_type          (void) G_GNUC_CONST;
+GtkWidget*            eel_editable_label_new                  (const char       *str);
+void                  eel_editable_label_set_text             (EelEditableLabel *label,
+							       const char       *str);
+G_CONST_RETURN gchar* eel_editable_label_get_text             (EelEditableLabel *label);
+void                  eel_editable_label_set_justify          (EelEditableLabel *label,
+							       GtkJustification  jtype);
+GtkJustification      eel_editable_label_get_justify          (EelEditableLabel *label);
+void                  eel_editable_label_set_line_wrap        (EelEditableLabel *label,
+							       gboolean          wrap);
+void                  eel_editable_label_set_line_wrap_mode   (EelEditableLabel *label,
+							       PangoWrapMode     mode);
+gboolean              eel_editable_label_get_line_wrap        (EelEditableLabel *label);
+void                  eel_editable_label_set_draw_outline     (EelEditableLabel *label,
+							       gboolean          wrap);
+void                  eel_editable_label_select_region        (EelEditableLabel *label,
+							       gint              start_offset,
+							       gint              end_offset);
+gboolean              eel_editable_label_get_selection_bounds (EelEditableLabel *label,
+							       gint             *start,
+							       gint             *end);
+PangoLayout *         eel_editable_label_get_layout           (EelEditableLabel *label);
+void                  eel_editable_label_get_layout_offsets   (EelEditableLabel *label,
+							       gint             *x,
+							       gint             *y);
+PangoFontDescription *eel_editable_label_get_font_description (EelEditableLabel *label);
+void                  eel_editable_label_set_font_description (EelEditableLabel *label,
+							       const PangoFontDescription *desc);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* __EEL_EDITABLE_LABEL_H__ */
diff -up /dev/null gnome-control-center-2.25.2/capplets/about-me/eel-marshal.c
--- /dev/null	2008-12-16 15:36:17.645108819 -0500
+++ gnome-control-center-2.25.2/capplets/about-me/eel-marshal.c	2008-12-16 21:16:16.000000000 -0500
@@ -0,0 +1,556 @@
+
+#include	<glib-object.h>
+
+
+#ifdef G_ENABLE_DEBUG
+#define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
+#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
+#define g_marshal_value_peek_int(v)      g_value_get_int (v)
+#define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
+#define g_marshal_value_peek_long(v)     g_value_get_long (v)
+#define g_marshal_value_peek_ulong(v)    g_value_get_ulong (v)
+#define g_marshal_value_peek_int64(v)    g_value_get_int64 (v)
+#define g_marshal_value_peek_uint64(v)   g_value_get_uint64 (v)
+#define g_marshal_value_peek_enum(v)     g_value_get_enum (v)
+#define g_marshal_value_peek_flags(v)    g_value_get_flags (v)
+#define g_marshal_value_peek_float(v)    g_value_get_float (v)
+#define g_marshal_value_peek_double(v)   g_value_get_double (v)
+#define g_marshal_value_peek_string(v)   (char*) g_value_get_string (v)
+#define g_marshal_value_peek_param(v)    g_value_get_param (v)
+#define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
+#define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
+#define g_marshal_value_peek_object(v)   g_value_get_object (v)
+#else /* !G_ENABLE_DEBUG */
+/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
+ *          Do not access GValues directly in your code. Instead, use the
+ *          g_value_get_*() functions
+ */
+#define g_marshal_value_peek_boolean(v)  (v)->data[0].v_int
+#define g_marshal_value_peek_char(v)     (v)->data[0].v_int
+#define g_marshal_value_peek_uchar(v)    (v)->data[0].v_uint
+#define g_marshal_value_peek_int(v)      (v)->data[0].v_int
+#define g_marshal_value_peek_uint(v)     (v)->data[0].v_uint
+#define g_marshal_value_peek_long(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
+#define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
+#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_float(v)    (v)->data[0].v_float
+#define g_marshal_value_peek_double(v)   (v)->data[0].v_double
+#define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
+#define g_marshal_value_peek_param(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
+#define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
+#endif /* !G_ENABLE_DEBUG */
+
+
+/* BOOLEAN:BOOLEAN (eelmarshal.list:1) */
+void
+eel_marshal_BOOLEAN__BOOLEAN (GClosure     *closure,
+                              GValue       *return_value G_GNUC_UNUSED,
+                              guint         n_param_values,
+                              const GValue *param_values,
+                              gpointer      invocation_hint G_GNUC_UNUSED,
+                              gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__BOOLEAN) (gpointer     data1,
+                                                     gboolean     arg_1,
+                                                     gpointer     data2);
+  register GMarshalFunc_BOOLEAN__BOOLEAN callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 2);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__BOOLEAN) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_boolean (param_values + 1),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN:BOXED (eelmarshal.list:2) */
+void
+eel_marshal_BOOLEAN__BOXED (GClosure     *closure,
+                            GValue       *return_value G_GNUC_UNUSED,
+                            guint         n_param_values,
+                            const GValue *param_values,
+                            gpointer      invocation_hint G_GNUC_UNUSED,
+                            gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED) (gpointer     data1,
+                                                   gpointer     arg_1,
+                                                   gpointer     data2);
+  register GMarshalFunc_BOOLEAN__BOXED callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 2);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__BOXED) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_boxed (param_values + 1),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN:POINTER,POINTER (eelmarshal.list:3) */
+void
+eel_marshal_BOOLEAN__POINTER_POINTER (GClosure     *closure,
+                                      GValue       *return_value G_GNUC_UNUSED,
+                                      guint         n_param_values,
+                                      const GValue *param_values,
+                                      gpointer      invocation_hint G_GNUC_UNUSED,
+                                      gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_POINTER) (gpointer     data1,
+                                                             gpointer     arg_1,
+                                                             gpointer     arg_2,
+                                                             gpointer     data2);
+  register GMarshalFunc_BOOLEAN__POINTER_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__POINTER_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_pointer (param_values + 1),
+                       g_marshal_value_peek_pointer (param_values + 2),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN:VOID (eelmarshal.list:4) */
+void
+eel_marshal_BOOLEAN__VOID (GClosure     *closure,
+                           GValue       *return_value G_GNUC_UNUSED,
+                           guint         n_param_values,
+                           const GValue *param_values,
+                           gpointer      invocation_hint G_GNUC_UNUSED,
+                           gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__VOID) (gpointer     data1,
+                                                  gpointer     data2);
+  register GMarshalFunc_BOOLEAN__VOID callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 1);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__VOID) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* ENUM:INT,INT (eelmarshal.list:5) */
+void
+eel_marshal_ENUM__INT_INT (GClosure     *closure,
+                           GValue       *return_value G_GNUC_UNUSED,
+                           guint         n_param_values,
+                           const GValue *param_values,
+                           gpointer      invocation_hint G_GNUC_UNUSED,
+                           gpointer      marshal_data)
+{
+  typedef gint (*GMarshalFunc_ENUM__INT_INT) (gpointer     data1,
+                                              gint         arg_1,
+                                              gint         arg_2,
+                                              gpointer     data2);
+  register GMarshalFunc_ENUM__INT_INT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gint v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_ENUM__INT_INT) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_int (param_values + 1),
+                       g_marshal_value_peek_int (param_values + 2),
+                       data2);
+
+  g_value_set_enum (return_value, v_return);
+}
+
+/* INT:INT (eelmarshal.list:6) */
+void
+eel_marshal_INT__INT (GClosure     *closure,
+                      GValue       *return_value G_GNUC_UNUSED,
+                      guint         n_param_values,
+                      const GValue *param_values,
+                      gpointer      invocation_hint G_GNUC_UNUSED,
+                      gpointer      marshal_data)
+{
+  typedef gint (*GMarshalFunc_INT__INT) (gpointer     data1,
+                                         gint         arg_1,
+                                         gpointer     data2);
+  register GMarshalFunc_INT__INT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gint v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 2);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_INT__INT) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_int (param_values + 1),
+                       data2);
+
+  g_value_set_int (return_value, v_return);
+}
+
+/* INT:POINTER,STRING (eelmarshal.list:7) */
+void
+eel_marshal_INT__POINTER_STRING (GClosure     *closure,
+                                 GValue       *return_value G_GNUC_UNUSED,
+                                 guint         n_param_values,
+                                 const GValue *param_values,
+                                 gpointer      invocation_hint G_GNUC_UNUSED,
+                                 gpointer      marshal_data)
+{
+  typedef gint (*GMarshalFunc_INT__POINTER_STRING) (gpointer     data1,
+                                                    gpointer     arg_1,
+                                                    gpointer     arg_2,
+                                                    gpointer     data2);
+  register GMarshalFunc_INT__POINTER_STRING callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gint v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_INT__POINTER_STRING) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_pointer (param_values + 1),
+                       g_marshal_value_peek_string (param_values + 2),
+                       data2);
+
+  g_value_set_int (return_value, v_return);
+}
+
+/* STRING:POINTER (eelmarshal.list:8) */
+void
+eel_marshal_STRING__POINTER (GClosure     *closure,
+                             GValue       *return_value G_GNUC_UNUSED,
+                             guint         n_param_values,
+                             const GValue *param_values,
+                             gpointer      invocation_hint G_GNUC_UNUSED,
+                             gpointer      marshal_data)
+{
+  typedef gchar* (*GMarshalFunc_STRING__POINTER) (gpointer     data1,
+                                                  gpointer     arg_1,
+                                                  gpointer     data2);
+  register GMarshalFunc_STRING__POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gchar* v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 2);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_STRING__POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_pointer (param_values + 1),
+                       data2);
+
+  g_value_take_string (return_value, v_return);
+}
+
+/* STRING:VOID (eelmarshal.list:9) */
+void
+eel_marshal_STRING__VOID (GClosure     *closure,
+                          GValue       *return_value G_GNUC_UNUSED,
+                          guint         n_param_values,
+                          const GValue *param_values,
+                          gpointer      invocation_hint G_GNUC_UNUSED,
+                          gpointer      marshal_data)
+{
+  typedef gchar* (*GMarshalFunc_STRING__VOID) (gpointer     data1,
+                                               gpointer     data2);
+  register GMarshalFunc_STRING__VOID callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gchar* v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 1);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_STRING__VOID) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       data2);
+
+  g_value_take_string (return_value, v_return);
+}
+
+/* VOID:ENUM,INT (eelmarshal.list:10) */
+void
+eel_marshal_VOID__ENUM_INT (GClosure     *closure,
+                            GValue       *return_value G_GNUC_UNUSED,
+                            guint         n_param_values,
+                            const GValue *param_values,
+                            gpointer      invocation_hint G_GNUC_UNUSED,
+                            gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__ENUM_INT) (gpointer     data1,
+                                               gint         arg_1,
+                                               gint         arg_2,
+                                               gpointer     data2);
+  register GMarshalFunc_VOID__ENUM_INT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__ENUM_INT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_enum (param_values + 1),
+            g_marshal_value_peek_int (param_values + 2),
+            data2);
+}
+
+/* VOID:ENUM,INT,BOOLEAN (eelmarshal.list:11) */
+void
+eel_marshal_VOID__ENUM_INT_BOOLEAN (GClosure     *closure,
+                                    GValue       *return_value G_GNUC_UNUSED,
+                                    guint         n_param_values,
+                                    const GValue *param_values,
+                                    gpointer      invocation_hint G_GNUC_UNUSED,
+                                    gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__ENUM_INT_BOOLEAN) (gpointer     data1,
+                                                       gint         arg_1,
+                                                       gint         arg_2,
+                                                       gboolean     arg_3,
+                                                       gpointer     data2);
+  register GMarshalFunc_VOID__ENUM_INT_BOOLEAN callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__ENUM_INT_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_enum (param_values + 1),
+            g_marshal_value_peek_int (param_values + 2),
+            g_marshal_value_peek_boolean (param_values + 3),
+            data2);
+}
+
+/* VOID:INT,INT,INT,INT (eelmarshal.list:12) */
+void
+eel_marshal_VOID__INT_INT_INT_INT (GClosure     *closure,
+                                   GValue       *return_value G_GNUC_UNUSED,
+                                   guint         n_param_values,
+                                   const GValue *param_values,
+                                   gpointer      invocation_hint G_GNUC_UNUSED,
+                                   gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__INT_INT_INT_INT) (gpointer     data1,
+                                                      gint         arg_1,
+                                                      gint         arg_2,
+                                                      gint         arg_3,
+                                                      gint         arg_4,
+                                                      gpointer     data2);
+  register GMarshalFunc_VOID__INT_INT_INT_INT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 5);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__INT_INT_INT_INT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_int (param_values + 1),
+            g_marshal_value_peek_int (param_values + 2),
+            g_marshal_value_peek_int (param_values + 3),
+            g_marshal_value_peek_int (param_values + 4),
+            data2);
+}
+
+/* VOID:OBJECT,POINTER (eelmarshal.list:13) */
+void
+eel_marshal_VOID__OBJECT_POINTER (GClosure     *closure,
+                                  GValue       *return_value G_GNUC_UNUSED,
+                                  guint         n_param_values,
+                                  const GValue *param_values,
+                                  gpointer      invocation_hint G_GNUC_UNUSED,
+                                  gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__OBJECT_POINTER) (gpointer     data1,
+                                                     gpointer     arg_1,
+                                                     gpointer     arg_2,
+                                                     gpointer     data2);
+  register GMarshalFunc_VOID__OBJECT_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__OBJECT_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_object (param_values + 1),
+            g_marshal_value_peek_pointer (param_values + 2),
+            data2);
+}
+
diff -up /dev/null gnome-control-center-2.25.2/capplets/about-me/eel-marshal.h
--- /dev/null	2008-12-16 15:36:17.645108819 -0500
+++ gnome-control-center-2.25.2/capplets/about-me/eel-marshal.h	2008-12-16 21:16:16.000000000 -0500
@@ -0,0 +1,116 @@
+
+#ifndef __eel_marshal_MARSHAL_H__
+#define __eel_marshal_MARSHAL_H__
+
+#include	<glib-object.h>
+
+G_BEGIN_DECLS
+
+/* BOOLEAN:BOOLEAN (eelmarshal.list:1) */
+extern void eel_marshal_BOOLEAN__BOOLEAN (GClosure     *closure,
+                                          GValue       *return_value,
+                                          guint         n_param_values,
+                                          const GValue *param_values,
+                                          gpointer      invocation_hint,
+                                          gpointer      marshal_data);
+
+/* BOOLEAN:BOXED (eelmarshal.list:2) */
+extern void eel_marshal_BOOLEAN__BOXED (GClosure     *closure,
+                                        GValue       *return_value,
+                                        guint         n_param_values,
+                                        const GValue *param_values,
+                                        gpointer      invocation_hint,
+                                        gpointer      marshal_data);
+
+/* BOOLEAN:POINTER,POINTER (eelmarshal.list:3) */
+extern void eel_marshal_BOOLEAN__POINTER_POINTER (GClosure     *closure,
+                                                  GValue       *return_value,
+                                                  guint         n_param_values,
+                                                  const GValue *param_values,
+                                                  gpointer      invocation_hint,
+                                                  gpointer      marshal_data);
+
+/* BOOLEAN:VOID (eelmarshal.list:4) */
+extern void eel_marshal_BOOLEAN__VOID (GClosure     *closure,
+                                       GValue       *return_value,
+                                       guint         n_param_values,
+                                       const GValue *param_values,
+                                       gpointer      invocation_hint,
+                                       gpointer      marshal_data);
+
+/* ENUM:INT,INT (eelmarshal.list:5) */
+extern void eel_marshal_ENUM__INT_INT (GClosure     *closure,
+                                       GValue       *return_value,
+                                       guint         n_param_values,
+                                       const GValue *param_values,
+                                       gpointer      invocation_hint,
+                                       gpointer      marshal_data);
+
+/* INT:INT (eelmarshal.list:6) */
+extern void eel_marshal_INT__INT (GClosure     *closure,
+                                  GValue       *return_value,
+                                  guint         n_param_values,
+                                  const GValue *param_values,
+                                  gpointer      invocation_hint,
+                                  gpointer      marshal_data);
+
+/* INT:POINTER,STRING (eelmarshal.list:7) */
+extern void eel_marshal_INT__POINTER_STRING (GClosure     *closure,
+                                             GValue       *return_value,
+                                             guint         n_param_values,
+                                             const GValue *param_values,
+                                             gpointer      invocation_hint,
+                                             gpointer      marshal_data);
+
+/* STRING:POINTER (eelmarshal.list:8) */
+extern void eel_marshal_STRING__POINTER (GClosure     *closure,
+                                         GValue       *return_value,
+                                         guint         n_param_values,
+                                         const GValue *param_values,
+                                         gpointer      invocation_hint,
+                                         gpointer      marshal_data);
+
+/* STRING:VOID (eelmarshal.list:9) */
+extern void eel_marshal_STRING__VOID (GClosure     *closure,
+                                      GValue       *return_value,
+                                      guint         n_param_values,
+                                      const GValue *param_values,
+                                      gpointer      invocation_hint,
+                                      gpointer      marshal_data);
+
+/* VOID:ENUM,INT (eelmarshal.list:10) */
+extern void eel_marshal_VOID__ENUM_INT (GClosure     *closure,
+                                        GValue       *return_value,
+                                        guint         n_param_values,
+                                        const GValue *param_values,
+                                        gpointer      invocation_hint,
+                                        gpointer      marshal_data);
+
+/* VOID:ENUM,INT,BOOLEAN (eelmarshal.list:11) */
+extern void eel_marshal_VOID__ENUM_INT_BOOLEAN (GClosure     *closure,
+                                                GValue       *return_value,
+                                                guint         n_param_values,
+                                                const GValue *param_values,
+                                                gpointer      invocation_hint,
+                                                gpointer      marshal_data);
+
+/* VOID:INT,INT,INT,INT (eelmarshal.list:12) */
+extern void eel_marshal_VOID__INT_INT_INT_INT (GClosure     *closure,
+                                               GValue       *return_value,
+                                               guint         n_param_values,
+                                               const GValue *param_values,
+                                               gpointer      invocation_hint,
+                                               gpointer      marshal_data);
+
+/* VOID:OBJECT,POINTER (eelmarshal.list:13) */
+extern void eel_marshal_VOID__OBJECT_POINTER (GClosure     *closure,
+                                              GValue       *return_value,
+                                              guint         n_param_values,
+                                              const GValue *param_values,
+                                              gpointer      invocation_hint,
+                                              gpointer      marshal_data);
+
+G_END_DECLS
+
+#endif /* __eel_marshal_MARSHAL_H__ */
+
diff -up gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c.gecos gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c
--- gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c.gecos	2008-12-16 21:16:16.000000000 -0500
+++ gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c	2008-12-16 21:16:16.000000000 -0500
@@ -39,6 +39,8 @@
 #endif
 
 #include "e-image-chooser.h"
+#include "eel-editable-label.h"
+#include <gdk/gdkkeysyms.h>
 #include "gnome-about-me-fingerprint.h"
 #include "marshal.h"
 
@@ -69,6 +71,7 @@ typedef struct {
 	gboolean      	 have_image;
 	gboolean      	 image_changed;
 	gboolean      	 create_self;
+        gboolean         editing_username;
 
 	gchar        	*person;
 	gchar 		*login;
@@ -148,7 +151,7 @@ struct WidToCid ids[] = {
 #define ATTRIBUTE_OTHER "OTHER"
 
 static void about_me_set_address_field (EContactAddress *, guint, gchar *);
-
+static gchar *about_me_get_address_field (EContactAddress *, guint);
 
 /*** Utility functions ***/
 static void
@@ -285,6 +288,50 @@ about_me_commit (GnomeAboutMe *me)
 	me->create_self = FALSE;
 }
 
+static void
+update_gecos (GnomeAboutMe *me)
+{
+	const gchar *argv[12];
+	gint i = 0;
+	const gchar *fullname;
+	const gchar *office;
+	const gchar *office_phone;
+	const gchar *home_phone;
+
+	argv[i++] = "/usr/bin/userinfo";
+
+	fullname = e_contact_get_const (me->contact, E_CONTACT_FULL_NAME);
+	office = about_me_get_address_field (me->addr2, ADDRESS_LOCALITY);
+	office_phone = e_contact_get_const (me->contact, E_CONTACT_PHONE_BUSINESS);
+	home_phone = e_contact_get_const (me->contact, E_CONTACT_PHONE_HOME);
+
+	if (fullname) {
+		argv[i++] = "-f";
+		argv[i++] = fullname;
+	}
+ 
+	if (office) {
+		argv[i++] = "-o";
+		argv[i++] = office;
+	}
+ 
+	if (office_phone) {
+		argv[i++] = "-p";
+		argv[i++] = office_phone;
+	}
+
+	if (home_phone) {
+		argv[i++] = "-h";
+		argv[i++] = home_phone;
+	}
+
+	argv[i++] = "-x";
+	argv[i++] = NULL;
+
+	g_spawn_sync (NULL, (gchar **)argv, NULL, 0,
+		      NULL, NULL, NULL, NULL, NULL, NULL);
+}
+
 static gboolean
 about_me_commit_from_timeout (GnomeAboutMe *me)
 {
@@ -354,22 +401,6 @@ about_me_focus_out (GtkWidget *widget, G
 	return FALSE;
 }
 
-static char *
-get_user_login (void)
-{
-	char buf[LINE_MAX * 4];
-	struct passwd pwd, *err;
-
-	int i;
-#if defined(__sun) && !defined(_POSIX_PTHREAD_SEMANTICS)
-	i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf));
-	return (i != 0) ? g_strdup (pwd.pw_name) : NULL;
-#else
-	i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf), &err);
-	return ((i == 0) && (err == &pwd)) ? g_strdup (pwd.pw_name) : NULL;
-#endif
-}
-
 /*
  * Helpers
  */
@@ -873,6 +904,8 @@ about_me_button_clicked_cb (GtkDialog *d
 			g_source_remove (me->commit_timeout_id);
 			about_me_commit (me);
 		}
+                 
+                update_gecos (me);
 
 		about_me_destroy (me);
 		gtk_main_quit ();
@@ -893,6 +926,144 @@ about_me_fingerprint_button_clicked_cb (
 				    me->disable_fingerprint_button);
 }
 
+static GtkWidget *
+find_fullname_editable_label (GnomeAboutMe *me)
+{
+        GtkWidget    *widget;
+        GList        *list;
+        GtkWidget    *c;
+        GladeXML     *dialog;
+ 
+        dialog = me->dialog;
+ 
+	widget = WID ("fullnamebox");
+ 
+	list = gtk_container_get_children (GTK_CONTAINER (widget->parent));
+ 
+	while (list) {
+		c = list->data;
+
+		if (EEL_IS_EDITABLE_LABEL (c))
+			break;
+
+		c = NULL;
+
+		list = list->next;
+	}
+
+	g_list_free (list);
+
+	return c;
+}
+ 
+static void
+about_me_button_clicked (GtkWidget      *button,
+			 GnomeAboutMe   *me)
+{
+	GtkWidget    *label;
+	GtkWidget    *entry;
+	PangoFontDescription *font;
+	gint size;
+	const gchar *text;
+
+	label = gtk_bin_get_child (GTK_BIN (button));
+	entry = find_fullname_editable_label (me);
+
+	font = pango_font_description_copy (label->style->font_desc);
+	size = pango_font_description_get_size (font);
+	if (size == 0)
+		size = 10;
+	pango_font_description_set_size (font, size * PANGO_SCALE_XX_LARGE);
+	pango_font_description_set_weight (font, PANGO_WEIGHT_BOLD);
+
+	eel_editable_label_set_font_description (EEL_EDITABLE_LABEL (entry), font);
+	pango_font_description_free (font);
+
+	gtk_misc_set_alignment (GTK_MISC (entry), 0.0, 0.5);
+
+	me->editing_username = TRUE;
+
+	text = gtk_label_get_text (GTK_LABEL (label));
+	eel_editable_label_set_text (EEL_EDITABLE_LABEL (entry), text);
+
+	gtk_widget_hide (button);
+	gtk_widget_show (entry);
+	gtk_widget_grab_focus (entry);
+}
+
+static void 
+stop_editing (GnomeAboutMe *me, gboolean commit)
+{
+	GtkWidget   *button;
+        GtkWidget   *label;
+	GtkWidget   *entry;
+        GtkWidget   *main_dialog;
+	const gchar *text;
+	gchar *str;
+	GladeXML     *dialog;
+
+	if (!me->editing_username)
+		return;
+
+	me->editing_username = FALSE;
+
+	dialog = me->dialog;
+
+	button = WID ("fullnamebox");
+	label = gtk_bin_get_child (GTK_BIN (button));
+	entry = find_fullname_editable_label (me);
+
+	if (commit) {
+		text = eel_editable_label_get_text (EEL_EDITABLE_LABEL (entry));
+		str = g_strdup_printf ("<b><span size=\"xx-large\">%s</span></b>", text);
+		gtk_label_set_markup (GTK_LABEL (label), str);
+		g_free (str);
+
+		g_free (me->username);
+		me->username = g_strdup (text);
+		e_contact_set (me->contact, E_CONTACT_FULL_NAME, me->username);
+
+		main_dialog = WID ("about-me-dialog");
+		str = g_strdup_printf (_("About %s"), me->username);
+		gtk_window_set_title (GTK_WINDOW (main_dialog), str);
+		g_free (str);
+	}
+
+	gtk_widget_hide (entry);
+	gtk_widget_show (button);
+}
+ 
+static gboolean
+about_me_entry_focus_out (GtkWidget     *entry,
+			  GdkEventFocus *event,
+			  GnomeAboutMe  *me)
+{
+	stop_editing (me, TRUE);
+
+	return FALSE;
+}
+
+static gboolean
+about_me_entry_key_press (GtkWidget    *entry,
+			  GdkEventKey  *event,
+			  GnomeAboutMe *me)
+{
+	switch (event->keyval)
+	{
+	case GDK_Return:
+	case GDK_KP_Enter:
+		stop_editing (me, TRUE);
+		return TRUE;
+	case GDK_Escape:
+		stop_editing (me, FALSE);
+		return TRUE;
+	default:
+		break;
+	}
+
+	return FALSE;
+}
+
 static gint
 about_me_setup_dialog (void)
 {
@@ -903,6 +1074,8 @@ about_me_setup_dialog (void)
 	GError 	     *error = NULL;
 	GList        *chain;
 	gchar        *str;
+	GtkWidget    *entry;
+	GtkWidget    *button;
 
 	me = g_new0 (GnomeAboutMe, 1);
 
@@ -983,6 +1156,25 @@ about_me_setup_dialog (void)
 	gtk_label_set_markup (GTK_LABEL (widget), str);
 	g_free (str);
 
+       button = WID ("fullnamebox");
+       g_signal_connect (button, "clicked",
+                         G_CALLBACK (about_me_button_clicked), me);
+
+       entry = eel_editable_label_new (me->username);
+       eel_editable_label_set_line_wrap (EEL_EDITABLE_LABEL (entry), TRUE);
+        gtk_container_add (GTK_CONTAINER (button->parent), entry);
+       gtk_box_reorder_child (GTK_BOX (button->parent), entry, 3);
+       g_signal_connect (entry, "focus-out-event",
+                         G_CALLBACK (about_me_entry_focus_out), me);
+       g_signal_connect (entry, "key-press-event",
+                         G_CALLBACK (about_me_entry_key_press), me);
+
+       gtk_widget_set_no_show_all (button, TRUE);
+       gtk_widget_set_no_show_all (entry, TRUE);
+       gtk_widget_show (widget);
+       gtk_widget_show (button);
+       gtk_widget_hide (entry);
+
 	widget = WID ("login");
 	gtk_label_set_text (GTK_LABEL (widget), me->login);
 
diff -up gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.glade.gecos gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.glade
--- gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.glade.gecos	2008-12-01 08:32:12.000000000 -0500
+++ gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.glade	2008-12-16 21:16:16.000000000 -0500
@@ -101,23 +101,30 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="fullname">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Full Name</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
+                    <widget class="GtkButton" id="fullnamebox">
+                      <property name="relief">GTK_RELIEF_NONE</property>
+                      <property name="focus_on_click">True</property>
+ 
+                      <child>
+                        <widget class="GtkLabel" id="fullname">
+                          <property name="visible">True</property>
+                          <property name="label" translatable="yes">Full Name</property>
+                          <property name="use_underline">False</property>
+                          <property name="use_markup">False</property>
+                          <property name="justify">GTK_JUSTIFY_LEFT</property>
+                          <property name="wrap">False</property>
+                          <property name="selectable">False</property>
+                          <property name="xalign">0</property>
+                          <property name="yalign">0.5</property>
+                          <property name="xpad">0</property>
+                          <property name="ypad">0</property>
+                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                          <property name="width_chars">-1</property>
+                          <property name="single_line_mode">False</property>
+                          <property name="angle">0</property>
+                        </widget>
+                      </child>
+                    </widget>
 		    <packing>
 		      <property name="padding">0</property>
 		      <property name="expand">False</property>
diff -up gnome-control-center-2.25.2/capplets/about-me/Makefile.am.gecos gnome-control-center-2.25.2/capplets/about-me/Makefile.am
--- gnome-control-center-2.25.2/capplets/about-me/Makefile.am.gecos	2008-12-02 11:52:42.000000000 -0500
+++ gnome-control-center-2.25.2/capplets/about-me/Makefile.am	2008-12-16 21:16:16.000000000 -0500
@@ -9,13 +9,16 @@ pixmap_files = 				\
 Desktop_in_files = gnome-about-me.desktop.in
 
 gnome_about_me_SOURCES =	 	\
-	eel-alert-dialog.c		\
-	eel-alert-dialog.h		\
-	eel-gtk-macros.h		\
 	gnome-about-me-password.c	\
 	gnome-about-me-password.h	\
 	e-image-chooser.c		\
 	e-image-chooser.h		\
+	eel-accessibility.c		\
+	eel-accessibility.h		\
+	eel-editable-label.c		\
+	eel-editable-label.h		\
+	eel-marshal.h			\
+	eel-marshal.c			\
 	gnome-about-me-fingerprint.c	\
 	gnome-about-me-fingerprint.h	\
 	$(MARSHALFILES)			\
@@ -28,7 +31,7 @@ bin_PROGRAMS = gnome-about-me
 if BUILD_ABOUTME
 bin_PROGRAMS = gnome-about-me
 
-gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(POLKIT_GNOME_LIBS)
+gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(POLKIT_GNOME_LIBS) $(GAIL_LIBS)
 gnome_about_me_LDFLAGS = -export-dynamic
 
 @INTLTOOL_DESKTOP_RULE@
@@ -43,6 +46,7 @@ INCLUDES = \
 	$(GNOMECC_CAPPLETS_CFLAGS) \
 	$(LIBEBOOK_CFLAGS) \
 	$(POLKIT_GNOME_CFLAGS) \
+	$(GAIL_CFLAGS) \
 	-DDATADIR="\"$(datadir)\"" \
 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
 	-DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \
diff -up gnome-control-center-2.25.2/configure.in.gecos gnome-control-center-2.25.2/configure.in
--- gnome-control-center-2.25.2/configure.in.gecos	2008-12-16 21:16:16.000000000 -0500
+++ gnome-control-center-2.25.2/configure.in	2008-12-16 21:16:16.000000000 -0500
@@ -97,6 +97,7 @@ PKG_CHECK_MODULES(METACITY, libmetacity-
 PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
 PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
 PKG_CHECK_MODULES(GIO, gio-2.0)
+PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome)
 
 gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-2.0`
 gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
@@ -200,6 +201,8 @@ if test "x$enable_aboutme" = "xyes"; the
   		    has_polkit=false)
 fi
 
+PKG_CHECK_MODULES(GAIL, [gail])
+
 AM_CONDITIONAL(BUILD_ABOUTME, test "x$enable_aboutme" = "xyes")
 
 dnl ==============================================