[evolution-data-server/mmeeks-gdbus-import] lots of header renames, and cleanups

From: Michael Meeks <michael src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server/mmeeks-gdbus-import] lots of header renames, and cleanups
Date: Fri, 26 Feb 2010 11:09:06 +0000 (UTC)
commit 6012c9b7aebeab0b0702a3963d1fbe2af7cc96bb
Author: Michael Meeks <michael meeks novell com>
Date:   Fri Feb 26 10:58:05 2010 +0000

    lots of header renames, and cleanups

 Makefile.am                                   |    4 ++--
 configure.ac                                  |   11 +++++++++--
 {libedbus => edbus}/README                    |    0
 {libedbus => edbus}/ebitlock.c                |    4 ++--
 {libedbus => edbus}/ebitlock.h                |    0
 {libedbus => edbus}/edbus-marshal.c           |    2 +-
 {libedbus => edbus}/edbus-marshal.h           |    0
 {libedbus => edbus}/edbus-marshal.list        |    0
 {libedbus => edbus}/edbus.h                   |   22 +++++++++++-----------
 {libedbus => edbus}/edbusconnection.c         |   16 ++++++++--------
 {libedbus => edbus}/edbusconnection.h         |    4 ++--
 {libedbus => edbus}/edbusconversion.c         |    8 ++++----
 {libedbus => edbus}/edbusconversion.h         |    2 +-
 {libedbus => edbus}/edbusenums.h              |    2 +-
 {libedbus => edbus}/edbusenumtypes.c          |    0
 {libedbus => edbus}/edbusenumtypes.c.template |    0
 {libedbus => edbus}/edbusenumtypes.h          |    0
 {libedbus => edbus}/edbusenumtypes.h.template |    0
 {libedbus => edbus}/edbuserror.c              |   10 +++++-----
 {libedbus => edbus}/edbuserror.h              |    4 ++--
 {libedbus => edbus}/edbusintrospection.c      |    4 ++--
 {libedbus => edbus}/edbusintrospection.h      |    4 ++--
 {libedbus => edbus}/edbusmethodinvocation.c   |   14 +++++++-------
 {libedbus => edbus}/edbusmethodinvocation.h   |    4 ++--
 {libedbus => edbus}/edbusnameowning.c         |   10 +++++-----
 {libedbus => edbus}/edbusnameowning.h         |    4 ++--
 {libedbus => edbus}/edbusnamewatching.c       |   10 +++++-----
 {libedbus => edbus}/edbusnamewatching.h       |    4 ++--
 {libedbus => edbus}/edbusprivate.c            |    4 ++--
 {libedbus => edbus}/edbusprivate.h            |    2 +-
 {libedbus => edbus}/edbusproxy.c              |   14 +++++++-------
 {libedbus => edbus}/edbusproxy.h              |    4 ++--
 {libedbus => edbus}/edbusproxywatching.c      |   14 +++++++-------
 {libedbus => edbus}/edbusproxywatching.h      |    4 ++--
 {libedbus => edbus}/edbusserver.c             |   12 ++++++------
 {libedbus => edbus}/edbusserver.h             |    4 ++--
 {libedbus => edbus}/edbustypes.h              |    6 +++---
 {libedbus => edbus}/evariant-core.c           |    6 +++---
 {libedbus => edbus}/evariant-printer.c        |    2 +-
 {libedbus => edbus}/evariant-private.h        |    4 ++--
 {libedbus => edbus}/evariant-serialiser.c     |    4 ++--
 {libedbus => edbus}/evariant-serialiser.h     |    2 +-
 {libedbus => edbus}/evariant-util.c           |    2 +-
 {libedbus => edbus}/evariant-valist.c         |    2 +-
 {libedbus => edbus}/evariant.h                |    6 ++----
 {libedbus => edbus}/evarianttype.c            |    2 +-
 {libedbus => edbus}/evarianttype.h            |    3 +--
 {libedbus => edbus}/evarianttypeinfo.c        |    2 +-
 {libedbus => edbus}/evarianttypeinfo.h        |    2 +-
 {libedbus => edbus}/example-own-name.c        |    2 +-
 {libedbus => edbus}/example-server.c          |    2 +-
 {libedbus => edbus}/example-subtree.c         |    2 +-
 {libedbus => edbus}/example-watch-name.c      |    2 +-
 {libedbus => edbus}/example-watch-proxy.c     |    2 +-
 {libedbus => edbus}/tests/Makefile.decl       |    0
 55 files changed, 129 insertions(+), 125 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index acef370..0c00c9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,8 @@ if ENABLE_CALENDAR
 CALENDAR_DIR = calendar
 endif
 
-SUBDIRS = win32 libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui docs art po libedbus
-DIST_SUBDIRS = win32 libedataserver libebackend servers camel addressbook calendar libedataserverui docs art po libedbus
+SUBDIRS = win32 libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui docs art po edbus
+DIST_SUBDIRS = win32 libedataserver libebackend servers camel addressbook calendar libedataserverui docs art po edbus
 
 changelogs =			\
 	ChangeLog
diff --git a/configure.ac b/configure.ac
index ff111c4..76c9bc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1181,6 +1181,13 @@ PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= dbus_glib_minimum_version)
 AC_SUBST(DBUS_GLIB_CFLAGS)
 AC_SUBST(DBUS_GLIB_LIBS)
 
