admin/acinclude.m4.in      |    1 +

 src/Makefile.am            |    2 +-

 src/comment.cpp            |    2 +-

 src/fileimporterbibtex.cpp |    5 +++--

 src/kbibtex.desktop        |    2 ++

 src/mergeelements.cpp      |    2 +-

 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in

index 27476d4..259317a 100644

--- a/admin/acinclude.m4.in

+++ b/admin/acinclude.m4.in

@@ -2085,6 +2085,7 @@ if test $kde_qtver = 3; then

    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")

    AC_SUBST(LIB_KDNSSD, "-lkdnssd")

    AC_SUBST(LIB_KUNITTEST, "-lkunittest")

+   AC_SUBST(LIB_KTEXTEDITOR, "-lktexteditor")

 # these are for backward compatibility

    AC_SUBST(LIB_KSYCOCA, "-lkio")

    AC_SUBST(LIB_KFILE, "-lkio")

diff --git a/src/Makefile.am b/src/Makefile.am

index ca217b5..1480e09 100644

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -74,7 +74,7 @@ libkbibtexpart_la_SOURCES = comment.cpp fileexporterdocbook5.cpp commentwidget.c

 	xsltransform.cpp webquerysciencedirect.cpp findduplicates.cpp settingsz3950.cpp \

 	messagehandler.cpp iso6937converter.cpp iso5426converter.cpp

 libkbibtexpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)

-libkbibtexpart_la_LIBADD  = $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KUTILS) $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIBYAZ_LIBS) $(LIBBIBUTILS_LIBS) -lkatepartinterfaces

+libkbibtexpart_la_LIBADD  = $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KUTILS) $(LIB_KDEUI) $(LIB_KTEXTEDITOR) $(LIB_KDECORE) $(LIB_QT) $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIBYAZ_LIBS) $(LIBBIBUTILS_LIBS) -lkatepartinterfaces

 # this is where the desktop file will go

 partdesktopdir   = $(kde_servicesdir)

diff --git a/src/comment.cpp b/src/comment.cpp

index 1ee33df..3cd8fac 100644

--- a/src/comment.cpp

+++ b/src/comment.cpp

@@ -82,7 +82,7 @@ namespace BibTeX

             }

             /** return success depending on filter type and number of hits */

-            return ( filterType == ftAnyWord && hits > 0 || filterType == ftEveryWord && hits == words.count() );

+            return ( (filterType == ftAnyWord) && (hits > 0) || (filterType == ftEveryWord) && (hits == words.count()) );

         }

     }

diff --git a/src/fileimporterbibtex.cpp b/src/fileimporterbibtex.cpp

index 069420c..6bb6fe8 100644

--- a/src/fileimporterbibtex.cpp

+++ b/src/fileimporterbibtex.cpp

@@ -31,6 +31,7 @@

 #include <element.h>

 #include <encoderlatex.h>

 #include <value.h>

+#include <iconv.h>

 #include "fileimporterbibtex.h"

@@ -77,13 +78,13 @@ namespace BibTeX

             {

                 QString problematic = QString( m_lineBuffer ).mid( max( 0, m_lineBufferSize - encLen - 15 ), 30 );

                 if ( problematic.isNull() || problematic.isEmpty() ) problematic = QString( m_lineBuffer );

-                qDebug( "iconv resulted in error code %i for source encoding %s, maybe file is in different encoding? Problem is somewhere here: \"%s\"", result, encodingFrom, problematic.latin1() );

+                qDebug( "iconv resulted in error code %zi for source encoding %s, maybe file is in different encoding? Problem is somewhere here: \"%s\"", result, encodingFrom, problematic.latin1() );

                 encodingOk = false;

                 break;

             }

             if ( rawLen > 0 )

             {

-                qDebug( "iconv could not convert complete string, only %i out of %i chars", len - rawLen, len );

+                qDebug( "iconv could not convert complete string, only %zi out of %i chars", len - rawLen, len );

                 encodingOk = false;

                 break;

             }

diff --git a/src/kbibtex.desktop b/src/kbibtex.desktop

index 5c9d9c3..6d80382 100644

--- a/src/kbibtex.desktop

+++ b/src/kbibtex.desktop

@@ -6,6 +6,8 @@ Type=Application

 X-DocPath=kbibtex/kbibtex.html

 Comment=A BibTeX editor for KDE

 Comment[de]=Ein BibTeX-Editor für KDE

+Comment[ru]=Редактор BibTeX для KDE

+Comment[uk]=Редактор BibTeX для KDE

 MimeType=text/x-bibtex;

 Categories=Qt;KDE;Office;

 X-KDE-HasTempFileOption=true

diff --git a/src/mergeelements.cpp b/src/mergeelements.cpp

index dff6307..74175ff 100644

--- a/src/mergeelements.cpp

+++ b/src/mergeelements.cpp

@@ -619,7 +619,7 @@ namespace KBibTeX

                         for ( QListViewItem *cur = typeController->firstChild(); isNew && cur != NULL; cur = cur->nextSibling() )

                         {

                             MergeEntriesAlternativesEntryType *meat = dynamic_cast<MergeEntriesAlternativesEntryType*>( cur );

-                            isNew = type == BibTeX::Entry::etUnknown && meat->typeString != typeString || meat->type != type;

+                            isNew = (type == BibTeX::Entry::etUnknown) && (meat->typeString != typeString) || (meat->type != type);

                         }

                         if ( isNew )

                         {