Merge branch 'master' of github.com:jeena/Bungloo

Mac/Controller.h

@@ -73,6 +73,8 @@
 
 - (void)notificateViewsAboutDeletedPostWithId:(NSString *)postId byEntity:(NSString*)entity;
 
+- (NSURLRequest *)webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource;
+
 - (void)setString:(NSString *)string forKey:(NSString *)aKey;
 - (void)setSecret:(NSString *)string;
 - (NSString *)secret;

Mac/Controller.m

@@ -26,6 +26,7 @@
 - (void)awakeFromNib
 {
 	[timelineViewWindow setExcludedFromWindowsMenu:YES];
+    [timelineView setResourceLoadDelegate:self];
 
 	[self initHotKeys];
 
@@ -432,6 +433,13 @@
 	[timelineView stringByEvaluatingJavaScriptFromString:fun];
 }
 
+/* we disable cookies to avoid  see a timeline during the consultation of a profile with which the user are connected through safari cf https://github.com/jeena/Bungloo/issues/189 */
+- (NSURLRequest *)webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource{
+    NSMutableURLRequest * response = [request mutableCopy];
+    [response setHTTPShouldHandleCookies:FALSE];
+    return response;
+}
+
 - (void)loggedIn
 {
 	[loginActivityIndicator stopAnimation:self];

Mac/ViewDelegate.m

@@ -103,20 +103,16 @@
 
 - (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems
 {
-	// FIXME
-	/*
-	NSMutableArray *menuItems = [NSMutableArray arrayWithArray:defaultMenuItems];
-
-	for (NSMenuItem*item in defaultMenuItems) {
-		if ([[item title] isEqualToString:@"Reload"]) {
-			//[item setAction:@selector(reload:)];
-			//[item setTarget:self];
-		} else {
-			[menuItems addObject:item];
+	//remove reload menu item
+    NSMutableArray *menuItems = [NSMutableArray arrayWithArray:defaultMenuItems];
+	for (NSMenuItem* item in defaultMenuItems) {
+		if ([item tag] == WebMenuItemTagReload) {
+			[menuItems removeObject:item];
+            break;
 		}
-	}*/
+	}
 
-	return defaultMenuItems;
+	return menuItems;
 }
 
 - (void)reload:(id)sender {