Removes OperationSetPresence and OperationSetPersistentPresence from supported operation sets of sip protocol when SIMPLE is disabled for account.

src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java

@@ -177,11 +177,15 @@ public void loadSkin()
         setIcon(new ImageIcon(ImageUtils.getBytesInImage(
                 protocolProvider.getProtocolIcon().getIcon(
                     ProtocolIcon.ICON_SIZE_16x16))));
-        onlineItem.setIcon(getIcon());
-        offlineItem.setIcon(
-            new ImageIcon(LightGrayFilter.createDisabledImage(
-                ImageUtils.getBytesInImage(
-                    protocolProvider.getProtocolIcon().getIcon(
-                        ProtocolIcon.ICON_SIZE_16x16)))));
+
+        if(onlineItem != null)
+            onlineItem.setIcon(getIcon());
+
+        if(offlineItem != null)
+            offlineItem.setIcon(
+                new ImageIcon(LightGrayFilter.createDisabledImage(
+                    ImageUtils.getBytesInImage(
+                        protocolProvider.getProtocolIcon().getIcon(
+                            ProtocolIcon.ICON_SIZE_16x16)))));
     }
 }

src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java

@@ -1680,7 +1680,10 @@ public static ImageIcon getAccountStatusImage(ProtocolProviderService pps)
             = pps.getOperationSet(OperationSetPresence.class);
 
         Image statusImage;
-        byte[] protocolStatusIcon = presence.getPresenceStatus().getStatusIcon();
+        byte[] protocolStatusIcon = null;
+
+        if(presence != null)
+            protocolStatusIcon = presence.getPresenceStatus().getStatusIcon();
 
         if (presence != null && protocolStatusIcon != null)
         {

src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java

@@ -486,21 +486,21 @@ protected void initialize(String    sipAddress,
                 }
             }
 
-            //init presence op set.
-            OperationSetPersistentPresence opSetPersPresence
-                = new OperationSetPresenceSipImpl(this, enablePresence,
-                        forceP2P, pollingValue, subscriptionExpiration);
-
-            addSupportedOperationSet(
-                OperationSetPersistentPresence.class,
-                opSetPersPresence);
-            //also register with standard presence
-            addSupportedOperationSet(
-                OperationSetPresence.class,
-                opSetPersPresence);
-
             if (enablePresence)
             {
+                //init presence op set.
+                OperationSetPersistentPresence opSetPersPresence
+                    = new OperationSetPresenceSipImpl(this, enablePresence,
+                            forceP2P, pollingValue, subscriptionExpiration);
+
+                addSupportedOperationSet(
+                    OperationSetPersistentPresence.class,
+                    opSetPersPresence);
+                //also register with standard presence
+                addSupportedOperationSet(
+                    OperationSetPresence.class,
+                    opSetPersPresence);
+
                 // init instant messaging
                 OperationSetBasicInstantMessagingSipImpl opSetBasicIM =
                     new OperationSetBasicInstantMessagingSipImpl(this);