This is an automated email from the git hooks/post-receive script.
intrigeri pushed a commit to branch experimental
in repository libnet-dbus-perl.
commit b55138ca6b3e52eff326ebd443134867ab2a5080
Author: Daniel P. Berrange <berra...@redhat.com>
Date: Mon Jul 3 08:48:59 2006 -0400
Change copyright from GPL to GPL/Artistic
---
CHANGES | 3 +
COPYING | 214 ++++--
DBus.xs | 1046 +++++++++++++-------------
lib/Net/DBus.pm | 24 +-
lib/Net/DBus/ASyncReply.pm | 22 +-
lib/Net/DBus/Annotation.pm | 22 +-
lib/Net/DBus/Binding/Bus.pm | 24 +-
lib/Net/DBus/Binding/Connection.pm | 24 +-
lib/Net/DBus/Binding/Introspector.pm | 24 +-
lib/Net/DBus/Binding/Iterator.pm | 24 +-
lib/Net/DBus/Binding/Message.pm | 24 +-
lib/Net/DBus/Binding/Message/Error.pm | 24 +-
lib/Net/DBus/Binding/Message/MethodCall.pm | 25 +-
lib/Net/DBus/Binding/Message/MethodReturn.pm | 24 +-
lib/Net/DBus/Binding/Message/Signal.pm | 24 +-
lib/Net/DBus/Binding/PendingCall.pm | 22 +-
lib/Net/DBus/Binding/Server.pm | 24 +-
lib/Net/DBus/Binding/Value.pm | 24 +-
lib/Net/DBus/Binding/Watch.pm | 24 +-
lib/Net/DBus/Callback.pm | 24 +-
lib/Net/DBus/Dumper.pm | 24 +-
lib/Net/DBus/Error.pm | 22 +-
lib/Net/DBus/Exporter.pm | 24 +-
lib/Net/DBus/Object.pm | 24 +-
lib/Net/DBus/Reactor.pm | 24 +-
lib/Net/DBus/RemoteObject.pm | 24 +-
lib/Net/DBus/RemoteService.pm | 24 +-
lib/Net/DBus/Service.pm | 24 +-
lib/Net/DBus/Test/MockConnection.pm | 24 +-
lib/Net/DBus/Test/MockObject.pm | 24 +-
30 files changed, 973 insertions(+), 931 deletions(-)
diff --git a/CHANGES b/CHANGES
index dbfcb34..ba745ed 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,9 @@ Changes since 0.33.2
are explicitly serialized into DBus errors, rather than
a generic 'org.freedesktop.DBus.Failed'.
+ - Change re-distribution license from GPL, to GPL / Perl Artistic,
+ matching the terms of Perl itself.
+
Changes since 0.33.1
- Fixed handling of variants in introspection data
diff --git a/COPYING b/COPYING
index 637a79d..0439b15 100644
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,15 @@
+Net-DBus may be redistributed and/or modified under the terms of Perl itself.
+Either:
+
+a) the GNU General Public License as published by the Free
+ Software Foundation; either version 1, or (at your option) any
+ later version
+
+or
+
+b) the "Artistic License"
+
+---------------------------------------------------------------------------
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
@@ -227,7 +239,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -280,63 +292,147 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN
ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
+---------------------------------------------------------------------------
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+The "Artistic License"
+
+ Preamble
+
+ The intent of this document is to state the conditions under which a
+ Package may be copied, such that the Copyright Holder maintains some
+ semblance of artistic control over the development of the package,
+ while giving the users of the package the right to use and distribute
+ the Package in a more-or-less customary fashion, plus the right to make
+ reasonable modifications.
+
+ Definitions
+
+ "Package"
+ refers to the collection of files distributed by the Copyright
+ Holder, and derivatives of that collection of files created through
+ textual modification.
+
+ "Standard Version"
+ refers to such a Package if it has not been modified, or has been
+ modified in accordance with the wishes of the Copyright Holder as
+ specified below.
+
+ "Copyright Holder"
+ is whoever is named in the copyright or copyrights for the package.
+
+ "You"
+ is you, if you're thinking about copying or distributing this Pack-
+ age.
+
+ "Reasonable copying fee"
+ is whatever you can justify on the basis of media cost, duplication
+ charges, time of people involved, and so on. (You will not be
+ required to justify it to the Copyright Holder, but only to the
+ computing community at large as a market that must bear the fee.)
+
+ "Freely Available"
+ means that no fee is charged for the item itself, though there may
+ be fees involved in handling the item. It also means that recipi-
+ ents of the item may redistribute it under the same conditions they
+ received it.
+
+ Conditions
+
+ 1. You may make and give away verbatim copies of the source form of
+ the Standard Version of this Package without restriction, provided
+ that you duplicate all of the original copyright notices and asso-
+ ciated disclaimers.
+
+ 2. You may apply bug fixes, portability fixes and other modifications
+ derived from the Public Domain or from the Copyright Holder. A
+ Package modified in such a way shall still be considered the Stan-
+ dard Version.
+
+ 3. You may otherwise modify your copy of this Package in any way, pro-
+ vided that you insert a prominent notice in each changed file stat-
+ ing how and when you changed that file, and provided that you do at
+ least ONE of the following:
+
+ a) place your modifications in the Public Domain or otherwise make
+ them Freely Available, such as by posting said modifications to
+ Usenet or an equivalent medium, or placing the modifications on
+ a major archive site such as uunet.uu.net, or by allowing the
+ Copyright Holder to include your modifications in the Standard
+ Version of the Package.
+
+ b) use the modified Package only within your corporation or orga-
+ nization.
+
+ c) rename any non-standard executables so the names do not con-
+ flict with standard executables, which must also be provided,
+ and provide a separate manual page for each non-standard exe-
+ cutable that clearly documents how it differs from the Standard
+ Version.
+
+ d) make other distribution arrangements with the Copyright Holder.
+
+ 4. You may distribute the programs of this Package in object code or
+ executable form, provided that you do at least ONE of the follow-
+ ing:
+
+ a) distribute a Standard Version of the executables and library
+ files, together with instructions (in the manual page or equiv-
+ alent) on where to get the Standard Version.
+
+ b) accompany the distribution with the machine-readable source of
+ the Package with your modifications.
+
+ c) give non-standard executables non-standard names, and clearly
+ document the differences in manual pages (or equivalent),
+ together with instructions on where to get the Standard Ver-
+ sion.
+
+ d) make other distribution arrangements with the Copyright Holder.
+
+ 5. You may charge a reasonable copying fee for any distribution of
+ this Package. You may charge any fee you choose for support of
+ this Package. You may not charge a fee for this Package itself.
+ However, you may distribute this Package in aggregate with other
+ (possibly commercial) programs as part of a larger (possibly com-
+ mercial) software distribution provided that you do not advertise
+ this Package as a product of your own. You may embed this Pack-
+ age's interpreter within an executable of yours (by linking); this
+ shall be construed as a mere form of aggregation, provided that the
+ complete Standard Version of the interpreter is so embedded.
+
+ 6. The scripts and library files supplied as input to or produced as
+ output from the programs of this Package do not automatically fall
+ under the copyright of this Package, but belong to whoever gener-
+ ated them, and may be sold commercially, and may be aggregated with
+ this Package. If such scripts or library files are aggregated with
+ this Package via the so-called "undump" or "unexec" methods of pro-
+ ducing a binary executable image, then distribution of such an
+ image shall neither be construed as a distribution of this Package
+ nor shall it fall under the restrictions of Paragraphs 3 and 4,
+ provided that you do not represent such an executable image as a
+ Standard Version of this Package.
+
+ 7. C subroutines (or comparably compiled subroutines in other lan-
+ guages) supplied by you and linked into this Package in order to
+ emulate subroutines and variables of the language defined by this
+ Package shall not be considered part of this Package, but are the
+ equivalent of input as in Paragraph 6, provided these subroutines
+ do not change the language in any way that would cause it to fail
+ the regression tests for the language.
+
+ 8. Aggregation of this Package with a commercial distribution is
+ always permitted provided that the use of this Package is embedded;
+ that is, when no overt attempt is made to make this Package's
+ interfaces visible to the end user of the commercial distribution.
+ Such use shall not be construed as a distribution of this Package.
+
+ 9. The name of the Copyright Holder may not be used to endorse or pro-
+ mote products derived from this software without specific prior
+ written permission.
+
+ 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES
+ OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+ The End
diff --git a/DBus.xs b/DBus.xs
index db449a1..912112a 100644
--- a/DBus.xs
+++ b/DBus.xs
@@ -1,22 +1,20 @@
/* -*- c -*-
*
- * Copyright (C) 2004-2005 Daniel P. Berrange
+ * Copyright (C) 2004-2006 Daniel P. Berrange
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; You can redistribute it and/or modify
+ * it under the same terms as Perl itself. Either:
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * a) the GNU General Public License as published by the Free
+ * Software Foundation; either version 2, or (at your option) any
+ * later version,
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * or
*
- * $Id: DBus.xs,v 1.21 2006/02/03 13:30:14 dan Exp $
+ * b) the "Artistic License"
+ *
+ * The file "COPYING" distributed along with this file provides full
+ * details of the terms and conditions of the two licenses.
*/
#include "EXTERN.h"
@@ -33,7 +31,7 @@
/* The -1 is required by the contract for
- dbus_{server,connection}_allocate_slot
+ dbus_{server,connection}_allocate_slot
initialization */
dbus_int32_t connection_data_slot = -1;
dbus_int32_t server_data_slot = -1;
@@ -66,8 +64,8 @@ _watch_generic(DBusWatch *watch, void *data, char *key,
dbus_bool_t server) {
call = hv_fetch(self, key, strlen(key), 0);
if (!call) {
- warn("Could not find watch callback %s for fd %d\n",
- key, dbus_watch_get_fd(watch));
+ warn("Could not find watch callback %s for fd %d\n",
+ key, dbus_watch_get_fd(watch));
return FALSE;
}
@@ -182,10 +180,10 @@ _timeout_connection_toggled(DBusTimeout *timeout, void
*data) {
_timeout_generic(timeout, data, "toggled_timeout", 0);
}
-void
+void
_connection_callback (DBusServer *server,
- DBusConnection *new_connection,
- void *data) {
+ DBusConnection *new_connection,
+ void *data) {
SV *selfref = (SV*)dbus_server_get_data((DBusServer*)data,
server_data_slot);
HV *self = (HV*)SvRV(selfref);
SV **call;
@@ -217,14 +215,14 @@ _connection_callback (DBusServer *server,
call_sv(*call, G_DISCARD);
FREETMPS;
- LEAVE;
+ LEAVE;
}
DBusHandlerResult
_message_filter(DBusConnection *con,
- DBusMessage *msg,
- void *data) {
+ DBusMessage *msg,
+ void *data) {
SV *selfref;
HV *self;
SV *value;
@@ -276,14 +274,14 @@ _filter_release(void *data) {
void
_path_unregister_callback(DBusConnection *con,
- void *data) {
+ void *data) {
SvREFCNT_dec(data);
}
DBusHandlerResult
_path_message_callback(DBusConnection *con,
- DBusMessage *msg,
- void *data) {
+ DBusMessage *msg,
+ void *data) {
SV *self = (SV*)dbus_connection_get_data(con, connection_data_slot);
SV *value;
dSP;
@@ -319,8 +317,8 @@ DBusObjectPathVTable _path_callback_vtable = {
_path_message_callback,
NULL,
NULL,
- NULL,
- NULL
+ NULL,
+ NULL
};
SV *
@@ -332,18 +330,18 @@ _sv_from_error (DBusError *error)
warn ("error is NULL");
return &PL_sv_undef;
}
-
+
if (!dbus_error_is_set (error)) {
warn ("error is unset");
return &PL_sv_undef;
}
-
+
hv = newHV ();
-
+
/* map DBusError attributes to hash keys */
hv_store (hv, "name", 4, newSVpv (error->name, 0), 0);
hv_store (hv, "message", 7, newSVpv (error->message, 0), 0);
-
+
return sv_bless (newRV_noinc ((SV*) hv), gv_stashpv ("Net::DBus::Error",
TRUE));
}
@@ -351,10 +349,10 @@ void
_croak_error (DBusError *error)
{
sv_setsv (ERRSV, _sv_from_error (error));
-
+
/* croak does not return, so we free this now to avoid leaking */
dbus_error_free (error);
-
+
croak (Nullch);
}
@@ -366,53 +364,53 @@ _populate_constant(HV *href, char *name, int val)
#define REGISTER_CONSTANT(name, key) _populate_constant(constants, #key, name)
-MODULE = Net::DBus PACKAGE = Net::DBus
+MODULE = Net::DBus PACKAGE = Net::DBus
PROTOTYPES: ENABLE
BOOT:
{
- HV *constants;
-
- /* not the 'standard' way of doing perl constants, but a lot easier to
maintain */
-
- constants = perl_get_hv("Net::DBus::Binding::Bus::_constants", TRUE);
- REGISTER_CONSTANT(DBUS_BUS_SYSTEM, SYSTEM);
- REGISTER_CONSTANT(DBUS_BUS_SESSION, SESSION);
- REGISTER_CONSTANT(DBUS_BUS_STARTER, STARTER);
-
- constants = perl_get_hv("Net::DBus::Binding::Message::_constants",
TRUE);
- REGISTER_CONSTANT(DBUS_TYPE_ARRAY, TYPE_ARRAY);
- REGISTER_CONSTANT(DBUS_TYPE_BOOLEAN, TYPE_BOOLEAN);
- REGISTER_CONSTANT(DBUS_TYPE_BYTE, TYPE_BYTE);
- REGISTER_CONSTANT(DBUS_TYPE_DOUBLE, TYPE_DOUBLE);
- REGISTER_CONSTANT(DBUS_TYPE_INT16, TYPE_INT16);
- REGISTER_CONSTANT(DBUS_TYPE_INT32, TYPE_INT32);
- REGISTER_CONSTANT(DBUS_TYPE_INT64, TYPE_INT64);
- REGISTER_CONSTANT(DBUS_TYPE_INVALID, TYPE_INVALID);
- REGISTER_CONSTANT(DBUS_TYPE_STRUCT, TYPE_STRUCT);
- REGISTER_CONSTANT(DBUS_TYPE_SIGNATURE, TYPE_SIGNATURE);
- REGISTER_CONSTANT(DBUS_TYPE_OBJECT_PATH, TYPE_OBJECT_PATH);
- REGISTER_CONSTANT(DBUS_TYPE_DICT_ENTRY, TYPE_DICT_ENTRY);
- REGISTER_CONSTANT(DBUS_TYPE_STRING, TYPE_STRING);
- REGISTER_CONSTANT(DBUS_TYPE_UINT16, TYPE_UINT16);
- REGISTER_CONSTANT(DBUS_TYPE_UINT32, TYPE_UINT32);
- REGISTER_CONSTANT(DBUS_TYPE_UINT64, TYPE_UINT64);
- REGISTER_CONSTANT(DBUS_TYPE_VARIANT, TYPE_VARIANT);
+ HV *constants;
+
+ /* not the 'standard' way of doing perl constants, but a lot easier to
maintain */
+
+ constants = perl_get_hv("Net::DBus::Binding::Bus::_constants", TRUE);
+ REGISTER_CONSTANT(DBUS_BUS_SYSTEM, SYSTEM);
+ REGISTER_CONSTANT(DBUS_BUS_SESSION, SESSION);
+ REGISTER_CONSTANT(DBUS_BUS_STARTER, STARTER);
+
+ constants = perl_get_hv("Net::DBus::Binding::Message::_constants",
TRUE);
+ REGISTER_CONSTANT(DBUS_TYPE_ARRAY, TYPE_ARRAY);
+ REGISTER_CONSTANT(DBUS_TYPE_BOOLEAN, TYPE_BOOLEAN);
+ REGISTER_CONSTANT(DBUS_TYPE_BYTE, TYPE_BYTE);
+ REGISTER_CONSTANT(DBUS_TYPE_DOUBLE, TYPE_DOUBLE);
+ REGISTER_CONSTANT(DBUS_TYPE_INT16, TYPE_INT16);
+ REGISTER_CONSTANT(DBUS_TYPE_INT32, TYPE_INT32);
+ REGISTER_CONSTANT(DBUS_TYPE_INT64, TYPE_INT64);
+ REGISTER_CONSTANT(DBUS_TYPE_INVALID, TYPE_INVALID);
+ REGISTER_CONSTANT(DBUS_TYPE_STRUCT, TYPE_STRUCT);
+ REGISTER_CONSTANT(DBUS_TYPE_SIGNATURE, TYPE_SIGNATURE);
+ REGISTER_CONSTANT(DBUS_TYPE_OBJECT_PATH, TYPE_OBJECT_PATH);
+ REGISTER_CONSTANT(DBUS_TYPE_DICT_ENTRY, TYPE_DICT_ENTRY);
+ REGISTER_CONSTANT(DBUS_TYPE_STRING, TYPE_STRING);
+ REGISTER_CONSTANT(DBUS_TYPE_UINT16, TYPE_UINT16);
+ REGISTER_CONSTANT(DBUS_TYPE_UINT32, TYPE_UINT32);
+ REGISTER_CONSTANT(DBUS_TYPE_UINT64, TYPE_UINT64);
+ REGISTER_CONSTANT(DBUS_TYPE_VARIANT, TYPE_VARIANT);
REGISTER_CONSTANT(DBUS_MESSAGE_TYPE_METHOD_CALL,
MESSAGE_TYPE_METHOD_CALL);
REGISTER_CONSTANT(DBUS_MESSAGE_TYPE_METHOD_RETURN,
MESSAGE_TYPE_METHOD_RETURN);
REGISTER_CONSTANT(DBUS_MESSAGE_TYPE_ERROR, MESSAGE_TYPE_ERROR);
REGISTER_CONSTANT(DBUS_MESSAGE_TYPE_SIGNAL, MESSAGE_TYPE_SIGNAL);
REGISTER_CONSTANT(DBUS_MESSAGE_TYPE_INVALID, MESSAGE_TYPE_INVALID);
-
- constants = perl_get_hv("Net::DBus::Binding::Watch::_constants", TRUE);
- REGISTER_CONSTANT(DBUS_WATCH_READABLE, READABLE);
- REGISTER_CONSTANT(DBUS_WATCH_WRITABLE, WRITABLE);
- REGISTER_CONSTANT(DBUS_WATCH_ERROR, ERROR);
- REGISTER_CONSTANT(DBUS_WATCH_HANGUP, HANGUP);
-
- dbus_connection_allocate_data_slot(&connection_data_slot);
- dbus_server_allocate_data_slot(&server_data_slot);
+
+ constants = perl_get_hv("Net::DBus::Binding::Watch::_constants", TRUE);
+ REGISTER_CONSTANT(DBUS_WATCH_READABLE, READABLE);
+ REGISTER_CONSTANT(DBUS_WATCH_WRITABLE, WRITABLE);
+ REGISTER_CONSTANT(DBUS_WATCH_ERROR, ERROR);
+ REGISTER_CONSTANT(DBUS_WATCH_HANGUP, HANGUP);
+
+ dbus_connection_allocate_data_slot(&connection_data_slot);
+ dbus_server_allocate_data_slot(&server_data_slot);
}
@@ -422,234 +420,234 @@ PROTOTYPES: ENABLE
DBusConnection *
_open(address)
- char *address;
+ char *address;
PREINIT:
- DBusError error;
- DBusConnection *con;
- CODE:
- dbus_error_init(&error);
- con = dbus_connection_open(address, &error);
- if (!con) {
- _croak_error (&error);
- }
- RETVAL = con;
+ DBusError error;
+ DBusConnection *con;
+ CODE:
+ dbus_error_init(&error);
+ con = dbus_connection_open(address, &error);
+ if (!con) {
+ _croak_error (&error);
+ }
+ RETVAL = con;
OUTPUT:
- RETVAL
+ RETVAL
MODULE = Net::DBus::Binding::C::Connection PACKAGE =
Net::DBus::Binding::C::Connection
void
_set_owner(con, owner)
- DBusConnection *con;
- SV *owner;
+ DBusConnection *con;
+ SV *owner;
CODE:
- SvREFCNT_inc(owner);
- dbus_connection_set_data(con, connection_data_slot, owner,
_object_release);
+ SvREFCNT_inc(owner);
+ dbus_connection_set_data(con, connection_data_slot, owner,
_object_release);
void
dbus_connection_disconnect(con)
- DBusConnection *con;
+ DBusConnection *con;
int
dbus_connection_get_is_connected(con)
- DBusConnection *con;
+ DBusConnection *con;
int
dbus_connection_get_is_authenticated(con)
- DBusConnection *con;
+ DBusConnection *con;
void
dbus_connection_flush(con)
- DBusConnection *con;
+ DBusConnection *con;
int
_send(con, msg)
- DBusConnection *con;
- DBusMessage *msg;
+ DBusConnection *con;
+ DBusMessage *msg;
PREINIT:
- dbus_uint32_t serial;
+ dbus_uint32_t serial;
CODE:
- if (!dbus_connection_send(con, msg, &serial)) {
- croak("not enough memory to send message");
- }
- RETVAL = serial;
+ if (!dbus_connection_send(con, msg, &serial)) {
+ croak("not enough memory to send message");
+ }
+ RETVAL = serial;
OUTPUT:
- RETVAL
+ RETVAL
DBusMessage *
_send_with_reply_and_block(con, msg, timeout)
- DBusConnection *con;
- DBusMessage *msg;
- int timeout;
+ DBusConnection *con;
+ DBusMessage *msg;
+ int timeout;
PREINIT:
- DBusMessage *reply;
- DBusError error;
- CODE:
- dbus_error_init(&error);
- if (!(reply = dbus_connection_send_with_reply_and_block(con, msg,
timeout, &error))) {
- _croak_error(&error);
- }
- PD_DEBUG("Create msg reply %p\n", reply);
- PD_DEBUG(" Type %d\n", dbus_message_get_type(reply));
- PD_DEBUG(" Interface %s\n", dbus_message_get_interface(reply) ?
dbus_message_get_interface(reply) : "");
- PD_DEBUG(" Path %s\n", dbus_message_get_path(reply) ?
dbus_message_get_path(reply) : "");
- PD_DEBUG(" Member %s\n", dbus_message_get_member(reply) ?
dbus_message_get_member(reply) : "");
- // XXX needed ?
- //dbus_message_ref(reply);
- RETVAL = reply;
+ DBusMessage *reply;
+ DBusError error;
+ CODE:
+ dbus_error_init(&error);
+ if (!(reply = dbus_connection_send_with_reply_and_block(con, msg,
timeout, &error))) {
+ _croak_error(&error);
+ }
+ PD_DEBUG("Create msg reply %p\n", reply);
+ PD_DEBUG(" Type %d\n", dbus_message_get_type(reply));
+ PD_DEBUG(" Interface %s\n", dbus_message_get_interface(reply) ?
dbus_message_get_interface(reply) : "");
+ PD_DEBUG(" Path %s\n", dbus_message_get_path(reply) ?
dbus_message_get_path(reply) : "");
+ PD_DEBUG(" Member %s\n", dbus_message_get_member(reply) ?
dbus_message_get_member(reply) : "");
+ // XXX needed ?
+ //dbus_message_ref(reply);
+ RETVAL = reply;
OUTPUT:
- RETVAL
+ RETVAL
DBusPendingCall *
_send_with_reply(con, msg, timeout)
- DBusConnection *con;
- DBusMessage *msg;
- int timeout;
+ DBusConnection *con;
+ DBusMessage *msg;
+ int timeout;
PREINIT:
- DBusPendingCall *reply;
- CODE:
- if (!dbus_connection_send_with_reply(con, msg, &reply, timeout)) {
- croak("not enough memory to send message");
- }
- PD_DEBUG("Create pending call %p\n", reply);
- // XXX needed ?
- //dbus_pending_call_ref(reply);
- RETVAL = reply;
+ DBusPendingCall *reply;
+ CODE:
+ if (!dbus_connection_send_with_reply(con, msg, &reply, timeout)) {
+ croak("not enough memory to send message");
+ }
+ PD_DEBUG("Create pending call %p\n", reply);
+ // XXX needed ?
+ //dbus_pending_call_ref(reply);
+ RETVAL = reply;
OUTPUT:
- RETVAL
+ RETVAL
DBusMessage *
dbus_connection_borrow_message(con)
- DBusConnection *con;
+ DBusConnection *con;
void
dbus_connection_return_message(con, msg)
- DBusConnection *con;
- DBusMessage *msg;
+ DBusConnection *con;
+ DBusMessage *msg;
void
dbus_connection_steal_borrowed_message(con, msg)
- DBusConnection *con;
- DBusMessage *msg;
+ DBusConnection *con;
+ DBusMessage *msg;
DBusMessage *
dbus_connection_pop_message(con)
- DBusConnection *con;
+ DBusConnection *con;
void
_dispatch(con)
- DBusConnection *con;
+ DBusConnection *con;
CODE:
- while(dbus_connection_dispatch(con) == DBUS_DISPATCH_DATA_REMAINS);
+ while(dbus_connection_dispatch(con) == DBUS_DISPATCH_DATA_REMAINS);
void
_set_watch_callbacks(con)
- DBusConnection *con;
+ DBusConnection *con;
CODE:
- if (!dbus_connection_set_watch_functions(con,
- _watch_connection_add,
- _watch_connection_remove,
- _watch_connection_toggled,
- con, NULL)) {
- croak("not enough memory to set watch functions on connection");
- }
+ if (!dbus_connection_set_watch_functions(con,
+ _watch_connection_add,
+ _watch_connection_remove,
+ _watch_connection_toggled,
+ con, NULL)) {
+ croak("not enough memory to set watch functions on connection");
+ }
void
_set_timeout_callbacks(con)
- DBusConnection *con;
+ DBusConnection *con;
CODE:
- if (!dbus_connection_set_timeout_functions(con,
- _timeout_connection_add,
- _timeout_connection_remove,
-
_timeout_connection_toggled,
- con, NULL)) {
- croak("not enough memory to set timeout functions on connection");
- }
+ if (!dbus_connection_set_timeout_functions(con,
+ _timeout_connection_add,
+ _timeout_connection_remove,
+ _timeout_connection_toggled,
+ con, NULL)) {
+ croak("not enough memory to set timeout functions on connection");
+ }
void
_register_object_path(con, path, code)
- DBusConnection *con;
- char *path;
- SV *code;
+ DBusConnection *con;
+ char *path;
+ SV *code;
CODE:
- SvREFCNT_inc(code);
- if (!(dbus_connection_register_object_path(con, path,
&_path_callback_vtable, code))) {
- croak("failure when registering object path");
- }
+ SvREFCNT_inc(code);
+ if (!(dbus_connection_register_object_path(con, path,
&_path_callback_vtable, code))) {
+ croak("failure when registering object path");
+ }
void
_unregister_object_path(con, path)
- DBusConnection *con;
- char *path;
+ DBusConnection *con;
+ char *path;
CODE:
- /* The associated data will be free'd by the previously
- registered callback */
- if (!(dbus_connection_unregister_object_path(con, path))) {
- croak("failure when unregistering object path");
- }
+ /* The associated data will be free'd by the previously
+ registered callback */
+ if (!(dbus_connection_unregister_object_path(con, path))) {
+ croak("failure when unregistering object path");
+ }
void
_register_fallback(con, path, code)
- DBusConnection *con;
- char *path;
- SV *code;
+ DBusConnection *con;
+ char *path;
+ SV *code;
CODE:
- SvREFCNT_inc(code);
- if (!(dbus_connection_register_fallback(con, path,
&_path_callback_vtable, code))) {
- croak("failure when registering fallback object path");
- }
+ SvREFCNT_inc(code);
+ if (!(dbus_connection_register_fallback(con, path,
&_path_callback_vtable, code))) {
+ croak("failure when registering fallback object path");
+ }
void
_add_filter(con, code)
- DBusConnection *con;
- SV *code;
+ DBusConnection *con;
+ SV *code;
CODE:
- SvREFCNT_inc(code);
+ SvREFCNT_inc(code);
PD_DEBUG("Adding filter %p\n", code);
- dbus_connection_add_filter(con, _message_filter, code,
_filter_release);
+ dbus_connection_add_filter(con, _message_filter, code, _filter_release);
dbus_bool_t
dbus_bus_register(con)
- DBusConnection *con;
+ DBusConnection *con;
PREINIT:
- DBusError error;
- int reply;
+ DBusError error;
+ int reply;
CODE:
- dbus_error_init(&error);
- if (!(reply = dbus_bus_register(con, &error))) {
- _croak_error(&error);
- }
- RETVAL = reply;
+ dbus_error_init(&error);
+ if (!(reply = dbus_bus_register(con, &error))) {
+ _croak_error(&error);
+ }
+ RETVAL = reply;
void
dbus_bus_add_match(con, rule)
- DBusConnection *con;
- char *rule;
+ DBusConnection *con;
+ char *rule;
PREINIT:
- DBusError error;
+ DBusError error;
CODE:
- dbus_error_init(&error);
+ dbus_error_init(&error);
PD_DEBUG("Adding match %s\n", rule);
- dbus_bus_add_match(con, rule, &error);
+ dbus_bus_add_match(con, rule, &error);
if (dbus_error_is_set(&error)) {
_croak_error(&error);
- }
+ }
void
dbus_bus_remove_match(con, rule)
- DBusConnection *con;
- char *rule;
+ DBusConnection *con;
+ char *rule;
PREINIT:
- DBusError error;
+ DBusError error;
CODE:
- dbus_error_init(&error);
+ dbus_error_init(&error);
PD_DEBUG("Removeing match %s\n", rule);
- dbus_bus_remove_match(con, rule, &error);
+ dbus_bus_remove_match(con, rule, &error);
if (dbus_error_is_set(&error)) {
_croak_error(&error);
- }
+ }
const char *
dbus_bus_get_unique_name(con)
@@ -657,28 +655,28 @@ dbus_bus_get_unique_name(con)
int
dbus_bus_request_name(con, service_name)
- DBusConnection *con;
- char *service_name;
+ DBusConnection *con;
+ char *service_name;
PREINIT:
- DBusError error;
- int reply;
- CODE:
- dbus_error_init(&error);
- if (!(reply = dbus_bus_request_name(con, service_name, 0, &error))) {
- _croak_error(&error);
- }
- RETVAL = reply;
+ DBusError error;
+ int reply;
+ CODE:
+ dbus_error_init(&error);
+ if (!(reply = dbus_bus_request_name(con, service_name, 0, &error))) {
+ _croak_error(&error);
+ }
+ RETVAL = reply;
OUTPUT:
- RETVAL
+ RETVAL
void
DESTROY(con)
- DBusConnection *con;
+ DBusConnection *con;
CODE:
- PD_DEBUG("Destroying connection %p\n", con);
- dbus_connection_disconnect(con);
- // XXX do we need this or not ?
- //dbus_connection_unref(con);
+ PD_DEBUG("Destroying connection %p\n", con);
+ dbus_connection_disconnect(con);
+ // XXX do we need this or not ?
+ //dbus_connection_unref(con);
MODULE = Net::DBus::Binding::Server PACKAGE =
Net::DBus::Binding::Server
@@ -687,83 +685,83 @@ PROTOTYPES: ENABLE
DBusServer *
_open(address)
- char *address;
+ char *address;
PREINIT:
- DBusError error;
- DBusServer *server;
- CODE:
- dbus_error_init(&error);
- server = dbus_server_listen(address, &error);
- PD_DEBUG("Created server %p on address %s", server, address);
- if (!server) {
- _croak_error(&error);
- }
- if (!dbus_server_set_auth_mechanisms(server, NULL)) {
- croak("not enough memory to server auth mechanisms");
- }
- RETVAL = server;
+ DBusError error;
+ DBusServer *server;
+ CODE:
+ dbus_error_init(&error);
+ server = dbus_server_listen(address, &error);
+ PD_DEBUG("Created server %p on address %s", server, address);
+ if (!server) {
+ _croak_error(&error);
+ }
+ if (!dbus_server_set_auth_mechanisms(server, NULL)) {
+ croak("not enough memory to server auth mechanisms");
+ }
+ RETVAL = server;
OUTPUT:
- RETVAL
+ RETVAL
MODULE = Net::DBus::Binding::C::Server PACKAGE =
Net::DBus::Binding::C::Server
void
_set_owner(server, owner)
- DBusServer *server;
- SV *owner;
+ DBusServer *server;
+ SV *owner;
CODE:
- SvREFCNT_inc(owner);
- dbus_server_set_data(server, server_data_slot, owner, _object_release);
+ SvREFCNT_inc(owner);
+ dbus_server_set_data(server, server_data_slot, owner, _object_release);
void
dbus_server_disconnect(server)
- DBusServer *server;
+ DBusServer *server;
int
dbus_server_get_is_connected(server)
- DBusServer *server;
+ DBusServer *server;
void
_set_watch_callbacks(server)
- DBusServer *server;
+ DBusServer *server;
CODE:
- if (!dbus_server_set_watch_functions(server,
- _watch_server_add,
- _watch_server_remove,
- _watch_server_toggled,
- server, NULL)) {
- croak("not enough memory to set watch functions on server");
- }
+ if (!dbus_server_set_watch_functions(server,
+ _watch_server_add,
+ _watch_server_remove,
+ _watch_server_toggled,
+ server, NULL)) {
+ croak("not enough memory to set watch functions on server");
+ }
void
_set_timeout_callbacks(server)
- DBusServer *server;
+ DBusServer *server;
CODE:
- if (!dbus_server_set_timeout_functions(server,
- _timeout_server_add,
- _timeout_server_remove,
- _timeout_server_toggled,
- server, NULL)) {
- croak("not enough memory to set timeout functions on server");
- }
+ if (!dbus_server_set_timeout_functions(server,
+ _timeout_server_add,
+ _timeout_server_remove,
+ _timeout_server_toggled,
+ server, NULL)) {
+ croak("not enough memory to set timeout functions on server");
+ }
void
_set_connection_callback(server)
- DBusServer *server;
+ DBusServer *server;
CODE:
- dbus_server_set_new_connection_function(server,
- _connection_callback,
- server, NULL);
+ dbus_server_set_new_connection_function(server,
+ _connection_callback,
+ server, NULL);
void
DESTROY(server)
- DBusServer *server;
+ DBusServer *server;
CODE:
- PD_DEBUG("Destroying server %p\n", server);
- dbus_server_unref(server);
+ PD_DEBUG("Destroying server %p\n", server);
+ dbus_server_unref(server);
MODULE = Net::DBus::Binding::Bus PACKAGE =
Net::DBus::Binding::Bus
@@ -772,19 +770,19 @@ PROTOTYPES: ENABLE
DBusConnection *
_open(type)
- DBusBusType type;
+ DBusBusType type;
PREINIT:
- DBusError error;
- DBusConnection *con;
- CODE:
- dbus_error_init(&error);
- con = dbus_bus_get(type, &error);
- if (!con) {
- _croak_error(&error);
- }
- RETVAL = con;
+ DBusError error;
+ DBusConnection *con;
+ CODE:
+ dbus_error_init(&error);
+ con = dbus_bus_get(type, &error);
+ if (!con) {
+ _croak_error(&error);
+ }
+ RETVAL = con;
OUTPUT:
- RETVAL
+ RETVAL
MODULE = Net::DBus::Binding::Message PACKAGE =
Net::DBus::Binding::Message
@@ -792,53 +790,53 @@ PROTOTYPES: ENABLE
DBusMessage *
_create(type)
- IV type;
+ IV type;
PREINIT:
- DBusMessage *msg;
- CODE:
- msg = dbus_message_new(type);
- if (!msg) {
- croak("No memory to allocate message");
- }
- PD_DEBUG("Create msg new %p\n", msg);
- PD_DEBUG(" Type %d\n", dbus_message_get_type(msg));
- RETVAL = msg;
+ DBusMessage *msg;
+ CODE:
+ msg = dbus_message_new(type);
+ if (!msg) {
+ croak("No memory to allocate message");
+ }
+ PD_DEBUG("Create msg new %p\n", msg);
+ PD_DEBUG(" Type %d\n", dbus_message_get_type(msg));
+ RETVAL = msg;
OUTPUT:
- RETVAL
+ RETVAL
DBusMessageIter *
_iterator_append(msg)
- DBusMessage *msg;
+ DBusMessage *msg;
CODE:
- RETVAL = dbus_new(DBusMessageIter, 1);
- dbus_message_iter_init_append(msg, RETVAL);
+ RETVAL = dbus_new(DBusMessageIter, 1);
+ dbus_message_iter_init_append(msg, RETVAL);
OUTPUT:
- RETVAL
+ RETVAL
DBusMessageIter *
_iterator(msg)
- DBusMessage *msg;
+ DBusMessage *msg;
CODE:
- RETVAL = dbus_new(DBusMessageIter, 1);
- dbus_message_iter_init(msg, RETVAL);
+ RETVAL = dbus_new(DBusMessageIter, 1);
+ dbus_message_iter_init(msg, RETVAL);
OUTPUT:
- RETVAL
+ RETVAL
MODULE = Net::DBus::Binding::C::Message PACKAGE =
Net::DBus::Binding::C::Message
void
DESTROY(msg)
- DBusMessage *msg;
+ DBusMessage *msg;
CODE:
- PD_DEBUG("De-referencing message %p\n", msg);
- PD_DEBUG(" Type %d\n", dbus_message_get_type(msg));
- PD_DEBUG(" Interface %s\n", dbus_message_get_interface(msg) ?
dbus_message_get_interface(msg) : "");
- PD_DEBUG(" Path %s\n", dbus_message_get_path(msg) ?
dbus_message_get_path(msg) : "");
- PD_DEBUG(" Member %s\n", dbus_message_get_member(msg) ?
dbus_message_get_member(msg) : "");
- dbus_message_unref(msg);
+ PD_DEBUG("De-referencing message %p\n", msg);
+ PD_DEBUG(" Type %d\n", dbus_message_get_type(msg));
+ PD_DEBUG(" Interface %s\n", dbus_message_get_interface(msg) ?
dbus_message_get_interface(msg) : "");
+ PD_DEBUG(" Path %s\n", dbus_message_get_path(msg) ?
dbus_message_get_path(msg) : "");
+ PD_DEBUG(" Member %s\n", dbus_message_get_member(msg) ?
dbus_message_get_member(msg) : "");
+ dbus_message_unref(msg);
dbus_bool_t
dbus_message_get_no_reply(msg)
@@ -847,7 +845,7 @@ dbus_message_get_no_reply(msg)
void
dbus_message_set_no_reply(msg,flag)
DBusMessage *msg;
- dbus_bool_t flag;
+ dbus_bool_t flag;
int
dbus_message_get_type(msg)
@@ -888,12 +886,12 @@ dbus_message_get_signature(msg)
void
dbus_message_set_sender(msg, sender);
DBusMessage *msg;
- const char *sender;
+ const char *sender;
void
dbus_message_set_destination(msg, dest);
DBusMessage *msg;
- const char *dest;
+ const char *dest;
MODULE = Net::DBus::Binding::Message::Signal PACKAGE =
Net::DBus::Binding::Message::Signal
@@ -901,24 +899,24 @@ PROTOTYPES: ENABLE
DBusMessage *
_create(path, interface, name)
- char *path;
- char *interface;
- char *name;
+ char *path;
+ char *interface;
+ char *name;
PREINIT:
- DBusMessage *msg;
- CODE:
- msg = dbus_message_new_signal(path, interface, name);
- if (!msg) {
- croak("No memory to allocate message");
- }
- PD_DEBUG("Create msg new signal %p\n", msg);
- PD_DEBUG(" Type %d\n", dbus_message_get_type(msg));
- PD_DEBUG(" Interface %s\n", dbus_message_get_interface(msg) ?
dbus_message_get_interface(msg) : "");
- PD_DEBUG(" Path %s\n", dbus_message_get_path(msg) ?
dbus_message_get_path(msg) : "");
- PD_DEBUG(" Member %s\n", dbus_message_get_member(msg) ?
dbus_message_get_member(msg) : "");
- RETVAL = msg;
+ DBusMessage *msg;
+ CODE:
+ msg = dbus_message_new_signal(path, interface, name);
+ if (!msg) {
+ croak("No memory to allocate message");
+ }
+ PD_DEBUG("Create msg new signal %p\n", msg);
+ PD_DEBUG(" Type %d\n", dbus_message_get_type(msg));
+ PD_DEBUG(" Interface %s\n", dbus_message_get_interface(msg) ?
dbus_message_get_interface(msg) : "");
+ PD_DEBUG(" Path %s\n", dbus_message_get_path(msg) ?
dbus_message_get_path(msg) : "");
+ PD_DEBUG(" Member %s\n", dbus_message_get_member(msg) ?
dbus_message_get_member(msg) : "");
+ RETVAL = msg;
OUTPUT:
- RETVAL
+ RETVAL
MODULE = Net::DBus::Binding::Message::MethodCall PACKAGE =
Net::DBus::Binding::Message::MethodCall
@@ -926,25 +924,25 @@ PROTOTYPES: ENABLE
DBusMessage *
_create(service, path, interface, method)
- char *service;
- char *path;
- char *interface;
- char *method;
+ char *service;
+ char *path;
+ char *interface;
+ char *method;
PREINIT:
- DBusMessage *msg;
- CODE:
- msg = dbus_message_new_method_call(service, path, interface, method);
- if (!msg) {
- croak("No memory to allocate message");
- }
- PD_DEBUG("Create msg new method call %p\n", msg);
- PD_DEBUG(" Type %d\n", dbus_message_get_type(msg));
- PD_DEBUG(" Interface %s\n", dbus_message_get_interface(msg) ?
dbus_message_get_interface(msg) : "");
- PD_DEBUG(" Path %s\n", dbus_message_get_path(msg) ?
dbus_message_get_path(msg) : "");
- PD_DEBUG(" Member %s\n", dbus_message_get_member(msg) ?
dbus_message_get_member(msg) : "");
- RETVAL = msg;
+ DBusMessage *msg;
+ CODE:
+ msg = dbus_message_new_method_call(service, path, interface, method);
+ if (!msg) {
+ croak("No memory to allocate message");
+ }
+ PD_DEBUG("Create msg new method call %p\n", msg);
+ PD_DEBUG(" Type %d\n", dbus_message_get_type(msg));
+ PD_DEBUG(" Interface %s\n", dbus_message_get_interface(msg) ?
dbus_message_get_interface(msg) : "");
+ PD_DEBUG(" Path %s\n", dbus_message_get_path(msg) ?
dbus_message_get_path(msg) : "");
+ PD_DEBUG(" Member %s\n", dbus_message_get_member(msg) ?
dbus_message_get_member(msg) : "");
+ RETVAL = msg;
OUTPUT:
- RETVAL
+ RETVAL
MODULE = Net::DBus::Binding::Message::MethodReturn PACKAGE =
Net::DBus::Binding::Message::MethodReturn
@@ -952,25 +950,25 @@ PROTOTYPES: ENABLE
DBusMessage *
_create(call)
- DBusMessage *call;
+ DBusMessage *call;
PREINIT:
- DBusMessage *msg;
- CODE:
- msg = dbus_message_new_method_return(call);
- if (!msg) {
- croak("No memory to allocate message");
- }
- dbus_message_set_interface(msg, dbus_message_get_interface(call));
- dbus_message_set_path(msg, dbus_message_get_path(call));
- dbus_message_set_member(msg, dbus_message_get_member(call));
- PD_DEBUG("Create msg new method return %p\n", msg);
- PD_DEBUG(" Type %d\n", dbus_message_get_type(msg));
- PD_DEBUG(" Interface %s\n", dbus_message_get_interface(msg) ?
dbus_message_get_interface(msg) : "");
- PD_DEBUG(" Path %s\n", dbus_message_get_path(msg) ?
dbus_message_get_path(msg) : "");
- PD_DEBUG(" Member %s\n", dbus_message_get_member(msg) ?
dbus_message_get_member(msg) : "");
- RETVAL = msg;
+ DBusMessage *msg;
+ CODE:
+ msg = dbus_message_new_method_return(call);
+ if (!msg) {
+ croak("No memory to allocate message");
+ }
+ dbus_message_set_interface(msg, dbus_message_get_interface(call));
+ dbus_message_set_path(msg, dbus_message_get_path(call));
+ dbus_message_set_member(msg, dbus_message_get_member(call));
+ PD_DEBUG("Create msg new method return %p\n", msg);
+ PD_DEBUG(" Type %d\n", dbus_message_get_type(msg));
+ PD_DEBUG(" Interface %s\n", dbus_message_get_interface(msg) ?
dbus_message_get_interface(msg) : "");
+ PD_DEBUG(" Path %s\n", dbus_message_get_path(msg) ?
dbus_message_get_path(msg) : "");
+ PD_DEBUG(" Member %s\n", dbus_message_get_member(msg) ?
dbus_message_get_member(msg) : "");
+ RETVAL = msg;
OUTPUT:
- RETVAL
+ RETVAL
MODULE = Net::DBus::Binding::Message::Error PACKAGE =
Net::DBus::Binding::Message::Error
@@ -978,24 +976,24 @@ PROTOTYPES: ENABLE
DBusMessage *
_create(replyto, name, message)
- DBusMessage *replyto;
- char *name;
- char *message;
+ DBusMessage *replyto;
+ char *name;
+ char *message;
PREINIT:
- DBusMessage *msg;
- CODE:
- msg = dbus_message_new_error(replyto, name, message);
- if (!msg) {
- croak("No memory to allocate message");
- }
- PD_DEBUG("Create msg new error %p\n", msg);
- PD_DEBUG(" Type %d\n", dbus_message_get_type(msg));
- PD_DEBUG(" Interface %s\n", dbus_message_get_interface(msg) ?
dbus_message_get_interface(msg) : "");
- PD_DEBUG(" Path %s\n", dbus_message_get_path(msg) ?
dbus_message_get_path(msg) : "");
- PD_DEBUG(" Member %s\n", dbus_message_get_member(msg) ?
dbus_message_get_member(msg) : "");
- RETVAL = msg;
+ DBusMessage *msg;
+ CODE:
+ msg = dbus_message_new_error(replyto, name, message);
+ if (!msg) {
+ croak("No memory to allocate message");
+ }
+ PD_DEBUG("Create msg new error %p\n", msg);
+ PD_DEBUG(" Type %d\n", dbus_message_get_type(msg));
+ PD_DEBUG(" Interface %s\n", dbus_message_get_interface(msg) ?
dbus_message_get_interface(msg) : "");
+ PD_DEBUG(" Path %s\n", dbus_message_get_path(msg) ?
dbus_message_get_path(msg) : "");
+ PD_DEBUG(" Member %s\n", dbus_message_get_member(msg) ?
dbus_message_get_member(msg) : "");
+ RETVAL = msg;
OUTPUT:
- RETVAL
+ RETVAL
MODULE = Net::DBus::Binding::C::PendingCall PACKAGE =
Net::DBus::Binding::C::PendingCall
@@ -1003,391 +1001,391 @@ PROTOTYPES: ENABLE
DBusMessage *
dbus_pending_call_steal_reply(call)
- DBusPendingCall *call;
+ DBusPendingCall *call;
void
dbus_pending_call_block(call)
- DBusPendingCall *call;
+ DBusPendingCall *call;
dbus_bool_t
dbus_pending_call_get_completed(call)
- DBusPendingCall *call;
+ DBusPendingCall *call;
void
dbus_pending_call_cancel(call)
- DBusPendingCall *call;
+ DBusPendingCall *call;
void
DESTROY (call)
- DBusPendingCall *call;
+ DBusPendingCall *call;
CODE:
- PD_DEBUG("Unrefing pending call %p", call);
- dbus_pending_call_unref(call);
+ PD_DEBUG("Unrefing pending call %p", call);
+ dbus_pending_call_unref(call);
MODULE = Net::DBus::Binding::C::Watch PACKAGE =
Net::DBus::Binding::C::Watch
int
get_fileno(watch)
- DBusWatch *watch;
+ DBusWatch *watch;
CODE:
- RETVAL = dbus_watch_get_fd(watch);
+ RETVAL = dbus_watch_get_fd(watch);
OUTPUT:
- RETVAL
+ RETVAL
unsigned int
get_flags(watch)
- DBusWatch *watch;
+ DBusWatch *watch;
CODE:
- RETVAL = dbus_watch_get_flags(watch);
+ RETVAL = dbus_watch_get_flags(watch);
OUTPUT:
- RETVAL
+ RETVAL
dbus_bool_t
is_enabled(watch)
- DBusWatch *watch;
+ DBusWatch *watch;
CODE:
- RETVAL = dbus_watch_get_enabled(watch);
+ RETVAL = dbus_watch_get_enabled(watch);
OUTPUT:
- RETVAL
+ RETVAL
void
handle(watch, flags)
- DBusWatch *watch;
- unsigned int flags;
+ DBusWatch *watch;
+ unsigned int flags;
CODE:
- PD_DEBUG("Handling event %d on fd %d (%p)\n", flags,
dbus_watch_get_fd(watch), watch);
- dbus_watch_handle(watch, flags);
+ PD_DEBUG("Handling event %d on fd %d (%p)\n", flags,
dbus_watch_get_fd(watch), watch);
+ dbus_watch_handle(watch, flags);
void *
get_data(watch)
- DBusWatch *watch;
+ DBusWatch *watch;
CODE:
- RETVAL = dbus_watch_get_data(watch);
+ RETVAL = dbus_watch_get_data(watch);
OUTPUT:
- RETVAL
+ RETVAL
void
set_data(watch, data)
- DBusWatch *watch;
- void *data;
+ DBusWatch *watch;
+ void *data;
CODE:
- dbus_watch_set_data(watch, data, NULL);
+ dbus_watch_set_data(watch, data, NULL);
MODULE = Net::DBus::Binding::C::Timeout PACKAGE =
Net::DBus::Binding::C::Timeout
int
get_interval(timeout)
- DBusTimeout *timeout;
+ DBusTimeout *timeout;
CODE:
- RETVAL = dbus_timeout_get_interval(timeout);
+ RETVAL = dbus_timeout_get_interval(timeout);
OUTPUT:
- RETVAL
+ RETVAL
dbus_bool_t
is_enabled(timeout)
- DBusTimeout *timeout;
+ DBusTimeout *timeout;
CODE:
- RETVAL = dbus_timeout_get_enabled(timeout);
+ RETVAL = dbus_timeout_get_enabled(timeout);
OUTPUT:
- RETVAL
+ RETVAL
void
handle(timeout)
- DBusTimeout *timeout;
+ DBusTimeout *timeout;
CODE:
- PD_DEBUG("Handling timeout event %p\n", timeout);
- dbus_timeout_handle(timeout);
+ PD_DEBUG("Handling timeout event %p\n", timeout);
+ dbus_timeout_handle(timeout);
void *
get_data(timeout)
- DBusTimeout *timeout;
+ DBusTimeout *timeout;
CODE:
- RETVAL = dbus_timeout_get_data(timeout);
+ RETVAL = dbus_timeout_get_data(timeout);
OUTPUT:
- RETVAL
+ RETVAL
void
set_data(timeout, data)
- DBusTimeout *timeout;
- void *data;
+ DBusTimeout *timeout;
+ void *data;
CODE:
- dbus_timeout_set_data(timeout, data, NULL);
+ dbus_timeout_set_data(timeout, data, NULL);
MODULE = Net::DBus::Binding::Iterator PACKAGE = Net::DBus::Binding::Iterator
DBusMessageIter *
_recurse(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- RETVAL = dbus_new(DBusMessageIter, 1);
- dbus_message_iter_recurse(iter, RETVAL);
+ RETVAL = dbus_new(DBusMessageIter, 1);
+ dbus_message_iter_recurse(iter, RETVAL);
OUTPUT:
- RETVAL
+ RETVAL
DBusMessageIter *
_open_container(iter, type, sig)
- DBusMessageIter *iter;
- int type;
- char *sig;
+ DBusMessageIter *iter;
+ int type;
+ char *sig;
CODE:
- RETVAL = dbus_new(DBusMessageIter, 1);
- dbus_message_iter_open_container(iter, type, sig, RETVAL);
+ RETVAL = dbus_new(DBusMessageIter, 1);
+ dbus_message_iter_open_container(iter, type, sig, RETVAL);
OUTPUT:
- RETVAL
+ RETVAL
void
_close_container(iter, sub_iter)
- DBusMessageIter *iter;
- DBusMessageIter *sub_iter;
+ DBusMessageIter *iter;
+ DBusMessageIter *sub_iter;
CODE:
- dbus_message_iter_close_container(iter, sub_iter);
+ dbus_message_iter_close_container(iter, sub_iter);
int
get_arg_type(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- RETVAL = dbus_message_iter_get_arg_type(iter);
+ RETVAL = dbus_message_iter_get_arg_type(iter);
OUTPUT:
- RETVAL
+ RETVAL
int
get_element_type(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- RETVAL = dbus_message_iter_get_element_type(iter);
+ RETVAL = dbus_message_iter_get_element_type(iter);
OUTPUT:
- RETVAL
+ RETVAL
dbus_bool_t
has_next(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
RETVAL = dbus_message_iter_has_next(iter);
OUTPUT:
- RETVAL
+ RETVAL
dbus_bool_t
next(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- RETVAL = dbus_message_iter_next(iter);
+ RETVAL = dbus_message_iter_next(iter);
OUTPUT:
- RETVAL
+ RETVAL
dbus_bool_t
get_boolean(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- dbus_message_iter_get_basic(iter, &RETVAL);
+ dbus_message_iter_get_basic(iter, &RETVAL);
OUTPUT:
- RETVAL
+ RETVAL
unsigned char
get_byte(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- dbus_message_iter_get_basic(iter, &RETVAL);
+ dbus_message_iter_get_basic(iter, &RETVAL);
OUTPUT:
- RETVAL
+ RETVAL
dbus_int16_t
get_int16(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- dbus_message_iter_get_basic(iter, &RETVAL);
+ dbus_message_iter_get_basic(iter, &RETVAL);
OUTPUT:
- RETVAL
+ RETVAL
dbus_uint16_t
get_uint16(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- dbus_message_iter_get_basic(iter, &RETVAL);
+ dbus_message_iter_get_basic(iter, &RETVAL);
OUTPUT:
- RETVAL
+ RETVAL
dbus_int32_t
get_int32(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- dbus_message_iter_get_basic(iter, &RETVAL);
+ dbus_message_iter_get_basic(iter, &RETVAL);
OUTPUT:
- RETVAL
+ RETVAL
dbus_uint32_t
get_uint32(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- dbus_message_iter_get_basic(iter, &RETVAL);
+ dbus_message_iter_get_basic(iter, &RETVAL);
OUTPUT:
- RETVAL
+ RETVAL
dbus_int64_t
_get_int64(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- dbus_message_iter_get_basic(iter, &RETVAL);
+ dbus_message_iter_get_basic(iter, &RETVAL);
OUTPUT:
- RETVAL
+ RETVAL
dbus_uint64_t
_get_uint64(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- dbus_message_iter_get_basic(iter, &RETVAL);
+ dbus_message_iter_get_basic(iter, &RETVAL);
OUTPUT:
- RETVAL
+ RETVAL
double
get_double(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- dbus_message_iter_get_basic(iter, &RETVAL);
+ dbus_message_iter_get_basic(iter, &RETVAL);
OUTPUT:
- RETVAL
+ RETVAL
char *
get_string(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- dbus_message_iter_get_basic(iter, &RETVAL);
+ dbus_message_iter_get_basic(iter, &RETVAL);
OUTPUT:
- RETVAL
+ RETVAL
char *
get_signature(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- dbus_message_iter_get_basic(iter, &RETVAL);
+ dbus_message_iter_get_basic(iter, &RETVAL);
OUTPUT:
- RETVAL
+ RETVAL
char *
get_object_path(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- dbus_message_iter_get_basic(iter, &RETVAL);
+ dbus_message_iter_get_basic(iter, &RETVAL);
OUTPUT:
- RETVAL
+ RETVAL
void
append_boolean(iter, val)
- DBusMessageIter *iter;
- dbus_bool_t val;
+ DBusMessageIter *iter;
+ dbus_bool_t val;
CODE:
if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &val)) {
- croak("cannot append boolean");
- }
+ croak("cannot append boolean");
+ }
void
append_byte(iter, val)
- DBusMessageIter *iter;
- unsigned char val;
+ DBusMessageIter *iter;
+ unsigned char val;
CODE:
if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_BYTE, &val)) {
- croak("cannot append byte");
- }
+ croak("cannot append byte");
+ }
void
append_int16(iter, val)
- DBusMessageIter *iter;
- dbus_int16_t val;
+ DBusMessageIter *iter;
+ dbus_int16_t val;
CODE:
if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_INT16, &val)) {
- croak("cannot append int16");
- }
+ croak("cannot append int16");
+ }
void
append_uint16(iter, val)
- DBusMessageIter *iter;
- dbus_uint16_t val;
+ DBusMessageIter *iter;
+ dbus_uint16_t val;
CODE:
- if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &val)) {
- croak("cannot append uint16");
- }
+ if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &val)) {
+ croak("cannot append uint16");
+ }
void
append_int32(iter, val)
- DBusMessageIter *iter;
- dbus_int32_t val;
+ DBusMessageIter *iter;
+ dbus_int32_t val;
CODE:
if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_INT32, &val)) {
- croak("cannot append int32");
- }
+ croak("cannot append int32");
+ }
void
append_uint32(iter, val)
- DBusMessageIter *iter;
- dbus_uint32_t val;
+ DBusMessageIter *iter;
+ dbus_uint32_t val;
CODE:
- if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &val)) {
- croak("cannot append uint32");
- }
+ if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &val)) {
+ croak("cannot append uint32");
+ }
void
_append_int64(iter, val)
- DBusMessageIter *iter;
- dbus_int64_t val;
+ DBusMessageIter *iter;
+ dbus_int64_t val;
CODE:
- if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_INT64, &val)) {
- croak("cannot append int64");
- }
+ if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_INT64, &val)) {
+ croak("cannot append int64");
+ }
void
_append_uint64(iter, val)
- DBusMessageIter *iter;
- dbus_uint64_t val;
+ DBusMessageIter *iter;
+ dbus_uint64_t val;
CODE:
- if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT64, &val)) {
- croak("cannot append uint64");
- }
+ if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT64, &val)) {
+ croak("cannot append uint64");
+ }
void
append_double(iter, val)
- DBusMessageIter *iter;
- double val;
+ DBusMessageIter *iter;
+ double val;
CODE:
- if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_DOUBLE, &val)) {
- croak("cannot append double");
- }
+ if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_DOUBLE, &val)) {
+ croak("cannot append double");
+ }
void
append_string(iter, val)
- DBusMessageIter *iter;
- char *val;
+ DBusMessageIter *iter;
+ char *val;
CODE:
- if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &val)) {
- croak("cannot append string");
- }
+ if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &val)) {
+ croak("cannot append string");
+ }
void
append_object_path(iter, val)
- DBusMessageIter *iter;
- char *val;
+ DBusMessageIter *iter;
+ char *val;
CODE:
- if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH,
&val)) {
- croak("cannot append object path");
- }
+ if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &val))
{
+ croak("cannot append object path");
+ }
void
append_signature(iter, val)
- DBusMessageIter *iter;
- char *val;
+ DBusMessageIter *iter;
+ char *val;
CODE:
- if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_SIGNATURE, &val)) {
- croak("cannot append signature");
- }
+ if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_SIGNATURE, &val)) {
+ croak("cannot append signature");
+ }
void
DESTROY(iter)
- DBusMessageIter *iter;
+ DBusMessageIter *iter;
CODE:
- PD_DEBUG("Destroying iterator %p\n", iter);
- dbus_free(iter);
+ PD_DEBUG("Destroying iterator %p\n", iter);
+ dbus_free(iter);
MODULE = Net::DBus PACKAGE = Net::DBus
diff --git a/lib/Net/DBus.pm b/lib/Net/DBus.pm
index 3c79017..e70a6c7 100644
--- a/lib/Net/DBus.pm
+++ b/lib/Net/DBus.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: DBus.pm,v 1.24 2006/01/27 15:34:22 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/ASyncReply.pm b/lib/Net/DBus/ASyncReply.pm
index 03895e8..1e72131 100644
--- a/lib/Net/DBus/ASyncReply.pm
+++ b/lib/Net/DBus/ASyncReply.pm
@@ -2,21 +2,19 @@
#
# Copyright (C) 2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: RemoteObject.pm,v 1.20 2006/01/27 15:34:24 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Annotation.pm b/lib/Net/DBus/Annotation.pm
index c0b0f49..def26d0 100644
--- a/lib/Net/DBus/Annotation.pm
+++ b/lib/Net/DBus/Annotation.pm
@@ -2,21 +2,19 @@
#
# Copyright (C) 2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: RemoteObject.pm,v 1.20 2006/01/27 15:34:24 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Binding/Bus.pm b/lib/Net/DBus/Binding/Bus.pm
index ebc708e..0dfa075 100644
--- a/lib/Net/DBus/Binding/Bus.pm
+++ b/lib/Net/DBus/Binding/Bus.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Bus.pm,v 1.11 2006/01/27 15:34:24 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Binding/Connection.pm
b/lib/Net/DBus/Binding/Connection.pm
index ca852e9..9df661f 100644
--- a/lib/Net/DBus/Binding/Connection.pm
+++ b/lib/Net/DBus/Binding/Connection.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Connection.pm,v 1.8 2006/01/27 15:34:24 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Binding/Introspector.pm
b/lib/Net/DBus/Binding/Introspector.pm
index 7d677da..527d4c0 100644
--- a/lib/Net/DBus/Binding/Introspector.pm
+++ b/lib/Net/DBus/Binding/Introspector.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Introspector.pm,v 1.14 2006/02/03 13:30:14 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Binding/Iterator.pm b/lib/Net/DBus/Binding/Iterator.pm
index 4b3c525..62036a8 100644
--- a/lib/Net/DBus/Binding/Iterator.pm
+++ b/lib/Net/DBus/Binding/Iterator.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Iterator.pm,v 1.16 2006/02/03 13:30:14 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Binding/Message.pm b/lib/Net/DBus/Binding/Message.pm
index 3e75bee..69a9254 100644
--- a/lib/Net/DBus/Binding/Message.pm
+++ b/lib/Net/DBus/Binding/Message.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Message.pm,v 1.13 2006/02/03 13:30:14 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Binding/Message/Error.pm
b/lib/Net/DBus/Binding/Message/Error.pm
index 6de0752..c4c9337 100644
--- a/lib/Net/DBus/Binding/Message/Error.pm
+++ b/lib/Net/DBus/Binding/Message/Error.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Error.pm,v 1.6 2006/02/02 16:58:27 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Binding/Message/MethodCall.pm
b/lib/Net/DBus/Binding/Message/MethodCall.pm
index 5b5a0fd..6e68255 100644
--- a/lib/Net/DBus/Binding/Message/MethodCall.pm
+++ b/lib/Net/DBus/Binding/Message/MethodCall.pm
@@ -1,23 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: MethodCall.pm,v 1.5 2006/02/02 16:58:27 dan Exp $
-
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Binding/Message/MethodReturn.pm
b/lib/Net/DBus/Binding/Message/MethodReturn.pm
index 148aba7..2a57764 100644
--- a/lib/Net/DBus/Binding/Message/MethodReturn.pm
+++ b/lib/Net/DBus/Binding/Message/MethodReturn.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: MethodReturn.pm,v 1.5 2006/02/02 16:58:27 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Binding/Message/Signal.pm
b/lib/Net/DBus/Binding/Message/Signal.pm
index aa62381..caa7387 100644
--- a/lib/Net/DBus/Binding/Message/Signal.pm
+++ b/lib/Net/DBus/Binding/Message/Signal.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Signal.pm,v 1.6 2006/02/02 16:58:27 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Binding/PendingCall.pm
b/lib/Net/DBus/Binding/PendingCall.pm
index 673e4b5..36aff92 100644
--- a/lib/Net/DBus/Binding/PendingCall.pm
+++ b/lib/Net/DBus/Binding/PendingCall.pm
@@ -2,21 +2,19 @@
#
# Copyright (C) 2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: PendingCall.pm,v 1.8 2006/01/27 15:34:24 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Binding/Server.pm b/lib/Net/DBus/Binding/Server.pm
index 4008076..b999f24 100644
--- a/lib/Net/DBus/Binding/Server.pm
+++ b/lib/Net/DBus/Binding/Server.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Server.pm,v 1.5 2006/01/27 15:34:24 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Binding/Value.pm b/lib/Net/DBus/Binding/Value.pm
index 178fb96..b282b99 100644
--- a/lib/Net/DBus/Binding/Value.pm
+++ b/lib/Net/DBus/Binding/Value.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Value.pm,v 1.7 2006/01/27 15:34:24 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Binding/Watch.pm b/lib/Net/DBus/Binding/Watch.pm
index 76bcd5b..3d2591c 100644
--- a/lib/Net/DBus/Binding/Watch.pm
+++ b/lib/Net/DBus/Binding/Watch.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Watch.pm,v 1.3 2006/01/27 15:34:24 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Callback.pm b/lib/Net/DBus/Callback.pm
index 52a2a4a..40b8131 100644
--- a/lib/Net/DBus/Callback.pm
+++ b/lib/Net/DBus/Callback.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Callback.pm,v 1.7 2006/02/02 16:58:26 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Dumper.pm b/lib/Net/DBus/Dumper.pm
index c6359ba..90b8871 100644
--- a/lib/Net/DBus/Dumper.pm
+++ b/lib/Net/DBus/Dumper.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Dumper.pm,v 1.9 2006/01/27 15:34:23 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Error.pm b/lib/Net/DBus/Error.pm
index df2179a..eda7626 100644
--- a/lib/Net/DBus/Error.pm
+++ b/lib/Net/DBus/Error.pm
@@ -2,21 +2,19 @@
#
# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Error.pm,v 1.23 2006/02/03 13:30:14 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Exporter.pm b/lib/Net/DBus/Exporter.pm
index d9dcc29..c9e1545 100644
--- a/lib/Net/DBus/Exporter.pm
+++ b/lib/Net/DBus/Exporter.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Exporter.pm,v 1.11 2006/02/03 13:43:50 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Object.pm b/lib/Net/DBus/Object.pm
index a0e78a7..58db7f7 100644
--- a/lib/Net/DBus/Object.pm
+++ b/lib/Net/DBus/Object.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Object.pm,v 1.23 2006/02/03 13:30:14 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Reactor.pm b/lib/Net/DBus/Reactor.pm
index 168bf06..99b9f03 100644
--- a/lib/Net/DBus/Reactor.pm
+++ b/lib/Net/DBus/Reactor.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Reactor.pm,v 1.9 2006/01/27 15:34:24 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/RemoteObject.pm b/lib/Net/DBus/RemoteObject.pm
index 2ae9afa..4f6b4f9 100644
--- a/lib/Net/DBus/RemoteObject.pm
+++ b/lib/Net/DBus/RemoteObject.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: RemoteObject.pm,v 1.20 2006/01/27 15:34:24 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/RemoteService.pm b/lib/Net/DBus/RemoteService.pm
index 390930d..a5d1737 100644
--- a/lib/Net/DBus/RemoteService.pm
+++ b/lib/Net/DBus/RemoteService.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: RemoteService.pm,v 1.9 2006/01/27 15:34:24 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Service.pm b/lib/Net/DBus/Service.pm
index 913b669..2b91c24 100644
--- a/lib/Net/DBus/Service.pm
+++ b/lib/Net/DBus/Service.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: Service.pm,v 1.12 2006/01/27 15:34:24 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Test/MockConnection.pm
b/lib/Net/DBus/Test/MockConnection.pm
index 76c5599..078bc7c 100644
--- a/lib/Net/DBus/Test/MockConnection.pm
+++ b/lib/Net/DBus/Test/MockConnection.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: MockConnection.pm,v 1.5 2006/02/03 13:30:14 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
diff --git a/lib/Net/DBus/Test/MockObject.pm b/lib/Net/DBus/Test/MockObject.pm
index 6e5d151..a1ce762 100644
--- a/lib/Net/DBus/Test/MockObject.pm
+++ b/lib/Net/DBus/Test/MockObject.pm
@@ -1,22 +1,20 @@
# -*- perl -*-
#
-# Copyright (C) 2004-2005 Daniel P. Berrange
+# Copyright (C) 2004-2006 Daniel P. Berrange
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; You can redistribute it and/or modify
+# it under the same terms as Perl itself. Either:
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# a) the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any
+# later version,
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# or
#
-# $Id: MockObject.pm,v 1.5 2006/02/03 13:30:14 dan Exp $
+# b) the "Artistic License"
+#
+# The file "COPYING" distributed along with this file provides full
+# details of the terms and conditions of the two licenses.
=pod
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libnet-dbus-perl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
