Changeset 21292

Timestamp:

10/17/2007 04:28:18 PM (1 year ago)

Author:

evands

Message:

Patch from sphynx to add a "Launch Mail" option to the New Mail dialogue, very useful if you use a client other than your browser for mail. Good first patch! Thanks :)

I changed the "Open Mail" button to read "Open Mail in Browser" to make the distinction more clear between loading the mail in the browser and loading the default Mail program (e.g. Mail.app).

Closes #6481

Files:

• trunk/Plugins/Purple Service/ESPurpleNotifyEmailController.m (modified) (5 diffs)

trunk/Plugins/Purple Service/ESPurpleNotifyEmailController.m

@@ -25 +25 @@
-@interface ESPurpleNotifyEmailController (PRIVATE)
-+ (void)openURLString:(NSString *)urlString;
++ (void)startMailApplication;
++ (NSString *)mailApplicationName;
-@end
-
@@ -165 +167 @@
-+ (void)showNotifyEmailWindowForAccount:(AIAccount *)account withMessage:(NSAttributedString *)inMessage URLString:(NSString *)inURLString
-{       
+        NSString *mailApplicationName = [self mailApplicationName];
-        [ESTextAndButtonsWindowController showTextAndButtonsWindowWithTitle:AILocalizedString(@"New Mail",nil)
-                                                                                                                  defaultButton:nil
-                                                                                                                alternateButton:(inURLString ? 
-
+ in Browser
-                                                                                                                                                 nil)
-
+
+
+
-                                                                                                                           onWindow:nil
-                                                                                                          withMessageHeader:nil
@@ -195 +200 @@
-
-                case AITextAndButtonsDefaultReturn:
+                        break;
+                        
-                case AITextAndButtonsOtherReturn:
+                        if (userInfo) [self startMailApplication];
+                        break;
+                        
-                case AITextAndButtonsClosedWithoutResponse:
-                        //No action needed
@@ -202 +212 @@
-        
-        return YES;
+}
+
+/*!
+ * @brief Start mail application from the new mail window
+ *
+ * Launch the user's mail application instead of opening the webmail-page
+ */ 
++ (void)startMailApplication {
+        if ([[NSWorkspace sharedWorkspace] launchApplication:[self mailApplicationName]] == NO) {
+                NSLog(@"Could not launch mail application '%@'", [self mailApplicationName]);
+        }
-}
-
@@ -251 +272 @@
-}
-
+/*!
+ * @brief Returns the name of the user's mail application
+ *
+ * Use the LaunchServices to identify the user's mail application and return it's name
+ * @return NSString with the application's name
+ */ 
++ (NSString *)mailApplicationName {
+        NSString *appName;
+        FSRef myAppRef;
+        
+        LSGetApplicationForURL((CFURLRef)[NSURL URLWithString:@"mailto://"], kLSRolesAll, &myAppRef, NULL);
+        LSCopyDisplayNameForRef(&myAppRef, (CFStringRef *)&appName);
+        
+        return [appName autorelease];
+}
+
-@end