+dnl ******************************
+dnl EDBus stuff
+dnl ******************************
+PKG_CHECK_MODULES(EDBUS, gthread-2.0 glib-2.0 gobject-2.0 gio-2.0 dbus-1)
+AC_SUBST(EDBUS_CFLAGS)
+AC_SUBST(EDBUS_LIBS)
+
 dnl ***********************
 dnl Gnome keyring support
 dnl ***********************
@@ -1494,8 +1501,8 @@ camel/tests/smime/Makefile
 camel/tests/stream/Makefile
 camel/camel.pc
 camel/camel-provider.pc
-libedbus/Makefile
-libedbus/tests/Makefile
+edbus/Makefile
+edbus/tests/Makefile
 libebackend/Makefile
 libebackend/libebackend.pc
 libedataserver/Makefile
diff --git a/libedbus/README b/edbus/README
similarity index 100%
rename from libedbus/README
rename to edbus/README
diff --git a/libedbus/ebitlock.c b/edbus/ebitlock.c
similarity index 99%
rename from libedbus/ebitlock.c
rename to edbus/ebitlock.c
index 745aed1..a1dcaa5 100644
--- a/libedbus/ebitlock.c
+++ b/edbus/ebitlock.c
@@ -20,13 +20,13 @@
  * Author: Ryan Lortie <desrt desrt ca>
  */
 
-#include "gbitlock.h"
+#include "ebitlock.h"
 
 #include <glib/gatomic.h>
 #include <glib/gslist.h>
 #include <glib/gthread.h>
 
-// #include "gthreadprivate.h"
+// #include "ethreadprivate.h"
 #include "config.h"
 
 #ifdef G_BIT_LOCK_FORCE_FUTEX_EMULATION
diff --git a/libedbus/ebitlock.h b/edbus/ebitlock.h
similarity index 100%
rename from libedbus/ebitlock.h
rename to edbus/ebitlock.h
diff --git a/libedbus/edbus-marshal.c b/edbus/edbus-marshal.c
similarity index 99%
rename from libedbus/edbus-marshal.c
rename to edbus/edbus-marshal.c
index 732f9fd..5cfd657 100644
--- a/libedbus/edbus-marshal.c
+++ b/edbus/edbus-marshal.c
@@ -1,4 +1,4 @@
-#include "gdbus-marshal.h"
+#include "edbus-marshal.h"
 
 #include	<glib-object.h>
 
diff --git a/libedbus/edbus-marshal.h b/edbus/edbus-marshal.h
similarity index 100%
rename from libedbus/edbus-marshal.h
rename to edbus/edbus-marshal.h
diff --git a/libedbus/edbus-marshal.list b/edbus/edbus-marshal.list
similarity index 100%
rename from libedbus/edbus-marshal.list
rename to edbus/edbus-marshal.list
diff --git a/libedbus/edbus.h b/edbus/edbus.h
similarity index 73%
rename from libedbus/edbus.h
rename to edbus/edbus.h
index 84a33a4..798c27e 100644
--- a/libedbus/edbus.h
+++ b/edbus/edbus.h
@@ -25,17 +25,17 @@
 
 #define __E_DBUS_H_INSIDE__
 
-#include <gdbus/gdbustypes.h>
-#include <gdbus/gdbusenumtypes.h>
-#include <gdbus/gdbusconnection.h>
-#include <gdbus/gdbuserror.h>
-#include <gdbus/gdbusnameowning.h>
-#include <gdbus/gdbusnamewatching.h>
-#include <gdbus/gdbusproxywatching.h>
-#include <gdbus/gdbusproxy.h>
-#include <gdbus/gdbusintrospection.h>
-#include <gdbus/gdbusmethodinvocation.h>
-#include <gdbus/gdbusserver.h>
+#include <edbus/edbustypes.h>
+#include <edbus/edbusenumtypes.h>
+#include <edbus/edbusconnection.h>
+#include <edbus/edbuserror.h>
+#include <edbus/edbusnameowning.h>
+#include <edbus/edbusnamewatching.h>
+#include <edbus/edbusproxywatching.h>
+#include <edbus/edbusproxy.h>
+#include <edbus/edbusintrospection.h>
+#include <edbus/edbusmethodinvocation.h>
+#include <edbus/edbusserver.h>
 
 extern void e_dbus_threads_init (void);
 
diff --git a/libedbus/edbusconnection.c b/edbus/edbusconnection.c
similarity index 99%
rename from libedbus/edbusconnection.c
rename to edbus/edbusconnection.c
index 3025073..918c5c5 100644
--- a/libedbus/edbusconnection.c
+++ b/edbus/edbusconnection.c
@@ -26,18 +26,18 @@
 
 #include <glib/gi18n.h>
 
