bug 853642 fix menu placement and missing label on menu, r=markh

browser/base/content/browser-menubar.inc

@@ -542,9 +542,9 @@
                             key="focusChatBar"
                             command="Social:FocusChat"
                             class="show-only-for-keyboard"/>
+                  <menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
                   <menuseparator class="social-statusarea-separator"/>
                   <menuseparator class="social-provider-menu" hidden="true"/>
-                  <menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
                   <menuitem class="social-addons-menuitem" command="Social:Addons"
                             label="&social.addons.label;"/>
                 </menupopup>

browser/base/content/browser-social.js

@@ -170,12 +170,12 @@ let SocialUI = {
   },
 
   _updateMenuItems: function () {
-    if (!Social.provider)
+    let provider = Social.provider || Social.defaultProvider;
+    if (!provider)
       return;
-
     // The View->Sidebar and Menubar->Tools menu.
     for (let id of ["menu_socialSidebar", "menu_socialAmbientMenu"])
-      document.getElementById(id).setAttribute("label", Social.provider.name);
+      document.getElementById(id).setAttribute("label", provider.name);
   },
 
   // This handles "ActivateSocialFeature" events fired against content documents

browser/base/content/browser.xul

@@ -721,9 +721,9 @@
                       command="Social:ToggleNotifications"
                       label="&social.toggleNotifications.label;"
                       accesskey="&social.toggleNotifications.accesskey;"/>
+            <menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
             <menuseparator class="social-statusarea-separator"/>
             <menuseparator class="social-provider-menu" hidden="true"/>
-            <menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
             <menuitem class="social-addons-menuitem" command="Social:Addons"
                       label="&social.addons.label;"/>
           </menupopup>