canvas-item: Don't wrap after . immediately followed by numbers

Nautilus allowed line wrapping for filenames after a . or _
The code made an exception for version numbers, but it
was too rigid and broke things like Ubuntu's 12.04 version
numbering. This relaxes the exception so that the line isn't
wrapped for a . or _ immediately followed by any numbers.

https://launchpad.net/bugs/942539

https://bugzilla.gnome.org/show_bug.cgi?id=781875

1 files changed, 2 insertions, 10 deletions

diff --git a/src/nautilus-canvas-item.c b/src/nautilus-canvas-item.c
index a103d34a4..97672001f 100644
--- a/src/nautilus-canvas-item.c
+++ b/src/nautilus-canvas-item.c
@@ -1457,12 +1457,6 @@ nautilus_canvas_item_draw (EelCanvasItem  *item,
 
 #define ZERO_WIDTH_SPACE "\xE2\x80\x8B"
 
-#define ZERO_OR_THREE_DIGITS(p)                 \
-    (!g_ascii_isdigit (*(p)) ||             \
-     (g_ascii_isdigit (*(p + 1)) &&           \
-      g_ascii_isdigit (*(p + 2))))
-
-
 static PangoLayout *
 create_label_layout (NautilusCanvasItem *item,
                      const char         *text)
@@ -1492,12 +1486,10 @@ create_label_layout (NautilusCanvasItem *item,
         {
             str = g_string_append_c (str, *p);
 
-            if (*p == '_' || *p == '-' || (*p == '.' && ZERO_OR_THREE_DIGITS (p + 1)))
+            if (*p == '_' || *p == '-' || (*p == '.' && !g_ascii_isdigit(*(p+1))))
             {
                 /* Ensure that we allow to break after '_' or '.' characters,
-                 * if they are not likely to be part of a version information, to
-                 * not break wrapping of foobar-0.0.1.
-                 * Wrap before IPs and long numbers, though. */
+                 * if they are not followed by a number */
                 str = g_string_append (str, ZERO_WIDTH_SPACE);
             }
         }