From baa640126870f63ee62b818f0c6e2b8e9596b753 Mon Sep 17 00:00:00 2001
From: Darin Adler <darin@src.gnome.org>
Date: Thu, 3 Jan 2002 22:48:25 +0000
Subject: [PATCH] Updated.

	* TODO: Updated.

	* libnautilus-private/nautilus-icon-canvas-item.c:
	(create_label_layout): Use eel_pango_layout_set_underline.

	* components/music/nautilus-music-view.c:
	Don't include EelList.
---
 ChangeLog                                     | 11 +++++++++++
 TODO                                          | 19 ++++++++++++-------
 components/music/nautilus-music-view.c        |  1 -
 .../nautilus-icon-canvas-item.c               | 11 ++---------
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6827ed55b..d585a72a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-01-03  Darin Adler  <darin@bentspoon.com>
+
+	* TODO: Updated.
+
+	* libnautilus-private/nautilus-icon-canvas-item.c:
+	(create_label_layout): Use eel_pango_layout_set_underline.
+
+	* components/music/nautilus-music-view.c:
+	Don't include EelList.
+
+
 2002-01-03  Darin Adler  <darin@bentspoon.com>
 
 	* libnautilus-private/nautilus-icon-container.c:
diff --git a/TODO b/TODO
index 794047f09..c3ace6cbf 100644
--- a/TODO
+++ b/TODO
@@ -1,15 +1,20 @@
 For tasks outside the porting effort, we track them as bugs in
-http://bugzilla.gnome.org.
+http://bugzilla.gnome.org. For the porting effort, please let
+darin@bentspoon.com know what you are working on.
+
+- Make closing a window work (Bonobo fixes needed?).
+- Port list view to GtkTreeView and then go to eel and remove
+  EelCList, EelList, and EelListColumnTitle.
+- Port tree sidebar panel to GtkTreeView and then go to eel and
+  remove EelCTree.
+
+- Visit all the GNOME2_CONVERSION_COMPLETE and fix each issue
+  (details forthcoming)
 
-- Make closing a window work (Bonobo fix needed).
-- Get list view working.
 - Visit all the destroy and move things into finalize or dispose
   and make them callable twice as appropriate.
 - Change things that use destroy handlers to use weak references
   instead.
+
 - Figure out why we get NULL font problems in Pango when the progress
   dialog comes up.
-
-- Get EelLabel working and switch back to it on the sidebar.
-- Get rid of the direct freetype use and switch to using
-  Pango instead.
diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c
index 5d2f57161..d29167784 100644
--- a/components/music/nautilus-music-view.c
+++ b/components/music/nautilus-music-view.c
@@ -38,7 +38,6 @@
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-image.h>
-#include <eel/eel-list.h>
 #include <eel/eel-preferences.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
index e72a58633..9c01d6ea9 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.c
+++ b/libnautilus-private/nautilus-icon-canvas-item.c
@@ -38,6 +38,7 @@
 #include <eel/eel-gnome-extensions.h>
 #include <eel/eel-graphic-effects.h>
 #include <eel/eel-gtk-macros.h>
+#include <eel/eel-pango-extensions.h>
 #include <eel/eel-string.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtksignal.h>
@@ -1273,8 +1274,6 @@ create_label_layout (NautilusIconCanvasItem *item,
 		     const char *text)
 {
 	PangoLayout *layout;
-	PangoAttrList *attr_list;
-	PangoAttribute *attr;
 
 	layout = pango_layout_new (eel_gnome_canvas_get_pango_context (GNOME_CANVAS_ITEM (item)->canvas));
 
@@ -1285,13 +1284,7 @@ create_label_layout (NautilusIconCanvasItem *item,
 
 	/* if it's prelit, and we're in click-to-activate mode, underline the text */
 	if (item->details->is_prelit && in_single_click_mode ()) {
-		attr_list = pango_attr_list_new ();
-		attr = pango_attr_underline_new (PANGO_UNDERLINE_SINGLE);
-		attr->start_index = 0;
-		attr->end_index = strlen (text);
-		pango_attr_list_insert (attr_list, attr);
-		pango_layout_set_attributes (layout, attr_list);
-		pango_attr_list_unref (attr_list);
+		eel_pango_layout_set_underline (layout, PANGO_UNDERLINE_SINGLE);
 	}
 	
 	return layout;