adium 3514:c45a3061c91e: Compilation fix; apologies.

commits at adium.im commits at adium.im
Sat Nov 13 18:14:13 UTC 2010


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

Compilation fix; apologies.
(transplanted from ca4bf7ac1d0c1d3abab0a6d4eae6c317966c6126)

diffs (37 lines):

diff -r c0fdf31e5469 -r c45a3061c91e Plugins/Purple Service/adiumPurpleRequest.m
--- a/Plugins/Purple Service/adiumPurpleRequest.m	Sat Nov 13 08:35:57 2010 -0600
+++ b/Plugins/Purple Service/adiumPurpleRequest.m	Sat Nov 13 12:12:38 2010 -0600
@@ -147,8 +147,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);
@@ -262,14 +262,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,




More information about the commits mailing list