adium 4668:2c8dbad30144: "Null" isn't a good reference name for ...

commits at adium.im commits at adium.im
Wed Feb 8 07:14:50 UTC 2012 

details:	http://hg.adium.im/adium/rev/2c8dbad30144
revision:	4668:2c8dbad30144
branch:		PreferencesRedux
author:		Frank Dowsett <wixardy at adium.im>
date:		Wed Feb 08 02:07:55 2012 -0500

"Null" isn't a good reference name for a xib.
Subject: adium 4669:ae14848046ef: Update the Facebook logo.

details:	http://hg.adium.im/adium/rev/ae14848046ef
revision:	4669:ae14848046ef
branch:		PreferencesRedux
author:		Frank Dowsett <wixardy at adium.im>
date:		Sun Feb 05 20:08:17 2012 -0500

Update the Facebook logo.
Subject: adium 4670:16d2f6ca66d1: Update the XMPP logo and change the name from "Jabber" to "XMPP". Fixes #10375

details:	http://hg.adium.im/adium/rev/16d2f6ca66d1
revision:	4670:16d2f6ca66d1
branch:		PreferencesRedux
author:		Frank Dowsett <wixardy at adium.im>
date:		Sun Feb 05 20:13:17 2012 -0500

Update the XMPP logo and change the name from "Jabber" to "XMPP". Fixes #10375

diffs (132 lines):

diff -r 84301e77d2f2 -r 16d2f6ca66d1 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Sun Feb 05 18:06:15 2012 -0500
+++ b/Adium.xcodeproj/project.pbxproj	Sun Feb 05 20:13:17 2012 -0500
@@ -629,8 +629,6 @@
 		34C7C62809EC4E890060FB4A /* AILibpurplePlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B3244309BA003C00029361 /* AILibpurplePlugin.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34C846AF101E515900140B4B /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34C846AE101E515900140B4B /* QTKit.framework */; };
 		34C899AC07E51B18009357F6 /* BuiltInEventPresets.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34C899AB07E51B18009357F6 /* BuiltInEventPresets.plist */; };
-		34C8D06C13B688670073718A /* f_logo_small.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C8D06A13B688660073718A /* f_logo_small.png */; };
-		34C8D06D13B688670073718A /* f_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C8D06B13B688670073718A /* f_logo.png */; };
 		34C91BBB0CA8909700740974 /* AIContentNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C91BB90CA8909700740974 /* AIContentNotification.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34C91BBC0CA8909700740974 /* AIContentNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C91BBA0CA8909700740974 /* AIContentNotification.m */; };
 		34CA15530CAFDFB2009AA5E3 /* sidebarActionWidget.png in Resources */ = {isa = PBXBuildFile; fileRef = 34CA15520CAFDFB2009AA5E3 /* sidebarActionWidget.png */; };
@@ -1114,7 +1112,7 @@
 		5A799674133C3D6F0005AC6A /* MessageView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A1FEA601334549300C14951 /* MessageView.xib */; };
 		5A804FEA12BE9E84007CDC1B /* scandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA6F12BDD5CE0048F6C0 /* scandate.m */; };
 		5A80508512BE9F00007CDC1B /* scandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA6F12BDD5CE0048F6C0 /* scandate.m */; };
-		5A8F637614DD1B21008412C8 /* (null) in Resources */ = {isa = PBXBuildFile; };
+		5A8F637614DD1B21008412C8 /* Preferences-Privacy.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A8F637514DD1B21008412C8 /* Preferences-Privacy.xib */; };
 		5A94397B1279ECB800FDD81D /* AIImgurImageUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A94397A1279ECB800FDD81D /* AIImgurImageUploader.m */; };
 		5A9A9F8911F2951400328DF9 /* AIDoNothingContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A9A9F8811F2951400328DF9 /* AIDoNothingContactAlertPlugin.m */; };
 		5A9A9F8B11F295EB00328DF9 /* Stop sign.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A9A9F8A11F295EB00328DF9 /* Stop sign.png */; };
