adium/adium

Removing Privacy and Xtras from Adium menu. Fixes #15977

2012-08-07, Shawn Khan
f576d9a1ffbe
Parents 964989565282
Children 6ca830aa9583
Removing Privacy and Xtras from Adium menu. Fixes #15977

r=wix
5 files changed, 35 insertions(+), 48 deletions(-)
  • +35 -37
    Resources/MainMenu.xib
  • +0 -1
    Source/AIMenuController.h
  • +0 -1
    Source/AIMenuController.m
  • +0 -1
    Source/RAFBlockEditorPlugin.h
  • +0 -8
    Source/RAFBlockEditorPlugin.m
    • --- a/Resources/MainMenu.xib Sun Dec 29 15:48:04 2013 -0500
    +++ b/Resources/MainMenu.xib Tue Aug 07 12:53:04 2012 -0400
    @@ -2,18 +2,18 @@
    <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
    <data>
    <int key="IBDocument.SystemTarget">1060</int>
    - <string key="IBDocument.SystemVersion">12A154q</string>
    - <string key="IBDocument.InterfaceBuilderVersion">2429</string>
    - <string key="IBDocument.AppKitVersion">1162.3</string>
    - <string key="IBDocument.HIToolboxVersion">604.00</string>
    + <string key="IBDocument.SystemVersion">12A269</string>
    + <string key="IBDocument.InterfaceBuilderVersion">2549</string>
    + <string key="IBDocument.AppKitVersion">1187</string>
    + <string key="IBDocument.HIToolboxVersion">624.00</string>
    <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
    <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
    - <string key="NS.object.0">2429</string>
    + <string key="NS.object.0">2549</string>
    </object>
    <array key="IBDocument.IntegratedClassDependencies">
    + <string>NSCustomObject</string>
    <string>NSMenu</string>
    <string>NSMenuItem</string>
    - <string>NSCustomObject</string>
    </array>
    <array key="IBDocument.PluginDependencies">
    <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
    @@ -79,15 +79,6 @@
    <reference key="NSMixedImage" ref="551713053"/>
    <int key="NSTag">1</int>
    </object>
    - <object class="NSMenuItem" id="650991877">
    - <reference key="NSMenu" ref="123945392"/>
    - <string key="NSTitle">Adium Xtras</string>
    - <string key="NSKeyEquiv"/>
    - <int key="NSKeyEquivModMask">1048576</int>
    - <int key="NSMnemonicLoc">2147483647</int>
    - <reference key="NSOnImage" ref="145266427"/>
    - <reference key="NSMixedImage" ref="551713053"/>
    - </object>
    <object class="NSMenuItem" id="833951242">
    <reference key="NSMenu" ref="123945392"/>
    <bool key="NSIsDisabled">YES</bool>
    @@ -1016,6 +1007,14 @@
    <object class="NSCustomObject" id="126913366">
    <string key="NSClassName">SUUpdater</string>
    </object>
    + <object class="NSMenuItem" id="650991877">
    + <string key="NSTitle">Adium Xtras</string>
    + <string key="NSKeyEquiv"/>
    + <int key="NSKeyEquivModMask">1048576</int>
    + <int key="NSMnemonicLoc">2147483647</int>
    + <reference key="NSOnImage" ref="145266427"/>
    + <reference key="NSMixedImage" ref="551713053"/>
    + </object>
    </array>
    <object class="IBObjectContainer" key="IBDocument.Objects">
    <array class="NSMutableArray" key="connectionRecords">
    @@ -1349,14 +1348,6 @@
    </object>
    <object class="IBConnectionRecord">
    <object class="IBActionConnection" key="connection">
    - <string key="label">showXtras:</string>
    - <reference key="source" ref="412113127"/>
    - <reference key="destination" ref="650991877"/>
    - </object>
    - <int key="connectionID">7055</int>
    - </object>
    - <object class="IBConnectionRecord">
    - <object class="IBActionConnection" key="connection">
    <string key="label">contibutingToAdium:</string>
    <reference key="source" ref="412113127"/>
    <reference key="destination" ref="336798830"/>
    @@ -1396,6 +1387,14 @@
    <int key="connectionID">7374</int>
    </object>
    <object class="IBConnectionRecord">
    + <object class="IBActionConnection" key="connection">
    + <string key="label">showXtras:</string>
    + <reference key="source" ref="412113127"/>
    + <reference key="destination" ref="650991877"/>
    + </object>
    + <int key="connectionID">7055</int>
    + </object>
    + <object class="IBConnectionRecord">
    <object class="IBOutletConnection" key="connection">
    <string key="label">delegate</string>
    <reference key="source" ref="123945392"/>
    @@ -1741,14 +1740,6 @@
    </object>
    <object class="IBConnectionRecord">
    <object class="IBOutletConnection" key="connection">
    - <string key="label">menuItem_adiumXtras</string>
    - <reference key="source" ref="752992373"/>
    - <reference key="destination" ref="650991877"/>
    - </object>
    - <int key="connectionID">7155</int>
    - </object>
    - <object class="IBConnectionRecord">
    - <object class="IBOutletConnection" key="connection">
    <string key="label">menuItem_preferences</string>
    <reference key="source" ref="752992373"/>
    <reference key="destination" ref="223212230"/>
    @@ -2349,6 +2340,14 @@
    </object>
    <object class="IBConnectionRecord">
    <object class="IBOutletConnection" key="connection">
    + <string key="label">menuItem_adiumXtras</string>
    + <reference key="source" ref="752992373"/>
    + <reference key="destination" ref="650991877"/>
    + </object>
    + <int key="connectionID">7155</int>
    + </object>
    + <object class="IBConnectionRecord">
    + <object class="IBOutletConnection" key="connection">
    <string key="label">menuItem_bold</string>
    <reference key="source" ref="276456795"/>
    <reference key="destination" ref="855568741"/>
    @@ -2888,7 +2887,6 @@
    <reference ref="692256499"/>
    <reference ref="223212230"/>
    <reference ref="846974817"/>
    - <reference ref="650991877"/>
    <reference ref="258218277"/>
    <reference ref="461621623"/>
    <reference ref="336798830"/>
    @@ -2960,11 +2958,6 @@
    <reference key="parent" ref="123945392"/>
    </object>
    <object class="IBObjectRecord">
    - <int key="objectID">7054</int>
    - <reference key="object" ref="650991877"/>
    - <reference key="parent" ref="123945392"/>
    - </object>
    - <object class="IBObjectRecord">
    <int key="objectID">7240</int>
    <reference key="object" ref="258218277"/>
    <reference key="parent" ref="123945392"/>
    @@ -3368,6 +3361,11 @@
    <reference key="parent" ref="758315211"/>
    <string key="objectName">Menu Item - Deselect All</string>
    </object>
    + <object class="IBObjectRecord">
    + <int key="objectID">7054</int>
    + <reference key="object" ref="650991877"/>
    + <reference key="parent" ref="0"/>
    + </object>
    </array>
    </object>
    <dictionary class="NSMutableDictionary" key="flattenedProperties">
    --- a/Source/AIMenuController.h Sun Dec 29 15:48:04 2013 -0500
    +++ b/Source/AIMenuController.h Tue Aug 07 12:53:04 2012 -0400
    @@ -80,7 +80,6 @@
    //Adium menu
    IBOutlet NSMenuItem *menuItem_aboutAdium;
    - IBOutlet NSMenuItem *menuItem_adiumXtras;
    IBOutlet NSMenuItem *menuItem_checkForUpdates;
    IBOutlet NSMenuItem *menuItem_preferences;
    IBOutlet NSMenuItem *menuItem_donate;
    --- a/Source/AIMenuController.m Sun Dec 29 15:48:04 2013 -0500
    +++ b/Source/AIMenuController.m Tue Aug 07 12:53:04 2012 -0400
    @@ -412,7 +412,6 @@
    //Adium menu
    [menuItem_aboutAdium setTitle:AILocalizedString(@"About Adium",nil)];
    - [menuItem_adiumXtras setTitle:[AILocalizedString(@"Xtras Manager",nil) stringByAppendingEllipsis]];
    [menuItem_checkForUpdates setTitle:[AILocalizedString(@"Check For Updates",nil) stringByAppendingEllipsis]];
    [menuItem_preferences setTitle:[AILocalizedString(@"Preferences",nil) stringByAppendingEllipsis]];
    [menuItem_donate setTitle:[AILocalizedString(@"Donate",nil) stringByAppendingEllipsis]];
    --- a/Source/RAFBlockEditorPlugin.h Sun Dec 29 15:48:04 2013 -0500
    +++ b/Source/RAFBlockEditorPlugin.h Tue Aug 07 12:53:04 2012 -0400
    @@ -18,7 +18,6 @@
    #import "RAFBlockEditorWindowController.h"
    @interface RAFBlockEditorPlugin : AIPlugin {
    - NSMenuItem *blockEditorMenuItem;
    RAFBlockEditorWindowController *preferences;
    }
    --- a/Source/RAFBlockEditorPlugin.m Sun Dec 29 15:48:04 2013 -0500
    +++ b/Source/RAFBlockEditorPlugin.m Tue Aug 07 12:53:04 2012 -0400
    @@ -22,14 +22,6 @@
    - (void)installPlugin
    {
    - //Install the Block menu items
    - blockEditorMenuItem = [[NSMenuItem alloc] initWithTitle:[AILocalizedString(@"Privacy Settings", nil) stringByAppendingEllipsis]
    - target:self
    - action:@selector(showEditor:)
    - keyEquivalent:@"p"];
    - [blockEditorMenuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask | NSCommandKeyMask)];
    - [adium.menuController addMenuItem:blockEditorMenuItem toLocation:LOC_Adium_Preferences];
    -
    //Install our preference view
    preferences = (RAFBlockEditorWindowController *)[RAFBlockEditorWindowController preferencePaneForPlugin:self];
    }