[haiku-commits] haiku: hrev47996 - src/apps/haikudepot/model

  • From: superstippi@xxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 10 Oct 2014 22:49:14 +0200 (CEST)

hrev47996 adds 1 changeset to branch 'master'
old head: 6d519fd17558a53659c82f7a5ac101b7b6be1213
new head: 2fb1b897bc0fef6cc691410920694ed2e717533a
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=2fb1b89+%5E6d519fd

----------------------------------------------------------------------------

2fb1b89: HaikuDepot: Revert change regarding publisher name
  
  It is now again the first string from the copyrights list, unless there is
  no copyrights list, in which case the vendor string is used.

                                      [ Stephan Aßmus <superstippi@xxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev47996
Commit:      2fb1b897bc0fef6cc691410920694ed2e717533a
URL:         http://cgit.haiku-os.org/haiku/commit/?id=2fb1b89
Author:      Stephan Aßmus <superstippi@xxxxxx>
Date:        Fri Oct 10 20:51:19 2014 UTC

----------------------------------------------------------------------------

1 file changed, 3 insertions(+), 5 deletions(-)
src/apps/haikudepot/model/PackageInfo.cpp | 8 +++-----

----------------------------------------------------------------------------

diff --git a/src/apps/haikudepot/model/PackageInfo.cpp 
b/src/apps/haikudepot/model/PackageInfo.cpp
index c0ff4d0..d3bbdd9 100644
--- a/src/apps/haikudepot/model/PackageInfo.cpp
+++ b/src/apps/haikudepot/model/PackageInfo.cpp
@@ -495,11 +495,9 @@ PackageInfo::PackageInfo(const BPackageInfo& info)
                publisherURL = info.URLList().StringAt(0);
 
        BString publisherName = info.Vendor();
-       if (publisherName.IsEmpty()) {
-               const BStringList& rightsList = info.CopyrightList();
-               if (rightsList.CountStrings() > 0)
-                       publisherName = rightsList.StringAt(0);
-       }
+       const BStringList& rightsList = info.CopyrightList();
+       if (rightsList.CountStrings() > 0)
+               publisherName = rightsList.StringAt(0);
 
        fPublisher = PublisherInfo(BitmapRef(), publisherName, "", 
publisherURL);
 }


Other related posts:

  • » [haiku-commits] haiku: hrev47996 - src/apps/haikudepot/model - superstippi