[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/3.5/kdenetwork/kopete/protocols/oscar
From: Jan Ritzerfeld <kde () bugs ! jan ! ritzerfeld ! net>
Date: 2008-01-26 10:47:09
Message-ID: 1201344429.284045.23363.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 766580 by jritzerfeld:
The feature of ignoring other contacts' wish to require authorization
does no longer work: Last November, AOL dropped the support for local contact
lists that were used to circumvent the authorization.
Therefore, the checkbox "Respect other contacts' wish to require
authorization" of group "Privacy Options" in icq's account preferences is
removed.
CCBUG: 101587
M +0 -2 icq/icqaccount.cpp
M +2 -2 icq/icqpresence.h
M +1 -9 icq/ui/icqeditaccountui.ui
M +0 -6 icq/ui/icqeditaccountwidget.cpp
M +1 -1 liboscar/Makefile.am
D liboscar/localcontactlisttask.cpp
D liboscar/localcontactlisttask.h
M +0 -10 liboscar/oscarsettings.cpp
M +0 -3 liboscar/oscarsettings.h
M +0 -3 liboscar/servicesetuptask.cpp
M +18 -8 liboscar/userdetails.cpp
--- branches/KDE/3.5/kdenetwork/kopete/protocols/oscar/icq/icqaccount.cpp \
#766579:766580 @@ -172,8 +172,6 @@
Oscar::Settings* oscarSettings = engine()->clientSettings();
oscarSettings->setWebAware( configGroup()->readBoolEntry( "WebAware", false ) );
oscarSettings->setHideIP( configGroup()->readBoolEntry( "HideIP", true ) );
- oscarSettings->setRequireAuth( configGroup()->readBoolEntry( "RequireAuth", false \
) );
- oscarSettings->setRespectRequireAuth( configGroup()->readBoolEntry( \
"RespectRequireAuth", true ) ); //FIXME: also needed for the other call to setStatus \
(in setPresenceTarget) DWORD status = pres.toOscarStatus();
--- branches/KDE/3.5/kdenetwork/kopete/protocols/oscar/icq/icqpresence.h \
#766579:766580 @@ -96,8 +96,8 @@
/**
* Friendly types this status can be
*/
- enum Type { Offline, DoNotDisturb, Occupied, NotAvailable, Away, FreeForChat, \
Online };
- enum { TypeCount = Online + 1 };
+ enum Type { Offline, DoNotDisturb, Occupied, NotAvailable, Away, Online, \
FreeForChat }; + enum { TypeCount = FreeForChat + 1 };
enum Visibility { Invisible, Visible };
--- branches/KDE/3.5/kdenetwork/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui \
#766579:766580 @@ -331,14 +331,6 @@
</widget>
<widget class="QCheckBox" row="1" column="0">
<property name="name">
- <cstring>chkRespectRequireAuth</cstring>
- </property>
- <property name="text">
- <string>Respect other contacts' &wish to \
require authorization</string>
- </property>
- </widget>
- <widget class="QCheckBox" row="2" column="0">
- <property name="name">
<cstring>chkHideIP</cstring>
</property>
<property name="text">
@@ -351,7 +343,7 @@
<string>Checking this box will not allow people \
to see what your IP address if they view your ICQ user details such as name, address, \
or age.</string> </property>
</widget>
- <widget class="QCheckBox" row="3" column="0">
+ <widget class="QCheckBox" row="2" column="0">
<property name="name">
<cstring>chkWebAware</cstring>
</property>
--- branches/KDE/3.5/kdenetwork/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp \
#766579:766580 @@ -78,9 +78,6 @@
bool configValue = mAccount->configGroup()->readBoolEntry( "RequireAuth", \
false ); mAccountSettings->chkRequireAuth->setChecked( configValue );
- configValue = mAccount->configGroup()->readBoolEntry( "RespectRequireAuth", \
true );
- mAccountSettings->chkRespectRequireAuth->setChecked( configValue );
-
configValue = mAccount->configGroup()->readBoolEntry( "HideIP", true );
mAccountSettings->chkHideIP->setChecked( configValue );
@@ -130,9 +127,6 @@
bool configValue = mAccountSettings->chkRequireAuth->isChecked();
mAccount->configGroup()->writeEntry( "RequireAuth", configValue );
- configValue = mAccountSettings->chkRespectRequireAuth->isChecked();
- mAccount->configGroup()->writeEntry( "RespectRequireAuth", configValue );
-
configValue = mAccountSettings->chkHideIP->isChecked();
mAccount->configGroup()->writeEntry( "HideIP", configValue );
--- branches/KDE/3.5/kdenetwork/kopete/protocols/oscar/liboscar/Makefile.am \
#766579:766580 @@ -19,7 +19,7 @@
offlinemessagestask.cpp ssiauthtask.cpp userinfotask.cpp icquserinfo.cpp \
icquserinfotask.cpp \ usersearchtask.cpp warningtask.cpp changevisibilitytask.cpp \
typingnotifytask.cpp \ buddyicontask.cpp serverredirecttask.cpp oscarsettings.cpp \
- localcontactlisttask.cpp chatnavservicetask.cpp connectionhandler.cpp \
chatservicetask.cpp + chatnavservicetask.cpp connectionhandler.cpp \
chatservicetask.cpp
liboscar_la_LDFLAGS = -no-undefined $(all_libraries)
liboscar_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
--- branches/KDE/3.5/kdenetwork/kopete/protocols/oscar/liboscar/oscarsettings.cpp \
#766579:766580 @@ -49,16 +49,6 @@
return m_requireAuth;
}
-void Settings::setRespectRequireAuth( bool respect )
-{
- m_respectRequireAuth = respect;
-}
-
-bool Settings::respectRequireAuth() const
-{
- return m_respectRequireAuth;
-}
-
void Settings::setHideIP( bool hide )
{
m_hideIP = hide;
--- branches/KDE/3.5/kdenetwork/kopete/protocols/oscar/liboscar/oscarsettings.h \
#766579:766580 @@ -42,8 +42,6 @@
/* Authorization settings */
void setRequireAuth( bool require );
bool requireAuth() const;
- void setRespectRequireAuth( bool require );
- bool respectRequireAuth() const;
/* Hide IP Settings */
void setHideIP( bool hide );
@@ -53,7 +51,6 @@
bool m_webAware;
bool m_requireAuth;
- bool m_respectRequireAuth;
bool m_hideIP;
};
--- branches/KDE/3.5/kdenetwork/kopete/protocols/oscar/liboscar/servicesetuptask.cpp \
#766579:766580 @@ -21,7 +21,6 @@
#include "blmlimitstask.h"
#include "connection.h"
#include "clientreadytask.h"
-#include "localcontactlisttask.h"
#include "icbmparamstask.h"
#include "locationrightstask.h"
#include "ownuserinfotask.h"
@@ -110,8 +109,6 @@
crt->setFamilies( familyList );
sitt->go( true );
crt->go( true ); //autodelete
- LocalContactListTask* lclt = new LocalContactListTask( client()->rootTask() );
- lclt->go( true );
}
if ( m_finishedTaskCount == 8 )
--- branches/KDE/3.5/kdenetwork/kopete/protocols/oscar/liboscar/userdetails.cpp \
#766579:766580 @@ -124,7 +124,11 @@
QString UserDetails::clientName() const
{
- return (m_clientName + m_clientVersion);
+ if ( !m_clientVersion.isEmpty() )
+ return i18n("Translators: client-name client-version",
+ "%1 %2").arg(m_clientName, m_clientVersion);
+ else
+ return m_clientName;
}
void UserDetails::fill( Buffer * buffer )
@@ -196,10 +200,10 @@
m_dcInsideIp = KNetwork::KIpAddress( ntohl( b.getDWord() ) );
m_dcPort = b.getDWord();
#ifdef OSCAR_USERINFO_DEBUG
- kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Internal IP address is " << \
m_dcInsideIp.toString() << endl;
- kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Port number is " << m_dcPort << \
endl; + kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Internal IP address is " << \
m_dcInsideIp.toString() << endl; + kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Port \
number is " << m_dcPort << endl; #endif
- m_dcType = b.getByte();
+ m_dcType = b.getByte();
m_dcProtoVersion = b.getWord();
m_dcAuthCookie = b.getDWord();
m_dcWebFrontPort = b.getDWord();
@@ -216,6 +220,9 @@
case 0x000D: //capability info
m_capabilities = Oscar::parseCapabilities( b, m_clientVersion );
m_capabilitiesSpecified = true;
+#ifdef OSCAR_USERINFO_DEBUG
+ kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Got capability info" << endl;
+#endif
break;
case 0x0010:
case 0x000F: //online time
@@ -306,7 +313,7 @@
* Thanks a lot for all the tests you guys must have made
* without sim-icq I would have only checked for the capabilities
*/
- /*
+
bool clientMatched = false;
if (m_capabilities != 0)
{
@@ -345,9 +352,9 @@
m_clientName=i18n("Licq");
if (ver % 10)
- m_clientVersion.sprintf("%d%d%u", ver/1000, (ver/10)%100, ver%10);
+ m_clientVersion.sprintf("%d.%d.%u", ver/1000, (ver/10)%100, ver%10);
else
- m_clientVersion.sprintf("%d%u", ver/1000, (ver/10)%100);
+ m_clientVersion.sprintf("%d.%u", ver/1000, (ver/10)%100);
return;
}
else // some client we could not detect using capabilities
@@ -425,6 +432,9 @@
case 9:
m_clientName=QString::fromLatin1("ICQ Lite");
break;
+ case 8:
+ m_clientName=QString::fromLatin1("Miranda");
+ break;
default:
m_clientName=QString::fromLatin1("ICQ2go");
}
@@ -464,7 +474,7 @@
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "detected client as: " << m_clientName
<< " " << m_clientVersion << endl;
- */
+
}
bool UserDetails::hasCap( int capNumber ) const
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic