36 files changed, 25 insertions, 25 deletions
diff --git a/.gitignore b/.gitignore
index be1c16f7..6e92c360 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,10 +35,10 @@ po/POTFILES
 po/stamp-it
 po/.intltool-merge-cache
 
-common/test-client
-common/test-agent
-common/test-deviceselection
-common/gnome-bluetooth-enum-types.*
+lib/test-client
+lib/test-agent
+lib/test-deviceselection
+lib/gnome-bluetooth-enum-types.*
 applet/bluetooth-applet
 applet/bluetooth-applet.desktop.in
 applet/test-agentdialog
diff --git a/Makefile.am b/Makefile.am
index 6358c5bc..e494e6ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = icons common applet properties wizard sendto docs po help
+SUBDIRS = icons lib applet properties wizard sendto docs po help
 
 EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in ChangeLog.pre-2.27 gtk-doc.make gnome-doc-utils.make
 
diff --git a/applet/Makefile.am b/applet/Makefile.am
index 41b84aa7..9eca3aa9 100644
--- a/applet/Makefile.am
+++ b/applet/Makefile.am
@@ -3,17 +3,17 @@ bin_PROGRAMS = bluetooth-applet
 
 bluetooth_applet_SOURCES = main.c notify.h notify.c agent.h agent.c
 
-bluetooth_applet_LDADD = $(top_builddir)/common/libcommon.la $(top_builddir)/common/libgnome-bluetooth.la $(APPLET_LIBS)
+bluetooth_applet_LDADD = $(top_builddir)/lib/libcommon.la $(top_builddir)/lib/libgnome-bluetooth.la $(APPLET_LIBS)
 
 noinst_PROGRAMS = test-agentdialog
 
 test_agentdialog_SOURCES = test-agentdialog.c notify.h notify.c
 
