Fixes initial statuses of providers in presence menu, remove wrong assign of previously unused member (introduced with r10317).

cusax-fix
Damian Minkov 13 years ago
parent ed519ffebb
commit ec3fcc8293

@ -352,13 +352,9 @@ public void updateStatus(ProtocolProviderService protocolProvider)
presenceStatus = presenceStatusMenu.getOfflineStatus();
else
{
presenceStatus = presenceStatusMenu.getLastSelectedStatus();
presenceStatus = getLastPresenceStatus(protocolProvider);
if (presenceStatus == null)
{
presenceStatus = getLastPresenceStatus(protocolProvider);
if (presenceStatus == null)
presenceStatus = presenceStatusMenu.getOnlineStatus();
}
presenceStatus = presenceStatusMenu.getOnlineStatus();
}
presenceStatusMenu.updateStatus(presenceStatus);

@ -49,8 +49,6 @@ public class PresenceStatusMenu
private PresenceStatus onlineStatus;
private PresenceStatus lastSelectedStatus;
private OperationSetPresence presence;
/**
@ -272,7 +270,6 @@ public void setSelectedStatus(PresenceStatus status)
status.getStatusName());
this.setSelected(selectedObject);
lastSelectedStatus = status;
String tooltip = this.getToolTipText();
@ -301,16 +298,6 @@ public PresenceStatus getOnlineStatus()
return onlineStatus;
}
/**
* Returns the status that is currently selected.
*
* @return the status that is currently selected
*/
public PresenceStatus getLastSelectedStatus()
{
return lastSelectedStatus;
}
/**
* Loads resources for this component.
*/

Loading…
Cancel
Save