-#include "gdbusconnection.h"
-#include "gdbuserror.h"
-#include "gdbusenumtypes.h"
-#include "gdbusconversion.h"
-#include "gdbusintrospection.h"
-#include "gdbusmethodinvocation.h"
-#include "gdbusprivate.h"
+#include "edbusconnection.h"
+#include "edbuserror.h"
+#include "edbusenumtypes.h"
+#include "edbusconversion.h"
+#include "edbusintrospection.h"
+#include "edbusmethodinvocation.h"
+#include "edbusprivate.h"
 
 /**
  * SECTION:gdbusconnection
  * @short_description: D-Bus Connections
- * @include: gdbus/gdbus.h
+ * @include: edbus/edbus.h
  *
  * <para><note>
  * This class is rarely used directly. If you are writing an application, it is often
diff --git a/libedbus/edbusconnection.h b/edbus/edbusconnection.h
similarity index 99%
rename from libedbus/edbusconnection.h
rename to edbus/edbusconnection.h
index e617d6a..4ef6b65 100644
--- a/libedbus/edbusconnection.h
+++ b/edbus/edbusconnection.h
@@ -21,13 +21,13 @@
  */
 
 #if !defined (__E_DBUS_H_INSIDE__) && !defined (E_DBUS_COMPILATION)
-#error "Only <gdbus/gdbus.h> can be included directly."
+#error "Only <edbus/edbus.h> can be included directly."
 #endif
 
 #ifndef __E_DBUS_CONNECTION_H__
 #define __E_DBUS_CONNECTION_H__
 
-#include <gdbus/gdbustypes.h>
+#include <edbus/edbustypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/libedbus/edbusconversion.c b/edbus/edbusconversion.c
similarity index 99%
rename from libedbus/edbusconversion.c
rename to edbus/edbusconversion.c
index 08b9e94..8f79544 100644
--- a/libedbus/edbusconversion.c
+++ b/edbus/edbusconversion.c
@@ -29,10 +29,10 @@
 
 #include <glib/gi18n.h>
 
