Bug in the PluginController

--Apple-Mail-9--132792734
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	delsp=yes;
	format=flowed

Hi there,

There was a small bug in the PreferencesController that left out the  
incommingRawMessage case.

Also there was a naming inconsistency in the informal protocol which  
I fixed.

Have Phun,
cu Martin


--Apple-Mail-9--132792734
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="ctlToRaw.patch"
Content-Disposition: attachment;
	filename=ctlToRaw.patch

Index: FireGrowlPlugin/FireGrowlPlugin.m
===================================================================
--- FireGrowlPlugin/FireGrowlPlugin.m	(revision 4309)
+++ FireGrowlPlugin/FireGrowlPlugin.m	(working copy)
@@ -287,7 +287,7 @@
  *  NO will let the message continue processing
  */
 
-- (BOOL)incomingCtlMessage:(MessageItem *)msg additionalData:(NSDictionary *)dict
+- (BOOL)incomingRawMessage:(MessageItem *)msg additionalData:(NSDictionary *)dict
 {
     return NO;
 }
Index: FirePluginTemplate/TemplateClass.m
===================================================================
--- FirePluginTemplate/TemplateClass.m	(revision 4309)
+++ FirePluginTemplate/TemplateClass.m	(working copy)
@@ -211,7 +211,7 @@
  *  NO will let the message continue processing
  */
 
-- (BOOL)incomingCtlMessage:(MessageItem *)msg additionalData:(NSDictionary *)dict
+- (BOOL)incomingRawMessage:(MessageItem *)msg additionalData:(NSDictionary *)dict
 {
     return NO;
 }
Index: FireSQLLogger/FireSQLLogger.m
===================================================================
--- FireSQLLogger/FireSQLLogger.m	(revision 4309)
+++ FireSQLLogger/FireSQLLogger.m	(working copy)
@@ -245,7 +245,7 @@
  *  NO will let the message continue processing
  */
 
-- (BOOL)incomingCtlMessage:(MessageItem *)msg additionalData:(NSDictionary *)dict
+- (BOOL)incomingRawMessage:(MessageItem *)msg additionalData:(NSDictionary *)dict
 {
     return NO;
 }
Index: FireiAlertPlugin/FireiAlertPlugin.m
===================================================================
--- FireiAlertPlugin/FireiAlertPlugin.m	(revision 4309)
+++ FireiAlertPlugin/FireiAlertPlugin.m	(working copy)
@@ -242,7 +242,7 @@
  *  NO will let the message continue processing
  */
 
-- (BOOL)incomingCtlMessage:(MessageItem *)msg additionalData:(NSDictionary *)dict
+- (BOOL)incomingRawMessage:(MessageItem *)msg additionalData:(NSDictionary *)dict
 {
     return NO;
 }
Index: FortuneProfilesPlugin/FortuneProfilesPlugin.m
===================================================================
--- FortuneProfilesPlugin/FortuneProfilesPlugin.m	(revision 4309)
+++ FortuneProfilesPlugin/FortuneProfilesPlugin.m	(working copy)
@@ -226,7 +226,7 @@
  *  NO will let the message continue processing
  */
 
-- (BOOL)incomingCtlMessage:(MessageItem *)msg additionalData:(NSDictionary *)dict
+- (BOOL)incomingRawMessage:(MessageItem *)msg additionalData:(NSDictionary *)dict
 {
     return NO;
 }
Index: FireGrowlPlugin.10.2/FireGrowlPlugin.m
===================================================================
--- FireGrowlPlugin.10.2/FireGrowlPlugin.m	(revision 4309)
+++ FireGrowlPlugin.10.2/FireGrowlPlugin.m	(working copy)
@@ -275,7 +275,7 @@
  *  NO will let the message continue processing
  */
 
-- (BOOL)incomingCtlMessage:(MessageItem *)msg additionalData:(NSDictionary *)dict
+- (BOOL)incomingRawMessage:(MessageItem *)msg additionalData:(NSDictionary *)dict
 {
     return NO;
 }

--Apple-Mail-9--132792734
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="protocolInconsistency.patch"
Content-Disposition: attachment;
	filename=protocolInconsistency.patch

Index: Plugins/GPGEncryption/GPGEncryptionPlugin.m
===================================================================
--- Plugins/GPGEncryption/GPGEncryptionPlugin.m	(revision 4309)
+++ Plugins/GPGEncryption/GPGEncryptionPlugin.m	(working copy)
@@ -177,7 +177,7 @@
  *  NO will let the message continue processing
  */
 
-- (BOOL)incomingCtlMessage:(MessageItem *)msg additionalData:(NSDictionary *)dict
+- (BOOL)incomingRawMessage:(MessageItem *)msg additionalData:(NSDictionary *)dict
 {
     NSData *rawMessage = [msg messageData];
     NSString *tStr = nil;
Index: Core/Controllers/PluginController.m
===================================================================
--- Core/Controllers/PluginController.m	(revision 4309)
+++ Core/Controllers/PluginController.m	(working copy)
@@ -374,11 +374,14 @@
     SEL theSelector;
     
     switch(type){
+        case FIRE_PLUGIN_OUTGOING_RAW:
+            theSelector = @selector(outgoingRawMessage:additionalData:);
+            break;
         case FIRE_PLUGIN_OUTGOING_MSG:
             theSelector = @selector(outgoingMessage:additionalData:);
             break;
         case FIRE_PLUGIN_INCOMING_RAW:
-            theSelector = @selector(incomingCtlMessage:additionalData:);
+            theSelector = @selector(incomingRawMessage:additionalData:);
             break;
         case FIRE_PLUGIN_INCOMING_MSG:
             theSelector = @selector(incomingMessage:additionalData:);
@@ -399,9 +402,6 @@
             mustContinue = YES;
             theSelector = @selector(quitting:additionalData:);
             break;
-        case FIRE_PLUGIN_OUTGOING_RAW:
-            theSelector = @selector(outgoingRawMessage:additionalData:);
-            break;
         default:
             return NO;
     }

--Apple-Mail-9--132792734
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	delsp=yes;
	format=flowed

p.s.: I just noticed that in the last patch I forgot to update the  
old project file - sorry.
--Apple-Mail-9--132792734--


-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf