From kde-commits  Mon Dec 19 20:48:35 2005
From: Adriaan de Groot <groot () kde ! org>
Date: Mon, 19 Dec 2005 20:48:35 +0000
To: kde-commits
Subject: branches/KDE/3.5/kdenetwork/kopete/kopete/chatwindow
Message-Id: <1135025315.019699.19126.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=113502532328454

SVN commit 489819 by adridg:

Using C99-style boolean operator keywords is a no-no for gcc 2.95 compatibility.

CCMAIL: kde@freebsd.org


 M  +1 -1      emoticonselector.cpp  


--- branches/KDE/3.5/kdenetwork/kopete/kopete/chatwindow/emoticonselector.cpp #489818:489819
@@ -47,7 +47,7 @@
     // Some of the custom icons are rather large
     // so lets limit them to a maximum size for this display panel
     //
-    if (p.width() > 32 or p.height() > 32)
+    if (p.width() > 32 || p.height() > 32)
         p.resize(32, 32);
 	setMinimumSize(p.size());
 }