-#include "gdbusconversion.h"
-#include "gdbuserror.h"
-#include "gdbusenums.h"
-#include "gdbusprivate.h"
+#include "edbusconversion.h"
+#include "edbuserror.h"
+#include "edbusenums.h"
+#include "edbusprivate.h"
 
 static gboolean
 dconf_dbus_from_gv (DBusMessageIter  *iter,
diff --git a/libedbus/edbusconversion.h b/edbus/edbusconversion.h
similarity index 97%
rename from libedbus/edbusconversion.h
rename to edbus/edbusconversion.h
index ee94251..0a7e700 100644
--- a/libedbus/edbusconversion.h
+++ b/edbus/edbusconversion.h
@@ -27,7 +27,7 @@
 #ifndef __E_DBUS_CONVERSION_H__
 #define __E_DBUS_CONVERSION_H__
 
-#include <gdbus/gdbustypes.h>
+#include <edbus/edbustypes.h>
 #include <dbus/dbus.h>
 
 G_BEGIN_DECLS
diff --git a/libedbus/edbusenums.h b/edbus/edbusenums.h
similarity index 99%
rename from libedbus/edbusenums.h
rename to edbus/edbusenums.h
index 6ac7752..086edb9 100644
--- a/libedbus/edbusenums.h
+++ b/edbus/edbusenums.h
@@ -21,7 +21,7 @@
  */
 
 #if !defined (__E_DBUS_H_INSIDE__) && !defined (E_DBUS_COMPILATION)
-#error "Only <gdbus/gdbus.h> can be included directly."
+#error "Only <edbus/edbus.h> can be included directly."
 #endif
 
 #ifndef __E_DBUS_ENUMS_H__
diff --git a/libedbus/edbusenumtypes.c b/edbus/edbusenumtypes.c
similarity index 100%
rename from libedbus/edbusenumtypes.c
rename to edbus/edbusenumtypes.c
diff --git a/libedbus/edbusenumtypes.c.template b/edbus/edbusenumtypes.c.template
similarity index 100%
rename from libedbus/edbusenumtypes.c.template
rename to edbus/edbusenumtypes.c.template
diff --git a/libedbus/edbusenumtypes.h b/edbus/edbusenumtypes.h
similarity index 100%
rename from libedbus/edbusenumtypes.h
rename to edbus/edbusenumtypes.h
diff --git a/libedbus/edbusenumtypes.h.template b/edbus/edbusenumtypes.h.template
similarity index 100%
rename from libedbus/edbusenumtypes.h.template
rename to edbus/edbusenumtypes.h.template
diff --git a/libedbus/edbuserror.c b/edbus/edbuserror.c
similarity index 99%
rename from libedbus/edbuserror.c
rename to edbus/edbuserror.c
index 8555cf7..1038c91 100644
--- a/libedbus/edbuserror.c
+++ b/edbus/edbuserror.c
@@ -26,16 +26,16 @@
 
 #include <glib/gi18n.h>
 
-#include "gdbuserror.h"
-#include "gdbusenums.h"
-#include "gdbusenumtypes.h"
-#include "gdbusprivate.h"
+#include "edbuserror.h"
+#include "edbusenums.h"
+#include "edbusenumtypes.h"
+#include "edbusprivate.h"
 
 /**
  * SECTION:gdbuserror
  * @title: EDBusError
  * @short_description: Error helper functions
- * @include: gdbus/gdbus.h
+ * @include: edbus/edbus.h
  *
  * Error helper functions for EDBus.
  *
diff --git a/libedbus/edbuserror.h b/edbus/edbuserror.h
similarity index 97%
rename from libedbus/edbuserror.h
rename to edbus/edbuserror.h
index f8b4993..6c41b30 100644
--- a/libedbus/edbuserror.h
+++ b/edbus/edbuserror.h
@@ -21,13 +21,13 @@
  */
 
 #if !defined (__E_DBUS_H_INSIDE__) && !defined (E_DBUS_COMPILATION)
-#error "Only <gdbus/gdbus.h> can be included directly."
+#error "Only <edbus/edbus.h> can be included directly."
 #endif
 
 #ifndef __E_DBUS_ERROR_H__
 #define __E_DBUS_ERROR_H__
 
-#include <gdbus/gdbustypes.h>
+#include <edbus/edbustypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/libedbus/edbusintrospection.c b/edbus/edbusintrospection.c
similarity index 99%
rename from libedbus/edbusintrospection.c
rename to edbus/edbusintrospection.c
index f480265..6a65c52 100644
--- a/libedbus/edbusintrospection.c
+++ b/edbus/edbusintrospection.c
@@ -26,13 +26,13 @@
 
 #include <glib/gi18n.h>
 
-#include "gdbusintrospection.h"
+#include "edbusintrospection.h"
 
 /**
  * SECTION:gdbusintrospection
  * @title: Introspection XML
  * @short_description: Parse and Generate Introspection XML
- * @include: gdbus/gdbus.h
+ * @include: edbus/edbus.h
  *
  * Various data structures and convenience routines to parse and
  * generate D-Bus introspection XML.
diff --git a/libedbus/edbusintrospection.h b/edbus/edbusintrospection.h
similarity index 99%
rename from libedbus/edbusintrospection.h
rename to edbus/edbusintrospection.h
index 9d4e715..48dae45 100644
--- a/libedbus/edbusintrospection.h
+++ b/edbus/edbusintrospection.h
@@ -21,13 +21,13 @@
  */
 
 #if !defined (__E_DBUS_H_INSIDE__) && !defined (E_DBUS_COMPILATION)
-#error "Only <gdbus/gdbus.h> can be included directly."
+#error "Only <edbus/edbus.h> can be included directly."
 #endif
 
 #ifndef __E_DBUS_INTROSPECTION_H__
 #define __E_DBUS_INTROSPECTION_H__
 
-#include <gdbus/gdbustypes.h>
+#include <edbus/edbustypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/libedbus/edbusmethodinvocation.c b/edbus/edbusmethodinvocation.c
similarity index 99%
rename from libedbus/edbusmethodinvocation.c
rename to edbus/edbusmethodinvocation.c
index 3051434..502dc87 100644
--- a/libedbus/edbusmethodinvocation.c
+++ b/edbus/edbusmethodinvocation.c
@@ -25,17 +25,17 @@
 #include <stdlib.h>
 #include <glib/gi18n.h>
 
-#include "gdbusconnection.h"
-#include "gdbusmethodinvocation.h"
-#include "gdbusintrospection.h"
-#include "gdbusconversion.h"
-#include "gdbuserror.h"
-#include "gdbusprivate.h"
+#include "edbusconnection.h"
+#include "edbusmethodinvocation.h"
+#include "edbusintrospection.h"
+#include "edbusconversion.h"
+#include "edbuserror.h"
+#include "edbusprivate.h"
 
 /**
  * SECTION:gdbusmethodinvocation
  * @short_description: Object for handling remote calls
- * @include: gdbus/gdbus.h
+ * @include: edbus/edbus.h
  *
  * Instances of the #EDBusMethodInvocation class are used when
  * handling D-Bus method calls. It provides a way to asynchronously
diff --git a/libedbus/edbusmethodinvocation.h b/edbus/edbusmethodinvocation.h
similarity index 98%
rename from libedbus/edbusmethodinvocation.h
rename to edbus/edbusmethodinvocation.h
index 7eaf194..fd2a2c9 100644
--- a/libedbus/edbusmethodinvocation.h
+++ b/edbus/edbusmethodinvocation.h
@@ -21,13 +21,13 @@
  */
 
 #if !defined (__E_DBUS_H_INSIDE__) && !defined (E_DBUS_COMPILATION)
-#error "Only <gdbus/gdbus.h> can be included directly."
+#error "Only <edbus/edbus.h> can be included directly."
 #endif
 
 #ifndef __E_DBUS_METHOD_INVOCATION_H__
 #define __E_DBUS_METHOD_INVOCATION_H__
 
-#include <gdbus/gdbustypes.h>
+#include <edbus/edbustypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/libedbus/edbusnameowning.c b/edbus/edbusnameowning.c
similarity index 99%
rename from libedbus/edbusnameowning.c
rename to edbus/edbusnameowning.c
index ee26dbe..9c1a941 100644
--- a/libedbus/edbusnameowning.c
+++ b/edbus/edbusnameowning.c
@@ -26,16 +26,16 @@
 
 #include <glib/gi18n.h>
 
-#include "gdbusnameowning.h"
-#include "gdbuserror.h"
-#include "gdbusprivate.h"
-#include "gdbusconnection.h"
+#include "edbusnameowning.h"
+#include "edbuserror.h"
+#include "edbusprivate.h"
+#include "edbusconnection.h"
 
 /**
  * SECTION:gdbusnameowning
  * @title: Owning Bus Names
  * @short_description: Simple API for owning bus names
- * @include: gdbus/gdbus.h
+ * @include: edbus/edbus.h
  *
  * Convenience API for owning bus names.
  *
diff --git a/libedbus/edbusnameowning.h b/edbus/edbusnameowning.h
similarity index 97%
rename from libedbus/edbusnameowning.h
rename to edbus/edbusnameowning.h
index e44664f..5835866 100644
--- a/libedbus/edbusnameowning.h
+++ b/edbus/edbusnameowning.h
@@ -21,13 +21,13 @@
  */
 
 #if !defined (__E_DBUS_H_INSIDE__) && !defined (E_DBUS_COMPILATION)
-#error "Only <gdbus/gdbus.h> can be included directly."
+#error "Only <edbus/edbus.h> can be included directly."
 #endif
 
 #ifndef __E_DBUS_NAME_OWNING_H__
 #define __E_DBUS_NAME_OWNING_H__
 
-#include <gdbus/gdbustypes.h>
+#include <edbus/edbustypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/libedbus/edbusnamewatching.c b/edbus/edbusnamewatching.c
similarity index 99%
rename from libedbus/edbusnamewatching.c
rename to edbus/edbusnamewatching.c
index 7b5f7c0..da1886e 100644
--- a/libedbus/edbusnamewatching.c
+++ b/edbus/edbusnamewatching.c
@@ -26,16 +26,16 @@
 
 #include <glib/gi18n.h>
 
-#include "gdbusnamewatching.h"
-#include "gdbuserror.h"
-#include "gdbusprivate.h"
-#include "gdbusconnection.h"
+#include "edbusnamewatching.h"
+#include "edbuserror.h"
+#include "edbusprivate.h"
+#include "edbusconnection.h"
 
 /**
  * SECTION:gdbusnamewatching
  * @title: Watching Bus Names
  * @short_description: Simple API for watching bus names
- * @include: gdbus/gdbus.h
+ * @include: edbus/edbus.h
  *
  * Convenience API for watching bus names.
  *
diff --git a/libedbus/edbusnamewatching.h b/edbus/edbusnamewatching.h
similarity index 96%
rename from libedbus/edbusnamewatching.h
rename to edbus/edbusnamewatching.h
index 4d4411b..760f0f6 100644
--- a/libedbus/edbusnamewatching.h
+++ b/edbus/edbusnamewatching.h
@@ -21,13 +21,13 @@
  */
 
 #if !defined (__E_DBUS_H_INSIDE__) && !defined (E_DBUS_COMPILATION)
-#error "Only <gdbus/gdbus.h> can be included directly."
+#error "Only <edbus/edbus.h> can be included directly."
 #endif
 
 #ifndef __E_DBUS_NAME_WATCHING_H__
 #define __E_DBUS_NAME_WATCHING_H__
 
-#include <gdbus/gdbustypes.h>
+#include <edbus/edbustypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/libedbus/edbusprivate.c b/edbus/edbusprivate.c
similarity index 99%
rename from libedbus/edbusprivate.c
rename to edbus/edbusprivate.c
index 8227018..c0928ba 100644
--- a/libedbus/edbusprivate.c
+++ b/edbus/edbusprivate.c
@@ -29,8 +29,8 @@
 
 #include <dbus/dbus.h>
 
-#include "gdbustypes.h"
-#include "gdbusprivate.h"
+#include "edbustypes.h"
+#include "edbusprivate.h"
 
 void
 _e_dbus_oom (void)
diff --git a/libedbus/edbusprivate.h b/edbus/edbusprivate.h
similarity index 98%
rename from libedbus/edbusprivate.h
rename to edbus/edbusprivate.h
index 2d5a8f8..0968c5b 100644
--- a/libedbus/edbusprivate.h
+++ b/edbus/edbusprivate.h
@@ -27,7 +27,7 @@
 #ifndef __E_DBUS_PRIVATE_H__
 #define __E_DBUS_PRIVATE_H__
 
-#include <gdbus/gdbustypes.h>
+#include <edbus/edbustypes.h>
 #include <dbus/dbus.h>
 
 G_BEGIN_DECLS
diff --git a/libedbus/edbusproxy.c b/edbus/edbusproxy.c
similarity index 99%
rename from libedbus/edbusproxy.c
rename to edbus/edbusproxy.c
index f840e0a..1811089 100644
--- a/libedbus/edbusproxy.c
+++ b/edbus/edbusproxy.c
@@ -26,17 +26,17 @@
 #include <glib/gi18n.h>
 #include <gobject/gvaluecollector.h>
 
-#include "gdbusproxy.h"
-#include "gdbusenumtypes.h"
-#include "gdbusconnection.h"
-#include "gdbuserror.h"
-#include "gdbus-marshal.h"
-#include "gdbusprivate.h"
+#include "edbusproxy.h"
+#include "edbusenumtypes.h"
+#include "edbusconnection.h"
+#include "edbuserror.h"
+#include "edbus-marshal.h"
+#include "edbusprivate.h"
 
 /**
  * SECTION:gdbusproxy
  * @short_description: Base class for proxies
- * @include: gdbus/gdbus.h
+ * @include: edbus/edbus.h
  *
  * #EDBusProxy is a base class used for proxies to access a D-Bus
  * interface on a remote object. A #EDBusProxy can only be constructed
diff --git a/libedbus/edbusproxy.h b/edbus/edbusproxy.h
similarity index 98%
rename from libedbus/edbusproxy.h
rename to edbus/edbusproxy.h
index 56afca4..acb4747 100644
--- a/libedbus/edbusproxy.h
+++ b/edbus/edbusproxy.h
@@ -21,13 +21,13 @@
  */
 
 #if !defined (__E_DBUS_H_INSIDE__) && !defined (E_DBUS_COMPILATION)
-#error "Only <gdbus/gdbus.h> can be included directly."
+#error "Only <edbus/edbus.h> can be included directly."
 #endif
 
 #ifndef __E_DBUS_PROXY_H__
 #define __E_DBUS_PROXY_H__
 
-#include <gdbus/gdbustypes.h>
+#include <edbus/edbustypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/libedbus/edbusproxywatching.c b/edbus/edbusproxywatching.c
similarity index 98%
rename from libedbus/edbusproxywatching.c
rename to edbus/edbusproxywatching.c
index ed05b6f..aabe82f 100644
--- a/libedbus/edbusproxywatching.c
+++ b/edbus/edbusproxywatching.c
@@ -26,18 +26,18 @@
 
 #include <glib/gi18n.h>
 
-#include "gdbusnamewatching.h"
-#include "gdbusproxywatching.h"
-#include "gdbuserror.h"
-#include "gdbusprivate.h"
-#include "gdbusproxy.h"
-#include "gdbusnamewatching.h"
+#include "edbusnamewatching.h"
+#include "edbusproxywatching.h"
+#include "edbuserror.h"
+#include "edbusprivate.h"
+#include "edbusproxy.h"
+#include "edbusnamewatching.h"
 
 /**
  * SECTION:gdbusproxywatching
  * @title: Watching Proxies
  * @short_description: Simple API for watching proxies
- * @include: gdbus/gdbus.h
+ * @include: edbus/edbus.h
  *
  * Convenience API for watching bus proxies.
  *
diff --git a/libedbus/edbusproxywatching.h b/edbus/edbusproxywatching.h
similarity index 97%
rename from libedbus/edbusproxywatching.h
rename to edbus/edbusproxywatching.h
index a461aed..62c7c2f 100644
--- a/libedbus/edbusproxywatching.h
+++ b/edbus/edbusproxywatching.h
@@ -21,13 +21,13 @@
  */
 
 #if !defined (__E_DBUS_H_INSIDE__) && !defined (E_DBUS_COMPILATION)
-#error "Only <gdbus/gdbus.h> can be included directly."
+#error "Only <edbus/edbus.h> can be included directly."
 #endif
 
 #ifndef __E_DBUS_PROXY_WATCHING_H__
 #define __E_DBUS_PROXY_WATCHING_H__
 
-#include <gdbus/gdbustypes.h>
+#include <edbus/edbustypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/libedbus/edbusserver.c b/edbus/edbusserver.c
similarity index 98%
rename from libedbus/edbusserver.c
rename to edbus/edbusserver.c
index 34f477d..d77ccf2 100644
--- a/libedbus/edbusserver.c
+++ b/edbus/edbusserver.c
@@ -26,16 +26,16 @@
 
 #include <glib/gi18n.h>
 
-#include "gdbusconnection.h"
-#include "gdbuserror.h"
-#include "gdbusenumtypes.h"
-#include "gdbusserver.h"
-#include "gdbusprivate.h"
+#include "edbusconnection.h"
+#include "edbuserror.h"
+#include "edbusenumtypes.h"
+#include "edbusserver.h"
+#include "edbusprivate.h"
 
 /**
  * SECTION:gdbusserver
  * @short_description: Helper for accepting peer-to-peer connections
- * @include: gdbus/gdbus.h
+ * @include: edbus/edbus.h
  *
  * TODO
  */
diff --git a/libedbus/edbusserver.h b/edbus/edbusserver.h
similarity index 97%
rename from libedbus/edbusserver.h
rename to edbus/edbusserver.h
index a478395..3be8e9f 100644
--- a/libedbus/edbusserver.h
+++ b/edbus/edbusserver.h
@@ -21,13 +21,13 @@
  */
 
 #if !defined (__E_DBUS_H_INSIDE__) && !defined (E_DBUS_COMPILATION)
-#error "Only <gdbus/gdbus.h> can be included directly."
+#error "Only <edbus/edbus.h> can be included directly."
 #endif
 
 #ifndef __E_DBUS_SERVER_H__
 #define __E_DBUS_SERVER_H__
 
-#include <gdbus/gdbustypes.h>
+#include <edbus/edbustypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/libedbus/edbustypes.h b/edbus/edbustypes.h
similarity index 94%
rename from libedbus/edbustypes.h
rename to edbus/edbustypes.h
index 9aa811e..598550c 100644
--- a/libedbus/edbustypes.h
+++ b/edbus/edbustypes.h
@@ -21,14 +21,14 @@
  */
 
 #if !defined (__E_DBUS_H_INSIDE__) && !defined (E_DBUS_COMPILATION)
-#error "Only <gdbus/gdbus.h> can be included directly."
+#error "Only <edbus/edbus.h> can be included directly."
 #endif
 
 #ifndef __E_DBUS_TYPES_H__
 #define __E_DBUS_TYPES_H__
 
-#include "gvariant.h"
-#include <gdbus/gdbusenums.h>
+#include "evariant.h"
+#include <edbus/edbusenums.h>
 
 G_BEGIN_DECLS
 
diff --git a/libedbus/evariant-core.c b/edbus/evariant-core.c
similarity index 99%
rename from libedbus/evariant-core.c
rename to edbus/evariant-core.c
index 1cec489..068aabb 100644
--- a/libedbus/evariant-core.c
+++ b/edbus/evariant-core.c
@@ -50,12 +50,12 @@
  * SECTION 6: user-visible functions
  */
 
-#include "gvariant-private.h"
-#include "gvariant-serialiser.h"
+#include "evariant-private.h"
+#include "evariant-serialiser.h"
 
 #include <string.h>
 #include <glib.h>
-#include "gbitlock.h"
+#include "ebitlock.h"
 
 /* == SECTION 1: structure declaration, condition constants ============== */
 /**
diff --git a/libedbus/evariant-printer.c b/edbus/evariant-printer.c
similarity index 99%
rename from libedbus/evariant-printer.c
rename to edbus/evariant-printer.c
index f7806d8..28a2ff6 100644
--- a/libedbus/evariant-printer.c
+++ b/edbus/evariant-printer.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <errno.h>
 #include <glib.h>
-#include "gvariant.h"
+#include "evariant.h"
 
 /**
  * e_variant_print:
diff --git a/libedbus/evariant-private.h b/edbus/evariant-private.h
similarity index 97%
rename from libedbus/evariant-private.h
rename to edbus/evariant-private.h
index 01f876c..b4f1fd1 100644
--- a/libedbus/evariant-private.h
+++ b/edbus/evariant-private.h
@@ -20,8 +20,8 @@
 #ifndef __E_VARIANT_PRIVATE_H__
 #define __E_VARIANT_PRIVATE_H__
 
-#include "gvarianttypeinfo.h"
-#include "gvariant.h"
+#include "evarianttypeinfo.h"
+#include "evariant.h"
 
 /* gvariant-core.c */
 EVariant *                      e_variant_new_tree                      (const EVariantType  *type,
diff --git a/libedbus/evariant-serialiser.c b/edbus/evariant-serialiser.c
similarity index 99%
rename from libedbus/evariant-serialiser.c
rename to edbus/evariant-serialiser.c
index 0314205..467623a 100644
--- a/libedbus/evariant-serialiser.c
+++ b/edbus/evariant-serialiser.c
@@ -21,8 +21,8 @@
  */
 
 /* Prologue {{{1 */
-#include "gvariant.h"
-#include "gvariant-serialiser.h"
+#include "evariant.h"
+#include "evariant-serialiser.h"
 
 #include <glib/gtestutils.h>
 #include <glib/gstrfuncs.h>
diff --git a/libedbus/evariant-serialiser.h b/edbus/evariant-serialiser.h
similarity index 99%
rename from libedbus/evariant-serialiser.h
rename to edbus/evariant-serialiser.h
index 3f2a76c..a11d3d0 100644
--- a/libedbus/evariant-serialiser.h
+++ b/edbus/evariant-serialiser.h
@@ -23,7 +23,7 @@
 #ifndef __E_VARIANT_SERIALISER_H__
 #define __E_VARIANT_SERIALISER_H__
 
-#include "gvarianttypeinfo.h"
+#include "evarianttypeinfo.h"
 
 typedef struct
 {
diff --git a/libedbus/evariant-util.c b/edbus/evariant-util.c
similarity index 99%
rename from libedbus/evariant-util.c
rename to edbus/evariant-util.c
index 6571d4b..d3722da 100644
--- a/libedbus/evariant-util.c
+++ b/edbus/evariant-util.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <glib.h>
 
-#include "gvariant-private.h"
+#include "evariant-private.h"
 
 /**
  * EVariantIter:
diff --git a/libedbus/evariant-valist.c b/edbus/evariant-valist.c
similarity index 99%
rename from libedbus/evariant-valist.c
rename to edbus/evariant-valist.c
index f036af9..1cd4fe4 100644
--- a/libedbus/evariant-valist.c
+++ b/edbus/evariant-valist.c
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "gvariant-private.h"
+#include "evariant-private.h"
 
 #include <glib/gtestutils.h>
 #include <glib/gmessages.h>
diff --git a/libedbus/evariant.h b/edbus/evariant.h
similarity index 99%
rename from libedbus/evariant.h
rename to edbus/evariant.h
index abde203..48d3b63 100644
--- a/libedbus/evariant.h
+++ b/edbus/evariant.h
@@ -21,10 +21,8 @@
 #ifndef __E_VARIANT_H__
 #define __E_VARIANT_H__
 
-#include "gvarianttype.h"
-#include <glib/gstring.h>
-#include <glib/gmarkup.h>
-#include <glib/gerror.h>
+#include "evarianttype.h"
+#include <glib.h>
 #include <glib-object.h>
 #include <stdarg.h>
 
diff --git a/libedbus/evarianttype.c b/edbus/evarianttype.c
similarity index 99%
rename from libedbus/evarianttype.c
rename to edbus/evarianttype.c
index 3df9b88..eeb59b8 100644
--- a/libedbus/evarianttype.c
+++ b/edbus/evarianttype.c
@@ -20,7 +20,7 @@
  * Author: Ryan Lortie <desrt desrt ca>
  */
 
-#include "gvarianttype.h"
+#include "evarianttype.h"
 
 #include <glib/gtestutils.h>
 #include <glib/gstrfuncs.h>
diff --git a/libedbus/evarianttype.h b/edbus/evarianttype.h
similarity index 99%
rename from libedbus/evarianttype.h
rename to edbus/evarianttype.h
index 3d35bfb..e965761 100644
--- a/libedbus/evarianttype.h
+++ b/edbus/evarianttype.h
@@ -23,8 +23,7 @@
 #ifndef __E_VARIANT_TYPE_H__
 #define __E_VARIANT_TYPE_H__
 
-#include <glib/gmessages.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libedbus/evarianttypeinfo.c b/edbus/evarianttypeinfo.c
similarity index 99%
rename from libedbus/evarianttypeinfo.c
rename to edbus/evarianttypeinfo.c
index b0682e1..c52a934 100644
--- a/libedbus/evarianttypeinfo.c
+++ b/edbus/evarianttypeinfo.c
@@ -20,7 +20,7 @@
  * Author: Ryan Lortie <desrt desrt ca>
  */
 
-#include "gvarianttypeinfo.h"
+#include "evarianttypeinfo.h"
 #include <glib.h>
 
 /* < private >
diff --git a/libedbus/evarianttypeinfo.h b/edbus/evarianttypeinfo.h
similarity index 99%
rename from libedbus/evarianttypeinfo.h
rename to edbus/evarianttypeinfo.h
index 455272d..ff17b0f 100644
--- a/libedbus/evarianttypeinfo.h
+++ b/edbus/evarianttypeinfo.h
@@ -23,7 +23,7 @@
 #ifndef __E_VARIANT_TYPE_INFO_H__
 #define __E_VARIANT_TYPE_INFO_H__
 
-#include "gvarianttype.h"
+#include "evarianttype.h"
 
 #define E_VARIANT_TYPE_INFO_CHAR_MAYBE      'm'
 #define E_VARIANT_TYPE_INFO_CHAR_ARRAY      'a'
diff --git a/libedbus/example-own-name.c b/edbus/example-own-name.c
similarity index 98%
rename from libedbus/example-own-name.c
rename to edbus/example-own-name.c
index a3d12a7..6921552 100644
--- a/libedbus/example-own-name.c
+++ b/edbus/example-own-name.c
@@ -1,4 +1,4 @@
-#include <gdbus/gdbus.h>
+#include <edbus/edbus.h>
 
 static void
 on_name_acquired (EDBusConnection *connection,
diff --git a/libedbus/example-server.c b/edbus/example-server.c
similarity index 99%
rename from libedbus/example-server.c
rename to edbus/example-server.c
index df3eeec..db1a399 100644
--- a/libedbus/example-server.c
+++ b/edbus/example-server.c
@@ -1,5 +1,5 @@
 
-#include <gdbus/gdbus.h>
+#include <edbus/edbus.h>
 #include <stdlib.h>
 
 /* ---------------------------------------------------------------------------------------------------- */
diff --git a/libedbus/example-subtree.c b/edbus/example-subtree.c
similarity index 99%
rename from libedbus/example-subtree.c
rename to edbus/example-subtree.c
index 7b50ecf..5dc920f 100644
--- a/libedbus/example-subtree.c
+++ b/edbus/example-subtree.c
@@ -1,5 +1,5 @@
 
-#include <gdbus/gdbus.h>
+#include <edbus/edbus.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/libedbus/example-watch-name.c b/edbus/example-watch-name.c
similarity index 98%
rename from libedbus/example-watch-name.c
rename to edbus/example-watch-name.c
index 63a74c9..940df79 100644
--- a/libedbus/example-watch-name.c
+++ b/edbus/example-watch-name.c
@@ -1,4 +1,4 @@
-#include <gdbus/gdbus.h>
+#include <edbus/edbus.h>
 
 static gchar *opt_name         = NULL;
 static gboolean opt_system_bus = FALSE;
diff --git a/libedbus/example-watch-proxy.c b/edbus/example-watch-proxy.c
similarity index 99%
rename from libedbus/example-watch-proxy.c
rename to edbus/example-watch-proxy.c
index 151e4cd..0a69a2d 100644
--- a/libedbus/example-watch-proxy.c
+++ b/edbus/example-watch-proxy.c
@@ -1,4 +1,4 @@
-#include <gdbus/gdbus.h>
+#include <edbus/edbus.h>
 
 static gchar *opt_name         = NULL;
 static gchar *opt_object_path  = NULL;
diff --git a/libedbus/tests/Makefile.decl b/edbus/tests/Makefile.decl
similarity index 100%
rename from libedbus/tests/Makefile.decl
rename to edbus/tests/Makefile.decl
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]