diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-04-28 13:50:47 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-04-28 16:08:12 +0100 |
| commit | c1790e71e42d774923b7c8273ea617a22b69acdb (patch) | |
| tree | 11ea0a5b758b7346770b0bbd6b50e438f57ab108 | |
| parent | a4e984f3452880335ded6cad6c5c4fb0f6739c60 (diff) | |
capabilities-set: rename to capability-set
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| -rw-r--r-- | salut/Makefile.am | 2 | ||||
| -rw-r--r-- | salut/capability-set.h (renamed from salut/capabilities-set.h) | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/capability-set.c (renamed from src/capabilities-set.c) | 0 | ||||
| -rw-r--r-- | src/salut-capabilities.h | 2 | ||||
| -rw-r--r-- | src/salut-contact.h | 2 | ||||
| -rw-r--r-- | src/salut-self.h | 2 |
7 files changed, 6 insertions, 6 deletions
diff --git a/salut/Makefile.am b/salut/Makefile.am index f8858fe5..4c3ce25a 100644 --- a/salut/Makefile.am +++ b/salut/Makefile.am @@ -7,9 +7,9 @@ salutinclude_HEADERS = \ connection.h \ plugin.h \ protocol.h \ - capabilities-set.h \ caps-channel-manager.h \ capabilities.h \ + capability-set.h \ sidecar.h \ util.h diff --git a/salut/capabilities-set.h b/salut/capability-set.h index 3f215259..3f215259 100644 --- a/salut/capabilities-set.h +++ b/salut/capability-set.h diff --git a/src/Makefile.am b/src/Makefile.am index b18ecbfd..09e19fec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,9 +17,9 @@ noinst_PROGRAMS = write-mgr-file CORE_SOURCES = \ symbol-hacks.c \ symbol-hacks.h \ - capabilities-set.c \ + capability-set.c \ $(top_srcdir)/salut/capabilities.h \ - $(top_srcdir)/salut/capabilities-set.h \ + $(top_srcdir)/salut/capability-set.h \ caps-channel-manager.c \ $(top_srcdir)/salut/caps-channel-manager.h \ gabble_namespaces.h \ diff --git a/src/capabilities-set.c b/src/capability-set.c index 07e76d82..07e76d82 100644 --- a/src/capabilities-set.c +++ b/src/capability-set.c diff --git a/src/salut-capabilities.h b/src/salut-capabilities.h index 234f26c9..ec4e308b 100644 --- a/src/salut-capabilities.h +++ b/src/salut-capabilities.h @@ -22,7 +22,7 @@ #define __SALUT_CAPABILITIES__H__ #include <glib-object.h> -#include <salut/capabilities-set.h> +#include <salut/capability-set.h> GabbleCapabilitySet *salut_dup_self_advertised_caps (void); diff --git a/src/salut-contact.h b/src/salut-contact.h index 3f831263..074d0dce 100644 --- a/src/salut-contact.h +++ b/src/salut-contact.h @@ -25,7 +25,7 @@ #include <telepathy-glib/handle-repo.h> -#include <salut/capabilities-set.h> +#include <salut/capability-set.h> #include "salut-presence.h" #include "salut-connection.h" #ifdef ENABLE_OLPC diff --git a/src/salut-self.h b/src/salut-self.h index 7e5386e0..6ec1332b 100644 --- a/src/salut-self.h +++ b/src/salut-self.h @@ -28,7 +28,7 @@ #include <wocky/wocky-stanza.h> -#include <salut/capabilities-set.h> +#include <salut/capability-set.h> #include "salut-connection.h" #include "salut-presence.h" |