Index: eel/eel-gtk-extensions.c
===================================================================
--- eel/eel-gtk-extensions.c	(révision 1841)
+++ eel/eel-gtk-extensions.c	(copie de travail)
@@ -357,19 +357,6 @@ eel_gtk_window_set_initial_geometry_from
 }
 
 /**
- * eel_truncate_text_for_menu_item:
- * 
- * Given an arbitrary string, returns a newly-allocated string
- * suitable for use as a menu item label. Truncates long strings 
- * in the middle.
- */
-char *
-eel_truncate_text_for_menu_item (const char *text)
-{
-	return eel_str_middle_truncate (text, MAXIMUM_MENU_TITLE_LENGTH);
-}
-
-/**
  * eel_pop_up_context_menu:
  * 
  * Pop up a context menu under the mouse.
Index: eel/eel-gtk-extensions.h
===================================================================
--- eel/eel-gtk-extensions.h	(révision 1841)
+++ eel/eel-gtk-extensions.h	(copie de travail)
@@ -106,7 +106,6 @@ char *                eel_gtk_window_get
 
 
 /* GtkMenu and GtkMenuItem */
-char *                eel_truncate_text_for_menu_item                 (const char           *text);
 void                  eel_pop_up_context_menu                         (GtkMenu              *menu,
 								       gint16                offset_x,
 								       gint16                offset_y,
Index: eel/eel-string.c
===================================================================
--- eel/eel-string.c	(révision 1841)
+++ eel/eel-string.c	(copie de travail)
@@ -518,59 +518,6 @@ eel_str_capitalize (const char *string)
 	return capitalized;
 }
 
-/* Note: eel_string_ellipsize_* that use a length in pixels
- * rather than characters can be found in eel_gdk_extensions.h
- * 
- * FIXME bugzilla.eazel.com 5089: 
- * we should coordinate the names of eel_string_ellipsize_*
- * and eel_str_*_truncate so that they match better and reflect
- * their different behavior.
- */
-char *
-eel_str_middle_truncate (const char *string,
-			      guint truncate_length)
-{
-	char *truncated;
-	guint length;
-	guint num_left_chars;
-	guint num_right_chars;
-
-	const char delimter[] = "...";
-	const guint delimter_length = strlen (delimter);
-	const guint min_truncate_length = delimter_length + 2;
-
-	if (string == NULL) {
-		return NULL;
-	}
-
-	/* It doesnt make sense to truncate strings to less than
-	 * the size of the delimiter plus 2 characters (one on each
-	 * side)
-	 */
-	if (truncate_length < min_truncate_length) {
-		return g_strdup (string);
-	}
-
-	length = strlen (string);
-
-	/* Make sure the string is not already small enough. */
-	if (length <= truncate_length) {
-		return g_strdup (string);
-	}
-
-	/* Find the 'middle' where the truncation will occur. */
-	num_left_chars = (truncate_length - delimter_length) / 2;
-	num_right_chars = truncate_length - num_left_chars - delimter_length + 1;
-
-	truncated = g_new (char, truncate_length + 1);
-
-	strncpy (truncated, string, num_left_chars);
-	strncpy (truncated + num_left_chars, delimter, delimter_length);
-	strncpy (truncated + num_left_chars + delimter_length, string + length - num_right_chars + 1, num_right_chars);
-	
-	return truncated;
-}
-
 /**
  * eel_str_count_characters:
  * Count the number of 'c' characters that occur in 'string.
@@ -884,38 +831,6 @@ eel_self_check_string (void)
 	EEL_CHECK_STRING_RESULT (eel_str_capitalize ("foo"), "Foo");
 	EEL_CHECK_STRING_RESULT (eel_str_capitalize ("Foo"), "Foo");
 
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("foo", 0), "foo");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("foo", 1), "foo");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("foo", 3), "foo");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("foo", 4), "foo");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("foo", 5), "foo");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("foo", 6), "foo");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("foo", 7), "foo");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 0), "a_much_longer_foo");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 1), "a_much_longer_foo");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 2), "a_much_longer_foo");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 3), "a_much_longer_foo");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 4), "a_much_longer_foo");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 5), "a...o");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 6), "a...oo");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 7), "a_...oo");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 8), "a_...foo");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 9), "a_m...foo");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_even", 8), "so...ven");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_odd", 8), "so...odd");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_even", 9), "som...ven");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_odd", 9), "som...odd");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_even", 10), "som...even");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_odd", 10), "som..._odd");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_even", 11), "some...even");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_odd", 11), "some..._odd");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_even", 12), "some..._even");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_odd", 12), "some...g_odd");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_even", 13), "somet..._even");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_odd", 13), "something_odd");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_even", 14), "something_even");
-	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_odd", 13), "something_odd");
-
 	#define TEST_INTEGER_CONVERSION_FUNCTIONS(string, boolean_result, integer_result) \
 		EEL_CHECK_BOOLEAN_RESULT (eel_str_to_int (string, &integer), boolean_result); \
 		EEL_CHECK_INTEGER_RESULT (call_str_to_int (string), integer_result);
Index: eel/eel-string.h
===================================================================
--- eel/eel-string.h	(révision 1841)
+++ eel/eel-string.h	(copie de travail)
@@ -93,14 +93,6 @@ char *   eel_str_double_underscores     
 /* Capitalize a string */
 char *   eel_str_capitalize                (const char    *str);
 
-/* Middle truncate a string to a maximum of truncate_length characters.
- * The resulting string will be truncated in the middle with a "..."
- * delimiter.
- */
-char *   eel_str_middle_truncate           (const char    *str,
-					    guint          truncate_length);
-
-
 /* Count the number of 'c' characters that occur in 'string'. */
 guint    eel_str_count_characters          (const char    *str,
 					    char           c);
