Changeset 25330

Show
Ignore:
Timestamp:
05/06/08 16:18:31 (1 week ago)
Author:
korli
Message:
when no input method is found but the replicant was loaded, we now unload it
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • haiku/trunk/src/servers/input/AddOnManager.cpp

    r23240 r25330  
    474474                addon->AddMethod(); 
    475475        } 
     476} 
     477 
     478 
     479void 
     480AddOnManager::UnloadReplicant() 
     481{ 
     482        BDeskbar().RemoveItem(REPLICANT_CTL_NAME); 
    476483} 
    477484 
    …… 
    757764{ 
    758765        CALLED(); 
     766         
     767        if (InputServer::gInputMethodList.CountItems() == 0) { 
     768                UnloadReplicant(); 
     769                return B_OK; 
     770        } 
     771         
    759772        LoadReplicant(); 
    760773         

  • haiku/trunk/src/servers/input/AddOnManager.h

    r18696 r25330  
    5252                 
    5353                void LoadReplicant(); 
     54                void UnloadReplicant(); 
    5455                int32 GetReplicantAt(BMessenger target, int32 index) const; 
    5556                status_t GetReplicantName(BMessenger target, int32 uid, BMessage *reply) const;