2005-06-16 Colin Walters <walters@verbum.org>

	* glib/dbus-binding-tool-glib.c:
	* glib/dbus-gobject.c:
	* glib/dbus-gproxy.c:  Add Nokia copyright; Patch
	from Ross Burton, for his GLib bindings work.

diff --git a/ChangeLog b/ChangeLog
index 808dc95ca658b97c5acbe4bed062a8de9fb9b02f..cfbe86e536aba88baf2a7fbc934900bf5c5837e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-16  Colin Walters  <walters@verbum.org>
+
+       * glib/dbus-binding-tool-glib.c:
+       * glib/dbus-gobject.c:
+       * glib/dbus-gproxy.c:  Add Nokia copyright; Patch
+       from Ross Burton, for his GLib bindings work.
+
 2005-06-16  Colin Walters  <walters@verbum.org>
 
        * glib/dbus-gobject.c (funcsig_hash, funcsig_equal): Use n_params
@@ -160,7 +167,7 @@
        * glib/dbus-gobject.c:
        * glib/dbus-gvalue.c: Fix indentation and brace style.
        
-2005-06-14  Ross Burton <ross@burtonini.com>.
+2005-06-14  Ross Burton <ross@openedhand.com>.
 
        * glib/dbus-glib.h: Make DBusGMethodInvocation
        a private structure.  Rearrange prototypes a bit.
@@ -178,7 +185,7 @@
        * glib/dbus-gobject.c (_dbus_gobject_lookup_marshaller):
        Add missing return statements, noticed by Ross Burton.
        
-2005-06-13  Ross Burton <ross@burtonini.com>.
+2005-06-13  Ross Burton <ross@openedhand.com>.
 
        * glib/dbus-gobject.c: Handle errors on message
        demarshalling by sending error message back.
@@ -197,7 +204,7 @@
 2005-06-12  Colin Walters  <walters@verbum.org>
 
        Async signals and various bugfixes and testing by
-       Ross Burton <ross@burtonini.com>.
+       Ross Burton <ross@openedhand.com>.
 
        * glib/dbus-gvalue.h: (struct DBusBasicGValue): Delete.
        (dbus_gvalue_genmarshal_name_from_type)
@@ -484,7 +491,7 @@
        alias for ProxyMethod to make it easier for the Twisted 
        networking framework to integrate dbus. 
 
-2005-05-11  Ross Burton  <ross@burtonini.com>
+2005-05-11  Ross Burton  <ross@openedhand.com>
 
        * glib/dbus-glib-tool.c: Add --prefix argument.
        * glib/dbus-binding-tool-glib.h: Add prefix argument.
@@ -569,7 +576,7 @@
        * python/_dbus.py, python/proxies.py: implement __repr__ in a couple
        of classes so that print obj doesn't throw an exception (Bug #1685)
 
-2005-05-03  Ross Burton  <ross@burtonini.com>
+2005-05-03  Ross Burton  <ross@openedhand.com>
 
        * glib/dbus-gobject.c (dbus_g_connection_register_g_object):
        Return if we get an error during registration.  Set up a

diff --git a/glib/dbus-binding-tool-glib.c b/glib/dbus-binding-tool-glib.c
index 70c89e91207ae9cd4f6e6fad2380628235e28d7e..b04386bc02a64626fe1084195a41f72ddffaaa74 100644 (file)
--- a/glib/dbus-binding-tool-glib.c
+++ b/glib/dbus-binding-tool-glib.c
@@ -2,6 +2,7 @@
 /* dbus-binding-tool-glib.c: Output C glue
  *
  * Copyright (C) 2003, 2004, 2005 Red Hat, Inc.
+ * Copyright (C) 2005 Nokia
  *
  * Licensed under the Academic Free License version 2.1
  *

diff --git a/glib/dbus-gobject.c b/glib/dbus-gobject.c
index 8e43155a9629bfe6b046a3be5db5b84be91c8947..7a57d4ea6fbc16fef1abc625478bc56b0860194b 100644 (file)
--- a/glib/dbus-gobject.c
+++ b/glib/dbus-gobject.c
@@ -2,6 +2,7 @@
 /* dbus-gobject.c Exporting a GObject remotely
  *
  * Copyright (C) 2003, 2004, 2005 Red Hat, Inc.
+ * Copyright (C) 2005 Nokia
  *
  * Licensed under the Academic Free License version 2.1
  *

diff --git a/glib/dbus-gproxy.c b/glib/dbus-gproxy.c
index efb8292db05bd93ec595585db5032b4fc71be293..836167efa3f89a9728f36f4981b1f29b2d8111dc 100644 (file)
--- a/glib/dbus-gproxy.c
+++ b/glib/dbus-gproxy.c
@@ -2,6 +2,7 @@
 /* dbus-gproxy.c Proxy for remote objects
  *
  * Copyright (C) 2003, 2004, 2005 Red Hat, Inc.
+ * Copyright (C) 2005 Nokia
  *
  * Licensed under the Academic Free License version 2.1
  *