NSPerformService fix

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17946 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,13 @@
+2003-10-21  Bjorn Giesler <bjoern@giesler.de>
+
+	* Source/GSServicesManager.m: Fix NSPerformService() to work for
+	any localised service name.
+
+2003-10-21  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/GSServicesManager.m: Revert last modification in favour
+	of a fix by ... Bjorn.
+
 2003-10-20  Adam Fedor  <fedor@gnu.org>
 
 	* Source/NSApplication.m (-changeWindowsItem:title:filename:): Use

Source/GSServicesManager.m

@@ -1376,6 +1376,39 @@ GSContactApplication(NSString *appName, NSString *port, NSDate *expire)
   return app;
 }
 
+NSDictionary *
+_serviceFromAnyLocalizedTitle(NSString *title)
+{
+  NSDictionary *allServices;
+  NSEnumerator *e1;
+  NSDictionary *service;
+
+  allServices = [manager menuServices];
+  if(allServices == nil)
+    return nil;
+
+  if([allServices objectForKey: title] != nil)
+    return [allServices objectForKey: title];
+  
+  e1 = [allServices objectEnumerator];
+  while((service = [e1 nextObject]))
+    {
+      NSDictionary *menuItems;
+      NSString *itemName;
+      NSEnumerator *e2;
+
+      menuItems = [service objectForKey: @"NSMenuItem"];
+      if(menuItems == nil)
+	continue;
+      e2 = [menuItems objectEnumerator];
+      while((itemName = [e2 nextObject]))
+	if([itemName isEqualToString: title])
+	  return service;
+    }
+
+  return nil;
+}
+
 /**
  * <p>Given the name of a serviceItem, and some data in a pasteboard
  * this function sends the data to the service provider (launching
@@ -1399,7 +1432,7 @@ NSPerformService(NSString *serviceItem, NSPasteboard *pboard)
   NSString		*userData;
   NSString		*error = nil;
 
-  service = [[manager menuServices] objectForKey: serviceItem]; 
+  service = _serviceFromAnyLocalizedTitle(serviceItem);
   if (service == nil)
     {
       NSRunAlertPanel(nil,