[Gaim-commits] CVS: gaim/plugins/perl/common Account.xs,1.16,1.17 AccountOpts.xs,1.4,1.5 Conversation.xs,1.13,1.14 FT.xs,1.3,1.4 Gaim.xs,1.19,1.20 PluginPref.xs,1.4,1.5 Stringref.xs,1.2,1.3 XMLNode.xs,1.2,1.3 module.h,1.19,1.20 typemap,1.16,1.17

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/plugins/perl/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27795/plugins/perl/common

Modified Files:
	Account.xs AccountOpts.xs Conversation.xs FT.xs Gaim.xs 
	PluginPref.xs Stringref.xs XMLNode.xs module.h typemap 
Log Message:
sf patch #1373688, from Will Thompson

"Make the Perl bindings more Perl-ish"


Index: Account.xs
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/perl/common/Account.xs,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -p -r1.16 -r1.17
--- Account.xs	12 Oct 2005 02:47:28 -0000	1.16
+++ Account.xs	5 Dec 2005 23:54:34 -0000	1.17
@@ -8,9 +8,11 @@ gaim_account_get_presence(account)
 	Gaim::Account account
 
 Gaim::Account
-gaim_account_new(username, protocol_id)
+gaim_account_new(class, username, protocol_id)
 	const char * username
 	const char * protocol_id
+    C_ARGS:
+	username, protocol_id
 
 void 
 gaim_account_destroy(account)

Index: AccountOpts.xs
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/perl/common/AccountOpts.xs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- AccountOpts.xs	18 Aug 2005 01:35:14 -0000	1.4
+++ AccountOpts.xs	5 Dec 2005 23:54:34 -0000	1.5
@@ -33,7 +33,7 @@ gaim_account_option_set_default_bool(opt
 	gboolean value	 	
 
 Gaim::Account::Option
-gaim_account_option_list_new(text, pref_name, values)
+gaim_account_option_list_new(class, text, pref_name, values)
 	const char * text
 	const char * pref_name
 	SV * values
@@ -53,28 +53,36 @@ OUTPUT:
 	RETVAL
 
 Gaim::Account::Option
-gaim_account_option_string_new(text, pref_name, default_value)
+gaim_account_option_string_new(class, text, pref_name, default_value)
 	const char * text
 	const char * pref_name
 	const char * default_value
+    C_ARGS:
+	text, pref_name, default_value
 
 Gaim::Account::Option
-gaim_account_option_int_new(text, pref_name, default_value)
+gaim_account_option_int_new(class, text, pref_name, default_value)
 	const char * text
 	const char * pref_name
 	gboolean default_value
+    C_ARGS:
+	text, pref_name, default_value
 
 Gaim::Account::Option
-gaim_account_option_bool_new(text, pref_name, default_value)
+gaim_account_option_bool_new(class, text, pref_name, default_value)
 	const char * text
 	const char * pref_name
 	gboolean default_value
+    C_ARGS:
+	text, pref_name, default_value
 
 Gaim::Account::Option
-gaim_account_option_new(type, text, pref_name)
+gaim_account_option_new(class, type, text, pref_name)
 	Gaim::PrefType type
 	const char * text
 	const char * pref_name
+    C_ARGS:
+	type, text, pref_name
 
 void
 gaim_account_option_get_list(option)
@@ -137,10 +145,12 @@ MODULE = Gaim::Account::Option  PACKAGE 
 PROTOTYPES: ENABLE
 
 Gaim::Account::UserSplit
-gaim_account_user_split_new(text, default_value, sep)
+gaim_account_user_split_new(class, text, default_value, sep)
 	const char * text
 	const char * default_value
 	char sep
+    C_ARGS:
+	text, default_value, sep
 
 char 
 gaim_account_user_split_get_separator(split)

Index: Conversation.xs
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/perl/common/Conversation.xs,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -p -r1.13 -r1.14
--- Conversation.xs	5 Dec 2005 03:52:59 -0000	1.13
+++ Conversation.xs	5 Dec 2005 23:54:34 -0000	1.14
@@ -124,10 +124,12 @@ gaim_conversation_update(conv, type)
 	Gaim::ConvUpdateType type
 
 Gaim::Conversation
-gaim_conversation_new(type, account, name)
+gaim_conversation_new(class, type, account, name)
 	Gaim::ConversationType type
 	Gaim::Account account
 	const char *name
+    C_ARGS:
+	type, account, name
 
 void
 gaim_conversation_set_account(conv, account);

Index: FT.xs
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/perl/common/FT.xs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- FT.xs	18 Aug 2005 01:35:14 -0000	1.3
+++ FT.xs	5 Dec 2005 23:54:34 -0000	1.4
@@ -3,6 +3,14 @@
 MODULE = Gaim::Xfer  PACKAGE = Gaim::Xfer  PREFIX = gaim_xfer_
 PROTOTYPES: ENABLE
 
+Gaim::Xfer
+gaim_xfer_new(class, account, type, who)
+	Gaim::Account account
+	Gaim::XferType type
+	const char *who
+    C_ARGS:
+	account, type, who
+
 void 
 gaim_xfer_add(xfer)
 	Gaim::Xfer xfer

Index: Gaim.xs
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/perl/common/Gaim.xs,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -p -r1.19 -r1.20
--- Gaim.xs	5 Dec 2005 03:52:59 -0000	1.19
+++ Gaim.xs	5 Dec 2005 23:54:34 -0000	1.20
@@ -96,7 +96,7 @@ BOOT:
 	GAIM_PERL_BOOT(Network);
 	GAIM_PERL_BOOT(Notify);
 	GAIM_PERL_BOOT(Plugin);
-	GAIM_PERL_BOOT(Pref); 
+	GAIM_PERL_BOOT(PluginPref);
 	GAIM_PERL_BOOT(Pounce);
 	GAIM_PERL_BOOT(Prefs);
 	GAIM_PERL_BOOT(Privacy);

Index: PluginPref.xs
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/perl/common/PluginPref.xs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- PluginPref.xs	18 Aug 2005 01:35:14 -0000	1.4
+++ PluginPref.xs	5 Dec 2005 23:54:34 -0000	1.5
@@ -1,30 +1,20 @@
 #include "module.h"
 
-MODULE = Gaim::Pref  PACKAGE = Gaim::Pref  PREFIX = gaim_plugin_pref_
+MODULE = Gaim::PluginPref  PACKAGE = Gaim::PluginPref::Frame  PREFIX = gaim_plugin_pref_frame_
 PROTOTYPES: ENABLE
 
-void 
-gaim_plugin_pref_add_choice(pref, label, choice)
-	Gaim::PluginPref pref
-	char *label
-	gpointer choice
-
-void 
-gaim_plugin_pref_destroy(pref)
-	Gaim::PluginPref pref
-
-void 
+void
 gaim_plugin_pref_frame_add(frame, pref)
-	Gaim::PluginPrefFrame frame
+	Gaim::PluginPref::Frame frame
 	Gaim::PluginPref pref
 
 void 
 gaim_plugin_pref_frame_destroy(frame)
-	Gaim::PluginPrefFrame frame
+	Gaim::PluginPref::Frame frame
 
 void
 gaim_plugin_pref_frame_get_prefs(frame)
-	Gaim::PluginPrefFrame frame
+	Gaim::PluginPref::Frame frame
 PREINIT:
 	GList *l;
 PPCODE:
@@ -32,11 +22,26 @@ PPCODE:
 		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListItem")));
 	}
 	
