X-Git-Url: http://git.ithinksw.org/GrowlITTSW.git/blobdiff_plain/db492e315730afc3ec7fe21f8f6102e42675e8d6..HEAD:/GrowlITTSWController.m

diff --git a/GrowlITTSWController.m b/GrowlITTSWController.m
index b5c762b..5503ee8 100644
--- a/GrowlITTSWController.m
+++ b/GrowlITTSWController.m
@@ -112,9 +112,11 @@
 	}
 }
 
-- (void)showWindowWithTitle:(NSString *)title text:(NSString *)text image:(NSImage *)image {
-	if (text && ![text isEqualToString:@""] && ![text isEqualToString:@"\n"]) {
-		text = [title stringByAppendingFormat:@"\n%@", text];
+- (void)showWindowWithTitle:(NSString *)title desc:(NSString *)desc image:(NSImage *)image {
+	NSString *text = title;
+	
+	if (desc && ![desc isEqualToString:@""] && ![desc isEqualToString:@"\n"]) {
+		text = [text stringByAppendingFormat:@"\n%@", desc];
 	}
 	
 	NSSize newSize;
@@ -132,11 +134,11 @@
 	}
 	
 	if (_wrapNotifications) {
-		text = [text stringByReplacingOccurrencesOfRegex:[NSString stringWithFormat:@"(.{1,%i})(?: +|$)\\n?|(.{%i})", _wrapColumns, _wrapColumns] withString:@"$1$2\n"];
+		text = [text stringByReplacingOccurrencesOfRegex:[NSString stringWithFormat:@"(\\S\\S{%i,}|.{1,%i})(?:\\s+|$)", _wrapColumns, _wrapColumns] withString:@"$1\n"];
 	}
 	
 	//trim trailing whitespace
-	text = [text stringByReplacingOccurrencesOfRegex:@"[\\s\\r\\n]+$" withString:@""];
+	text = [text stringByReplacingOccurrencesOfRegex:@"\\s+$" withString:@""];
 	
 	NSArray *gothicChars = [NSArray arrayWithObjects:[NSString stringWithUTF8String:"☆"], [NSString stringWithUTF8String:"★"], nil];
 	NSMutableAttributedString *attributedText = [[NSMutableAttributedString alloc] initWithString:text];