From 008685a90ee1d32b422f7d39011de8a6282d41e5 Mon Sep 17 00:00:00 2001
From: markt <markt>
Date: Sat, 5 May 2007 22:21:35 +0000
Subject: fixing return value checks for utf8 strings

---
 src/FbTk/FbWindow.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index 926abfd..1dba746 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -465,7 +465,7 @@ void FbWindow::reparent(const FbWindow &parent, int x, int y, bool continuing) {
 std::string FbWindow::textProperty(Atom property) const {
     XTextProperty text_prop;
     char ** stringlist = 0;
-    int count;
+    int count = 0;
     std::string ret;
 
     static Atom m_utf8string = XInternAtom(display(), "UTF8_STRING", False);
@@ -492,7 +492,8 @@ std::string FbWindow::textProperty(Atom property) const {
         ret = stringlist[0];
     } else {
         // still returns a "StringList" despite the different name
-        if (XmbTextPropertyToTextList(display(), &text_prop, &stringlist, &count) == 0 || count == 0)
+        XmbTextPropertyToTextList(display(), &text_prop, &stringlist, &count);
+        if (count == 0)
             return "";
 
         ret = FbStringUtil::LocaleStrToFb(stringlist[0]);
-- 
cgit v0.11.2