-Gaim::PluginPrefFrame
-gaim_plugin_pref_frame_new()
+Gaim::PluginPref::Frame
+gaim_plugin_pref_frame_new(class)
+    C_ARGS: /* void */
 
 
-void 
+MODULE = Gaim::PluginPref  PACKAGE = Gaim::PluginPref  PREFIX = gaim_plugin_pref_
+PROTOTYPES: ENABLE
+
+void
+gaim_plugin_pref_add_choice(pref, label, choice)
+	Gaim::PluginPref pref
+	char *label
+	gpointer choice
+
+void
+gaim_plugin_pref_destroy(pref)
+	Gaim::PluginPref pref
+
+
+void
 gaim_plugin_pref_get_bounds(pref, min, max)
 	Gaim::PluginPref pref
 	int *min
@@ -73,21 +78,28 @@ gaim_plugin_pref_get_type(pref)
 	Gaim::PluginPref pref
 
 Gaim::PluginPref
-gaim_plugin_pref_new()
+gaim_plugin_pref_new(class)
+    C_ARGS: /* void */
 
 
 Gaim::PluginPref
-gaim_plugin_pref_new_with_label(label)
+gaim_plugin_pref_new_with_label(class, label)
 	char *label
+    C_ARGS:
+	label
 
 Gaim::PluginPref
-gaim_plugin_pref_new_with_name(name)
+gaim_plugin_pref_new_with_name(class, name)
 	char *name
+    C_ARGS:
+	name
 
 Gaim::PluginPref
-gaim_plugin_pref_new_with_name_and_label(name, label)
+gaim_plugin_pref_new_with_name_and_label(class, name, label)
 	char *name
 	char *label
+    C_ARGS:
+	name, label
 
 void 
 gaim_plugin_pref_set_bounds(pref, min, max)