@@ -3390,8 +3388,6 @@
 		34C846E5101E518F00140B4B /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
 		34C898C2089297B00046AD38 /* ja */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ja; path = "Resources/ja.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
 		34C899AB07E51B18009357F6 /* BuiltInEventPresets.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist; name = BuiltInEventPresets.plist; path = Resources/BuiltInEventPresets.plist; sourceTree = "<group>"; };
-		34C8D06A13B688660073718A /* f_logo_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = f_logo_small.png; path = "Plugins/Purple Service/f_logo_small.png"; sourceTree = "<group>"; };
-		34C8D06B13B688670073718A /* f_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = f_logo.png; path = "Plugins/Purple Service/f_logo.png"; sourceTree = "<group>"; };
 		34C91BB90CA8909700740974 /* AIContentNotification.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIContentNotification.h; path = "Frameworks/Adium Framework/Source/AIContentNotification.h"; sourceTree = "<group>"; };
 		34C91BBA0CA8909700740974 /* AIContentNotification.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIContentNotification.m; path = "Frameworks/Adium Framework/Source/AIContentNotification.m"; sourceTree = "<group>"; };
 		34C9EC40099FA2A8007ECAB3 /* DefaultBlockedStatusIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DefaultBlockedStatusIcon.png; path = "Frameworks/Adium Framework/DefaultBlockedStatusIcon.png"; sourceTree = "<group>"; };
@@ -4037,6 +4033,7 @@
 		5A80CCAB121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = uk; path = Resources/uk.lproj/Statuses.strings; sourceTree = "<group>"; };
 		5A80CCAD121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = Resources/uk.lproj/StatusSortConfiguration.nib; sourceTree = "<group>"; };
 		5A80CCAE121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/WebKit Message View/uk.lproj/WebKitPreferencesView.nib"; sourceTree = "<group>"; };
+		5A8F637514DD1B21008412C8 /* Preferences-Privacy.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-Privacy.xib"; path = "Resources/Preferences-Privacy.xib"; sourceTree = "<group>"; };
 		5A9439791279ECB800FDD81D /* AIImgurImageUploader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIImgurImageUploader.h; path = "Plugins/Image Uploading Plugin/AIImgurImageUploader.h"; sourceTree = "<group>"; };
 		5A94397A1279ECB800FDD81D /* AIImgurImageUploader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIImgurImageUploader.m; path = "Plugins/Image Uploading Plugin/AIImgurImageUploader.m"; sourceTree = "<group>"; };
 		5A9A9F8711F2951400328DF9 /* AIDoNothingContactAlertPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIDoNothingContactAlertPlugin.h; sourceTree = "<group>"; };
@@ -5579,8 +5576,6 @@
 				34D8153713B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.m */,
 				34D8153813B663650022C8C4 /* AIFacebookXMPPService.h */,
 				34D8153913B663650022C8C4 /* AIFacebookXMPPService.m */,
-				34C8D06A13B688660073718A /* f_logo_small.png */,
-				34C8D06B13B688670073718A /* f_logo.png */,
 				34D8154813B663730022C8C4 /* JSON Kit */,
 				34D8152D13B6634A0022C8C4 /* Legacy (Upgrade path) */,
 			);
@@ -6108,6 +6103,7 @@
 				110763F408676CC9005987A5 /* RAFBlockEditorWindowController.m */,
 				9E125C6307D3571400AA91C5 /* ESBlockingPlugin.h */,
 				9E125C6407D3571400AA91C5 /* ESBlockingPlugin.m */,
+				5A8F637514DD1B21008412C8 /* Preferences-Privacy.xib */,
 			);
 			name = Blocking;
 			sourceTree = "<group>";
@@ -9531,8 +9527,6 @@
 				345D689A0F1FD56B002F2D01 /* facebook-small.png in Resources */,
 				1150A9960FBE48D600E0BD31 /* ESIRCAccountView.nib in Resources */,
 				34D8153F13B663650022C8C4 /* AIFacebookXMPPOauthWebViewWindow.xib in Resources */,
-				34C8D06C13B688670073718A /* f_logo_small.png in Resources */,
-				34C8D06D13B688670073718A /* f_logo.png in Resources */,
 				5A22D6E214834F44004E15F7 /* AIFacebookXMPPAccountView.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -9795,7 +9789,7 @@
 				5A27FA7F14A272330063489D /* pref-personal.png in Resources */,
 				5A27FA8014A272330063489D /* pref-windowhandling.png in Resources */,
 				5A1E3A1214DCE60400724574 /* Preferences-Xtras.xib in Resources */,
