Bug 1295871 - CHAT_ATTRS_ARRAY should only be defined if MOZ_THUNDERBIRD=1. r=rkent
authorEdmund Wong <ewong@pw-wspx.org>
Wed, 17 Aug 2016 14:16:51 +0800
changeset 25825 94a5190aa5ee96d1b5d072cb179713661d19a734
parent 25824 c5a436806512cca3a3302a79d9100a892d0e7f9f
child 25826 2c7039e401827cb0ec615443ed20ac61b1c821a3
push id1771
push userclokep@gmail.com
push dateMon, 14 Nov 2016 17:47:53 +0000
treeherdercomm-beta@399ae9d71595 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrkent
bugs1295871
Bug 1295871 - CHAT_ATTRS_ARRAY should only be defined if MOZ_THUNDERBIRD=1. r=rkent
mailnews/addrbook/src/nsAbCardProperty.cpp
--- a/mailnews/addrbook/src/nsAbCardProperty.cpp
+++ b/mailnews/addrbook/src/nsAbCardProperty.cpp
@@ -88,27 +88,30 @@ static const AppendItem WORK_ATTRS_ARRAY
 static const AppendItem CUSTOM_ATTRS_ARRAY[] = {
   {kCustom1Property, "propertyCustom1", eAppendLabel},
   {kCustom2Property, "propertyCustom2", eAppendLabel},
   {kCustom3Property, "propertyCustom3", eAppendLabel},
   {kCustom4Property, "propertyCustom4", eAppendLabel},
   {kNotesProperty, "", eAppendLine}
 };
 
+#ifdef MOZ_THUNDERBIRD
+
 static const AppendItem CHAT_ATTRS_ARRAY[] = {
   {kGtalkProperty, "propertyGtalk", eAppendLabel},
   {kAIMProperty, "propertyAIM", eAppendLabel},
   {kYahooProperty, "propertyYahoo", eAppendLabel},
   {kSkypeProperty, "propertySkype", eAppendLabel},
   {kQQProperty, "propertyQQ", eAppendLabel},
   {kMSNProperty, "propertyMSN", eAppendLabel},
   {kICQProperty, "propertyICQ", eAppendLabel},
   {kXMPPProperty, "propertyXMPP", eAppendLabel},
   {kIRCProperty, "propertyIRC", eAppendLabel}
 };
+#endif
 
 nsAbCardProperty::nsAbCardProperty()
   : m_IsMailList(false)
 {
   // Initialize some default properties
   SetPropertyAsUint32(kPreferMailFormatProperty, nsIAbPreferMailFormat::unknown);
   SetPropertyAsUint32(kPopularityIndexProperty, 0);
   // Uninitialized...