diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-04-14 13:09:01 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-04-14 13:09:01 +0100 |
| commit | d3b647c9e032598579449f5d64d80ae6cd96460f (patch) | |
| tree | 0571ed64996b679b59668a8fb97b9773f774c844 | |
| parent | 70d0a6d6b4798b0776fbe1c248ec98036274357d (diff) | |
util: rename to utils
We don't want to conflict with Salut's <salut/util.h>
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| -rw-r--r-- | salut/Makefile.am | 4 | ||||
| -rw-r--r-- | salut/channel-manager.c | 2 | ||||
| -rw-r--r-- | salut/message-channel.c | 2 | ||||
| -rw-r--r-- | salut/status.c | 1 | ||||
| -rw-r--r-- | salut/utils.c (renamed from salut/util.c) | 2 | ||||
| -rw-r--r-- | salut/utils.h (renamed from salut/util.h) | 0 |
6 files changed, 6 insertions, 5 deletions
diff --git a/salut/Makefile.am b/salut/Makefile.am index 80bed78..c71be85 100644 --- a/salut/Makefile.am +++ b/salut/Makefile.am @@ -24,5 +24,5 @@ ytstenut_salut_la_SOURCES = \ message-channel.h \ channel-manager.c \ channel-manager.h \ - util.c \ - util.h + utils.c \ + utils.h diff --git a/salut/channel-manager.c b/salut/channel-manager.c index b548b9b..c8ba267 100644 --- a/salut/channel-manager.c +++ b/salut/channel-manager.c @@ -24,7 +24,7 @@ #include "message-channel.h" #include "channel-manager.h" -#include "util.h" +#include "utils.h" #include <telepathy-glib/channel-manager.h> #include <telepathy-glib/dbus.h> diff --git a/salut/message-channel.c b/salut/message-channel.c index 82d0f6e..8c01945 100644 --- a/salut/message-channel.c +++ b/salut/message-channel.c @@ -53,7 +53,7 @@ #define DEBUG(msg, ...) \ g_debug ("%s: " msg, G_STRFUNC, ##__VA_ARGS__) -#include "util.h" +#include "utils.h" #define EL_YTSTENUT_MESSAGE "message" diff --git a/salut/status.c b/salut/status.c index 2aae37c..9f68fad 100644 --- a/salut/status.c +++ b/salut/status.c @@ -24,6 +24,7 @@ #include "status.h" #include <salut/plugin.h> +#include <salut/util.h> #include <telepathy-glib/svc-generic.h> diff --git a/salut/util.c b/salut/utils.c index 6486a33..255f400 100644 --- a/salut/util.c +++ b/salut/utils.c @@ -20,7 +20,7 @@ #include "config.h" -#include "util.h" +#include "utils.h" #include <telepathy-ytstenut-glib/telepathy-ytstenut-glib.h> diff --git a/salut/util.h b/salut/utils.h index bcab939..bcab939 100644 --- a/salut/util.h +++ b/salut/utils.h |