-				5A8F637614DD1B21008412C8 /* (null) in Resources */,
+				5A8F637614DD1B21008412C8 /* Preferences-Privacy.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff -r 84301e77d2f2 -r 16d2f6ca66d1 Plugins/Purple Service/AIFacebookXMPPService.m
--- a/Plugins/Purple Service/AIFacebookXMPPService.m	Sun Feb 05 18:06:15 2012 -0500
+++ b/Plugins/Purple Service/AIFacebookXMPPService.m	Sun Feb 05 20:13:17 2012 -0500
@@ -83,9 +83,9 @@
 - (NSImage *)defaultServiceIconOfType:(AIServiceIconType)iconType
 {
 	if ((iconType == AIServiceIconSmall) || (iconType == AIServiceIconList)) {
-		return [NSImage imageNamed:@"f_logo_small" forClass:[self class] loadLazily:YES];
+		return [NSImage imageNamed:@"facebook-small" forClass:[self class] loadLazily:YES];
 	} else {
-		return [NSImage imageNamed:@"f_logo" forClass:[self class] loadLazily:YES];
+		return [NSImage imageNamed:@"facebook" forClass:[self class] loadLazily:YES];
 	}
 }
 
@@ -100,9 +100,9 @@
 - (NSString *)pathForDefaultServiceIconOfType:(AIServiceIconType)iconType
 {
 	if ((iconType == AIServiceIconSmall) || (iconType == AIServiceIconList)) {
-		return [[NSBundle bundleForClass:[self class]] pathForImageResource:@"f_logo_small"];
+		return [[NSBundle bundleForClass:[self class]] pathForImageResource:@"facebook-small"];
 	} else {
-		return [[NSBundle bundleForClass:[self class]] pathForImageResource:@"f_logo"];		
+		return [[NSBundle bundleForClass:[self class]] pathForImageResource:@"facebook"];		
 	}
 }
 
diff -r 84301e77d2f2 -r 16d2f6ca66d1 Plugins/Purple Service/ESJabberService.m
--- a/Plugins/Purple Service/ESJabberService.m	Sun Feb 05 18:06:15 2012 -0500
+++ b/Plugins/Purple Service/ESJabberService.m	Sun Feb 05 20:13:17 2012 -0500
@@ -83,10 +83,10 @@
 	return @"Jabber";
 }
 - (NSString *)shortDescription{
-	return @"Jabber";
+	return @"XMPP";
 }
 - (NSString *)longDescription{
-	return @"Jabber";
+	return @"XMPP";
 }
 
 /*!
diff -r 84301e77d2f2 -r 16d2f6ca66d1 Plugins/Purple Service/f_logo.png
Binary file Plugins/Purple Service/f_logo.png has changed
diff -r 84301e77d2f2 -r 16d2f6ca66d1 Plugins/Purple Service/f_logo_small.png
Binary file Plugins/Purple Service/f_logo_small.png has changed
diff -r 84301e77d2f2 -r 16d2f6ca66d1 Plugins/Purple Service/facebook-small.png
Binary file Plugins/Purple Service/facebook-small.png has changed
diff -r 84301e77d2f2 -r 16d2f6ca66d1 Plugins/Purple Service/facebook.png
Binary file Plugins/Purple Service/facebook.png has changed
diff -r 84301e77d2f2 -r 16d2f6ca66d1 Resources/Service Icons/Aqua.AdiumServiceIcons/facebook-small.png
Binary file Resources/Service Icons/Aqua.AdiumServiceIcons/facebook-small.png has changed
diff -r 84301e77d2f2 -r 16d2f6ca66d1 Resources/Service Icons/Aqua.AdiumServiceIcons/facebook.png
Binary file Resources/Service Icons/Aqua.AdiumServiceIcons/facebook.png has changed
diff -r 84301e77d2f2 -r 16d2f6ca66d1 Resources/Service Icons/Aqua.AdiumServiceIcons/jabber-small.png
Binary file Resources/Service Icons/Aqua.AdiumServiceIcons/jabber-small.png has changed
diff -r 84301e77d2f2 -r 16d2f6ca66d1 Resources/Service Icons/Aqua.AdiumServiceIcons/jabber.png
Binary file Resources/Service Icons/Aqua.AdiumServiceIcons/jabber.png has changed

More information about the commits mailing list