[poppler] 2 commits - qt4/src

[Albert Astals Cid]

 qt4/src/poppler-embeddedfile.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5e73cb059e27f68b329513de609d52e84d73f8af
Merge: 5e9654a b3e44fc
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue May 7 22:00:02 2013 +0200

    Merge remote-tracking branch 'origin/poppler-0.22'

commit b3e44fc59a9258ad701bc67132dea0646fd8b61a
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue May 7 21:53:31 2013 +0200

    We need UnicodeParsedString here too
    
    Fixes KDE bug #307786

diff --git a/qt4/src/poppler-embeddedfile.cc b/qt4/src/poppler-embeddedfile.cc
index 5b3f7d3..f70573a 100644
--- a/qt4/src/poppler-embeddedfile.cc
+++ b/qt4/src/poppler-embeddedfile.cc
@@ -1,5 +1,5 @@
 /* poppler-document.cc: qt interface to poppler
- * Copyright (C) 2005, 2008, 2009, 2012, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2005, 2008, 2009, 2012, 2013, Albert Astals Cid <aacid at kde.org>
  * Copyright (C) 2005, Brad Hards <bradh at frogmouth.net>
  * Copyright (C) 2008, 2011, Pino Toscano <pino at kde.org>
  *
@@ -69,7 +69,7 @@ EmbeddedFile::~EmbeddedFile()
 QString EmbeddedFile::name() const
 {
 	GooString *goo = m_embeddedFile->filespec->getFileName();
-	return goo ? QString(goo->getCString()) : QString();
+	return goo ? UnicodeParsedString(goo) : QString();
 }
 
 QString EmbeddedFile::description() const