Initial gcc2 support, patch from Haikuports, with a little modification by myself. Set the deskbar replicant show as default, and removed the gcc4 notice from preferences.

This commit is contained in:
Barrett 2013-07-31 22:34:52 +02:00
parent f8179b8bad
commit 00440a3ffc
14 changed files with 26 additions and 32 deletions

View File

@ -30,7 +30,7 @@ CayaPreferencesData::CayaPreferencesData()
RaiseUserIsTyping(false), RaiseUserIsTyping(false),
MarkUnreadWindow(true), MarkUnreadWindow(true),
HideCayaDeskbar(false), HideCayaDeskbar(false),
DisableReplicant(true), DisableReplicant(false),
IgnoreEmoticons(false), IgnoreEmoticons(false),
NotifyProtocolStatus(true), NotifyProtocolStatus(true),
NotifyContactStatus(false), NotifyContactStatus(false),

View File

@ -30,7 +30,7 @@ PreferencesReplicant::PreferencesReplicant()
: BView("Replicant", B_WILL_DRAW) : BView("Replicant", B_WILL_DRAW)
{ {
fReplicantString = new BStringView("ReplicantString", fReplicantString = new BStringView("ReplicantString",
"Deskbar Replicant (only with gcc4hybrid)"); "Deskbar Replicant");
fReplicantString->SetExplicitAlignment( fReplicantString->SetExplicitAlignment(
BAlignment(B_ALIGN_LEFT, B_ALIGN_MIDDLE)); BAlignment(B_ALIGN_LEFT, B_ALIGN_MIDDLE));
@ -40,6 +40,9 @@ PreferencesReplicant::PreferencesReplicant()
fDisableReplicant = new BCheckBox("DisableReplicant", fDisableReplicant = new BCheckBox("DisableReplicant",
"Disable Deskbar replicant", new BMessage(kDisableReplicant)); "Disable Deskbar replicant", new BMessage(kDisableReplicant));
if (!CayaPreferences::Item()->HideCayaDeskbar)
Looper()->PostMessage(new BMessage(kDisableReplicant));
fPermanentReplicant = new BCheckBox("PermanentReplicant", fPermanentReplicant = new BCheckBox("PermanentReplicant",
"Permanent Deskbar Replicant", NULL); "Permanent Deskbar Replicant", NULL);
fPermanentReplicant->SetEnabled(false); fPermanentReplicant->SetEnabled(false);

View File

@ -303,7 +303,7 @@ namespace gloox
bool ci_equal( char ch1, char ch2 ) bool ci_equal( char ch1, char ch2 )
{ {
return std::toupper( (unsigned char)ch1 ) == std::toupper( (unsigned char)ch2 ); return toupper( (unsigned char)ch1 ) == toupper( (unsigned char)ch2 );
} }
std::string::size_type ci_find( const std::string& str1, const std::string& str2 ) std::string::size_type ci_find( const std::string& str1, const std::string& str2 )

View File

@ -1214,7 +1214,7 @@ namespace gloox
/** /**
* A multimap of strings. * A multimap of strings.
*/ */
typedef std::multimap<std::string, std::string> StringMultiMap; typedef std::multimap<const std::string, const std::string> StringMultiMap;
class StanzaExtension; class StanzaExtension;
/** /**

View File

@ -141,7 +141,8 @@ namespace gloox
{ {
if( pos + needle.length() <= data.length() ) if( pos + needle.length() <= data.length() )
{ {
if( !data.compare( pos, needle.length(), needle ) ) // if( !data.compare(pos, needle.length(), needle ) )
if( !data.compare(needle.substr(pos, needle.length())) )
{ {
pos += needle.length() - 1; pos += needle.length() - 1;
return ForwardFound; return ForwardFound;

View File

@ -84,11 +84,11 @@ namespace gloox
DataFormField* dff = df.addField( DataFormField::TypeListSingle, "stream-method" ); DataFormField* dff = df.addField( DataFormField::TypeListSingle, "stream-method" );
StringMultiMap sm; StringMultiMap sm;
if( streamTypes & FTTypeS5B ) if( streamTypes & FTTypeS5B )
sm.insert( std::make_pair( "s5b", XMLNS_BYTESTREAMS ) ); sm.insert( std::make_pair<const char*, std::string>( "s5b", XMLNS_BYTESTREAMS ) );
if( streamTypes & FTTypeIBB ) if( streamTypes & FTTypeIBB )
sm.insert( std::make_pair( "ibb", XMLNS_IBB ) ); sm.insert( std::make_pair<const char*, std::string>( "ibb", XMLNS_IBB ) );
if( streamTypes & FTTypeOOB ) if( streamTypes & FTTypeOOB )
sm.insert( std::make_pair( "oob", XMLNS_IQ_OOB ) ); sm.insert( std::make_pair<const char*, std::string>( "oob", XMLNS_IQ_OOB ) );
dff->setOptions( sm ); dff->setOptions( sm );
feature->addChild( df.tag() ); feature->addChild( df.tag() );

View File

@ -2,6 +2,7 @@ SubDir TOP libs libmsn ;
SubDirSysHdrs [ FDirName $(TOP) ] ; SubDirSysHdrs [ FDirName $(TOP) ] ;
SubDirSysHdrs [ FDirName $(TOP) libs ] ; SubDirSysHdrs [ FDirName $(TOP) libs ] ;
SubDirSysHdrs [ FDirName $(TOP) libs libmsn ] ;
SubDirSysHdrs [ FDirName $(OPENSSL_INCLUDE_DIR) ] ; SubDirSysHdrs [ FDirName $(OPENSSL_INCLUDE_DIR) ] ;

View File

@ -29,6 +29,7 @@
#include <vector> #include <vector>
#include <map> #include <map>
#include <stdexcept> #include <stdexcept>
#include <sstream>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning( disable : 4290 ) #pragma warning( disable : 4290 )

View File

@ -124,7 +124,7 @@ namespace MSN
{ {
std::string color = this->getFormatInfo()["CO"]; std::string color = this->getFormatInfo()["CO"];
assert(color.size() <= 6 && color.size() >= 0); assert(color.size() <= 6 && color.size() >= 0);
color.insert(0U, 6 - color.size(), '0'); color.insert((size_t)0, (size_t)(6 - color.size()), '0');
int r = 0, g = 0, b = 0; int r = 0, g = 0, b = 0;
b = strtol(color.substr(0, 2).c_str(), NULL, 16); b = strtol(color.substr(0, 2).c_str(), NULL, 16);
@ -167,7 +167,7 @@ namespace MSN
void Message::setColor(std::string color) void Message::setColor(std::string color)
{ {
color.insert(0U, 6 - color.size(), '0'); color.insert((size_t)0, (size_t)(6 - color.size()), '0');
int r = 0, g = 0, b = 0; int r = 0, g = 0, b = 0;
r = strtol(color.substr(0, 2).c_str(), NULL, 16); r = strtol(color.substr(0, 2).c_str(), NULL, 16);

View File

@ -30,7 +30,7 @@ namespace MSN
{ {
void MSNObject::addMSNObject(std::string filename, int Type) void MSNObject::addMSNObject(std::string filename, int Type)
{ {
std::ifstream::pos_type size; std::streampos size;
char * memblock; char * memblock;
SHA_CTX ctx; SHA_CTX ctx;
unsigned char digest[SHA_DIGEST_LENGTH]; unsigned char digest[SHA_DIGEST_LENGTH];

View File

@ -146,8 +146,8 @@ namespace MSN
it1 != s1.end() && it2 != s2.end(); it1 != s1.end() && it2 != s2.end();
++it1, ++it2) ++it1, ++it2)
{ {
if (std::toupper(*it1) != std::toupper(*it2)) if (toupper(*it1) != toupper(*it2))
return std::toupper(*it1) - std::toupper(*it2); return toupper(*it1) - toupper(*it2);
} }
size_t size1 = s1.size(), size2 = s2.size(); size_t size1 = s1.size(), size2 = s2.size();
return (int) (size1 - size2); return (int) (size1 - size2);
@ -358,11 +358,11 @@ namespace MSN
int FileSize(const char* sFileName) int FileSize(const char* sFileName)
{ {
std::ifstream f; std::ifstream f;
f.open(sFileName, std::ios_base::binary | std::ios_base::in); f.open(sFileName, std::ios::binary | std::ios::in);
if (!f.good() || f.eof() || !f.is_open()) { return 0; } if (!f.good() || f.eof() || !f.is_open()) { return 0; }
f.seekg(0, std::ios_base::beg); f.seekg(0, std::ios::beg);
std::ifstream::pos_type begin_pos = f.tellg(); std::streampos begin_pos = f.tellg();
f.seekg(0, std::ios_base::end); f.seekg(0, std::ios::end);
return static_cast<int>(f.tellg() - begin_pos); return static_cast<int>(f.tellg() - begin_pos);
} }

View File

@ -29,19 +29,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#if STDC_HEADERS
# include <string.h> # include <string.h>
#else
# if !HAVE_STRCHR
# define strchr index
# define strrchr rindex
# endif
char *strchr(), *strrchr();
# if !HAVE_MEMCPY
# define memcpy(d, s, n) bcopy ((s), (d), (n))
# define memmove(d, s, n) bcopy ((s), (d), (n))
# endif
#endif
#include <errno.h> #include <errno.h>
#if HAVE_UNISTD_H #if HAVE_UNISTD_H
@ -374,7 +362,6 @@ void yahoo_http_get(int id, const char *url, const char *cookies, int http11,
void yahoo_http_head(int id, const char *url, const char *cookies, int len, void yahoo_http_head(int id, const char *url, const char *cookies, int len,
char *payload, yahoo_get_fd_callback callback, void *data) char *payload, yahoo_get_fd_callback callback, void *data)
{ {
printf("yahoo_http_read\n");
char host[255]; char host[255];
int port = 80; int port = 80;
char path[255]; char path[255];

View File

@ -52,7 +52,7 @@ const char* kProtocolName = "MSN Protocol";
const uint32 kAvatarCheckMessage = 'AVMs'; const uint32 kAvatarCheckMessage = 'AVMs';
struct pollfd* kPollSockets = NULL; struct pollfd* kPollSockets = NULL;
struct ssl { struct Ssl {
bool isSSL; bool isSSL;
bool isConnected; bool isConnected;
SSL *ssl; SSL *ssl;
@ -718,7 +718,7 @@ void MSNP::registerSocket(void *s, int reading, int writing, bool isSSL)
return; return;
} }
kSocketsSsl = (struct ssl*) realloc(kSocketsSsl, (kSocketsAvailable + 10) * sizeof(struct ssl)); kSocketsSsl = (struct Ssl*) realloc(kSocketsSsl, (kSocketsAvailable + 10) * sizeof(struct Ssl));
if (kSocketsSsl == NULL) { if (kSocketsSsl == NULL) {
Error("Memory Error!!\n", NULL); Error("Memory Error!!\n", NULL);
return; return;

View File

@ -2,6 +2,7 @@ SubDir TOP protocols xmpp ;
SubDirSysHdrs [ FDirName $(TOP) ] ; SubDirSysHdrs [ FDirName $(TOP) ] ;
SubDirSysHdrs [ FDirName $(TOP) libs ] ; SubDirSysHdrs [ FDirName $(TOP) libs ] ;
SubDirSysHdrs [ FDirName $(TOP) libs libgloox ] ;
SubDirSysHdrs [ FDirName $(OPENSSL_INCLUDE_DIR) ] ; SubDirSysHdrs [ FDirName $(OPENSSL_INCLUDE_DIR) ] ;
SubDirSysHdrs [ FDirName $(CAYA_INCLUDE_DIR) ] ; SubDirSysHdrs [ FDirName $(CAYA_INCLUDE_DIR) ] ;