[Sim-icq-commit] sim/plugins/_core core.cpp,1.77,1.77.2.1 core.h,1.44,1.44.2.1 msgedit.cpp,1.64,1.64.2.1

[<sh...@us...>]

Update of /cvsroot/sim-icq/sim/plugins/_core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13758/plugins/_core

Modified Files:
      Tag: SHUTOFF
	core.cpp core.h msgedit.cpp 
Log Message:
Add work with jabber with resources

Index: core.cpp
===================================================================
RCS file: /cvsroot/sim-icq/sim/plugins/_core/core.cpp,v
retrieving revision 1.77
retrieving revision 1.77.2.1
diff -C2 -d -r1.77 -r1.77.2.1
*** core.cpp	17 Mar 2004 10:10:41 -0000	1.77
--- core.cpp	18 Mar 2004 09:29:14 -0000	1.77.2.1
***************
*** 2262,2267 ****
                      if ((c->id == MessageSMS) && (cc.client->protocol()->description()->flags & PROTOCOL_NOSMS))
                          continue;
!                     string resource;
!                     if (!cc.client->canSend(c->id, cc.data, resource)){
                          CheckSend cs;
                          cs.id     = c->id;
--- 2262,2266 ----
                      if ((c->id == MessageSMS) && (cc.client->protocol()->description()->flags & PROTOCOL_NOSMS))
                          continue;
!                     if (!cc.client->canSend(c->id, cc.data)){
                          CheckSend cs;
                          cs.id     = c->id;
***************
*** 2332,2337 ****
                          if ((cmd->id == MessageSMS) && ((*it).client->protocol()->description()->flags & PROTOCOL_NOSMS))
                              return NULL;
!                         string resource;
!                         if ((*it).client->canSend(cmd->id, (*it).data, resource)){
                              return e->param();
                          }
--- 2331,2335 ----
                          if ((cmd->id == MessageSMS) && ((*it).client->protocol()->description()->flags & PROTOCOL_NOSMS))
                              return NULL;
!                         if ((*it).client->canSend(cmd->id, (*it).data)){
                              return e->param();
                          }
***************
*** 2348,2353 ****
                  }
                  for (unsigned i = 0; i < getContacts()->nClients(); i++){
!                     string resource;
!                     if (getContacts()->getClient(i)->canSend(cmd->id, NULL, resource))
                          return e->param();
                  }
--- 2346,2350 ----
                  }
                  for (unsigned i = 0; i < getContacts()->nClients(); i++){
!                     if (getContacts()->getClient(i)->canSend(cmd->id, NULL))
                          return e->param();
                  }
***************
*** 2507,2512 ****
                  for (unsigned i = 0; i < getContacts()->nClients(); i++){
                      Client *client = getContacts()->getClient(i);
!                     string resource;
!                     if (client->canSend(MessageSMS, NULL, resource))
                          return e->param();
                  }
--- 2504,2508 ----
                  for (unsigned i = 0; i < getContacts()->nClients(); i++){
                      Client *client = getContacts()->getClient(i);
!                     if (client->canSend(MessageSMS, NULL))
                          return e->param();
                  }
***************
*** 2595,2600 ****
                          while ((data = ++it) != NULL){
                              Client *client = it.client();
!                             string resource;
!                             if (client->canSend(msg->type(), data, resource) && client->send(msg, data))
                                  break;
                          }
--- 2591,2595 ----
                          while ((data = ++it) != NULL){
                              Client *client = it.client();
!                             if (client->canSend(msg->type(), data) && client->send(msg, data))
                                  break;
                          }
***************
*** 2666,2671 ****
                                  return e->param();
                          }else{
!                             string resource;
!                             if (client->canSend(MessageAuthGranted, data, resource) && client->send(msg, data))
                                  return e->param();
                          }
--- 2661,2665 ----
                                  return e->param();
                          }else{
!                             if (client->canSend(MessageAuthGranted, data) && client->send(msg, data))
                                  return e->param();
                          }

Index: core.h
===================================================================
RCS file: /cvsroot/sim-icq/sim/plugins/_core/core.h,v
retrieving revision 1.44
retrieving revision 1.44.2.1
diff -C2 -d -r1.44 -r1.44.2.1
*** core.h	27 Feb 2004 04:02:44 -0000	1.44
--- core.h	18 Mar 2004 09:29:14 -0000	1.44.2.1
***************
*** 394,398 ****
      clientData	*data;
      Client		*client;
!     bool		bNew;
  } clientContact;
  
--- 394,398 ----
      clientData	*data;
      Client		*client;
!     bool		bNew;
  } clientContact;
  

Index: msgedit.cpp
===================================================================
RCS file: /cvsroot/sim-icq/sim/plugins/_core/msgedit.cpp,v
retrieving revision 1.64
retrieving revision 1.64.2.1
diff -C2 -d -r1.64 -r1.64.2.1
*** msgedit.cpp	17 Mar 2004 10:10:41 -0000	1.64
--- msgedit.cpp	18 Mar 2004 09:29:14 -0000	1.64.2.1
***************
*** 358,363 ****
          for (i = 0; i < cs.size(); i++){
              Client *client = getContacts()->getClient(cs[i].client);
!             string resource;
!             if (client->canSend(m_type, cs[i].data, resource)){
                  data = cs[i].data;
                  if (bTyping)
--- 358,362 ----
          for (i = 0; i < cs.size(); i++){
              Client *client = getContacts()->getClient(cs[i].client);
!             if (client->canSend(m_type, cs[i].data)){
                  data = cs[i].data;
                  if (bTyping)
***************
*** 375,380 ****
                  if (c && (c != contact))
                      continue;
!                 string resource;
!                 if (client->canSend(m_type, d, resource)){
                      if (bCreate)
                          client->createData(cs[i].data, contact);
--- 374,378 ----
                  if (c && (c != contact))
                      continue;
!                 if (client->canSend(m_type, d)){
                      if (bCreate)
                          client->createData(cs[i].data, contact);