Switch to current pasteboard types

Cf. https://developer.apple.com/library/archive/documentation/Miscellaneous/Reference/UTIRef/Articles/System-DeclaredUniformTypeIdentifiers.html
mac-oss-apps · Jul 8, 2023 · ada77a5 · ada77a5
1 parent ced711d
commit ada77a5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/Vienna/Sources/Main window/ArticleListView.m b/Vienna/Sources/Main window/ArticleListView.m
@@ -1478,7 +1478,7 @@ -(BOOL)copyTableSelection:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)
  [pboard declareTypes:@[VNAPasteboardTypeRSSItem, VNAPasteboardTypeWebURLsWithTitles, NSPasteboardTypeString, NSPasteboardTypeHTML]
  owner:self];
  if (count == 1) {
- [pboard addTypes:@[VNAPasteboardTypeURL, VNAPasteboardTypeURLName, NSPasteboardTypeURL]
+ [pboard addTypes:@[NSPasteboardTypeURL, VNAPasteboardTypeURLName]
  owner:self];
  }
 
@@ -1513,7 +1513,7 @@ -(BOOL)copyTableSelection:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)
  [fullHTMLText appendFormat:@"<a href=\"%@\">%@</a><br />%@<br /><br />", msgLink, msgTitle, msgText];
 
  if (count == 1) {
- [pboard setString:msgLink forType:VNAPasteboardTypeURL];
+ [pboard setString:msgLink forType:NSPasteboardTypeURL];
  [pboard setString:msgTitle forType:VNAPasteboardTypeURLName];
 
  // Write the link to the pastboard.

diff --git a/Vienna/Sources/Main window/UnifiedDisplayView.m b/Vienna/Sources/Main window/UnifiedDisplayView.m
@@ -599,7 +599,7 @@ -(BOOL)copyIndexesSelection:(NSIndexSet*)rowIndexes toPasteboard:(NSPasteboard *
  // Set up the pasteboard
  [pboard declareTypes:@[VNAPasteboardTypeRSSItem, VNAPasteboardTypeWebURLsWithTitles, NSPasteboardTypeString, NSPasteboardTypeHTML] owner:self];
  if (count == 1) {
- [pboard addTypes:@[VNAPasteboardTypeURL, VNAPasteboardTypeURLName, NSPasteboardTypeURL]
+ [pboard addTypes:@[NSPasteboardTypeURL, VNAPasteboardTypeURLName]
  owner:self];
  }
 
@@ -634,7 +634,7 @@ -(BOOL)copyIndexesSelection:(NSIndexSet*)rowIndexes toPasteboard:(NSPasteboard *
  [fullHTMLText appendFormat:@"<a href=\"%@\">%@</a><br />%@<br /><br />", msgLink, msgTitle, msgText];
 
  if (count == 1) {
- [pboard setString:msgLink forType:VNAPasteboardTypeURL];
+ [pboard setString:msgLink forType:NSPasteboardTypeURL];
  [pboard setString:msgTitle forType:VNAPasteboardTypeURLName];
 
  // Write the link to the pastboard.

diff --git a/Vienna/Sources/Shared/Constants.h b/Vienna/Sources/Shared/Constants.h
@@ -127,7 +127,6 @@ extern NSInteger const MA_Default_ConcurrentDownloads;
 extern NSPasteboardType const VNAPasteboardTypeRSSItem;
 extern NSPasteboardType const VNAPasteboardTypeFolderList;
 extern NSPasteboardType const VNAPasteboardTypeRSSSource;
-extern NSPasteboardType const VNAPasteboardTypeURL;
 extern NSPasteboardType const VNAPasteboardTypeURLName;
 extern NSPasteboardType const VNAPasteboardTypeWebURLsWithTitles;
 

diff --git a/Vienna/Sources/Shared/Constants.m b/Vienna/Sources/Shared/Constants.m
@@ -140,6 +140,5 @@
 NSPasteboardType const VNAPasteboardTypeFolderList = @"ViennaFolderType";
 NSPasteboardType const VNAPasteboardTypeRSSSource = @"CorePasteboardFlavorType 0x52535373";
 NSPasteboardType const VNAPasteboardTypeRSSItem = @"CorePasteboardFlavorType 0x52535369";
-NSPasteboardType const VNAPasteboardTypeURL = @"CorePasteboardFlavorType 0x75726C20";
-NSPasteboardType const VNAPasteboardTypeURLName = @"CorePasteboardFlavorType 0x75726C6E";
+NSPasteboardType const VNAPasteboardTypeURLName = @"public.url-name";
 NSPasteboardType const VNAPasteboardTypeWebURLsWithTitles = @"WebURLsWithTitlesPboardType";