2004-08-09 Havoc Pennington <hp@redhat.com>

	* COPYING: switch to Academic Free License version 2.1 instead of
	2.0, to resolve complaints about patent termination clause.

17 files changed, 18 insertions, 18 deletions

diff --git a/glib/dbus-gidl.c b/glib/dbus-gidl.c
index c8efc46d..6fa83916 100644
--- a/glib/dbus-gidl.c
+++ b/glib/dbus-gidl.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  *
  * 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
diff --git a/glib/dbus-gidl.h b/glib/dbus-gidl.h
index 254fa942..47b4f093 100644
--- a/glib/dbus-gidl.h
+++ b/glib/dbus-gidl.h
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  * 
  * 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
diff --git a/glib/dbus-glib-tool.c b/glib/dbus-glib-tool.c
index bd66e18d..c460a352 100644
--- a/glib/dbus-glib-tool.c
+++ b/glib/dbus-glib-tool.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003, 2004 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  *
  * 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
diff --git a/glib/dbus-glib.c b/glib/dbus-glib.c
index 476e5cd2..b5f5920d 100644
--- a/glib/dbus-glib.c
+++ b/glib/dbus-glib.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2004 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  * 
  * 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
diff --git a/glib/dbus-gloader-expat.c b/glib/dbus-gloader-expat.c
index bda652f8..fa7e3692 100644
--- a/glib/dbus-gloader-expat.c
+++ b/glib/dbus-gloader-expat.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  *
  * 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
diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c
index c0741ac2..23c5a78c 100644
--- a/glib/dbus-gmain.c
+++ b/glib/dbus-gmain.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003 CodeFactory AB
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  * 
  * 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
diff --git a/glib/dbus-gobject.c b/glib/dbus-gobject.c
index dfd33f3e..df9ff9d6 100644
--- a/glib/dbus-gobject.c
+++ b/glib/dbus-gobject.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003, 2004 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  *
  * 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
diff --git a/glib/dbus-gparser.c b/glib/dbus-gparser.c
index 2cdca81f..2318c015 100644
--- a/glib/dbus-gparser.c
+++ b/glib/dbus-gparser.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  * 
  * 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
diff --git a/glib/dbus-gparser.h b/glib/dbus-gparser.h
index 766063b8..d1b0aa04 100644
--- a/glib/dbus-gparser.h
+++ b/glib/dbus-gparser.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  * 
  * 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
diff --git a/glib/dbus-gproxy.c b/glib/dbus-gproxy.c
index a5827be9..fe285ab3 100644
--- a/glib/dbus-gproxy.c
+++ b/glib/dbus-gproxy.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003, 2004 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  * 
  * 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
@@ -903,7 +903,7 @@ dbus_g_proxy_new_for_service (DBusGConnection *connection,
   g_return_val_if_fail (interface_name != NULL, NULL);
   
   proxy = dbus_g_proxy_new (connection, service_name,
-                           path_name, interface_name);
+                            path_name, interface_name);
 
   return proxy;
 }
diff --git a/glib/dbus-gtest-main.c b/glib/dbus-gtest-main.c
index a86839e0..c23c5c1e 100644
--- a/glib/dbus-gtest-main.c
+++ b/glib/dbus-gtest-main.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  * 
  * 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
diff --git a/glib/dbus-gtest.c b/glib/dbus-gtest.c
index f583e3ba..77e2e7b2 100644
--- a/glib/dbus-gtest.c
+++ b/glib/dbus-gtest.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  * 
  * 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
diff --git a/glib/dbus-gtest.h b/glib/dbus-gtest.h
index f0ef02e4..b68ab23f 100644
--- a/glib/dbus-gtest.h
+++ b/glib/dbus-gtest.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  * 
  * 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
diff --git a/glib/dbus-gthread.c b/glib/dbus-gthread.c
index 8bc55a57..f7b6fafb 100644
--- a/glib/dbus-gthread.c
+++ b/glib/dbus-gthread.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  CodeFactory AB
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  * 
  * 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
diff --git a/glib/dbus-gtool-test.h b/glib/dbus-gtool-test.h
index 73c27235..971264ea 100644
--- a/glib/dbus-gtool-test.h
+++ b/glib/dbus-gtool-test.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  * 
  * 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
diff --git a/glib/dbus-gutils.c b/glib/dbus-gutils.c
index dd8739a6..a40e3603 100644
--- a/glib/dbus-gutils.c
+++ b/glib/dbus-gutils.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  *
  * 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
diff --git a/glib/dbus-gutils.h b/glib/dbus-gutils.h
index bed2d295..fd2cac88 100644
--- a/glib/dbus-gutils.h
+++ b/glib/dbus-gutils.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  *
  * 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