Merge branch 'master' of git@git.quassel-irc.org:quassel

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc14806..bf34d35 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ if(ansi)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi")
 endif(ansi)
 
-set(QT_MIN_VERSION "4.4.0")
+set(QT_MIN_VERSION "4.3.0")
 
 # By default, we build all binaries
 if(NOT DEFINED BUILD)
@@ -188,3 +188,25 @@ if(APPLE)
                      COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makebundle.py
                              ${CMAKE_SOURCE_DIR} "Quassel" quassel)
 endif(APPLE)
+
+# Install rules
+if(BUILD_CORE)
+  install(TARGETS quasselcore
+          RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+endif(BUILD_CORE)
+
+if(BUILD_QTCLIENT)
+  install(TARGETS quasselclient
+          RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+
+  install(FILES quasselclient.desktop
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+endif(BUILD_QTCLIENT)
+
+if(BUILD_MONO)
+  install(TARGETS quassel
+          RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+
+  install(FILES quassel.desktop
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+endif(BUILD_MONO)

diff --git a/README.cmake b/INSTALL.cmake
similarity index 100%
rename from README.cmake
rename to INSTALL.cmake

diff --git a/quasselclient.desktop b/quasselclient.desktop
new file mode 100644 (file)
index 0000000..887082a
--- /dev/null
+++ b/quasselclient.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Quassel IRC
+GenericName=IRC Client
+Comment=Distributed IRC client with central core component
+Icon=quassel
+TryExec=quasselclient
+Exec=quasselclient
+Categories=Qt;Network;Chat;IRCClient;

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index c020424..0cb9fac 100644 (file)
--- a/src/client/buffer.cpp
+++ b/src/client/buffer.cpp
@@ -84,7 +84,7 @@ void Buffer::setVisible(bool visible) {
 void Buffer::setLastSeenMsg(const MsgId &msgId) {
   // qDebug() << "want to set lastSeen:" << bufferInfo() << seen << lastSeen();
   const MsgId oldLastSeen = lastSeenMsg();
-  if(!oldLastSeen.isValid() || msgId.isValid() && msgId > oldLastSeen) {
+  if(!oldLastSeen.isValid() || (msgId.isValid() && msgId > oldLastSeen)) {
     //qDebug() << "setting:" << bufferInfo().bufferName() << seen;
     _lastSeenMsg = msgId;
     Client::setBufferLastSeenMsg(bufferInfo().bufferId(), msgId);

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index 93d73bb..be5c95b 100644 (file)
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -186,8 +186,8 @@ void ClientSyncer::coreSocketDisconnected() {
 
 void ClientSyncer::clientInitAck(const QVariantMap &msg) {
   // Core has accepted our version info and sent its own. Let's see if we accept it as well...
-  if(msg.contains("CoreBuild") && msg["CoreBuild"].toUInt() < 732  // legacy!
-    || !msg.contains("CoreBuild") && msg["ProtocolVersion"].toUInt() < Global::clientNeedsProtocol) {
+  if((msg.contains("CoreBuild") && msg["CoreBuild"].toUInt() < 732)  // legacy!
+     || (!msg.contains("CoreBuild") && msg["ProtocolVersion"].toUInt() < Global::clientNeedsProtocol)) {
     emit connectionError(tr("<b>The Quassel Core you are trying to connect to is too old!</b><br>"
         "Need at least core/client protocol v%1 to connect.").arg(Global::clientNeedsProtocol));
     disconnectFromCore();

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index bd2d8a5..d09605f 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -255,7 +255,7 @@ void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
   UserCategoryItem *categoryItem = 0;
   for(int i = 0; i < childCount(); i++) {
     categoryItem = qobject_cast<UserCategoryItem *>(child(i));
-    if(success = categoryItem->removeUser(ircUser)) {
+    if((success = categoryItem->removeUser(ircUser))) {
       if(categoryItem->childCount() == 0)
        removeChild(i);
       break;

diff --git a/src/core/core.cpp b/src/core/core.cpp
index ebfe491..f9f8673 100644 (file)
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -386,8 +386,8 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
     QVariantMap reply;
 
     // Just version information -- check it!
-    if(msg.contains("ClientBuild") && msg["ClientBuild"].toUInt() < 732
-       || !msg.contains("ClientBuild") && msg["ProtocolVersion"].toUInt() < Global::coreNeedsProtocol) {
+    if((msg.contains("ClientBuild") && msg["ClientBuild"].toUInt() < 732)
+       || (!msg.contains("ClientBuild") && msg["ProtocolVersion"].toUInt() < Global::coreNeedsProtocol)) {
       reply["MsgType"] = "ClientInitReject";
       reply["Error"] = tr("<b>Your Quassel Client is too old!</b><br>"
       "This core needs at least client/core protocol version %1.<br>"

diff --git a/src/qtui/chatwidget.cpp b/src/qtui/chatwidget.cpp
index f386b8e..8a70a6d 100644 (file)
--- a/src/qtui/chatwidget.cpp
+++ b/src/qtui/chatwidget.cpp
@@ -628,7 +628,7 @@ void ChatWidget::viewportChanged(int newPos) {
     if(buffer->contents().isEmpty())
       return;
     MsgId msgId = buffer->contents().first()->msgId();
-    if(!lastBacklogOffset.isValid() || msgId < lastBacklogOffset && lastBacklogSize + REQUEST_COUNT <= buffer->contents().count()) {
+    if(!lastBacklogOffset.isValid() || (msgId < lastBacklogOffset && lastBacklogSize + REQUEST_COUNT <= buffer->contents().count())) {
       Client::backlogManager()->requestBacklog(bufferId, REQUEST_COUNT, msgId.toInt());
       lastBacklogOffset = msgId;
       lastBacklogSize = buffer->contents().size();

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index 396922d..0adf8eb 100644 (file)
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -102,7 +102,7 @@ void BufferViewFilter::configInitialized() {
 
 Qt::ItemFlags BufferViewFilter::flags(const QModelIndex &index) const {
   Qt::ItemFlags flags = mapToSource(index).flags();
-  if(_config && index == QModelIndex() || index.parent() == QModelIndex())
+  if(_config && (index == QModelIndex() || index.parent() == QModelIndex()))
     flags |= Qt::ItemIsDropEnabled;
   return flags;
 }