-test_agentdialog_LDADD = $(top_builddir)/common/libcommon.la $(APPLET_LIBS)
+test_agentdialog_LDADD = $(top_builddir)/lib/libcommon.la $(APPLET_LIBS)
 
 AM_CFLAGS = $(APPLET_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPKGDATADIR="\"$(pkgdatadir)\""
 
-INCLUDES = -I$(top_srcdir)/common
+INCLUDES = -I$(top_srcdir)/lib
 
 man_MANS = bluetooth-applet.1
 
diff --git a/configure.ac b/configure.ac
index ad63df95..02f35c94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,8 +131,8 @@ GNOME_DOC_INIT
 AC_OUTPUT(Makefile
 	  gnome-bluetooth-1.0.pc
 	  icons/Makefile
-	  common/Makefile
-	  common/plugins/Makefile
+	  lib/Makefile
+	  lib/plugins/Makefile
 	  applet/Makefile
 	  applet/bluetooth-applet.desktop.in
 	  properties/Makefile
diff --git a/docs/reference/libgnome-bluetooth/Makefile.am b/docs/reference/libgnome-bluetooth/Makefile.am
index d2f4fdb9..ac0ad934 100644
--- a/docs/reference/libgnome-bluetooth/Makefile.am
+++ b/docs/reference/libgnome-bluetooth/Makefile.am
@@ -22,7 +22,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../../common
+DOC_SOURCE_DIR=../../../lib
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
@@ -49,8 +49,8 @@ FIXXREF_OPTIONS=
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/common/*.h
-CFILE_GLOB=$(top_srcdir)/common/*.c
+HFILE_GLOB=$(top_srcdir)/lib/*.h
+CFILE_GLOB=$(top_srcdir)/lib/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@@ -75,7 +75,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=$(LIBGNOMEBT_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/common/libgnome-bluetooth.la $(top_builddir)/common/libcommon.la
+GTKDOC_LIBS=$(top_builddir)/lib/libgnome-bluetooth.la $(top_builddir)/lib/libcommon.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/common/Makefile.am b/lib/Makefile.am
index 1f82ed34..1f82ed34 100644
--- a/common/Makefile.am
+++ b/lib/Makefile.am
diff --git a/common/bluetooth-agent.c b/lib/bluetooth-agent.c
index bdc20b66..bdc20b66 100644
--- a/common/bluetooth-agent.c
+++ b/lib/bluetooth-agent.c
diff --git a/common/bluetooth-agent.h b/lib/bluetooth-agent.h
index bc861f50..bc861f50 100644
--- a/common/bluetooth-agent.h
+++ b/lib/bluetooth-agent.h
diff --git a/common/bluetooth-agent.xml b/lib/bluetooth-agent.xml
index 478177c8..478177c8 100644
--- a/common/bluetooth-agent.xml
+++ b/lib/bluetooth-agent.xml
diff --git a/common/bluetooth-chooser-button.c b/lib/bluetooth-chooser-button.c
index 258ce0c3..258ce0c3 100644
--- a/common/bluetooth-chooser-button.c
+++ b/lib/bluetooth-chooser-button.c
diff --git a/common/bluetooth-chooser-button.h b/lib/bluetooth-chooser-button.h
index a4499886..a4499886 100644
--- a/common/bluetooth-chooser-button.h
+++ b/lib/bluetooth-chooser-button.h
diff --git a/common/bluetooth-chooser.c b/lib/bluetooth-chooser.c
index 9ae33ec1..9ae33ec1 100644
--- a/common/bluetooth-chooser.c
+++ b/lib/bluetooth-chooser.c
diff --git a/common/bluetooth-chooser.h b/lib/bluetooth-chooser.h
index df114470..df114470 100644
--- a/common/bluetooth-chooser.h
+++ b/lib/bluetooth-chooser.h
diff --git a/common/bluetooth-client.c b/lib/bluetooth-client.c
index 1089e626..1089e626 100644
--- a/common/bluetooth-client.c
+++ b/lib/bluetooth-client.c
diff --git a/common/bluetooth-client.h b/lib/bluetooth-client.h
index 70f3ee5b..70f3ee5b 100644
--- a/common/bluetooth-client.h
+++ b/lib/bluetooth-client.h
diff --git a/common/bluetooth-client.xml b/lib/bluetooth-client.xml
index 23262779..23262779 100644
--- a/common/bluetooth-client.xml
+++ b/lib/bluetooth-client.xml
diff --git a/common/bluetooth-enums.h b/lib/bluetooth-enums.h
index 97919a80..97919a80 100644
--- a/common/bluetooth-enums.h
+++ b/lib/bluetooth-enums.h
diff --git a/common/bluetooth-killswitch.c b/lib/bluetooth-killswitch.c
index aca3aa57..aca3aa57 100644
--- a/common/bluetooth-killswitch.c
+++ b/lib/bluetooth-killswitch.c
diff --git a/common/bluetooth-killswitch.h b/lib/bluetooth-killswitch.h
index 75f791af..75f791af 100644
--- a/common/bluetooth-killswitch.h
+++ b/lib/bluetooth-killswitch.h
diff --git a/common/bluetooth-plugin-manager.c b/lib/bluetooth-plugin-manager.c
index 2d1554c5..2d1554c5 100644
--- a/common/bluetooth-plugin-manager.c
+++ b/lib/bluetooth-plugin-manager.c
diff --git a/common/bluetooth-plugin-manager.h b/lib/bluetooth-plugin-manager.h
index 1e8dacd4..1e8dacd4 100644
--- a/common/bluetooth-plugin-manager.h
+++ b/lib/bluetooth-plugin-manager.h
diff --git a/common/bluetooth-plugin.h b/lib/bluetooth-plugin.h
index 9f6069c0..9f6069c0 100644
--- a/common/bluetooth-plugin.h
+++ b/lib/bluetooth-plugin.h
diff --git a/common/gnome-bluetooth.symbols b/lib/gnome-bluetooth.symbols
index e6740f90..e6740f90 100644
--- a/common/gnome-bluetooth.symbols
+++ b/lib/gnome-bluetooth.symbols
diff --git a/common/marshal.list b/lib/marshal.list
index bc7f458b..bc7f458b 100644
--- a/common/marshal.list
+++ b/lib/marshal.list
diff --git a/common/obex-agent.c b/lib/obex-agent.c
index 5a5e3660..5a5e3660 100644
--- a/common/obex-agent.c
+++ b/lib/obex-agent.c
diff --git a/common/obex-agent.h b/lib/obex-agent.h
index e8c8a617..e8c8a617 100644
--- a/common/obex-agent.h
+++ b/lib/obex-agent.h
diff --git a/common/obex-agent.xml b/lib/obex-agent.xml
index 540a926b..540a926b 100644
--- a/common/obex-agent.xml
+++ b/lib/obex-agent.xml
diff --git a/common/plugins/Makefile.am b/lib/plugins/Makefile.am
index b8f33397..1357a0a8 100644
--- a/common/plugins/Makefile.am
+++ b/lib/plugins/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES =                                      \
         -DDATADIR=\"$(datadir)\"                \
         -DICONDIR=\"$(icondir)\"                \
 	-DLOCALEDIR="\"$(datadir)/locale\""	\
-        -I$(top_srcdir)/common			\
+        -I$(top_srcdir)/lib			\
         -I$(top_builddir)			\
 	$(PLUGINS_CFLAGS)			\
 	$(WARN_CFLAGS)
diff --git a/common/plugins/test.c b/lib/plugins/test.c
index c3ee1ec9..c3ee1ec9 100644
--- a/common/plugins/test.c
+++ b/lib/plugins/test.c
diff --git a/common/test-agent.c b/lib/test-agent.c
index 8d60da6c..8d60da6c 100644
--- a/common/test-agent.c
+++ b/lib/test-agent.c
diff --git a/common/test-client.c b/lib/test-client.c
index 02f3862e..02f3862e 100644
--- a/common/test-client.c
+++ b/lib/test-client.c
diff --git a/common/test-deviceselection.c b/lib/test-deviceselection.c
index fd67ebbf..fd67ebbf 100644
--- a/common/test-deviceselection.c
+++ b/lib/test-deviceselection.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b8690c12..0023a234 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
-common/bluetooth-client.c
-common/bluetooth-chooser-button.c
-common/bluetooth-chooser.c
-common/plugins/test.c
+lib/bluetooth-client.c
+lib/bluetooth-chooser-button.c
+lib/bluetooth-chooser.c
+lib/plugins/test.c
 applet/main.c
 applet/notify.c
 applet/agent.c
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 599f77c0..0a361ad9 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -3,11 +3,11 @@ bin_PROGRAMS = bluetooth-properties
 
 bluetooth_properties_SOURCES = main.c general.h general.c adapter.h adapter.c gconf-bridge.c gconf-bridge.h
 
-bluetooth_properties_LDADD = $(top_builddir)/common/libgnome-bluetooth.la $(top_builddir)/common/libcommon.la $(PROPS_LIBS)
+bluetooth_properties_LDADD = $(top_builddir)/lib/libgnome-bluetooth.la $(top_builddir)/lib/libcommon.la $(PROPS_LIBS)
 
 AM_CFLAGS = $(PROPS_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPKGDATADIR="\"$(pkgdatadir)\""
 
-INCLUDES = -I$(top_srcdir)/common
+INCLUDES = -I$(top_srcdir)/lib
 
 man_MANS = bluetooth-properties.1
 
diff --git a/sendto/Makefile.am b/sendto/Makefile.am
index 3c6b789b..01596214 100644
--- a/sendto/Makefile.am
+++ b/sendto/Makefile.am
@@ -3,11 +3,11 @@ bin_PROGRAMS = bluetooth-sendto
 
 bluetooth_sendto_SOURCES = main.c
 
-bluetooth_sendto_LDADD = $(top_builddir)/common/libcommon.la $(top_builddir)/common/libgnome-bluetooth.la $(SENDTO_LIBS)
+bluetooth_sendto_LDADD = $(top_builddir)/lib/libcommon.la $(top_builddir)/lib/libgnome-bluetooth.la $(SENDTO_LIBS)
 
 AM_CFLAGS = $(SENDTO_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
 
-INCLUDES = -I$(top_srcdir)/common -I$(top_builddir)/common
+INCLUDES = -I$(top_srcdir)/lib -I$(top_builddir)/lib
 
 man_MANS = bluetooth-sendto.1
 
diff --git a/wizard/Makefile.am b/wizard/Makefile.am
index 2cdc6537..3d07b47d 100644
--- a/wizard/Makefile.am
+++ b/wizard/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = bluetooth-wizard
 
 bluetooth_wizard_SOURCES = main.c pin.c pin.h
 
-bluetooth_wizard_LDADD = $(top_builddir)/common/libgnome-bluetooth.la $(top_builddir)/common/libcommon.la $(WIZARD_LIBS)
+bluetooth_wizard_LDADD = $(top_builddir)/lib/libgnome-bluetooth.la $(top_builddir)/lib/libcommon.la $(WIZARD_LIBS)
 
 AM_CFLAGS = $(WIZARD_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPKGDATADIR="\"$(pkgdatadir)\""
 
@@ -13,7 +13,7 @@ pindir = $(pkgdatadir)
 ui_DATA = wizard.ui
 uidir = $(pkgdatadir)
 
-INCLUDES = -I$(top_srcdir)/common
+INCLUDES = -I$(top_srcdir)/lib
 
 man_MANS = bluetooth-wizard.1