Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 291437
Collapse All | Expand All

(-)a/src/spectrumbuddy.cpp (-3 / +3 lines)
Lines 36-45 SpectrumBuddy::~SpectrumBuddy() { Link Here
36 

          36
          

        

        

          37
          
std::string SpectrumBuddy::getAlias() {

          37
          
std::string SpectrumBuddy::getAlias() {

        

        

          38
          
	std::string alias;

          38
          
	std::string alias;

        

          
            

              39
              
	if (purple_buddy_get_server_alias(m_buddy))


              39
              
	if (purple_buddy_get_alias(m_buddy))

            

            

              40
              
		alias = (std::string) purple_buddy_get_server_alias(m_buddy);


              
              
            

            

              41
              
	else


            

        

          42
          
		alias = (std::string) purple_buddy_get_alias(m_buddy);

          40
          
		alias = (std::string) purple_buddy_get_alias(m_buddy);

        

            

              
              
              41
              
	else

            

            

              42
              
		alias = (std::string) purple_buddy_get_server_alias(m_buddy);

            

        

          43
          
	return alias;

          43
          
	return alias;

        

        

          44
          
}

          44
          
}

        

        

          45
          

          45
          

        



(-)a/src/sql.cpp
      (-1 / +2 lines)




  

    
      
            Lines 905-911
          GHashTable *SQLClass::getBuddies(long userId, PurpleAccount *account) {
      
      
        Link Here
      
    
  

        

          905
          
				// create buddy

          905
          
				// create buddy

        

        

          906
          
				buddy = purple_buddy_new(account, buddyUins[k].c_str(), buddyNicknames[k].c_str());

          906
          
				buddy = purple_buddy_new(account, buddyUins[k].c_str(), buddyNicknames[k].c_str());

        

        

          907
          
				purple_blist_add_buddy(buddy, contact, g, NULL);

          907
          
				purple_blist_add_buddy(buddy, contact, g, NULL);

        

          
            

              908
              
				Log("ADDING BUDDY", buddyIds[k] << " " << buddyUins[k] << " subscription: " << subscription << " " << buddy);


              908
              
				purple_blist_server_alias_buddy(buddy, buddyNicknames[k].c_str());

            

            

              
              

              909
              
				Log("ADDING BUDDY", buddyIds[k] << " " << buddyUins[k] << " " << buddyNicknames[k] << " subscription: " << subscription << " " << buddy);

            

        

          909
          

          910
          

        

        

          910
          
				// add settings

          911
          
				// add settings

        

        

          911
          
				GHashTable *settings = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify) purple_value_destroy);

          912
          
				GHashTable *settings = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify) purple_value_destroy);

        






  

  Return to bug 291437