adium-1.4 3240:ca4bf7ac1d0c: Compilation fix; apologies.

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/ca4bf7ac1d0c
revision:	3240:ca4bf7ac1d0c
author:		Evan Schoenberg
date:		Sat Nov 13 12:12:38 2010 -0600

Compilation fix; apologies.

diffs (55 lines):

diff -r 87d4f5499e28 -r ca4bf7ac1d0c Plugins/Purple Service/adiumPurpleRequest.m
--- a/Plugins/Purple Service/adiumPurpleRequest.m	Sat Nov 13 12:04:03 2010 -0600
+++ b/Plugins/Purple Service/adiumPurpleRequest.m	Sat Nov 13 12:12:38 2010 -0600
@@ -148,8 +148,8 @@
 								  PurpleAccount *account, const char *who,
 								  PurpleConversation *conv, 
 								  gconstpointer icon_data, gsize icon_size,
-								  void *user_data,
-								  size_t action_count, va_list actions);
+								  void *userData,
+								  size_t actionCount, va_list actions)
 {
     NSString			*titleString = (title ? [NSString stringWithUTF8String:title] : @"");
 	NSString			*primaryString = (primary ? [NSString stringWithUTF8String:primary] : nil);
@@ -255,9 +255,6 @@
 	return requestController;
 }
 
-
-}
-
 //Purple requests the user take an action such as accept or deny a buddy's attempt to add us to her list 
 static void *adiumPurpleRequestAction(const char *title, const char *primary,
 									  const char *secondary, int default_action,
@@ -266,14 +263,14 @@
 									  void *userData,
 									  size_t actionCount, va_list actions)
 {
-	adiumPurpleRequestActionWithIcon(title, primary,
-									 secondary, default_action,
-									 account, who,
-									 conv,
-									 /* iconData */ NULL, /* iconSize */ 0,
-									 userData,
-									 actionCount, actions);
-								 
+	return adiumPurpleRequestActionWithIcon(title, primary,
+											secondary, default_action,
+											account, who,
+											conv,
+											/* iconData */ NULL, /* iconSize */ 0,
+											userData,
+											actionCount, actions);
+	
 }
 
 static void *adiumPurpleRequestFields(const char *title, const char *primary,
@@ -429,7 +426,6 @@
 	adiumPurpleRequestActionWithIcon,
 	NULL, /* reserved */
 	NULL, /* reserved */
-	NULL, /* reserved */
 	NULL  /* reserved */
 };