Index: Stringref.xs
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/perl/common/Stringref.xs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- Stringref.xs	18 Aug 2005 01:35:14 -0000	1.2
+++ Stringref.xs	5 Dec 2005 23:54:34 -0000	1.3
@@ -13,12 +13,16 @@ gaim_stringref_len(stringref)
 	Gaim::Stringref stringref
 
 Gaim::Stringref
-gaim_stringref_new(value)
+gaim_stringref_new(class, value)
 	const char *value
+    C_ARGS:
+	value
 
 Gaim::Stringref
-gaim_stringref_new_noref(value)
+gaim_stringref_new_noref(class, value)
 	const char *value
+    C_ARGS:
+	value
 
 
 

Index: XMLNode.xs
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/perl/common/XMLNode.xs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- XMLNode.xs	18 Aug 2005 01:35:14 -0000	1.2
+++ XMLNode.xs	5 Dec 2005 23:54:34 -0000	1.3
@@ -4,30 +4,34 @@ MODULE = Gaim::XMLNode  PACKAGE = Gaim::
 PROTOTYPES: ENABLE
 
 
-xmlnode *
-xmlnode_copy(src)
+Gaim::XMLNode
+xmlnode_copy(class, src)
 	xmlnode *src
+    C_ARGS:
+	src
 
 void 
 xmlnode_free(node)
 	xmlnode *node
 
-xmlnode *
-xmlnode_from_str(str, size)
+Gaim::XMLNode
+xmlnode_from_str(class, str, size)
 	const char *str
 	gssize size
+    C_ARGS:
+	str, size
 
 const char *
 xmlnode_get_attrib(node, attr)
 	xmlnode *node
 	const char *attr
 
-xmlnode *
+Gaim::XMLNode
 xmlnode_get_child(parent, name)
 	const xmlnode *parent
 	const char *name
 
-xmlnode *
+Gaim::XMLNode
 xmlnode_get_child_with_namespace(parent, name, xmlns)
 	const xmlnode *parent
 	const char *name
@@ -37,7 +41,7 @@ char *
 xmlnode_get_data(node)
 	xmlnode *node
 
-xmlnode *
+Gaim::XMLNode
 xmlnode_get_next_twin(node)
 	xmlnode *node
 
@@ -52,11 +56,13 @@ xmlnode_insert_data(node, data, size)
 	const char *data
 	gssize size
 
-xmlnode *
-xmlnode_new(name)
+Gaim::XMLNode
+xmlnode_new(class, name)
 	const char *name
+    C_ARGS:
+	name
 
-xmlnode *
+Gaim::XMLNode
 xmlnode_new_child(parent, name)
 	xmlnode *parent
 	const char *name

Index: module.h
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/perl/common/module.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -p -r1.19 -r1.20
--- module.h	28 Nov 2005 01:50:55 -0000	1.19
+++ module.h	5 Dec 2005 23:54:34 -0000	1.20
@@ -178,7 +178,7 @@ typedef GaimPluginLoaderInfo *          
 typedef GaimPluginAction *              Gaim__Plugin__Action;
 
 	/* pluginpref.h */
-typedef GaimPluginPrefFrame *           Gaim__PluginPrefFrame;
+typedef GaimPluginPrefFrame *           Gaim__PluginPref__Frame;
 typedef GaimPluginPref *                Gaim__PluginPref;
 typedef GaimPluginPrefType              Gaim__PluginPrefType;
 
@@ -250,6 +250,7 @@ typedef GaimStringref *			Gaim__Stringre
 typedef GaimValue *			Gaim__Value;
 
 	/* xmlnode.h */
+typedef	xmlnode *			Gaim__XMLNode;
 typedef XMLNodeType             XMLNode__Type;
 
 

Index: typemap
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/perl/common/typemap,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -p -r1.16 -r1.17
--- typemap	28 Nov 2005 01:50:55 -0000	1.16
+++ typemap	5 Dec 2005 23:54:34 -0000	1.17
@@ -115,7 +115,7 @@ Gaim::Plugin::Action            	T_GaimO
 Gaim::Plugin::Protocol::Info            T_GaimObj
 Gaim::PluginType                	T_IV
 Gaim::PrefType   			T_IV
-Gaim::PluginPrefFrame               	T_GaimObj
+Gaim::PluginPref::Frame               	T_GaimObj
 Gaim::PluginPref     		         T_GaimObj
 Gaim::PluginPrefType            	T_IV
 Gaim::Pounce            		T_GaimObj
@@ -169,6 +169,8 @@ Gaim::Xfer              		T_GaimObj
 Gaim::XferType          		T_IV
 Gaim::XferStatusType            	T_IV
 Gaim::XferUiOps				T_IV
+
+Gaim::XMLNode                                 T_GaimObj
 XMLNode::Type             		T_IV