From 234fdf07ba1ec3e25de2fb2bee3f382113d923ee Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 19 May 2011 22:50:15 +0200 Subject: [PATCH] * Renamed jreen/ to jabber/ --- src/sip/CMakeLists.txt | 7 +------ src/sip/{jreen => jabber}/CMakeLists.txt | 0 src/sip/{jreen => jabber}/avatarmanager.cpp | 0 src/sip/{jreen => jabber}/avatarmanager.h | 0 src/sip/{jreen => jabber}/configwidget.ui | 0 .../{jreen => jabber}/googlewrapper/CMakeLists.txt | 0 .../{jreen => jabber}/googlewrapper/gmail-logo.png | Bin .../googlewrapper/googlewrapper.cpp | 0 .../{jreen => jabber}/googlewrapper/googlewrapper.h | 2 +- .../{jreen => jabber}/googlewrapper/resources.qrc | 0 src/sip/{jreen => jabber}/jabber-icon.png | Bin src/sip/{jreen => jabber}/jabber.cpp | 0 src/sip/{jreen => jabber}/jabber.h | 0 src/sip/{jreen => jabber}/resources.qrc | 0 src/sip/{jreen => jabber}/tomahawksipmessage.cpp | 0 src/sip/{jreen => jabber}/tomahawksipmessage.h | 0 .../{jreen => jabber}/tomahawksipmessagefactory.cpp | 0 .../{jreen => jabber}/tomahawksipmessagefactory.h | 0 src/sip/{jreen => jabber}/xmlconsole.cpp | 0 src/sip/{jreen => jabber}/xmlconsole.h | 0 src/sip/{jreen => jabber}/xmlconsole.ui | 0 21 files changed, 2 insertions(+), 7 deletions(-) rename src/sip/{jreen => jabber}/CMakeLists.txt (100%) rename src/sip/{jreen => jabber}/avatarmanager.cpp (100%) rename src/sip/{jreen => jabber}/avatarmanager.h (100%) rename src/sip/{jreen => jabber}/configwidget.ui (100%) rename src/sip/{jreen => jabber}/googlewrapper/CMakeLists.txt (100%) rename src/sip/{jreen => jabber}/googlewrapper/gmail-logo.png (100%) rename src/sip/{jreen => jabber}/googlewrapper/googlewrapper.cpp (100%) rename src/sip/{jreen => jabber}/googlewrapper/googlewrapper.h (98%) rename src/sip/{jreen => jabber}/googlewrapper/resources.qrc (100%) rename src/sip/{jreen => jabber}/jabber-icon.png (100%) rename src/sip/{jreen => jabber}/jabber.cpp (100%) rename src/sip/{jreen => jabber}/jabber.h (100%) rename src/sip/{jreen => jabber}/resources.qrc (100%) rename src/sip/{jreen => jabber}/tomahawksipmessage.cpp (100%) rename src/sip/{jreen => jabber}/tomahawksipmessage.h (100%) rename src/sip/{jreen => jabber}/tomahawksipmessagefactory.cpp (100%) rename src/sip/{jreen => jabber}/tomahawksipmessagefactory.h (100%) rename src/sip/{jreen => jabber}/xmlconsole.cpp (100%) rename src/sip/{jreen => jabber}/xmlconsole.h (100%) rename src/sip/{jreen => jabber}/xmlconsole.ui (100%) diff --git a/src/sip/CMakeLists.txt b/src/sip/CMakeLists.txt index 3e547058a..bc996dccb 100644 --- a/src/sip/CMakeLists.txt +++ b/src/sip/CMakeLists.txt @@ -1,10 +1,5 @@ -# only build one of them, if ENABLE_JREEN is true, GLOOX_FOUND is automatically set to "false" -IF( GLOOX_FOUND AND NOT LIBJREEN_FOUND ) - ADD_SUBDIRECTORY( jabber ) -ENDIF( GLOOX_FOUND AND NOT LIBJREEN_FOUND ) - IF( LIBJREEN_FOUND ) - ADD_SUBDIRECTORY( jreen ) + ADD_SUBDIRECTORY( jabber ) ENDIF( LIBJREEN_FOUND ) ADD_SUBDIRECTORY( twitter ) diff --git a/src/sip/jreen/CMakeLists.txt b/src/sip/jabber/CMakeLists.txt similarity index 100% rename from src/sip/jreen/CMakeLists.txt rename to src/sip/jabber/CMakeLists.txt diff --git a/src/sip/jreen/avatarmanager.cpp b/src/sip/jabber/avatarmanager.cpp similarity index 100% rename from src/sip/jreen/avatarmanager.cpp rename to src/sip/jabber/avatarmanager.cpp diff --git a/src/sip/jreen/avatarmanager.h b/src/sip/jabber/avatarmanager.h similarity index 100% rename from src/sip/jreen/avatarmanager.h rename to src/sip/jabber/avatarmanager.h diff --git a/src/sip/jreen/configwidget.ui b/src/sip/jabber/configwidget.ui similarity index 100% rename from src/sip/jreen/configwidget.ui rename to src/sip/jabber/configwidget.ui diff --git a/src/sip/jreen/googlewrapper/CMakeLists.txt b/src/sip/jabber/googlewrapper/CMakeLists.txt similarity index 100% rename from src/sip/jreen/googlewrapper/CMakeLists.txt rename to src/sip/jabber/googlewrapper/CMakeLists.txt diff --git a/src/sip/jreen/googlewrapper/gmail-logo.png b/src/sip/jabber/googlewrapper/gmail-logo.png similarity index 100% rename from src/sip/jreen/googlewrapper/gmail-logo.png rename to src/sip/jabber/googlewrapper/gmail-logo.png diff --git a/src/sip/jreen/googlewrapper/googlewrapper.cpp b/src/sip/jabber/googlewrapper/googlewrapper.cpp similarity index 100% rename from src/sip/jreen/googlewrapper/googlewrapper.cpp rename to src/sip/jabber/googlewrapper/googlewrapper.cpp diff --git a/src/sip/jreen/googlewrapper/googlewrapper.h b/src/sip/jabber/googlewrapper/googlewrapper.h similarity index 98% rename from src/sip/jreen/googlewrapper/googlewrapper.h rename to src/sip/jabber/googlewrapper/googlewrapper.h index 7cb89f165..09f2dc8e0 100644 --- a/src/sip/jreen/googlewrapper/googlewrapper.h +++ b/src/sip/jabber/googlewrapper/googlewrapper.h @@ -19,7 +19,7 @@ #ifndef GOOGLEWRAPPER_H #define GOOGLEWRAPPER_H -#include "sip/jreen/jabber.h" +#include "sip/jabber/jabber.h" class SIPDLLEXPORT GoogleWrapperFactory : public SipPluginFactory { diff --git a/src/sip/jreen/googlewrapper/resources.qrc b/src/sip/jabber/googlewrapper/resources.qrc similarity index 100% rename from src/sip/jreen/googlewrapper/resources.qrc rename to src/sip/jabber/googlewrapper/resources.qrc diff --git a/src/sip/jreen/jabber-icon.png b/src/sip/jabber/jabber-icon.png similarity index 100% rename from src/sip/jreen/jabber-icon.png rename to src/sip/jabber/jabber-icon.png diff --git a/src/sip/jreen/jabber.cpp b/src/sip/jabber/jabber.cpp similarity index 100% rename from src/sip/jreen/jabber.cpp rename to src/sip/jabber/jabber.cpp diff --git a/src/sip/jreen/jabber.h b/src/sip/jabber/jabber.h similarity index 100% rename from src/sip/jreen/jabber.h rename to src/sip/jabber/jabber.h diff --git a/src/sip/jreen/resources.qrc b/src/sip/jabber/resources.qrc similarity index 100% rename from src/sip/jreen/resources.qrc rename to src/sip/jabber/resources.qrc diff --git a/src/sip/jreen/tomahawksipmessage.cpp b/src/sip/jabber/tomahawksipmessage.cpp similarity index 100% rename from src/sip/jreen/tomahawksipmessage.cpp rename to src/sip/jabber/tomahawksipmessage.cpp diff --git a/src/sip/jreen/tomahawksipmessage.h b/src/sip/jabber/tomahawksipmessage.h similarity index 100% rename from src/sip/jreen/tomahawksipmessage.h rename to src/sip/jabber/tomahawksipmessage.h diff --git a/src/sip/jreen/tomahawksipmessagefactory.cpp b/src/sip/jabber/tomahawksipmessagefactory.cpp similarity index 100% rename from src/sip/jreen/tomahawksipmessagefactory.cpp rename to src/sip/jabber/tomahawksipmessagefactory.cpp diff --git a/src/sip/jreen/tomahawksipmessagefactory.h b/src/sip/jabber/tomahawksipmessagefactory.h similarity index 100% rename from src/sip/jreen/tomahawksipmessagefactory.h rename to src/sip/jabber/tomahawksipmessagefactory.h diff --git a/src/sip/jreen/xmlconsole.cpp b/src/sip/jabber/xmlconsole.cpp similarity index 100% rename from src/sip/jreen/xmlconsole.cpp rename to src/sip/jabber/xmlconsole.cpp diff --git a/src/sip/jreen/xmlconsole.h b/src/sip/jabber/xmlconsole.h similarity index 100% rename from src/sip/jreen/xmlconsole.h rename to src/sip/jabber/xmlconsole.h diff --git a/src/sip/jreen/xmlconsole.ui b/src/sip/jabber/xmlconsole.ui similarity index 100% rename from src/sip/jreen/xmlconsole.ui rename to src/sip/jabber/xmlconsole.ui