Menu
▾
▴
[Gaim-commits] SF.net SVN: gaim: [17471] trunk
|
From: <de...@us...> - 2006-10-12 20:39:04
|
Revision: 17471
http://svn.sourceforge.net/gaim/?rev=17471&view=rev
Author: deryni9
Date: 2006-10-12 13:38:47 -0700 (Thu, 12 Oct 2006)
Log Message:
-----------
Martijn van Beers provided some patches to rework the perl object
casting/blessing for signal instances in order to let the newly added jabber-*
signals work. This is those patches.
This is also a small whitespace change, a removal of the gaim debug message
about "Found plugin info" it was just pissing me off, and a renamespacing of
gaim_blist_node_get_extended_menu into Gaim::Blist::Node where it makes
slightly more sense.
Modified Paths:
--------------
trunk/COPYRIGHT
trunk/libgaim/plugins/perl/common/Account.xs
trunk/libgaim/plugins/perl/common/BuddyIcon.xs
trunk/libgaim/plugins/perl/common/BuddyList.xs
trunk/libgaim/plugins/perl/common/Cipher.xs
trunk/libgaim/plugins/perl/common/Connection.xs
trunk/libgaim/plugins/perl/common/Conversation.xs
trunk/libgaim/plugins/perl/common/Plugin.xs
trunk/libgaim/plugins/perl/common/Pounce.xs
trunk/libgaim/plugins/perl/common/Prefs.xs
trunk/libgaim/plugins/perl/common/Proxy.xs
trunk/libgaim/plugins/perl/common/SavedStatuses.xs
trunk/libgaim/plugins/perl/common/Signal.xs
trunk/libgaim/plugins/perl/common/Status.xs
trunk/libgaim/plugins/perl/common/XMLNode.xs
trunk/libgaim/plugins/perl/common/module.h
trunk/libgaim/plugins/perl/common/typemap
trunk/libgaim/plugins/perl/perl-common.c
trunk/libgaim/plugins/perl/perl-handlers.c
trunk/libgaim/plugins/perl/perl.c
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/COPYRIGHT 2006-10-12 20:38:47 UTC (rev 17471)
@@ -305,6 +305,7 @@
Brad Turcotte
Junichi Uekawa
István Váradi
+Martijn van Beers
Philip Van Hoof
Kristof Vansant
James Vega
Modified: trunk/libgaim/plugins/perl/common/Account.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Account.xs 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Account.xs 2006-10-12 20:38:47 UTC (rev 17471)
@@ -306,7 +306,7 @@
Gaim::Account::UiOps
gaim_accounts_get_ui_ops()
-void *
+Gaim::Handle
gaim_accounts_get_handle()
void
Modified: trunk/libgaim/plugins/perl/common/BuddyIcon.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/BuddyIcon.xs 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/BuddyIcon.xs 2006-10-12 20:38:47 UTC (rev 17471)
@@ -80,7 +80,7 @@
const char *
gaim_buddy_icons_get_cache_dir();
-void *
+Gaim::Handle
gaim_buddy_icons_get_handle();
void
Modified: trunk/libgaim/plugins/perl/common/BuddyList.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/BuddyList.xs 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/BuddyList.xs 2006-10-12 20:38:47 UTC (rev 17471)
@@ -216,23 +216,13 @@
gaim_blist_request_add_group()
void
-gaim_blist_node_get_extended_menu(node)
- Gaim::BuddyList::Node node
-PREINIT:
- GList *l;
-PPCODE:
- for (l = gaim_blist_node_get_extended_menu(node); l != NULL; l = l->next) {
- XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Menu::Action")));
- }
-
-void
gaim_blist_set_ui_ops(ops)
Gaim::BuddyList::UiOps ops
Gaim::BuddyList::UiOps
gaim_blist_get_ui_ops()
-void *
+Gaim::Handle
gaim_blist_get_handle()
void
@@ -245,6 +235,16 @@
PROTOTYPES: ENABLE
void
+gaim_blist_node_get_extended_menu(node)
+ Gaim::BuddyList::Node node
+PREINIT:
+ GList *l;
+PPCODE:
+ for (l = gaim_blist_node_get_extended_menu(node); l != NULL; l = l->next) {
+ XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Menu::Action")));
+ }
+
+void
gaim_blist_node_set_bool(node, key, value)
Gaim::BuddyList::Node node
const char * key
Modified: trunk/libgaim/plugins/perl/common/Cipher.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Cipher.xs 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Cipher.xs 2006-10-12 20:38:47 UTC (rev 17471)
@@ -45,7 +45,7 @@
XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Cipher")));
}
-gpointer
+Gaim::Handle
gaim_ciphers_get_handle()
void
Modified: trunk/libgaim/plugins/perl/common/Connection.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Connection.xs 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Connection.xs 2006-10-12 20:38:47 UTC (rev 17471)
@@ -85,5 +85,5 @@
void
gaim_connections_uninit()
-void *
+Gaim::Handle
gaim_connections_get_handle()
Modified: trunk/libgaim/plugins/perl/common/Conversation.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Conversation.xs 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Conversation.xs 2006-10-12 20:38:47 UTC (rev 17471)
@@ -33,7 +33,7 @@
MODULE = Gaim::Conversation PACKAGE = Gaim::Conversations PREFIX = gaim_conversations_
PROTOTYPES: ENABLE
-void *
+Gaim::Handle
gaim_conversations_get_handle()
void
Modified: trunk/libgaim/plugins/perl/common/Plugin.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Plugin.xs 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Plugin.xs 2006-10-12 20:38:47 UTC (rev 17471)
@@ -146,7 +146,7 @@
XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Plugin")));
}
-void *
+Gaim::Handle
gaim_plugins_get_handle()
void
Modified: trunk/libgaim/plugins/perl/common/Pounce.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Pounce.xs 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Pounce.xs 2006-10-12 20:38:47 UTC (rev 17471)
@@ -73,7 +73,7 @@
XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Pounce")));
}
-void *
+Gaim::Handle
gaim_pounces_get_handle()
void
Modified: trunk/libgaim/plugins/perl/common/Prefs.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Prefs.xs 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Prefs.xs 2006-10-12 20:38:47 UTC (rev 17471)
@@ -58,7 +58,7 @@
gaim_prefs_get_bool(name)
const char *name
-void *
+Gaim::Handle
gaim_prefs_get_handle()
int
Modified: trunk/libgaim/plugins/perl/common/Proxy.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Proxy.xs 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Proxy.xs 2006-10-12 20:38:47 UTC (rev 17471)
@@ -6,7 +6,7 @@
Gaim::ProxyInfo
gaim_global_proxy_get_info()
-void *
+Gaim::Handle
gaim_proxy_get_handle()
void
Modified: trunk/libgaim/plugins/perl/common/SavedStatuses.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/SavedStatuses.xs 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/SavedStatuses.xs 2006-10-12 20:38:47 UTC (rev 17471)
@@ -48,7 +48,7 @@
XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::SavedStatus")));
}
-void *
+Gaim::Handle
gaim_savedstatuses_get_handle()
void
Modified: trunk/libgaim/plugins/perl/common/Signal.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Signal.xs 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Signal.xs 2006-10-12 20:38:47 UTC (rev 17471)
@@ -6,7 +6,7 @@
void
gaim_signal_connect_priority(instance, signal, plugin, callback, priority, data = 0)
- void *instance
+ Gaim::Handle instance
const char *signal
Gaim::Plugin plugin
SV *callback
@@ -17,7 +17,7 @@
void
gaim_signal_connect(instance, signal, plugin, callback, data = 0)
- void *instance
+ Gaim::Handle instance
const char *signal
Gaim::Plugin plugin
SV *callback
@@ -27,7 +27,7 @@
void
gaim_signal_disconnect(instance, signal, plugin)
- void *instance
+ Gaim::Handle instance
const char *signal
Gaim::Plugin plugin
CODE:
Modified: trunk/libgaim/plugins/perl/common/Status.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Status.xs 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Status.xs 2006-10-12 20:38:47 UTC (rev 17471)
@@ -263,7 +263,7 @@
Gaim::Status status
const char *id
-void *
+Gaim::Handle
gaim_status_get_handle()
const char *
Modified: trunk/libgaim/plugins/perl/common/XMLNode.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/XMLNode.xs 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/XMLNode.xs 2006-10-12 20:38:47 UTC (rev 17471)
@@ -5,13 +5,13 @@
Gaim::XMLNode
xmlnode_copy(class, src)
- xmlnode *src
+ Gaim::XMLNode src
C_ARGS:
src
void
xmlnode_free(node)
- xmlnode *node
+ Gaim::XMLNode node
Gaim::XMLNode
xmlnode_from_str(class, str, size)
@@ -22,36 +22,36 @@
const char *
xmlnode_get_attrib(node, attr)
- xmlnode *node
+ Gaim::XMLNode node
const char *attr
Gaim::XMLNode
xmlnode_get_child(parent, name)
- const xmlnode *parent
+ Gaim::XMLNode parent
const char *name
Gaim::XMLNode
xmlnode_get_child_with_namespace(parent, name, xmlns)
- const xmlnode *parent
+ Gaim::XMLNode parent
const char *name
const char *xmlns
char *
xmlnode_get_data(node)
- xmlnode *node
+ Gaim::XMLNode node
Gaim::XMLNode
xmlnode_get_next_twin(node)
- xmlnode *node
+ Gaim::XMLNode node
void
xmlnode_insert_child(parent, child)
- xmlnode *parent
- xmlnode *child
+ Gaim::XMLNode parent
+ Gaim::XMLNode child
void
xmlnode_insert_data(node, data, size)
- xmlnode *node
+ Gaim::XMLNode node
const char *data
gssize size
@@ -63,26 +63,26 @@
Gaim::XMLNode
xmlnode_new_child(parent, name)
- xmlnode *parent
+ Gaim::XMLNode parent
const char *name
void
xmlnode_remove_attrib(node, attr)
- xmlnode *node
+ Gaim::XMLNode node
const char *attr
void
xmlnode_set_attrib(node, attr, value)
- xmlnode *node
+ Gaim::XMLNode node
const char *attr
const char *value
char *
xmlnode_to_formatted_str(node, len)
- xmlnode *node
+ Gaim::XMLNode node
int *len
char *
xmlnode_to_str(node, len)
- xmlnode *node
+ Gaim::XMLNode node
int *len
Modified: trunk/libgaim/plugins/perl/common/module.h
===================================================================
--- trunk/libgaim/plugins/perl/common/module.h 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/module.h 2006-10-12 20:38:47 UTC (rev 17471)
@@ -263,4 +263,5 @@
typedef xmlnode * Gaim__XMLNode;
typedef XMLNodeType XMLNode__Type;
-/* other.h */
+/* other */
+typedef void * Gaim__Handle;
Modified: trunk/libgaim/plugins/perl/common/typemap
===================================================================
--- trunk/libgaim/plugins/perl/common/typemap 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/typemap 2006-10-12 20:38:47 UTC (rev 17471)
@@ -72,6 +72,8 @@
Gaim::Desktop::Item T_GaimObj
Gaim::DesktopItemType T_IV
+Gaim::Handle T_GaimObj
+
Gaim::IconScaleRules T_IV
Gaim::Log T_GaimObj
Modified: trunk/libgaim/plugins/perl/perl-common.c
===================================================================
--- trunk/libgaim/plugins/perl/perl-common.c 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/perl-common.c 2006-10-12 20:38:47 UTC (rev 17471)
@@ -447,6 +447,9 @@
case GAIM_SUBTYPE_XFER:
stash = "Gaim::Xfer";
break;
+ case GAIM_SUBTYPE_XMLNODE:
+ stash = "Gaim::XMLNode";
+ break;
default:
stash = "Gaim"; /* ? */
Modified: trunk/libgaim/plugins/perl/perl-handlers.c
===================================================================
--- trunk/libgaim/plugins/perl/perl-handlers.c 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/perl-handlers.c 2006-10-12 20:38:47 UTC (rev 17471)
@@ -71,7 +71,8 @@
/* XXX This *will* cease working correctly if context gets changed to
* ever be able to hold anything other than a GaimConnection */
if (context != NULL)
- XPUSHs(sv_2mortal(gaim_perl_bless_object(context, "Gaim::Connection")));
+ XPUSHs(sv_2mortal(gaim_perl_bless_object(context,
+ "Gaim::Connection")));
else
XPUSHs(&PL_sv_undef);
PUTBACK;
Modified: trunk/libgaim/plugins/perl/perl.c
===================================================================
--- trunk/libgaim/plugins/perl/perl.c 2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/perl.c 2006-10-12 20:38:47 UTC (rev 17471)
@@ -276,9 +276,6 @@
char *basename;
STRLEN len;
- gaim_debug(GAIM_DEBUG_INFO, "perl",
- "Found plugin info\n");
-
info = g_new0(GaimPluginInfo, 1);
gps = g_new0(GaimPerlScript, 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
