Changes - j0ke.net Open Build Service

Changes of Revision 11

[-] [+]	Changed	sim-0.9.5.tar.bz2/CMakeLists.txt
@@ -51,20 +51,20 @@ IF(NOT WIN32) INCLUDE(FindKDE3) IF(KDE3_FOUND) - OPTION(USE_KDE3 "Use kde3 integration" YES) - IF(USE_KDE3) + OPTION(ENABLE_KDE3 "Use kde3 integration" YES) + IF(ENABLE_KDE3) INCLUDE_DIRECTORIES(${KDE3_INCLUDE_DIRS}) LINK_DIRECTORIES(${KDE3_LIB_DIR}) - ENDIF(USE_KDE3) + ENDIF(ENABLE_KDE3) ENDIF(KDE3_FOUND) ENDIF(NOT WIN32) # do config checks INCLUDE(ConfigureChecks.cmake) -MACRO_BOOL_TO_01(OPENSSL_FOUND USE_OPENSSL) +MACRO_BOOL_TO_01(OPENSSL_FOUND ENABLE_OPENSSL) MACRO_BOOL_TO_01(X11_FOUND HAVE_X) -MACRO_BOOL_TO_01(USE_KDE3 USE_KDE) +MACRO_BOOL_TO_01(ENABLE_KDE3 USE_KDE) # development or release builds OPTION(DEV_BUILD "Build development version" YES)
[-] [+]	Changed	sim-0.9.5.tar.bz2/Makefile.in ^
@@ -888,7 +888,7 @@ .NOEXPORT: #>+ 2 -KDE_DIST=stamp-h.in config.h.cmake subdirs ALL_BUILD.vcproj Makefile.in configure.files sim.sln TODO.CMake config.h.in sim.vcproj configure.in altlinux.spec svn-ignore.sh aclocal.m4 ConfigureChecks.cmake jisp-resources.txt configure acinclude.m4 CMakeLists.txt Makefile.am +KDE_DIST=config.h.cmake subdirs ALL_BUILD.vcproj Makefile.in configure.files sim.sln TODO.CMake config.h.in sim.vcproj configure.in altlinux.spec svn-ignore.sh aclocal.m4 ConfigureChecks.cmake jisp-resources.txt configure acinclude.m4 CMakeLists.txt Makefile.am #>+ 2 docs-am:
[-] [+]	Changed	sim-0.9.5.tar.bz2/acinclude.m4 ^
@@ -5864,7 +5864,7 @@ ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref" if test "$have_ssl" = "yes"; then - AC_DEFINE(USE_OPENSSL, 1, [Use OpenSSL]) + AC_DEFINE(ENABLE_OPENSSL, 1, [Use OpenSSL]) fi ssl_libraries="$ac_ssl_libraries"
[-] [+]	Changed	sim-0.9.5.tar.bz2/admin/acinclude.m4.in ^
@@ -5864,7 +5864,7 @@ ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref" if test "$have_ssl" = "yes"; then - AC_DEFINE(USE_OPENSSL, 1, [Use OpenSSL]) + AC_DEFINE(ENABLE_OPENSSL, 1, [Use OpenSSL]) fi ssl_libraries="$ac_ssl_libraries"
[-] [+]	Changed	sim-0.9.5.tar.bz2/altlinux.spec ^
@@ -151,7 +151,7 @@ -DCMAKE_INSTALL_PREFIX=%_prefix \ -DCMAKE_SKIP_RPATH=YES \ -DUSE_GCC_VISIBILITY=1 \ - -DUSE_KDE3=0 \ + -DENABLE_KDE3=0 \ -DSIM_FLAVOUR="-qt" %make_build %makeinstall DESTDIR=%simqtinstalldir @@ -168,7 +168,7 @@ -DCMAKE_INSTALL_PREFIX=%_prefix \ -DCMAKE_SKIP_RPATH=YES \ -DUSE_GCC_VISIBILITY=1 \ - -DUSE_KDE3=1 + -DENABLE_KDE3=1 %make_build %makeinstall DESTDIR=%siminstalldir %endif
[-] [+]	Changed	sim-0.9.5.tar.bz2/autom4te.cache/output.0 ^
@@ -38625,7 +38625,7 @@ if test "$have_ssl" = "yes"; then cat >>confdefs.h <<\_ACEOF -@%:@define USE_OPENSSL 1 +@%:@define ENABLE_OPENSSL 1 _ACEOF fi
[-] [+]	Changed	sim-0.9.5.tar.bz2/autom4te.cache/output.1 ^
@@ -38625,7 +38625,7 @@ if test "$have_ssl" = "yes"; then cat >>confdefs.h <<\_ACEOF -@%:@define USE_OPENSSL 1 +@%:@define ENABLE_OPENSSL 1 _ACEOF fi
[-] [+]	Changed	sim-0.9.5.tar.bz2/autom4te.cache/traces.0 ^
@@ -5859,7 +5859,7 @@ ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref" if test "$have_ssl" = "yes"; then - AC_DEFINE(USE_OPENSSL, 1, [Use OpenSSL]) + AC_DEFINE(ENABLE_OPENSSL, 1, [Use OpenSSL]) fi ssl_libraries="$ac_ssl_libraries" @@ -17889,10 +17889,10 @@ m4trace:configure.in:122: -1- m4_pattern_allow([^HAVE_SSL$]) m4trace:configure.in:122: -1- AH_OUTPUT([HAVE_SSL], [/* If we are going to use OpenSSL / #undef HAVE_SSL]) -m4trace:configure.in:122: -1- AC_DEFINE_TRACE_LITERAL([USE_OPENSSL]) -m4trace:configure.in:122: -1- m4_pattern_allow([^USE_OPENSSL$]) -m4trace:configure.in:122: -1- AH_OUTPUT([USE_OPENSSL], [/ Use OpenSSL / -#undef USE_OPENSSL]) +m4trace:configure.in:122: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_OPENSSL]) +m4trace:configure.in:122: -1- m4_pattern_allow([^ENABLE_OPENSSL$]) +m4trace:configure.in:122: -1- AH_OUTPUT([ENABLE_OPENSSL], [/ Use OpenSSL / +#undef ENABLE_OPENSSL]) m4trace:configure.in:122: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OLD_SSL_API]) m4trace:configure.in:122: -1- m4_pattern_allow([^HAVE_OLD_SSL_API$]) m4trace:configure.in:122: -1- AH_OUTPUT([HAVE_OLD_SSL_API], [/ Define if you have OpenSSL < 0.9.6 */
[-] [+]	Changed	sim-0.9.5.tar.bz2/autom4te.cache/traces.1 ^
@@ -3905,10 +3905,10 @@ m4trace:configure.in:122: -1- m4_pattern_allow([^HAVE_SSL$]) m4trace:configure.in:122: -1- AH_OUTPUT([HAVE_SSL], [/* If we are going to use OpenSSL / #undef HAVE_SSL]) -m4trace:configure.in:122: -1- AC_DEFINE_TRACE_LITERAL([USE_OPENSSL]) -m4trace:configure.in:122: -1- m4_pattern_allow([^USE_OPENSSL$]) -m4trace:configure.in:122: -1- AH_OUTPUT([USE_OPENSSL], [/ Use OpenSSL / -#undef USE_OPENSSL]) +m4trace:configure.in:122: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_OPENSSL]) +m4trace:configure.in:122: -1- m4_pattern_allow([^ENABLE_OPENSSL$]) +m4trace:configure.in:122: -1- AH_OUTPUT([ENABLE_OPENSSL], [/ Use OpenSSL / +#undef ENABLE_OPENSSL]) m4trace:configure.in:122: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OLD_SSL_API]) m4trace:configure.in:122: -1- m4_pattern_allow([^HAVE_OLD_SSL_API$]) m4trace:configure.in:122: -1- AH_OUTPUT([HAVE_OLD_SSL_API], [/ Define if you have OpenSSL < 0.9.6 */
[-] [+]	Changed	sim-0.9.5.tar.bz2/cmake/SimPlugins.cmake ^
@@ -30,13 +30,13 @@ GET_FILENAME_COMPONENT(plugin ${_cur_dir} NAME_WE) STRING(TOUPPER ${plugin} uc_plugin) - OPTION(USE_PLUGIN_${uc_plugin} "Use plugin ${plugin}" ON) + OPTION(ENABLE_PLUGIN_${uc_plugin} "Enable plugin ${plugin}" ON) # all plugins starting with _ are not optional! IF(${uc_plugin} MATCHES "^_.$") ## prepend SET(SIM_PLUGINS ${plugin} ${SIM_PLUGINS}) - MARK_AS_ADVANCED(USE_${uc_plugin}) + MARK_AS_ADVANCED(ENABLE_PLUGIN_${uc_plugin}) ELSE(${uc_plugin} MATCHES "^_.$") ## append SET(SIM_PLUGINS ${SIM_PLUGINS} ${plugin}) @@ -50,11 +50,11 @@ MACRO(SIM_INCLUDE_PLUGINS) FOREACH(plugin ${SIM_PLUGINS}) STRING(TOUPPER ${plugin} uc_plugin) - IF(USE_PLUGIN_${uc_plugin}) - MESSAGE(STATUS "using plugin " ${plugin}) + IF(ENABLE_PLUGIN_${uc_plugin}) + MESSAGE(STATUS "Using plugin " ${plugin}) ADD_SUBDIRECTORY(plugins/${plugin}) - ELSE(USE_PLUGIN_${uc_plugin}) - MESSAGE(STATUS "skipping plugin " ${plugin}) - ENDIF(USE_PLUGIN_${uc_plugin}) + ELSE(ENABLE_PLUGIN_${uc_plugin}) + MESSAGE(STATUS "Skipping plugin " ${plugin}) + ENDIF(ENABLE_PLUGIN_${uc_plugin}) ENDFOREACH(plugin ${SIM_PLUGINS}) ENDMACRO(SIM_INCLUDE_PLUGINS)
[-] [+]	Changed	sim-0.9.5.tar.bz2/config.h.cmake ^
@@ -29,7 +29,7 @@ #cmakedefine HAVE_TM_GMTOFF 1 // libraries -#cmakedefine USE_OPENSSL 1 +#cmakedefine ENABLE_OPENSSL 1 #cmakedefine HAVE_X 1 #cmakedefine USE_KDE 1
[-] [+]	Changed	sim-0.9.5.tar.bz2/config.h.in ^
@@ -3,6 +3,9 @@ /* CVS build / #undef CVS_BUILD +/ Use OpenSSL / +#undef ENABLE_OPENSSL + / Define to 1 if you have the `alarm' function. / #undef HAVE_ALARM @@ -304,9 +307,6 @@ / Use KDE / #undef USE_KDE -/ Use OpenSSL / -#undef USE_OPENSSL - / Version number of package */ #undef VERSION
[-] [+]	Changed	sim-0.9.5.tar.bz2/configure ^
@@ -38625,7 +38625,7 @@ if test "$have_ssl" = "yes"; then cat >>confdefs.h <<\_ACEOF -#define USE_OPENSSL 1 +#define ENABLE_OPENSSL 1 _ACEOF fi
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/icq/icqclient.cpp ^
@@ -2875,7 +2875,7 @@ sendMTN(screen(data), msg->type() == MessageTypingStart ? ICQ_MTN_START : ICQ_MTN_FINISH); delete msg; return true; -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL case MessageOpenSecure: { if (data == NULL) return false; @@ -2959,7 +2959,7 @@ (data->Uin.toULong() \|\| hasCap(data, CAP_AIM_SENDFILE)); case MessageWarning: return data && (data->Uin.toULong() == 0); -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL case MessageOpenSecure: if ((data == NULL) \|\| ((data->Status.toULong() & 0xFFFF) == ICQ_STATUS_OFFLINE)) return false;
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/icq/icqclient.h ^
@@ -924,7 +924,7 @@ QValueList<SendDirectMsg> m_queue; QString name(); QString m_name; -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL void secureConnect(); void secureListen(); void secureStop(bool bShutdown);
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/icq/icqdirect.cpp ^
@@ -449,7 +449,7 @@ { m_channel = PLUGIN_NULL; m_state = WaitLogin; -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL m_ssl = NULL; #endif } @@ -460,7 +460,7 @@ m_state = None; m_channel = channel; m_port = (unsigned short)(data->Port.toULong()); -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL m_ssl = NULL; #endif } @@ -482,14 +482,14 @@ m_data->DirectPluginStatus.clear(); break; } -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL secureStop(false); #endif } bool DirectClient::isSecure() { -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL return m_ssl && m_ssl->connected(); #else return false; @@ -706,11 +706,11 @@ case ICQ_MSGxSECURExOPEN: case ICQ_MSGxSECURExCLOSE: msg_str = QString::null; -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL msg_str = "1"; #endif sendAck(seq, type, msgFlags, msg_str); -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL if (type == ICQ_MSGxSECURExOPEN){ secureListen(); }else{ @@ -832,7 +832,7 @@ id.id_l = seq; Message *m = m_client->parseMessage(type, m_client->screen(m_data), msg_str, m_socket->readBuffer(), id, 0); switch (msg->type()){ -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL case MessageCloseSecure: secureStop(true); break; @@ -1437,7 +1437,7 @@ processMsgQueue(); } -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL class ICQ_SSLClient : public SSLClient {
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/icq/icqvarious.cpp ^
@@ -1557,13 +1557,13 @@ error = QString::null; l = msg->getLeaf("network"); if (l) - network = QString(l->getValue()); + network = QString(l->getValue().c_str()); }else{ XmlBranch param = msg->getBranch("param"); if (param){ XmlLeaf l = param->getLeaf("error"); if (l) - error = QString(l->getValue()); + error = QString(l->getValue().c_str()); } } }
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/jabber/httppoll.cpp ^
@@ -53,7 +53,7 @@ : m_url(url) { m_cookie = "0"; -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL /* Buffer k; for (unsigned i = 0; i < 48; i++){ @@ -73,7 +73,7 @@ QString JabberHttpPool::getKey() { -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL if (m_key.isEmpty()){ m_key = m_seed; return m_key; @@ -106,7 +106,7 @@ return; Buffer packet = new Buffer; packet << (const char)m_cookie.local8Bit().data(); -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL packet << ";" << (const char)getKey().local8Bit().data(); #endif packet << ",";
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/jabber/jabber_auth.cpp ^
@@ -86,7 +86,7 @@ m_requests.push_back(req); } -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL void JabberClient::auth_digest() {
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/jabber/jabber_ssl.cpp ^
@@ -17,7 +17,7 @@ #include "simapi.h" -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL #include "jabber_ssl.h"
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/jabber/jabber_ssl.h ^
@@ -21,7 +21,7 @@ #include "simapi.h" #include "socket.h" -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL class JabberSSL : public SIM::SSLClient {
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/jabber/jabberclient.cpp ^
@@ -271,7 +271,7 @@ connected(); return; } -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL m_bSSL = true; SSLClient *ssl = new JabberSSL(socket()->socket()); socket()->setSocket(ssl); @@ -902,7 +902,7 @@ if (getRegister()){ auth_register(); }else{ -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL if (getUsePlain()){ auth_plain(); }else{
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/jabber/jabberclient.h ^
@@ -457,7 +457,7 @@ void processList(); void auth_plain(); -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL void auth_digest(); #endif void auth_register();
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/jabber/jabberconfig.cpp ^
@@ -57,7 +57,7 @@ edtServer1->setText(i18n("jabber.org")); edtPort1->setValue(m_client->getPort()); } -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL chkSSL->setChecked(m_client->getUseSSL()); chkSSL1->setChecked(m_client->getUseSSL()); chkPlain->setChecked(m_client->getUsePlain()); @@ -132,7 +132,7 @@ m_client->setPassword(edtPasswd->text()); m_client->setRegister(chkRegister->isChecked()); } -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL if (m_bConfig){ m_client->setUseSSL(chkSSL1->isChecked()); }else{
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/osd/osd.cpp ^
@@ -154,6 +154,7 @@ ePlugin.process(); const pluginInfo info = ePlugin.info(); core = static_cast<CorePlugin>(info->plugin); + bHaveUnreadMessages=false; } OSDPlugin::~OSDPlugin() @@ -546,9 +547,12 @@ } - if (core->getManualStatus()==STATUS_NA && data->EnableCapsLockFlash.toBool()) + if ( core->getManualStatus()==STATUS_NA && + data->EnableCapsLockFlash.toBool() && + ! this->running() + ) + this->start(); //Start flashing the CapsLock if enabled - text = i18n("%1 from %2") .arg(text) .arg(contact->getName()); if (msg_text.isEmpty()) break; @@ -576,7 +580,7 @@ } void OSDPlugin::run(){ - while ( core->unread.size()>0 ) { + while ( bHaveUnreadMessages ) { flashCapsLockLED(!bCapsState); #ifdef WIN32 @@ -721,6 +725,8 @@ if (data == NULL) break; osd.contact = msg->contact(); + if (! core->unread.empty()) + bHaveUnreadMessages=true; if (msg->type() == MessageStatus) { StatusMessage smsg = (StatusMessage)msg; switch (smsg->getStatus()) { @@ -776,6 +782,8 @@ if (data == NULL) break; osd.contact = msg->contact(); + if (core->unread.empty()) + bHaveUnreadMessages=false; if (msg->type() == MessageStatus) { StatusMessage smsg = (StatusMessage)msg; switch (smsg->getStatus()) {
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/osd/osd.h ^
@@ -141,6 +141,8 @@ QWidget m_osd; QTimer m_timer; bool bCapsState; + bool bHaveUnreadMessages; // Should use this flag in OSDPlugin::run instead of core->unread.size() + // see pacth #2304 for more info. }; #endif
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/sound/CMakeLists.txt ^
@@ -34,3 +34,24 @@ INSTALL(FILES sounds/system.wav DESTINATION ${SIM_SOUND_DIR}) INSTALL(FILES sounds/url.wav DESTINATION ${SIM_SOUND_DIR}) INSTALL(FILES sounds/vip-online.wav DESTINATION ${SIM_SOUND_DIR}) + +# install new sounds with known licence +INSTALL(FILES sounds/added.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/alert.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/auth.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/authrequest.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/contacts.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/contactrequest.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/deleted.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/error.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/file.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/filedone.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/mailpager.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/message.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/msgsent.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/refused.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/sms.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/startup.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/url.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/vip-online.ogg DESTINATION ${SIM_SOUND_DIR}) +INSTALL(FILES sounds/web.ogg DESTINATION ${SIM_SOUND_DIR})
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/spell/CMakeLists.txt ^
@@ -1,4 +1,4 @@ -IF(ASPELL_FOUND AND NOT USE_KDE3) +IF(ASPELL_FOUND AND NOT ENABLE_KDE3) ################# # spell library # @@ -42,10 +42,10 @@ SIM_ADD_PLUGIN(spell) -ELSE(ASPELL_FOUND AND NOT USE_KDE3) - IF(USE_KDE3) +ELSE(ASPELL_FOUND AND NOT ENABLE_KDE3) + IF(ENABLE_KDE3) MESSAGE(STATUS "Spell plugin is disabled when building with KDE") - ELSE(USE_KDE3) + ELSE(ENABLE_KDE3) MESSAGE(STATUS "Cannot build spell plugin because aspell is missing on your system") - ENDIF(USE_KDE3) -ENDIF(ASPELL_FOUND AND NOT USE_KDE3) + ENDIF(ENABLE_KDE3) +ENDIF(ASPELL_FOUND AND NOT ENABLE_KDE3)
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/transparent/CMakeLists.txt ^
@@ -1,7 +1,7 @@ ####################### # transparent library # ####################### -IF(WIN32 OR USE_KDE3) +IF(WIN32 OR ENABLE_KDE3) SET(transparent_SRCS transparent.cpp transparentcfg.cpp @@ -22,6 +22,6 @@ ENDIF(NOT WIN32) SIM_ADD_PLUGIN(transparent) -ELSE(WIN32 OR USE_KDE3) +ELSE(WIN32 OR ENABLE_KDE3) MESSAGE(STATUS "This plugin can only be used on windows or KDE") -ENDIF(WIN32 OR USE_KDE3) +ENDIF(WIN32 OR ENABLE_KDE3)
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/transparent/transparent.cpp ^
@@ -25,6 +25,7 @@ #include "transparent.h" #include "transparentcfg.h" +#include "../floaty/floatywnd.h" //Handle Floatings #ifndef WIN32 #include "transtop.h" @@ -131,6 +132,19 @@ SetWindowLongW(main->winId(), GWL_EXSTYLE, GetWindowLongW(main->winId(), GWL_EXSTYLE) & (~WS_EX_LAYERED)); if (timer) delete timer; + + //Handle Floatings + QWidgetList list = QApplication::topLevelWidgets(); + QWidgetListIt it(list); + QWidget * w; + while ((w = it.current()) != NULL) { + if (w->inherits("FloatyWnd")){ + FloatyWnd refwnd = static_cast<FloatyWnd>(w); + SetWindowLongW(refwnd->winId(), GWL_EXSTYLE, GetWindowLongW(refwnd->winId(), GWL_EXSTYLE) & (~WS_EX_LAYERED)); + } + ++it; + } + #else if (top) delete top; @@ -212,6 +226,8 @@ void TransparentPlugin::setState() { QWidget main = getMainWindow(); + QWidgetList list = QApplication::topLevelWidgets(); + if (main == NULL) return; #ifdef WIN32 @@ -222,14 +238,41 @@ SetWindowLongW(main->winId(), GWL_EXSTYLE, GetWindowLongW(main->winId(), GWL_EXSTYLE) \| WS_EX_LAYERED); slwa(main->winId(), main->colorGroup().background().rgb(), 0, LWA_ALPHA); RedrawWindow(main->winId(), NULL, NULL, RDW_UPDATENOW); - main->setMouseTracking(true); + main->setMouseTracking(true); m_bActive = main->isActiveWindow(); m_bState = !m_bActive; + + //Handle Floatings + QWidgetListIt it(list); + QWidget w; + while ((w = it.current()) != NULL) { + if (w->inherits("FloatyWnd")){ + FloatyWnd refwnd = static_cast<FloatyWnd>(w); + refwnd->installEventFilter(this); + SetWindowLongW(refwnd->winId(), GWL_EXSTYLE, GetWindowLongW(main->winId(), GWL_EXSTYLE) \| WS_EX_LAYERED); + slwa(refwnd->winId(), refwnd->colorGroup().background().rgb(), 0, LWA_ALPHA); + RedrawWindow(refwnd->winId(), NULL, NULL, RDW_UPDATENOW); + } + ++it; + } + delete list; //Handle Floatings// } bool bNewState = m_bActive \|\| m_bHaveMouse; if (bNewState == m_bState){ BYTE d = (BYTE)(bNewState ? 255 : QMIN((100 - getTransparency()) * 256 / 100, 255)); slwa(main->winId(), main->colorGroup().background().rgb(), d, LWA_ALPHA); + + //Handle Floatings + QWidgetListIt it(list); + QWidget w; + while ((w = it.current()) != NULL) { + if (w->inherits("FloatyWnd")){ + FloatyWnd refwnd = static_cast<FloatyWnd>(w); + slwa(refwnd->winId(), refwnd->colorGroup().background().rgb(), d, LWA_ALPHA); + } + ++it; + } + delete list;//Handle Floatings// return; } m_bState = bNewState; @@ -262,6 +305,18 @@ time = timeout - time; BYTE d = (BYTE)QMIN((100 - getTransparency() * time / timeout) * 256 / 100, 255); slwa(main->winId(), main->colorGroup().background().rgb(), d, LWA_ALPHA); + + //Handle Floatings + QWidgetList list = QApplication::topLevelWidgets(); + QWidgetListIt it(list); + QWidget * w; + while ((w = it.current()) != NULL) { + if (w->inherits("FloatyWnd")){ + FloatyWnd refwnd = static_cast<FloatyWnd>(w); + slwa(refwnd->winId(), refwnd->colorGroup().background().rgb(), d, LWA_ALPHA); + } + ++it; + }//Handle Floatings// #endif }
[-] [+]	Changed	sim-0.9.5.tar.bz2/plugins/weather/weather.cpp ^
@@ -394,6 +394,7 @@ i18n("weather", "Few Snow") i18n("weather", "Scattered Snow") i18n("weather", "Ice Crystals") +i18n("weather", "Sleet") i18n("weather", "Clear") i18n("weather", "Clearing") i18n("weather", "Showers")
[-] [+]	Changed	sim-0.9.5.tar.bz2/sim/CMakeLists.txt ^
@@ -117,11 +117,11 @@ TARGET_LINK_LIBRARIES(simlib ${OPENSSL_LIBRARIES} ${OPENSSL_EAY_LIBRARIES}) endif(OPENSSL_FOUND) -IF(USE_KDE3) +IF(ENABLE_KDE3) ADD_DEFINITIONS(${KDE3_DEFINITIONS}) LINK_DIRECTORIES(${KDE3_LIB_DIR}) TARGET_LINK_LIBRARIES(simlib ${QT_AND_KDECORE_LIBS} kdeui kio) -ENDIF(USE_KDE3) +ENDIF(ENABLE_KDE3) # we need wsock32 on win32 if (WIN32)
[-] [+]	Changed	sim-0.9.5.tar.bz2/sim/fetch.cpp ^
@@ -17,7 +17,7 @@ #include "simapi.h" -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL #include <openssl/ssl.h> #include <openssl/err.h> #include <openssl/bio.h> @@ -83,7 +83,7 @@ Buffer m_data; Buffer m_postData; enum State{ -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL SSLConnect, #endif None, @@ -93,7 +93,7 @@ Redirect }; State m_state; -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL bool m_bHTTPS; #endif friend class FetchManager; @@ -341,7 +341,7 @@ #endif -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL class HTTPSClient : public SSLClient { @@ -546,7 +546,7 @@ #endif m_received = 0; m_socket = new ClientSocket(this); -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL m_bHTTPS = false; #endif QString proto, host, user, pass, uri, extra; @@ -556,14 +556,14 @@ return; } if (proto != "http"){ -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL if (proto == "https"){ m_bHTTPS = true; }else{ #endif log(L_WARN, "Unsupported protocol %s", (const char)m_uri.local8Bit()); return; -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL } #endif } @@ -695,7 +695,7 @@ void FetchClientPrivate::connect_ready() { -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL if ((m_state == None) & m_bHTTPS){ m_socket->setRaw(true); m_socket->readBuffer().init(0); @@ -826,7 +826,7 @@ } switch (m_state){ case None: -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL case SSLConnect: #endif if (getToken(line, ' ').left(5) != "HTTP/"){
[-] [+]	Changed	sim-0.9.5.tar.bz2/sim/sim.cpp ^
@@ -217,7 +217,7 @@ I18N_NOOP("Multiprotocol Instant Messenger"), KAboutData::License_GPL, "Copyright (C) 2002-2004, Vladimir Shutoff\n" - "2005-2007, SIM-IM Development Team", + "2005-2008, SIM-IM Development Team", 0, "http://sim-im.org/", "https://mailman.dg.net.ua/listinfo/sim-im-main");
[-] [+]	Changed	sim-0.9.5.tar.bz2/sim/sim_pch.h ^
@@ -51,7 +51,7 @@ #include <qsignalslotimp.h> #endif -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL #include <openssl/ssl.h> #include <openssl/err.h> #include <openssl/bio.h>
[-] [+]	Changed	sim-0.9.5.tar.bz2/sim/socket.h ^
@@ -26,7 +26,7 @@ class QTimer; -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL typedef struct ssl_ctx_st SSL_CTX; typedef struct ssl_st SSL; typedef struct bio_st BIO; @@ -234,7 +234,7 @@ ClientSocket m_clientSocket; }; -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL EXPORT QByteArray md5(const char, int size = -1); EXPORT QByteArray sha1(const char*, int size = -1);
[-] [+]	Changed	sim-0.9.5.tar.bz2/sim/sslclient.cpp ^
@@ -19,7 +19,7 @@ #include "config.h" #endif -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL #include <openssl/ssl.h> #include <openssl/err.h>
[-] [+]	Changed	sim-0.9.5.tar.bz2/sim/win32/sim-default.vsprops ^
@@ -7,7 +7,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories="$(QTDIR)\include;$(SolutionDir)\sim;$(SolutionDir)\sim\win32;$(SolutionDir)\plugins\_core" BufferSecurityCheck="true" - PreprocessorDefinitions="NO_MOC_INCLUDES;HAVE_STDIO_H;HAVE_STRING_H;HAVE_MALLOC_H;QT_DLL;UNICODE;WIN32;QT_THREAD_SUPPORT;USE_OPENSSL;USE_AUDIERE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;CVS_BUILD=1;SIMTAG=\"$(SIMTAG)\";VERSION=\"0.9.5\";PACKAGE=\"SIM\";LTDL_OBJDIR=\"\";LTDL_SHLIB_EXT=\".dll\";" + PreprocessorDefinitions="NO_MOC_INCLUDES;HAVE_STDIO_H;HAVE_STRING_H;HAVE_MALLOC_H;QT_DLL;UNICODE;WIN32;QT_THREAD_SUPPORT;ENABLE_OPENSSL;USE_AUDIERE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;CVS_BUILD=1;SIMTAG=\"$(SIMTAG)\";VERSION=\"0.9.5\";PACKAGE=\"SIM\";LTDL_OBJDIR=\"\";LTDL_SHLIB_EXT=\".dll\";" /> <Tool Name="VCLinkerTool"