Merge lp:~gary-lasker/software-center/custom-desktop-key into lp:software-center

[Gary Lasker]

This branch provides support for a custom desktop key that allows application developers to specify a custom display name for their application in Ubuntu Software Center specifically. This is a feature request from Mike Terry, please see bug 801197 for more details.

Whatya think? Is this something we ought to support?

Thanks!

[lp:~gary-lasker/software-center/custom-desktop-key]

1879. By Gary Lasker on 2011-06-27

merge with trunk

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-27 01:47:56 +0000
+++ debian/changelog	2011-06-27 02:29:23 +0000
@@ -24,6 +24,9 @@
     error when searching (LP: #801114)
   * softwarecenter/ui/gtk/appview.py:
     - fix phantom install button in for purchase listview (LP: #801512)
+  * softwarecenter/db/update.py:
+    - add support for custom desktop key X-Ubuntu-Software-Center-Name
+      for USC-specific display names (LP: #801197)
     
   [ Steve Langasek ]
   * debian/control: point Vcs-Bzr field at the right branch.

=== modified file 'softwarecenter/db/update.py'
--- softwarecenter/db/update.py	2011-06-21 08:55:06 +0000
+++ softwarecenter/db/update.py	2011-06-27 02:29:23 +0000
@@ -539,7 +539,10 @@
         doc = xapian.Document()
         term_generator.set_document(doc)
         # app name is the data
-        if parser.has_option_desktop("X-GNOME-FullName"):
+        if parser.has_option_desktop("X-Ubuntu-Software-Center-Name"):
+            name = parser.get_desktop("X-Ubuntu-Software-Center-Name")
+            untranslated_name = parser.get_desktop("X-Ubuntu-Software-Center-Name", translated=False)
+        elif parser.has_option_desktop("X-GNOME-FullName"):
             name = parser.get_desktop("X-GNOME-FullName")
             untranslated_name = parser.get_desktop("X-GNOME-FullName", translated=False)
         else: