diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-04-28 14:05:57 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-04-28 16:08:12 +0100 |
| commit | 243c0b73d7ed3db43d13e37828bd28cb10c16cd6 (patch) | |
| tree | bf4b4e584c17bfb04cbcda15663eaea945b0baf6 | |
| parent | c1790e71e42d774923b7c8273ea617a22b69acdb (diff) | |
src: remove annoying salut- prefix
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| -rw-r--r-- | .gitignore | 10 | ||||
| -rw-r--r-- | src/Makefile.am | 190 | ||||
| -rw-r--r-- | src/avahi-contact-manager.c (renamed from src/salut-avahi-contact-manager.c) | 6 | ||||
| -rw-r--r-- | src/avahi-contact-manager.h (renamed from src/salut-avahi-contact-manager.h) | 10 | ||||
| -rw-r--r-- | src/avahi-contact.c (renamed from src/salut-avahi-contact.c) | 4 | ||||
| -rw-r--r-- | src/avahi-contact.h (renamed from src/salut-avahi-contact.h) | 6 | ||||
| -rw-r--r-- | src/avahi-discovery-client.c (renamed from src/salut-avahi-discovery-client.c) | 18 | ||||
| -rw-r--r-- | src/avahi-discovery-client.h (renamed from src/salut-avahi-discovery-client.h) | 4 | ||||
| -rw-r--r-- | src/avahi-muc-channel.c (renamed from src/salut-avahi-muc-channel.c) | 4 | ||||
| -rw-r--r-- | src/avahi-muc-channel.h (renamed from src/salut-avahi-muc-channel.h) | 8 | ||||
| -rw-r--r-- | src/avahi-muc-manager.c (renamed from src/salut-avahi-muc-manager.c) | 14 | ||||
| -rw-r--r-- | src/avahi-muc-manager.h (renamed from src/salut-avahi-muc-manager.h) | 8 | ||||
| -rw-r--r-- | src/avahi-olpc-activity-manager.c (renamed from src/salut-avahi-olpc-activity-manager.c) | 10 | ||||
| -rw-r--r-- | src/avahi-olpc-activity-manager.h (renamed from src/salut-avahi-olpc-activity-manager.h) | 8 | ||||
| -rw-r--r-- | src/avahi-olpc-activity.c (renamed from src/salut-avahi-olpc-activity.c) | 4 | ||||
| -rw-r--r-- | src/avahi-olpc-activity.h (renamed from src/salut-avahi-olpc-activity.h) | 6 | ||||
| -rw-r--r-- | src/avahi-roomlist-manager.c (renamed from src/salut-avahi-roomlist-manager.c) | 10 | ||||
| -rw-r--r-- | src/avahi-roomlist-manager.h (renamed from src/salut-avahi-roomlist-manager.h) | 8 | ||||
| -rw-r--r-- | src/avahi-self.c (renamed from src/salut-avahi-self.c) | 4 | ||||
| -rw-r--r-- | src/avahi-self.h (renamed from src/salut-avahi-self.h) | 8 | ||||
| -rw-r--r-- | src/capabilities.c (renamed from src/salut-capabilities.c) | 2 | ||||
| -rw-r--r-- | src/capabilities.h (renamed from src/salut-capabilities.h) | 2 | ||||
| -rw-r--r-- | src/caps-hash.c (renamed from src/salut-caps-hash.c) | 8 | ||||
| -rw-r--r-- | src/caps-hash.h (renamed from src/salut-caps-hash.h) | 4 | ||||
| -rw-r--r-- | src/connection-manager.c (renamed from src/salut-connection-manager.c) | 6 | ||||
| -rw-r--r-- | src/connection-manager.h (renamed from src/salut-connection-manager.h) | 2 | ||||
| -rw-r--r-- | src/connection.c (renamed from src/salut-connection.c) | 46 | ||||
| -rw-r--r-- | src/connection.h (renamed from src/salut-connection.h) | 2 | ||||
| -rw-r--r-- | src/contact-channel.c (renamed from src/salut-contact-channel.c) | 6 | ||||
| -rw-r--r-- | src/contact-channel.h (renamed from src/salut-contact-channel.h) | 2 | ||||
| -rw-r--r-- | src/contact-manager.c (renamed from src/salut-contact-manager.c) | 14 | ||||
| -rw-r--r-- | src/contact-manager.h (renamed from src/salut-contact-manager.h) | 6 | ||||
| -rw-r--r-- | src/contact.c (renamed from src/salut-contact.c) | 12 | ||||
| -rw-r--r-- | src/contact.h (renamed from src/salut-contact.h) | 8 | ||||
| -rw-r--r-- | src/disco.c (renamed from src/salut-disco.c) | 10 | ||||
| -rw-r--r-- | src/disco.h (renamed from src/salut-disco.h) | 4 | ||||
| -rw-r--r-- | src/discovery-client.c (renamed from src/salut-discovery-client.c) | 4 | ||||
| -rw-r--r-- | src/discovery-client.h (renamed from src/salut-discovery-client.h) | 12 | ||||
| -rw-r--r-- | src/dummy-discovery-client.c (renamed from src/salut-dummy-discovery-client.c) | 4 | ||||
| -rw-r--r-- | src/dummy-discovery-client.h (renamed from src/salut-dummy-discovery-client.h) | 4 | ||||
| -rw-r--r-- | src/file-transfer-channel.c (renamed from src/salut-file-transfer-channel.c) | 12 | ||||
| -rw-r--r-- | src/file-transfer-channel.h (renamed from src/salut-file-transfer-channel.h) | 8 | ||||
| -rw-r--r-- | src/ft-manager.c (renamed from src/salut-ft-manager.c) | 12 | ||||
| -rw-r--r-- | src/ft-manager.h (renamed from src/salut-ft-manager.h) | 6 | ||||
| -rw-r--r-- | src/im-channel.c (renamed from src/salut-im-channel.c) | 12 | ||||
| -rw-r--r-- | src/im-channel.h (renamed from src/salut-im-channel.h) | 2 | ||||
| -rw-r--r-- | src/im-manager.c (renamed from src/salut-im-manager.c) | 8 | ||||
| -rw-r--r-- | src/im-manager.h (renamed from src/salut-im-manager.h) | 6 | ||||
| -rw-r--r-- | src/muc-channel.c (renamed from src/salut-muc-channel.c) | 14 | ||||
| -rw-r--r-- | src/muc-channel.h (renamed from src/salut-muc-channel.h) | 4 | ||||
| -rw-r--r-- | src/muc-manager.c (renamed from src/salut-muc-manager.c) | 16 | ||||
| -rw-r--r-- | src/muc-manager.h (renamed from src/salut-muc-manager.h) | 10 | ||||
| -rw-r--r-- | src/olpc-activity-manager.c (renamed from src/salut-olpc-activity-manager.c) | 8 | ||||
| -rw-r--r-- | src/olpc-activity-manager.h (renamed from src/salut-olpc-activity-manager.h) | 8 | ||||
| -rw-r--r-- | src/olpc-activity.c (renamed from src/salut-olpc-activity.c) | 12 | ||||
| -rw-r--r-- | src/olpc-activity.h (renamed from src/salut-olpc-activity.h) | 4 | ||||
| -rw-r--r-- | src/presence-cache.c (renamed from src/salut-presence-cache.c) | 10 | ||||
| -rw-r--r-- | src/presence-cache.h (renamed from src/salut-presence-cache.h) | 6 | ||||
| -rw-r--r-- | src/presence.h (renamed from src/salut-presence.h) | 2 | ||||
| -rw-r--r-- | src/protocol.c | 16 | ||||
| -rw-r--r-- | src/roomlist-channel.c (renamed from src/salut-roomlist-channel.c) | 6 | ||||
| -rw-r--r-- | src/roomlist-channel.h (renamed from src/salut-roomlist-channel.h) | 4 | ||||
| -rw-r--r-- | src/roomlist-manager.c (renamed from src/salut-roomlist-manager.c) | 16 | ||||
| -rw-r--r-- | src/roomlist-manager.h (renamed from src/salut-roomlist-manager.h) | 8 | ||||
| -rw-r--r-- | src/salut.c | 4 | ||||
| -rw-r--r-- | src/self.c (renamed from src/salut-self.c) | 16 | ||||
| -rw-r--r-- | src/self.h (renamed from src/salut-self.h) | 8 | ||||
| -rw-r--r-- | src/si-bytestream-manager.c (renamed from src/salut-si-bytestream-manager.c) | 10 | ||||
| -rw-r--r-- | src/si-bytestream-manager.h (renamed from src/salut-si-bytestream-manager.h) | 4 | ||||
| -rw-r--r-- | src/text-helper.c | 2 | ||||
| -rw-r--r-- | src/text-helper.h | 2 | ||||
| -rw-r--r-- | src/tube-dbus.c | 4 | ||||
| -rw-r--r-- | src/tube-dbus.h | 4 | ||||
| -rw-r--r-- | src/tube-iface.c | 4 | ||||
| -rw-r--r-- | src/tube-stream.c | 12 | ||||
| -rw-r--r-- | src/tube-stream.h | 4 | ||||
| -rw-r--r-- | src/tubes-channel.c (renamed from src/salut-tubes-channel.c) | 16 | ||||
| -rw-r--r-- | src/tubes-channel.h (renamed from src/salut-tubes-channel.h) | 4 | ||||
| -rw-r--r-- | src/tubes-manager.c (renamed from src/salut-tubes-manager.c) | 20 | ||||
| -rw-r--r-- | src/tubes-manager.h (renamed from src/salut-tubes-manager.h) | 8 | ||||
| -rw-r--r-- | src/util.c (renamed from src/salut-util.c) | 6 | ||||
| -rw-r--r-- | src/util.h (renamed from src/salut-util.h) | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/check-node-properties.c | 2 | ||||
| -rw-r--r-- | tests/debug.c (renamed from tests/salut-debug.c) | 4 | ||||
| -rw-r--r-- | tests/twisted/saluttest.py | 2 |
86 files changed, 424 insertions, 424 deletions
@@ -67,8 +67,8 @@ missing stamp-h1 depcomp -*-enumtypes.c -*-enumtypes.h +enumtypes.c +enumtypes.h m4/libtool.m4 m4/ltoptions.m4 @@ -105,9 +105,9 @@ lib/gibber/examples/test_tcp libtool ltmain.sh missing -src/salut-signals-marshal.c -src/salut-signals-marshal.h -src/salut-signals-marshal.list +src/signals-marshal.c +src/signals-marshal.h +src/signals-marshal.list src/*-enumtypes.c src/*-enumtypes.h src/telepathy-salut diff --git a/src/Makefile.am b/src/Makefile.am index 09e19fec..dd80eaf9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,9 @@ BUILT_SOURCES = \ - salut-signals-marshal.list \ - salut-signals-marshal.h \ - salut-signals-marshal.c \ - salut-enumtypes.h \ - salut-enumtypes.c + signals-marshal.list \ + signals-marshal.h \ + signals-marshal.c \ + enumtypes.h \ + enumtypes.c # correctly clean the generated source files CLEANFILES = $(BUILT_SOURCES) @@ -24,63 +24,63 @@ CORE_SOURCES = \ $(top_srcdir)/salut/caps-channel-manager.h \ gabble_namespaces.h \ namespaces.h \ - salut-capabilities.c \ - salut-capabilities.h \ - salut-caps-hash.c \ - salut-caps-hash.h \ - salut-connection-manager.c \ - salut-connection-manager.h \ - salut-contact-manager.c \ - salut-contact-manager.h \ - salut-disco.c \ - salut-disco.h \ - salut-im-manager.c \ - salut-im-manager.h \ - salut-im-channel.c \ - salut-im-channel.h \ - salut-muc-manager.c \ - salut-muc-manager.h \ - salut-roomlist-manager.c \ - salut-roomlist-manager.h \ - salut-muc-channel.c \ - salut-ft-manager.c \ - salut-ft-manager.h \ - salut-file-transfer-channel.c \ - salut-file-transfer-channel.h \ - salut-muc-channel.h \ - salut-presence-cache.c \ - salut-presence-cache.h \ - salut-tubes-manager.c \ - salut-tubes-manager.h \ - salut-contact.h \ - salut-contact.c \ - salut-self.h \ - salut-self.c \ - salut-contact-channel.c \ - salut-contact-channel.h \ - salut-connection.c \ - salut-connection.h \ - salut-presence.h \ - salut-contact-channel.h \ - salut-contact-channel.c \ - salut-si-bytestream-manager.h \ - salut-si-bytestream-manager.c \ - text-helper.c \ - text-helper.h \ - salut-roomlist-channel.h \ - salut-roomlist-channel.c \ - salut-discovery-client.h \ - salut-discovery-client.c \ - tube-dbus.h \ - tube-dbus.c \ - tube-iface.h \ - tube-iface.c \ - tube-stream.h \ - tube-stream.c \ - salut-tubes-channel.h \ - salut-tubes-channel.c \ - salut-util.h \ - salut-util.c \ + capabilities.c \ + capabilities.h \ + caps-hash.c \ + caps-hash.h \ + connection-manager.c \ + connection-manager.h \ + contact-manager.c \ + contact-manager.h \ + disco.c \ + disco.h \ + im-manager.c \ + im-manager.h \ + im-channel.c \ + im-channel.h \ + muc-manager.c \ + muc-manager.h \ + roomlist-manager.c \ + roomlist-manager.h \ + muc-channel.c \ + ft-manager.c \ + ft-manager.h \ + file-transfer-channel.c \ + file-transfer-channel.h \ + muc-channel.h \ + presence-cache.c \ + presence-cache.h \ + tubes-manager.c \ + tubes-manager.h \ + contact.h \ + contact.c \ + self.h \ + self.c \ + contact-channel.c \ + contact-channel.h \ + connection.c \ + connection.h \ + presence.h \ + contact-channel.h \ + contact-channel.c \ + si-bytestream-manager.h \ + si-bytestream-manager.c \ + text-helper.c \ + text-helper.h \ + roomlist-channel.h \ + roomlist-channel.c \ + discovery-client.h \ + discovery-client.c \ + tube-dbus.h \ + tube-dbus.c \ + tube-iface.h \ + tube-iface.c \ + tube-stream.h \ + tube-stream.c \ + tubes-channel.h \ + tubes-channel.c \ + util.h \ + util.c \ $(top_srcdir)/salut/util.h \ debug.c \ debug.h \ @@ -95,38 +95,38 @@ CORE_SOURCES = \ sidecar.c AVAHI_BACKEND_SOURCES = \ - salut-avahi-discovery-client.h \ - salut-avahi-discovery-client.c \ - salut-avahi-muc-manager.h \ - salut-avahi-muc-manager.c \ - salut-avahi-roomlist-manager.h \ - salut-avahi-roomlist-manager.c \ - salut-avahi-muc-channel.h \ - salut-avahi-muc-channel.c \ - salut-avahi-contact-manager.h \ - salut-avahi-contact-manager.c \ - salut-avahi-contact.h \ - salut-avahi-contact.c \ - salut-avahi-self.h \ - salut-avahi-self.c + avahi-discovery-client.h \ + avahi-discovery-client.c \ + avahi-muc-manager.h \ + avahi-muc-manager.c \ + avahi-roomlist-manager.h \ + avahi-roomlist-manager.c \ + avahi-muc-channel.h \ + avahi-muc-channel.c \ + avahi-contact-manager.h \ + avahi-contact-manager.c \ + avahi-contact.h \ + avahi-contact.c \ + avahi-self.h \ + avahi-self.c if ENABLE_OLPC CORE_SOURCES += \ - salut-olpc-activity.h \ - salut-olpc-activity.c \ - salut-olpc-activity-manager.h \ - salut-olpc-activity-manager.c + olpc-activity.h \ + olpc-activity.c \ + olpc-activity-manager.h \ + olpc-activity-manager.c AVAHI_BACKEND_SOURCES += \ - salut-avahi-olpc-activity-manager.h \ - salut-avahi-olpc-activity-manager.c \ - salut-avahi-olpc-activity.h \ - salut-avahi-olpc-activity.c + avahi-olpc-activity-manager.h \ + avahi-olpc-activity-manager.c \ + avahi-olpc-activity.h \ + avahi-olpc-activity.c endif DUMMY_BACKEND_SOURCES = \ - salut-dummy-discovery-client.h \ - salut-dummy-discovery-client.c + dummy-discovery-client.h \ + dummy-discovery-client.c SHA1_SOURCES = \ sha1/sha1-util.h \ @@ -200,7 +200,7 @@ $(top_builddir)/lib/gibber/libgibber.la: .PHONY: $(top_builddir)/lib/gibber/libgibber.la -salut-signals-marshal.list: $(CORE_SOURCES) $(AVAHI_BACKEND_SOURCES) $(DUMMY_BACKEND_SOURCES) Makefile.am +signals-marshal.list: $(CORE_SOURCES) $(AVAHI_BACKEND_SOURCES) $(DUMMY_BACKEND_SOURCES) Makefile.am $(AM_V_GEN)( cd $(srcdir) && \ sed -n -e 's/.*salut_signals_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \ $(CORE_SOURCES) $(AVAHI_BACKEND_SOURCES) $(DUMMY_BACKEND_SOURCES) ) \ @@ -211,19 +211,19 @@ salut-signals-marshal.list: $(CORE_SOURCES) $(AVAHI_BACKEND_SOURCES) $(DUMMY_BAC mv $@.tmp $@; \ fi -%-signals-marshal.h: %-signals-marshal.list Makefile.am - $(AM_V_GEN)glib-genmarshal --header --prefix=$(subst -,_,$*)_signals_marshal $< > $@ +signals-marshal.h: signals-marshal.list Makefile.am + $(AM_V_GEN)glib-genmarshal --header --prefix=salut_signals_marshal $< > $@ -%-signals-marshal.c: %-signals-marshal.list Makefile.am - $(AM_V_GEN){ echo '#include "$*-signals-marshal.h"' && \ - glib-genmarshal --body --prefix=$(subst -,_,$*)_signals_marshal $< ; \ +signals-marshal.c: signals-marshal.list Makefile.am + $(AM_V_GEN){ echo '#include "signals-marshal.h"' && \ + glib-genmarshal --body --prefix=salut_signals_marshal $< ; \ } > $@ # rules for making the glib enum objects enumtype_sources = \ - $(top_srcdir)/src/salut-presence.h + $(top_srcdir)/src/presence.h -salut-enumtypes.h: $(enumtype_sources) Makefile.in +enumtypes.h: $(enumtype_sources) Makefile.in $(AM_V_GEN)glib-mkenums \ --fhead "#ifndef __SALUT_ENUM_TYPES_H__\n#define __SALUT_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \ @@ -231,7 +231,7 @@ salut-enumtypes.h: $(enumtype_sources) Makefile.in --ftail "G_END_DECLS\n\n#endif /* __SALUT_ENUM_TYPES_H__ */" \ $(enumtype_sources) > $@ -salut-enumtypes.c: $(enumtype_sources) Makefile.in +enumtypes.c: $(enumtype_sources) Makefile.in $(AM_V_GEN)glib-mkenums \ --fhead "#include <$*.h>" \ --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ diff --git a/src/salut-avahi-contact-manager.c b/src/avahi-contact-manager.c index 4897b006..e0dba62f 100644 --- a/src/salut-avahi-contact-manager.c +++ b/src/avahi-contact-manager.c @@ -1,5 +1,5 @@ /* - * salut-avahi-contact-manager.c - Source for SalutAvahiContactManager + * avahi-contact-manager.c - Source for SalutAvahiContactManager * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -30,8 +30,8 @@ #define DEBUG_FLAG DEBUG_MUC #include "debug.h" -#include "salut-avahi-contact-manager.h" -#include "salut-avahi-contact.h" +#include "avahi-contact-manager.h" +#include "avahi-contact.h" G_DEFINE_TYPE (SalutAvahiContactManager, salut_avahi_contact_manager, SALUT_TYPE_CONTACT_MANAGER); diff --git a/src/salut-avahi-contact-manager.h b/src/avahi-contact-manager.h index 010395f7..147543ac 100644 --- a/src/salut-avahi-contact-manager.h +++ b/src/avahi-contact-manager.h @@ -1,5 +1,5 @@ /* - * salut-avahi-contact-manager.h - Header for SalutAvahiContactManager + * avahi-contact-manager.h - Header for SalutAvahiContactManager * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,10 +24,10 @@ #include <glib-object.h> #include <avahi-gobject/ga-client.h> -#include "salut-contact-manager.h" -#include "salut-connection.h" -#include "salut-contact.h" -#include "salut-avahi-discovery-client.h" +#include "contact-manager.h" +#include "connection.h" +#include "contact.h" +#include "avahi-discovery-client.h" G_BEGIN_DECLS diff --git a/src/salut-avahi-contact.c b/src/avahi-contact.c index 19f3b869..9024a614 100644 --- a/src/salut-avahi-contact.c +++ b/src/avahi-contact.c @@ -1,5 +1,5 @@ /* - * salut-avahi-contact.c - Source for SalutAvahiContact + * avahi-contact.c - Source for SalutAvahiContact * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -29,7 +29,7 @@ #include <avahi-common/defs.h> #include <avahi-common/malloc.h> -#include "salut-avahi-contact.h" +#include "avahi-contact.h" #include <telepathy-glib/channel-factory-iface.h> #include <telepathy-glib/interfaces.h> diff --git a/src/salut-avahi-contact.h b/src/avahi-contact.h index b0e4ba91..a9f78b21 100644 --- a/src/salut-avahi-contact.h +++ b/src/avahi-contact.h @@ -1,5 +1,5 @@ /* - * salut-avahi-contact.h - Header for SalutAvahiContact + * avahi-contact.h - Header for SalutAvahiContact * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -22,8 +22,8 @@ #include <glib-object.h> -#include "salut-contact.h" -#include "salut-avahi-discovery-client.h" +#include "contact.h" +#include "avahi-discovery-client.h" G_BEGIN_DECLS diff --git a/src/salut-avahi-discovery-client.c b/src/avahi-discovery-client.c index 59027499..b75172ab 100644 --- a/src/salut-avahi-discovery-client.c +++ b/src/avahi-discovery-client.c @@ -1,5 +1,5 @@ /* - * salut-avahi-discovery-client.c - Source for SalutAvahiDiscoveryClient + * avahi-discovery-client.c - Source for SalutAvahiDiscoveryClient * Copyright (C) 2007 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "salut-avahi-discovery-client.h" +#include "avahi-discovery-client.h" #include <stdlib.h> #include <string.h> @@ -36,16 +36,16 @@ #define DEBUG_FLAG DEBUG_DISCOVERY #include "debug.h" -#include "salut-avahi-muc-manager.h" -#include "salut-avahi-contact-manager.h" -#include "salut-avahi-roomlist-manager.h" -#include "salut-avahi-self.h" +#include "avahi-muc-manager.h" +#include "avahi-contact-manager.h" +#include "avahi-roomlist-manager.h" +#include "avahi-self.h" #ifdef ENABLE_OLPC -#include "salut-avahi-olpc-activity-manager.h" +#include "avahi-olpc-activity-manager.h" #endif -#include "salut-presence.h" -#include "salut-signals-marshal.h" +#include "presence.h" +#include "signals-marshal.h" static void discovery_client_init (gpointer g_iface, gpointer iface_data); diff --git a/src/salut-avahi-discovery-client.h b/src/avahi-discovery-client.h index 7d7c3121..2582c1aa 100644 --- a/src/salut-avahi-discovery-client.h +++ b/src/avahi-discovery-client.h @@ -1,5 +1,5 @@ /* - * salut-avahi-discovery-client.h - Header for SalutAvahiDiscoveryClient + * avahi-discovery-client.h - Header for SalutAvahiDiscoveryClient * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ #include <avahi-gobject/ga-client.h> -#include "salut-discovery-client.h" +#include "discovery-client.h" G_BEGIN_DECLS diff --git a/src/salut-avahi-muc-channel.c b/src/avahi-muc-channel.c index 9a29ef7b..fa23732a 100644 --- a/src/salut-avahi-muc-channel.c +++ b/src/avahi-muc-channel.c @@ -1,5 +1,5 @@ /* - * salut-avahi-muc-channel.c - Source for SalutAvahiMucChannel + * avahi-muc-channel.c - Source for SalutAvahiMucChannel * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ #define DEBUG_FLAG DEBUG_MUC #include "debug.h" -#include "salut-avahi-muc-channel.h" +#include "avahi-muc-channel.h" #include <avahi-gobject/ga-entry-group.h> diff --git a/src/salut-avahi-muc-channel.h b/src/avahi-muc-channel.h index 8170364f..1aa5924e 100644 --- a/src/salut-avahi-muc-channel.h +++ b/src/avahi-muc-channel.h @@ -1,5 +1,5 @@ /* - * salut-avahi-muc-channel.h - Header for SalutAvahiMucChannel + * avahi-muc-channel.h - Header for SalutAvahiMucChannel * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -24,9 +24,9 @@ #include <gibber/gibber-muc-connection.h> -#include "salut-muc-channel.h" -#include "salut-connection.h" -#include "salut-avahi-discovery-client.h" +#include "muc-channel.h" +#include "connection.h" +#include "avahi-discovery-client.h" G_BEGIN_DECLS diff --git a/src/salut-avahi-muc-manager.c b/src/avahi-muc-manager.c index 681b0d4d..05feb95c 100644 --- a/src/salut-avahi-muc-manager.c +++ b/src/avahi-muc-manager.c @@ -1,5 +1,5 @@ /* - * salut-avahi-muc-manager.c - Source for SalutAvahiMucManager + * avahi-muc-manager.c - Source for SalutAvahiMucManager * Copyright (C) 2006 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ #include <string.h> #include <arpa/inet.h> -#include "salut-avahi-muc-manager.h" +#include "avahi-muc-manager.h" #include <avahi-gobject/ga-service-browser.h> #include <avahi-gobject/ga-service-resolver.h> @@ -32,11 +32,11 @@ #include <gibber/gibber-namespaces.h> #include <gibber/gibber-xmpp-error.h> -#include "salut-muc-channel.h" -#include "salut-contact-manager.h" -#include "salut-tubes-channel.h" -#include "salut-roomlist-channel.h" -#include "salut-avahi-muc-channel.h" +#include "muc-channel.h" +#include "contact-manager.h" +#include "tubes-channel.h" +#include "roomlist-channel.h" +#include "avahi-muc-channel.h" #include <telepathy-glib/channel-factory-iface.h> #include <telepathy-glib/interfaces.h> diff --git a/src/salut-avahi-muc-manager.h b/src/avahi-muc-manager.h index 291d8017..ea8034b5 100644 --- a/src/salut-avahi-muc-manager.h +++ b/src/avahi-muc-manager.h @@ -1,5 +1,5 @@ /* - * salut-avahi-muc-manager.h - Header for SalutAvahiMucManager + * avahi-muc-manager.h - Header for SalutAvahiMucManager * Copyright (C) 2006 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -22,9 +22,9 @@ #include <glib-object.h> -#include "salut-muc-manager.h" -#include "salut-connection.h" -#include "salut-avahi-discovery-client.h" +#include "muc-manager.h" +#include "connection.h" +#include "avahi-discovery-client.h" G_BEGIN_DECLS diff --git a/src/salut-avahi-olpc-activity-manager.c b/src/avahi-olpc-activity-manager.c index 45c4a11b..840128ec 100644 --- a/src/salut-avahi-olpc-activity-manager.c +++ b/src/avahi-olpc-activity-manager.c @@ -1,5 +1,5 @@ /* - * salut-avahi-avahi_olpc-activity-manager.c - Source for + * avahi-avahi_olpc-activity-manager.c - Source for * SalutAvahiOlpcActivityManager * Copyright (C) 2008 Collabora Ltd. * @@ -25,10 +25,10 @@ #include <avahi-gobject/ga-service-browser.h> -#include "salut-avahi-olpc-activity-manager.h" -#include "salut-avahi-olpc-activity.h" -#include "salut-avahi-discovery-client.h" -#include "salut-olpc-activity.h" +#include "avahi-olpc-activity-manager.h" +#include "avahi-olpc-activity.h" +#include "avahi-discovery-client.h" +#include "olpc-activity.h" #define DEBUG_FLAG DEBUG_OLPC_ACTIVITY #include "debug.h" diff --git a/src/salut-avahi-olpc-activity-manager.h b/src/avahi-olpc-activity-manager.h index 5f1c48e7..557f663b 100644 --- a/src/salut-avahi-olpc-activity-manager.h +++ b/src/avahi-olpc-activity-manager.h @@ -1,5 +1,5 @@ /* - * salut-avahi-olpc-activity-managere.h - Header for + * avahi-olpc-activity-managere.h - Header for * SalutAvahiOlpcActivityManager * Copyright (C) 2008 Collabora Ltd. * @@ -25,9 +25,9 @@ #include <telepathy-glib/handle.h> -#include "salut-olpc-activity-manager.h" -#include "salut-connection.h" -#include "salut-avahi-discovery-client.h" +#include "olpc-activity-manager.h" +#include "connection.h" +#include "avahi-discovery-client.h" G_BEGIN_DECLS diff --git a/src/salut-avahi-olpc-activity.c b/src/avahi-olpc-activity.c index 2a3681ac..8db8bd85 100644 --- a/src/salut-avahi-olpc-activity.c +++ b/src/avahi-olpc-activity.c @@ -1,5 +1,5 @@ /* - * salut-avahi-olpc-activity.c - Source for SalutAvahiOlpcActivity + * avahi-olpc-activity.c - Source for SalutAvahiOlpcActivity * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ #include <avahi-gobject/ga-service-resolver.h> #include <avahi-common/malloc.h> -#include "salut-avahi-olpc-activity.h" +#include "avahi-olpc-activity.h" #define DEBUG_FLAG DEBUG_OLPC_ACTIVITY #include "debug.h" diff --git a/src/salut-avahi-olpc-activity.h b/src/avahi-olpc-activity.h index 5021ae18..6343261a 100644 --- a/src/salut-avahi-olpc-activity.h +++ b/src/avahi-olpc-activity.h @@ -1,5 +1,5 @@ /* - * salut-avahi-olpc-activity.h - Header for SalutAvahiOlpcActivity + * avahi-olpc-activity.h - Header for SalutAvahiOlpcActivity * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -22,8 +22,8 @@ #include <glib-object.h> -#include "salut-olpc-activity.h" -#include "salut-avahi-discovery-client.h" +#include "olpc-activity.h" +#include "avahi-discovery-client.h" G_BEGIN_DECLS diff --git a/src/salut-avahi-roomlist-manager.c b/src/avahi-roomlist-manager.c index 0e78b2bd..0461dc0f 100644 --- a/src/salut-avahi-roomlist-manager.c +++ b/src/avahi-roomlist-manager.c @@ -1,5 +1,5 @@ /* - * salut-avahi-roomlist-manager.c - Source for SalutAvahiRoomlistManager + * avahi-roomlist-manager.c - Source for SalutAvahiRoomlistManager * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ #include <string.h> #include <arpa/inet.h> -#include "salut-avahi-roomlist-manager.h" +#include "avahi-roomlist-manager.h" #include <avahi-gobject/ga-service-browser.h> #include <avahi-gobject/ga-service-resolver.h> @@ -32,9 +32,9 @@ #include <gibber/gibber-namespaces.h> #include <gibber/gibber-xmpp-error.h> -#include "salut-contact-manager.h" -#include "salut-tubes-channel.h" -#include "salut-roomlist-channel.h" +#include "contact-manager.h" +#include "tubes-channel.h" +#include "roomlist-channel.h" #include <telepathy-glib/channel-factory-iface.h> #include <telepathy-glib/interfaces.h> diff --git a/src/salut-avahi-roomlist-manager.h b/src/avahi-roomlist-manager.h index 8623abbf..bc891bef 100644 --- a/src/salut-avahi-roomlist-manager.h +++ b/src/avahi-roomlist-manager.h @@ -1,5 +1,5 @@ /* - * salut-avahi-roomlist-manager.h - Header for SalutAvahiRoomlistManager + * avahi-roomlist-manager.h - Header for SalutAvahiRoomlistManager * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -22,9 +22,9 @@ #include <glib-object.h> -#include "salut-roomlist-manager.h" -#include "salut-connection.h" -#include "salut-avahi-discovery-client.h" +#include "roomlist-manager.h" +#include "connection.h" +#include "avahi-discovery-client.h" G_BEGIN_DECLS diff --git a/src/salut-avahi-self.c b/src/avahi-self.c index 1edc902e..4b839500 100644 --- a/src/salut-avahi-self.c +++ b/src/avahi-self.c @@ -1,5 +1,5 @@ /* - * salut-avahi-self.c - Source for SalutAvahiSelf + * avahi-self.c - Source for SalutAvahiSelf * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ #define DEBUG_FLAG DEBUG_SELF #include "debug.h" -#include "salut-avahi-self.h" +#include "avahi-self.h" #include "sha1/sha1-util.h" diff --git a/src/salut-avahi-self.h b/src/avahi-self.h index b55d1b31..4ebe942c 100644 --- a/src/salut-avahi-self.h +++ b/src/avahi-self.h @@ -1,5 +1,5 @@ /* - * salut-avahi-self.h - Header for SalutAvahiSelf + * avahi-self.h - Header for SalutAvahiSelf * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,9 +23,9 @@ #include <glib-object.h> -#include "salut-self.h" -#include "salut-connection.h" -#include "salut-avahi-discovery-client.h" +#include "self.h" +#include "connection.h" +#include "avahi-discovery-client.h" G_BEGIN_DECLS diff --git a/src/salut-capabilities.c b/src/capabilities.c index 4bd72395..29ea170c 100644 --- a/src/salut-capabilities.c +++ b/src/capabilities.c @@ -19,7 +19,7 @@ */ #include "config.h" -#include "salut-capabilities.h" +#include "capabilities.h" #include <gibber/gibber-namespaces.h> #include <telepathy-glib/interfaces.h> diff --git a/src/salut-capabilities.h b/src/capabilities.h index ec4e308b..b4c096f0 100644 --- a/src/salut-capabilities.h +++ b/src/capabilities.h @@ -1,5 +1,5 @@ /* - * salut-capabilities.h - Capabilities constants and utilities + * capabilities.h - Capabilities constants and utilities * Copyright (C) 2005-2008 Collabora Ltd. * Copyright (C) 2005-2008 Nokia Corporation * diff --git a/src/salut-caps-hash.c b/src/caps-hash.c index 1586bea1..16489539 100644 --- a/src/salut-caps-hash.c +++ b/src/caps-hash.c @@ -1,5 +1,5 @@ /* - * salut-caps-hash.c - Computing verification string hash (XEP-0115 v1.5) + * caps-hash.c - Computing verification string hash (XEP-0115 v1.5) * Copyright (C) 2006-2008 Collabora Ltd. * Copyright (C) 2006-2008 Nokia Corporation * @@ -36,9 +36,9 @@ #define DEBUG_FLAG SALUT_DEBUG_PRESENCE #include "debug.h" -#include "salut-capabilities.h" -#include "salut-caps-hash.h" -#include "salut-self.h" +#include "capabilities.h" +#include "caps-hash.h" +#include "self.h" static void add_to_pointer_array_foreach (gpointer ns, diff --git a/src/salut-caps-hash.h b/src/caps-hash.h index 945a68e6..4d2ef6c8 100644 --- a/src/salut-caps-hash.h +++ b/src/caps-hash.h @@ -1,5 +1,5 @@ /* - * salut-caps-hash.h - Headers for computing verification string hash + * caps-hash.h - Headers for computing verification string hash * (XEP-0115 v1.5) * Copyright (C) 2008 Collabora Ltd. * @@ -22,7 +22,7 @@ #ifndef __SALUT_CAPS_HASH_H__ #define __SALUT_CAPS_HASH_H__ -#include "salut-self.h" +#include "self.h" #include <wocky/wocky-stanza.h> diff --git a/src/salut-connection-manager.c b/src/connection-manager.c index 86434ddb..eb5d3664 100644 --- a/src/salut-connection-manager.c +++ b/src/connection-manager.c @@ -1,5 +1,5 @@ /* - * salut-connection-manager.c - Source for SalutConnectionManager + * connection-manager.c - Source for SalutConnectionManager * Copyright (C) 2005 Nokia Corporation * Copyright (C) 2006 Collabora Ltd. * @author: Sjoerd Simons <sjoerd@luon.net> @@ -20,7 +20,7 @@ */ #include "config.h" -#include "salut-connection-manager.h" +#include "connection-manager.h" #include <stdio.h> #include <stdlib.h> @@ -30,7 +30,7 @@ #include <telepathy-glib/debug-sender.h> #include "protocol.h" -#include "salut-connection.h" +#include "connection.h" #include "debug.h" #include "plugin-loader.h" diff --git a/src/salut-connection-manager.h b/src/connection-manager.h index 21e616cd..90e67fed 100644 --- a/src/salut-connection-manager.h +++ b/src/connection-manager.h @@ -1,5 +1,5 @@ /* - * salut-connection-manager.h - Header for SalutConnectionManager + * connection-manager.h - Header for SalutConnectionManager * Copyright (C) 2005 Collabora Ltd. * Copyright (C) 2005 Nokia Corporation * diff --git a/src/salut-connection.c b/src/connection.c index 88e6a636..75e10c95 100644 --- a/src/salut-connection.c +++ b/src/connection.c @@ -1,5 +1,5 @@ /* - * salut-connection.c - Source for SalutConnection + * connection.c - Source for SalutConnection * Copyright (C) 2005 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "salut-connection.h" +#include "connection.h" #include <stdio.h> #include <stdlib.h> @@ -49,30 +49,30 @@ #include <wocky/wocky-xep-0115-capabilities.h> #include "capabilities.h" -#include "salut-avahi-discovery-client.h" -#include "salut-capabilities.h" -#include "salut-caps-hash.h" -#include "salut-contact-channel.h" -#include "salut-contact.h" -#include "salut-contact-manager.h" -#include "salut-disco.h" -#include "salut-discovery-client.h" -#include "salut-im-manager.h" -#include "salut-muc-manager.h" -#include "salut-ft-manager.h" -#include "salut-contact.h" -#include "salut-roomlist-manager.h" -#include "salut-presence.h" -#include "salut-presence-cache.h" -#include "salut-self.h" -#include "salut-si-bytestream-manager.h" -#include "salut-tubes-manager.h" -#include "salut-util.h" +#include "avahi-discovery-client.h" +#include "capabilities.h" +#include "caps-hash.h" +#include "contact-channel.h" +#include "contact.h" +#include "contact-manager.h" +#include "disco.h" +#include "discovery-client.h" +#include "im-manager.h" +#include "muc-manager.h" +#include "ft-manager.h" +#include "contact.h" +#include "roomlist-manager.h" +#include "presence.h" +#include "presence-cache.h" +#include "self.h" +#include "si-bytestream-manager.h" +#include "tubes-manager.h" +#include "util.h" #include "plugin-loader.h" #ifdef ENABLE_OLPC -#include "salut-olpc-activity-manager.h" +#include "olpc-activity-manager.h" #endif #include <extensions/extensions.h> @@ -543,7 +543,7 @@ static const TpPresenceStatusSpec presence_statuses[] = { { "offline", TP_CONNECTION_PRESENCE_TYPE_OFFLINE, FALSE, NULL }, { NULL } }; -/* ... and these too (declared in salut-presence.h) */ +/* ... and these too (declared in presence.h) */ const char *salut_presence_status_txt_names[] = { "avail", "away", diff --git a/src/salut-connection.h b/src/connection.h index 8f28b98b..25c7e951 100644 --- a/src/salut-connection.h +++ b/src/connection.h @@ -1,5 +1,5 @@ /* - * salut-connection.h - Header for SalutConnection + * connection.h - Header for SalutConnection * Copyright (C) 2005 Collabora Ltd. * Copyright (C) 2005 Nokia Corporation * diff --git a/src/salut-contact-channel.c b/src/contact-channel.c index e82053a7..d87a81a4 100644 --- a/src/salut-contact-channel.c +++ b/src/contact-channel.c @@ -1,5 +1,5 @@ /* - * salut-contact-channel.c - Source for SalutContactChannel + * contact-channel.c - Source for SalutContactChannel * Copyright (C) 2005-2008 Collabora Ltd. * Copyright (C) 2005-2008 Nokia Corporation * @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "salut-contact-channel.h" +#include "contact-channel.h" #include <stdio.h> #include <stdlib.h> @@ -30,7 +30,7 @@ #include <telepathy-glib/svc-generic.h> #include <telepathy-glib/util.h> -#include "salut-connection.h" +#include "connection.h" static void channel_iface_init (gpointer g_iface, gpointer iface_data); diff --git a/src/salut-contact-channel.h b/src/contact-channel.h index 2563d8b3..dae4911e 100644 --- a/src/salut-contact-channel.h +++ b/src/contact-channel.h @@ -1,5 +1,5 @@ /* - * salut-contact-channel.h - Header for SalutContactChannel + * contact-channel.h - Header for SalutContactChannel * Copyright (C) 2005 Collabora Ltd. * Copyright (C) 2005 Nokia Corporation * diff --git a/src/salut-contact-manager.c b/src/contact-manager.c index f8d6d9f7..258bf44e 100644 --- a/src/salut-contact-manager.c +++ b/src/contact-manager.c @@ -1,5 +1,5 @@ /* - * salut-contact-manager.c - Source for SalutContactManager + * contact-manager.c - Source for SalutContactManager * Copyright (C) 2005 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -25,12 +25,12 @@ #include <salut/caps-channel-manager.h> -#include "salut-connection.h" -#include "salut-contact-channel.h" -#include "salut-contact-manager.h" -#include "salut-signals-marshal.h" -#include "salut-contact.h" -#include "salut-enumtypes.h" +#include "connection.h" +#include "contact-channel.h" +#include "contact-manager.h" +#include "signals-marshal.h" +#include "contact.h" +#include "enumtypes.h" #include <telepathy-glib/dbus.h> #include <telepathy-glib/interfaces.h> diff --git a/src/salut-contact-manager.h b/src/contact-manager.h index 3123ba8b..2f865729 100644 --- a/src/salut-contact-manager.h +++ b/src/contact-manager.h @@ -1,5 +1,5 @@ /* - * salut-contact-manager.h - Header for SalutContactManager + * contact-manager.h - Header for SalutContactManager * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,8 +23,8 @@ #include <glib-object.h> -#include "salut-connection.h" -#include "salut-contact.h" +#include "connection.h" +#include "contact.h" G_BEGIN_DECLS diff --git a/src/salut-contact.c b/src/contact.c index 239829bd..245d0999 100644 --- a/src/salut-contact.c +++ b/src/contact.c @@ -1,5 +1,5 @@ /* - * salut-contact.c - Source for salut_contact + * contact.c - Source for salut_contact * Copyright (C) 2005-2006 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -21,11 +21,11 @@ #include <stdlib.h> #include <string.h> -#include "salut-contact.h" -#include "salut-signals-marshal.h" -#include "salut-presence.h" -#include "salut-presence-cache.h" -#include "salut-enumtypes.h" +#include "contact.h" +#include "signals-marshal.h" +#include "presence.h" +#include "presence-cache.h" +#include "enumtypes.h" #include <telepathy-glib/util.h> diff --git a/src/salut-contact.h b/src/contact.h index 074d0dce..43ddbefc 100644 --- a/src/salut-contact.h +++ b/src/contact.h @@ -1,5 +1,5 @@ /* - * salut-contact.h - Header for SalutContact + * contact.h - Header for SalutContact * Copyright (C) 2005 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -26,10 +26,10 @@ #include <telepathy-glib/handle-repo.h> #include <salut/capability-set.h> -#include "salut-presence.h" -#include "salut-connection.h" +#include "presence.h" +#include "connection.h" #ifdef ENABLE_OLPC -#include "salut-olpc-activity.h" +#include "olpc-activity.h" #endif #include <wocky/wocky-ll-contact.h> diff --git a/src/salut-disco.c b/src/disco.c index bf93f2f0..da89ed09 100644 --- a/src/salut-disco.c +++ b/src/disco.c @@ -22,7 +22,7 @@ */ #include "config.h" -#include "salut-disco.h" +#include "disco.h" #include <string.h> @@ -36,9 +36,9 @@ #define DEBUG_FLAG DEBUG_DISCO #include "debug.h" -#include "salut-capabilities.h" -#include "salut-caps-hash.h" -#include "salut-connection.h" +#include "capabilities.h" +#include "caps-hash.h" +#include "connection.h" /* Properties */ enum @@ -83,7 +83,7 @@ salut_disco_error_quark (void) { static GQuark quark = 0; if (!quark) - quark = g_quark_from_static_string ("salut-disco-error"); + quark = g_quark_from_static_string ("disco-error"); return quark; } diff --git a/src/salut-disco.h b/src/disco.h index 24d5d710..7eae97d1 100644 --- a/src/salut-disco.h +++ b/src/disco.h @@ -27,8 +27,8 @@ #include <glib-object.h> #include <wocky/wocky-stanza.h> -#include "salut-contact.h" -#include "salut-connection.h" +#include "contact.h" +#include "connection.h" G_BEGIN_DECLS diff --git a/src/salut-discovery-client.c b/src/discovery-client.c index f466d8cb..8ca3f01a 100644 --- a/src/salut-discovery-client.c +++ b/src/discovery-client.c @@ -1,5 +1,5 @@ /* - * salut-discovery-client.c - Source for SalutDiscoveryClient interface + * discovery-client.c - Source for SalutDiscoveryClient interface * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "salut-discovery-client.h" +#include "discovery-client.h" #include <glib.h> diff --git a/src/salut-discovery-client.h b/src/discovery-client.h index 37e92233..e741a275 100644 --- a/src/salut-discovery-client.h +++ b/src/discovery-client.h @@ -1,5 +1,5 @@ /* - * salut-discovery-client.h - Header for SalutDiscoveryClient interface + * discovery-client.h - Header for SalutDiscoveryClient interface * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -22,12 +22,12 @@ #include <glib-object.h> -#include "salut-muc-manager.h" -#include "salut-contact-manager.h" -#include "salut-roomlist-manager.h" -#include "salut-self.h" +#include "muc-manager.h" +#include "contact-manager.h" +#include "roomlist-manager.h" +#include "self.h" #ifdef ENABLE_OLPC -#include "salut-olpc-activity-manager.h" +#include "olpc-activity-manager.h" #endif G_BEGIN_DECLS diff --git a/src/salut-dummy-discovery-client.c b/src/dummy-discovery-client.c index a91c1ca1..268d01c3 100644 --- a/src/salut-dummy-discovery-client.c +++ b/src/dummy-discovery-client.c @@ -1,5 +1,5 @@ /* - * salut-dummy-discovery-client.c - Source for SalutDummyDiscoveryClient + * dummy-discovery-client.c - Source for SalutDummyDiscoveryClient * Copyright (C) 2007 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "salut-dummy-discovery-client.h" +#include "dummy-discovery-client.h" #define DEBUG_FLAG DEBUG_DISCOVERY #include "debug.h" diff --git a/src/salut-dummy-discovery-client.h b/src/dummy-discovery-client.h index 67ce1494..6b3a51f9 100644 --- a/src/salut-dummy-discovery-client.h +++ b/src/dummy-discovery-client.h @@ -1,5 +1,5 @@ /* - * salut-dummy-discovery-client.h - Header for SalutDummyDiscoveryClient + * dummy-discovery-client.h - Header for SalutDummyDiscoveryClient * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ #include <glib-object.h> -#include "salut-discovery-client.h" +#include "discovery-client.h" G_BEGIN_DECLS diff --git a/src/salut-file-transfer-channel.c b/src/file-transfer-channel.c index 83d6071f..4fc84584 100644 --- a/src/salut-file-transfer-channel.c +++ b/src/file-transfer-channel.c @@ -1,5 +1,5 @@ /* - * salut-file-transfer-channel.c - Source for SalutFileTransferChannel + * file-transfer-channel.c - Source for SalutFileTransferChannel * Copyright (C) 2007 Marco Barisione <marco@barisione.org> * Copyright (C) 2005, 2007, 2008 Collabora Ltd. * @author: Sjoerd Simons <sjoerd@luon.net> @@ -34,12 +34,12 @@ #define DEBUG_FLAG DEBUG_FT #include "debug.h" -#include "salut-file-transfer-channel.h" -#include "salut-signals-marshal.h" +#include "file-transfer-channel.h" +#include "signals-marshal.h" -#include "salut-connection.h" -#include "salut-im-manager.h" -#include "salut-contact.h" +#include "connection.h" +#include "im-manager.h" +#include "contact.h" #include <wocky/wocky-stanza.h> #include <wocky/wocky-meta-porter.h> diff --git a/src/salut-file-transfer-channel.h b/src/file-transfer-channel.h index a37ef79e..2323f9ec 100644 --- a/src/salut-file-transfer-channel.h +++ b/src/file-transfer-channel.h @@ -1,5 +1,5 @@ /* - * salut-file-transfer-channel.h - Header for SalutFileTransferChannel + * file-transfer-channel.h - Header for SalutFileTransferChannel * Copyright (C) 2007 Marco Barisione <marco@barisione.org> * Copyright (C) 2005, 2007, 2008 Collabora Ltd. * @author: Sjoerd Simons <sjoerd@luon.net> @@ -31,9 +31,9 @@ #include <extensions/_gen/interfaces.h> #include <extensions/_gen/enums.h> -#include "salut-contact.h" -#include "salut-connection.h" -#include "salut-contact.h" +#include "contact.h" +#include "connection.h" +#include "contact.h" G_BEGIN_DECLS diff --git a/src/salut-ft-manager.c b/src/ft-manager.c index 8cade2df..567b472f 100644 --- a/src/salut-ft-manager.c +++ b/src/ft-manager.c @@ -1,5 +1,5 @@ /* - * salut-ft-manager.c - Source for SalutFtManager + * ft-manager.c - Source for SalutFtManager * Copyright (C) 2007 Marco Barisione <marco@barisione.org> * Copyright (C) 2006, 2008 Collabora Ltd. * @author: Jonny Lamb <jonny.lamb@collabora.co.uk> @@ -27,14 +27,14 @@ #include <gibber/gibber-file-transfer.h> #include <gibber/gibber-namespaces.h> -#include "salut-ft-manager.h" -#include "salut-signals-marshal.h" +#include "ft-manager.h" +#include "signals-marshal.h" #include <salut/caps-channel-manager.h> -#include "salut-file-transfer-channel.h" -#include "salut-contact-manager.h" -#include "salut-presence-cache.h" +#include "file-transfer-channel.h" +#include "contact-manager.h" +#include "presence-cache.h" #include <telepathy-glib/channel-factory-iface.h> #include <telepathy-glib/interfaces.h> diff --git a/src/salut-ft-manager.h b/src/ft-manager.h index be73b4ed..d04806d2 100644 --- a/src/salut-ft-manager.h +++ b/src/ft-manager.h @@ -1,5 +1,5 @@ /* - * salut-ft-manager.h - Header for SalutFtManager + * ft-manager.h - Header for SalutFtManager * Copyright (C) 2007 Marco Barisione <marco@barisione.org> * Copyright (C) 2006, 2008 Collabora Ltd. * @author: Jonny Lamb <jonny.lamb@collabora.co.uk> @@ -24,8 +24,8 @@ #include <glib-object.h> -#include <salut-connection.h> -#include <salut-im-manager.h> +#include <connection.h> +#include <im-manager.h> #include <extensions/_gen/interfaces.h> diff --git a/src/salut-im-channel.c b/src/im-channel.c index a1709239..dbf9eaab 100644 --- a/src/salut-im-channel.c +++ b/src/im-channel.c @@ -1,5 +1,5 @@ /* - * salut-im-channel.c - Source for SalutImChannel + * im-channel.c - Source for SalutImChannel * Copyright (C) 2005-2008,2010 Collabora Ltd. * @author: Sjoerd Simons <sjoerd@luon.net> * @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "salut-im-channel.h" +#include "im-channel.h" #include <errno.h> #include <netdb.h> @@ -41,10 +41,10 @@ #define DEBUG_FLAG DEBUG_IM #include "debug.h" -#include "salut-connection.h" -#include "salut-contact.h" -#include "salut-signals-marshal.h" -#include "salut-util.h" +#include "connection.h" +#include "contact.h" +#include "signals-marshal.h" +#include "util.h" #include "text-helper.h" static void channel_iface_init (gpointer g_iface, gpointer iface_data); diff --git a/src/salut-im-channel.h b/src/im-channel.h index a655f39f..80b61f4c 100644 --- a/src/salut-im-channel.h +++ b/src/im-channel.h @@ -1,5 +1,5 @@ /* - * salut-im-channel.h - Header for SalutImChannel + * im-channel.h - Header for SalutImChannel * Copyright (C) 2005 Collabora Ltd. * * This library is free software; you can redistribute it and/or diff --git a/src/salut-im-manager.c b/src/im-manager.c index 2c26bb38..96f5f9c7 100644 --- a/src/salut-im-manager.c +++ b/src/im-manager.c @@ -1,5 +1,5 @@ /* - * salut-im-manager.c - Source for SalutImManager + * im-manager.c - Source for SalutImManager * Copyright (C) 2005 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -24,9 +24,9 @@ #include <salut/caps-channel-manager.h> #include "extensions/extensions.h" -#include "salut-im-channel.h" -#include "salut-im-manager.h" -#include "salut-contact.h" +#include "im-channel.h" +#include "im-manager.h" +#include "contact.h" #include <gibber/gibber-linklocal-transport.h> #include <wocky/wocky-stanza.h> diff --git a/src/salut-im-manager.h b/src/im-manager.h index 359298cd..de000038 100644 --- a/src/salut-im-manager.h +++ b/src/im-manager.h @@ -1,5 +1,5 @@ /* - * salut-contact-manager.h - Header for SalutImManager + * contact-manager.h - Header for SalutImManager * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,8 +20,8 @@ #define __SALUT_IM_MANAGER_H__ #include <glib-object.h> -#include "salut-contact-manager.h" -#include "salut-im-channel.h" +#include "contact-manager.h" +#include "im-channel.h" #include <gibber/gibber-linklocal-transport.h> diff --git a/src/salut-muc-channel.c b/src/muc-channel.c index e94122bd..1f20e10d 100644 --- a/src/salut-muc-channel.c +++ b/src/muc-channel.c @@ -1,5 +1,5 @@ /* - * salut-muc-channel.c - Source for SalutMucChannel + * muc-channel.c - Source for SalutMucChannel * Copyright (C) 2006,2010 Collabora Ltd. * Copyright (C) 2006 Nokia Corporation * @@ -31,7 +31,7 @@ /* Maximum time to wait for others joining the group */ #define CONNECTED_TIMEOUT 60 * 1000 -#include "salut-muc-channel.h" +#include "muc-channel.h" #include <gibber/gibber-namespaces.h> #include <gibber/gibber-transport.h> @@ -45,11 +45,11 @@ #include <gibber/gibber-muc-connection.h> -#include "salut-connection.h" -#include "salut-contact-manager.h" -#include "salut-self.h" -#include "salut-muc-manager.h" -#include "salut-util.h" +#include "connection.h" +#include "contact-manager.h" +#include "self.h" +#include "muc-manager.h" +#include "util.h" #include "text-helper.h" #include "tube-stream.h" diff --git a/src/salut-muc-channel.h b/src/muc-channel.h index 052325dc..902db5e5 100644 --- a/src/salut-muc-channel.h +++ b/src/muc-channel.h @@ -1,5 +1,5 @@ /* - * salut-muc-channel.h - Header for SalutMucChannel + * muc-channel.h - Header for SalutMucChannel * Copyright (C) 2005 Collabora Ltd. * Copyright (C) 2005 Nokia Corporation * @@ -28,7 +28,7 @@ #include <gibber/gibber-muc-connection.h> -#include "salut-connection.h" +#include "connection.h" G_BEGIN_DECLS diff --git a/src/salut-muc-manager.c b/src/muc-manager.c index 50db5679..ce0378b9 100644 --- a/src/salut-muc-manager.c +++ b/src/muc-manager.c @@ -1,5 +1,5 @@ /* - * salut-muc-manager.c - Source for SalutMucManager + * muc-manager.c - Source for SalutMucManager * Copyright (C) 2006 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ #include <string.h> #include <arpa/inet.h> -#include "salut-muc-manager.h" +#include "muc-manager.h" #include <gibber/gibber-muc-connection.h> #include <gibber/gibber-namespaces.h> @@ -31,12 +31,12 @@ #include <salut/caps-channel-manager.h> -#include "salut-muc-channel.h" -#include "salut-contact-manager.h" -#include "salut-tubes-channel.h" -#include "salut-roomlist-channel.h" -#include "salut-roomlist-manager.h" -#include "salut-discovery-client.h" +#include "muc-channel.h" +#include "contact-manager.h" +#include "tubes-channel.h" +#include "roomlist-channel.h" +#include "roomlist-manager.h" +#include "discovery-client.h" #include "tube-stream.h" #include "tube-dbus.h" diff --git a/src/salut-muc-manager.h b/src/muc-manager.h index 2883c9a6..2e761a8d 100644 --- a/src/salut-muc-manager.h +++ b/src/muc-manager.h @@ -1,5 +1,5 @@ /* - * salut-muc-manager.h - Header for SalutMucManager + * muc-manager.h - Header for SalutMucManager * Copyright (C) 2006 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -24,10 +24,10 @@ #include <gibber/gibber-bytestream-iface.h> -#include <salut-connection.h> -#include "salut-muc-channel.h" -#include "salut-tubes-channel.h" -#include "salut-muc-channel.h" +#include <connection.h> +#include "muc-channel.h" +#include "tubes-channel.h" +#include "muc-channel.h" G_BEGIN_DECLS diff --git a/src/salut-olpc-activity-manager.c b/src/olpc-activity-manager.c index c56888da..a4acf0aa 100644 --- a/src/salut-olpc-activity-manager.c +++ b/src/olpc-activity-manager.c @@ -1,5 +1,5 @@ /* - * salut-olpc-activity-manager.c - Source for SalutOlpcActivityManager + * olpc-activity-manager.c - Source for SalutOlpcActivityManager * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -22,10 +22,10 @@ #include <stdlib.h> #include <string.h> -#include "salut-olpc-activity-manager.h" +#include "olpc-activity-manager.h" -#include "salut-connection.h" -#include "salut-signals-marshal.h" +#include "connection.h" +#include "signals-marshal.h" #define DEBUG_FLAG DEBUG_OLPC_ACTIVITY #include "debug.h" diff --git a/src/salut-olpc-activity-manager.h b/src/olpc-activity-manager.h index 23113edf..79686389 100644 --- a/src/salut-olpc-activity-manager.h +++ b/src/olpc-activity-manager.h @@ -1,5 +1,5 @@ /* - * salut-olpc-activity-managere.h - Header for SalutOlpcActivityManager + * olpc-activity-managere.h - Header for SalutOlpcActivityManager * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -24,9 +24,9 @@ #include <telepathy-glib/handle.h> -#include "salut-connection.h" -#include "salut-contact.h" -#include "salut-olpc-activity.h" +#include "connection.h" +#include "contact.h" +#include "olpc-activity.h" G_BEGIN_DECLS diff --git a/src/salut-olpc-activity.c b/src/olpc-activity.c index 0ca2b8d2..3265a295 100644 --- a/src/salut-olpc-activity.c +++ b/src/olpc-activity.c @@ -1,5 +1,5 @@ /* - * salut-olpc-activity.c - Source for SalutOlpcActivity + * olpc-activity.c - Source for SalutOlpcActivity * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -25,12 +25,12 @@ #include <gibber/gibber-namespaces.h> #include <wocky/wocky-stanza.h> -#include "salut-contact-manager.h" -#include "salut-olpc-activity.h" -#include "salut-muc-manager.h" -#include "salut-util.h" +#include "contact-manager.h" +#include "olpc-activity.h" +#include "muc-manager.h" +#include "util.h" -#include "salut-signals-marshal.h" +#include "signals-marshal.h" #define DEBUG_FLAG DEBUG_OLPC_ACTIVITY #include "debug.h" diff --git a/src/salut-olpc-activity.h b/src/olpc-activity.h index 3cadf48f..2adb6498 100644 --- a/src/salut-olpc-activity.h +++ b/src/olpc-activity.h @@ -1,5 +1,5 @@ /* - * salut-olpc-activity.h - Header for SalutOlpcActivity + * olpc-activity.h - Header for SalutOlpcActivity * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -24,7 +24,7 @@ #include <telepathy-glib/handle.h> -#include "salut-connection.h" +#include "connection.h" G_BEGIN_DECLS diff --git a/src/salut-presence-cache.c b/src/presence-cache.c index 00866af2..b7e95aea 100644 --- a/src/salut-presence-cache.c +++ b/src/presence-cache.c @@ -1,5 +1,5 @@ /* - * salut-presence-cache.c - Salut's contact presence cache + * presence-cache.c - Salut's contact presence cache * Copyright (C) 2005-2008 Collabora Ltd. * Copyright (C) 2005-2008 Nokia Corporation * @@ -19,7 +19,7 @@ */ #include "config.h" -#include "salut-presence-cache.h" +#include "presence-cache.h" #include <stdlib.h> #include <string.h> @@ -37,9 +37,9 @@ #include "capabilities.h" #include "debug.h" -#include "salut-caps-hash.h" -#include "salut-disco.h" -#include "salut-signals-marshal.h" +#include "caps-hash.h" +#include "disco.h" +#include "signals-marshal.h" G_DEFINE_TYPE (SalutPresenceCache, salut_presence_cache, G_TYPE_OBJECT); diff --git a/src/salut-presence-cache.h b/src/presence-cache.h index 5c28b67c..98f73cbf 100644 --- a/src/salut-presence-cache.h +++ b/src/presence-cache.h @@ -1,5 +1,5 @@ /* - * salut-presence-cache.h - Headers for Salut's contact presence cache + * presence-cache.h - Headers for Salut's contact presence cache * Copyright (C) 2005-2008 Collabora Ltd. * Copyright (C) 2005-2008 Nokia Corporation * @@ -25,8 +25,8 @@ #include <glib-object.h> #include "capabilities.h" -#include "salut-connection.h" -#include "salut-contact.h" +#include "connection.h" +#include "contact.h" G_BEGIN_DECLS diff --git a/src/salut-presence.h b/src/presence.h index b60d4093..98dc1dd6 100644 --- a/src/salut-presence.h +++ b/src/presence.h @@ -1,5 +1,5 @@ /* - * salut-presence.h - Header for Salut Presence types + * presence.h - Header for Salut Presence types * Copyright (C) 2005 Collabora Ltd. * * This library is free software; you can redistribute it and/or diff --git a/src/protocol.c b/src/protocol.c index 0d27a8e7..986d12e2 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -24,14 +24,14 @@ #include <telepathy-glib/base-connection-manager.h> #include <telepathy-glib/telepathy-glib.h> -#include "salut-connection.h" -#include "salut-contact-manager.h" -#include "salut-ft-manager.h" -#include "salut-im-manager.h" -#include "salut-muc-manager.h" -#include "salut-roomlist-manager.h" -#include "salut-tubes-manager.h" -#include "salut-avahi-discovery-client.h" +#include "connection.h" +#include "contact-manager.h" +#include "ft-manager.h" +#include "im-manager.h" +#include "muc-manager.h" +#include "roomlist-manager.h" +#include "tubes-manager.h" +#include "avahi-discovery-client.h" /* there is no appropriate vCard field for this protocol */ #define VCARD_FIELD_NAME "" diff --git a/src/salut-roomlist-channel.c b/src/roomlist-channel.c index 6d7b483f..025506eb 100644 --- a/src/salut-roomlist-channel.c +++ b/src/roomlist-channel.c @@ -1,5 +1,5 @@ /* - * salut-roomlist-channel.c - Source for SalutRoomlistChannel + * roomlist-channel.c - Source for SalutRoomlistChannel * Copyright (C) 2007 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -17,14 +17,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "salut-roomlist-channel.h" +#include "roomlist-channel.h" #include <dbus/dbus-glib.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "salut-connection.h" +#include "connection.h" #include <telepathy-glib/dbus.h> #include <telepathy-glib/enums.h> #include <telepathy-glib/gtypes.h> diff --git a/src/salut-roomlist-channel.h b/src/roomlist-channel.h index ae916142..6bb64a95 100644 --- a/src/salut-roomlist-channel.h +++ b/src/roomlist-channel.h @@ -1,5 +1,5 @@ /* - * salut-roomlist-channel.h - Header for SalutRoomlistChannel + * roomlist-channel.h - Header for SalutRoomlistChannel * Copyright (C) 2007 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ #include <glib-object.h> -#include "salut-connection.h" +#include "connection.h" G_BEGIN_DECLS diff --git a/src/salut-roomlist-manager.c b/src/roomlist-manager.c index 154a969b..8d02ed39 100644 --- a/src/salut-roomlist-manager.c +++ b/src/roomlist-manager.c @@ -1,5 +1,5 @@ /* - * salut-roomlist-manager.c - Source for SalutRoomlistManager + * roomlist-manager.c - Source for SalutRoomlistManager * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ #include <string.h> #include <arpa/inet.h> -#include "salut-roomlist-manager.h" +#include "roomlist-manager.h" #include <gibber/gibber-muc-connection.h> #include <gibber/gibber-namespaces.h> @@ -31,12 +31,12 @@ #include <salut/caps-channel-manager.h> -#include "salut-roomlist-channel.h" -#include "salut-contact-manager.h" -#include "salut-muc-manager.h" -#include "salut-tubes-channel.h" -#include "salut-roomlist-channel.h" -#include "salut-discovery-client.h" +#include "roomlist-channel.h" +#include "contact-manager.h" +#include "muc-manager.h" +#include "tubes-channel.h" +#include "roomlist-channel.h" +#include "discovery-client.h" #include <telepathy-glib/channel-manager.h> #include <telepathy-glib/dbus.h> diff --git a/src/salut-roomlist-manager.h b/src/roomlist-manager.h index 065d5cb8..eb087439 100644 --- a/src/salut-roomlist-manager.h +++ b/src/roomlist-manager.h @@ -1,5 +1,5 @@ /* - * salut-roomlist-manager.h - Header for SalutRoomlistManager + * roomlist-manager.h - Header for SalutRoomlistManager * Copyright (C) 2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -24,9 +24,9 @@ #include <gibber/gibber-bytestream-iface.h> -#include <salut-connection.h> -#include "salut-tubes-channel.h" -#include "salut-roomlist-channel.h" +#include <connection.h> +#include "tubes-channel.h" +#include "roomlist-channel.h" G_BEGIN_DECLS diff --git a/src/salut.c b/src/salut.c index e7c90932..161aeae2 100644 --- a/src/salut.c +++ b/src/salut.c @@ -5,8 +5,8 @@ #include <telepathy-glib/run.h> #include <telepathy-glib/debug.h> -#include "salut-connection-manager.h" -#include "salut-avahi-discovery-client.h" +#include "connection-manager.h" +#include "avahi-discovery-client.h" #include "debug.h" #include "plugin-loader.h" #include "symbol-hacks.h" diff --git a/src/salut-self.c b/src/self.c index d4f9419a..017c9404 100644 --- a/src/salut-self.c +++ b/src/self.c @@ -1,5 +1,5 @@ /* - * salut-self.c - Source for SalutSelf + * self.c - Source for SalutSelf * Copyright (C) 2005 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ #include <netdb.h> #include <errno.h> -#include "salut-self.h" +#include "self.h" #include <gibber/gibber-linklocal-transport.h> #include <gibber/gibber-namespaces.h> @@ -36,14 +36,14 @@ #include <telepathy-glib/util.h> #include <wocky/wocky-xep-0115-capabilities.h> -#include "salut-capabilities.h" -#include "salut-contact-manager.h" -#include "salut-util.h" -#include "salut-muc-manager.h" +#include "capabilities.h" +#include "contact-manager.h" +#include "util.h" +#include "muc-manager.h" #ifdef ENABLE_OLPC -#include "salut-olpc-activity.h" -#include "salut-olpc-activity-manager.h" +#include "olpc-activity.h" +#include "olpc-activity-manager.h" #endif #define DEBUG_FLAG DEBUG_SELF diff --git a/src/salut-self.h b/src/self.h index 6ec1332b..afe7e52e 100644 --- a/src/salut-self.h +++ b/src/self.h @@ -1,5 +1,5 @@ /* - * salut-self.h - Header for SalutSelf + * self.h - Header for SalutSelf * Copyright (C) 2005 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -30,10 +30,10 @@ #include <salut/capability-set.h> -#include "salut-connection.h" -#include "salut-presence.h" +#include "connection.h" +#include "presence.h" #ifdef ENABLE_OLPC -#include "salut-olpc-activity.h" +#include "olpc-activity.h" #endif G_BEGIN_DECLS diff --git a/src/salut-si-bytestream-manager.c b/src/si-bytestream-manager.c index 4f689d6c..1764ac98 100644 --- a/src/salut-si-bytestream-manager.c +++ b/src/si-bytestream-manager.c @@ -1,5 +1,5 @@ /* - * salut-si-bytestream-manager.c - Source for SalutSiBytestreamManager + * si-bytestream-manager.c - Source for SalutSiBytestreamManager * Copyright (C) 2007 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "salut-si-bytestream-manager.h" +#include "si-bytestream-manager.h" #include <stdio.h> #include <stdlib.h> @@ -31,9 +31,9 @@ #include <gibber/gibber-namespaces.h> #include <gibber/gibber-xmpp-error.h> -#include "salut-im-manager.h" -#include "salut-muc-manager.h" -#include "salut-tubes-manager.h" +#include "im-manager.h" +#include "muc-manager.h" +#include "tubes-manager.h" #define DEBUG_FLAG DEBUG_SI_BYTESTREAM_MGR #include "debug.h" diff --git a/src/salut-si-bytestream-manager.h b/src/si-bytestream-manager.h index 80ba47a3..67a552a7 100644 --- a/src/salut-si-bytestream-manager.h +++ b/src/si-bytestream-manager.h @@ -1,5 +1,5 @@ /* - * salut-si-bytestream-manager.h - Header for SalutSiBytestreamManager + * si-bytestream-manager.h - Header for SalutSiBytestreamManager * Copyright (C) 2007 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #define __SALUT_SI_BYTESTREAM_MANAGER_H__ #include <glib-object.h> -#include "salut-contact.h" +#include "contact.h" #include <gibber/gibber-linklocal-transport.h> #include <gibber/gibber-bytestream-iface.h> diff --git a/src/text-helper.c b/src/text-helper.c index 96b5194f..709160a5 100644 --- a/src/text-helper.c +++ b/src/text-helper.c @@ -42,7 +42,7 @@ #include "text-helper.h" -#include "salut-util.h" +#include "util.h" static void add_text (WockyStanza *stanza, const gchar *text) diff --git a/src/text-helper.h b/src/text-helper.h index c5034e70..64a1a4f1 100644 --- a/src/text-helper.h +++ b/src/text-helper.h @@ -25,7 +25,7 @@ #include <telepathy-glib/channel.h> #include <wocky/wocky-stanza.h> -#include "salut-contact.h" +#include "contact.h" /* Utility functions for the helper user */ diff --git a/src/tube-dbus.c b/src/tube-dbus.c index e5402365..ed5d434a 100644 --- a/src/tube-dbus.c +++ b/src/tube-dbus.c @@ -44,7 +44,7 @@ #define DEBUG_FLAG DEBUG_TUBES #include "debug.h" -#include "salut-connection.h" +#include "connection.h" #include "tube-iface.h" #include "sha1/sha1-util.h" @@ -432,7 +432,7 @@ create_dbus_server (SalutTubeDBus *self, g_free (priv->socket_path); generate_ascii_string (8, suffix); - priv->socket_path = g_strdup_printf ("%s/dbus-salut-%.8s", + priv->socket_path = g_strdup_printf ("%s/dbus-%.8s", g_get_tmp_dir (), suffix); priv->dbus_srv_addr = g_strdup_printf ("unix:path=%s", priv->socket_path); diff --git a/src/tube-dbus.h b/src/tube-dbus.h index a9c5329c..e8a64eb1 100644 --- a/src/tube-dbus.h +++ b/src/tube-dbus.h @@ -25,8 +25,8 @@ #include <telepathy-glib/enums.h> #include <telepathy-glib/interfaces.h> -#include "salut-connection.h" -#include "salut-tubes-channel.h" +#include "connection.h" +#include "tubes-channel.h" #include <gibber/gibber-muc-connection.h> #include <gibber/gibber-bytestream-iface.h> diff --git a/src/tube-iface.c b/src/tube-iface.c index 1089986a..18d39877 100644 --- a/src/tube-iface.c +++ b/src/tube-iface.c @@ -21,8 +21,8 @@ #include <telepathy-glib/gtypes.h> -#include "salut-connection.h" -#include "salut-tubes-channel.h" +#include "connection.h" +#include "tubes-channel.h" #include <glib.h> diff --git a/src/tube-stream.c b/src/tube-stream.c index e014d957..f4c97cb1 100644 --- a/src/tube-stream.c +++ b/src/tube-stream.c @@ -58,12 +58,12 @@ #define DEBUG_FLAG DEBUG_TUBES #include "debug.h" -#include "salut-signals-marshal.h" -#include "salut-connection.h" +#include "signals-marshal.h" +#include "connection.h" #include "tube-iface.h" -#include "salut-si-bytestream-manager.h" -#include "salut-contact-manager.h" -#include "salut-tubes-channel.h" +#include "si-bytestream-manager.h" +#include "contact-manager.h" +#include "tubes-channel.h" static void tube_iface_init (gpointer g_iface, gpointer iface_data); static void channel_iface_init (gpointer g_iface, gpointer iface_data); @@ -850,7 +850,7 @@ tube_stream_open (SalutTubeStream *self, int ret; generate_ascii_string (8, suffix); - path = g_strdup_printf ("/tmp/stream-salut-%.8s", suffix); + path = g_strdup_printf ("/tmp/stream-%.8s", suffix); DEBUG ("create socket: %s", path); diff --git a/src/tube-stream.h b/src/tube-stream.h index 5e8fd898..fb908590 100644 --- a/src/tube-stream.h +++ b/src/tube-stream.h @@ -26,8 +26,8 @@ #include <telepathy-glib/interfaces.h> #include "extensions/extensions.h" -#include "salut-connection.h" -#include "salut-tubes-channel.h" +#include "connection.h" +#include "tubes-channel.h" G_BEGIN_DECLS diff --git a/src/salut-tubes-channel.c b/src/tubes-channel.c index 0002c6d8..68258fd7 100644 --- a/src/salut-tubes-channel.c +++ b/src/tubes-channel.c @@ -1,5 +1,5 @@ /* - * salut-tubes-channel.c - Source for SalutTubesChannel + * tubes-channel.c - Source for SalutTubesChannel * Copyright (C) 2007 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "salut-tubes-channel.h" +#include "tubes-channel.h" #include <stdio.h> #include <stdlib.h> @@ -45,12 +45,12 @@ #define DEBUG_FLAG DEBUG_TUBES #include "debug.h" #include "extensions/extensions.h" -#include "salut-util.h" -#include "salut-connection.h" -#include "salut-contact.h" -#include "salut-muc-channel.h" -#include "salut-muc-manager.h" -#include "salut-tubes-manager.h" +#include "util.h" +#include "connection.h" +#include "contact.h" +#include "muc-channel.h" +#include "muc-manager.h" +#include "tubes-manager.h" #include "tube-iface.h" #include "tube-dbus.h" #include "tube-stream.h" diff --git a/src/salut-tubes-channel.h b/src/tubes-channel.h index e36bbcf6..e57ac010 100644 --- a/src/salut-tubes-channel.h +++ b/src/tubes-channel.h @@ -1,5 +1,5 @@ /* - * salut-tubes-channel.h - Header for SalutTubesChannel + * tubes-channel.h - Header for SalutTubesChannel * Copyright (C) 2007 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -24,7 +24,7 @@ #include <wocky/wocky-stanza.h> #include <gibber/gibber-bytestream-iface.h> -#include "salut-muc-channel.h" +#include "muc-channel.h" #include "tube-iface.h" G_BEGIN_DECLS diff --git a/src/salut-tubes-manager.c b/src/tubes-manager.c index 17f02e5f..e445a711 100644 --- a/src/salut-tubes-manager.c +++ b/src/tubes-manager.c @@ -1,5 +1,5 @@ /* - * salut-tubes-manager.c - Source for SalutTubesManager + * tubes-manager.c - Source for SalutTubesManager * Copyright (C) 2006-2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "salut-tubes-manager.h" +#include "tubes-manager.h" #include <stdlib.h> #include <string.h> @@ -40,13 +40,13 @@ #include "debug.h" #include "extensions/extensions.h" -#include "salut-connection.h" -#include "salut-capabilities.h" -#include "salut-tubes-channel.h" -#include "salut-muc-manager.h" -#include "salut-muc-channel.h" -#include "salut-self.h" -#include "salut-util.h" +#include "connection.h" +#include "capabilities.h" +#include "tubes-channel.h" +#include "muc-manager.h" +#include "muc-channel.h" +#include "self.h" +#include "util.h" #include "tube-iface.h" #include "tube-stream.h" @@ -111,7 +111,7 @@ salut_tubes_manager_init (SalutTubesManager *self) priv->dispose_has_run = FALSE; } -/* similar to the same function in salut-tubes-channel.c but extract +/* similar to the same function in tubes-channel.c but extract * information from a 1-1 <iq> message */ static gboolean extract_tube_information (TpHandleRepoIface *contact_repo, diff --git a/src/salut-tubes-manager.h b/src/tubes-manager.h index 8293e2b6..1697d9e0 100644 --- a/src/salut-tubes-manager.h +++ b/src/tubes-manager.h @@ -1,5 +1,5 @@ /* - * salut-tubes-manager.h - Header for SalutTubesManager + * tubes-manager.h - Header for SalutTubesManager * Copyright (C) 2006-2008 Collabora Ltd. * * This library is free software; you can redistribute it and/or @@ -23,9 +23,9 @@ #include <glib-object.h> #include <telepathy-glib/base-connection.h> -#include "salut-connection.h" -#include "salut-contact-manager.h" -#include "salut-tubes-channel.h" +#include "connection.h" +#include "contact-manager.h" +#include "tubes-channel.h" G_BEGIN_DECLS diff --git a/src/salut-util.c b/src/util.c index 3f216785..8b8f454c 100644 --- a/src/salut-util.c +++ b/src/util.c @@ -1,5 +1,5 @@ /* - * salut-util.c - Code for Salut utility functions + * util.c - Code for Salut utility functions * Copyright (C) 2006-2007 Collabora Ltd. * Copyright (C) 2006-2007 Nokia Corporation * @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "salut-util.h" #include "util.h" +#include <salut/util.h> #include <stdlib.h> #include <string.h> @@ -28,7 +28,7 @@ #include <dbus/dbus-glib.h> #include <telepathy-glib/util.h> -#include "salut-contact.h" +#include "contact.h" #ifdef HAVE_UUID # include <uuid.h> diff --git a/src/salut-util.h b/src/util.h index 17fca019..3426e985 100644 --- a/src/salut-util.h +++ b/src/util.h @@ -1,5 +1,5 @@ /* - * salut-util.h - Headers for Salut utility functions + * util.h - Headers for Salut utility functions * Copyright (C) 2006-2007 Collabora Ltd. * Copyright (C) 2006 Nokia Corporation * diff --git a/tests/Makefile.am b/tests/Makefile.am index 1d2deb74..116c0843 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,7 +15,7 @@ noinst_PROGRAMS = \ telepathy-salut-debug telepathy_salut_debug_SOURCES = \ - salut-debug.c + debug.c telepathy_salut_debug_LDADD = \ $(top_builddir)/src/libsalut-convenience.la \ diff --git a/tests/check-node-properties.c b/tests/check-node-properties.c index 4cb53499..e55b8846 100644 --- a/tests/check-node-properties.c +++ b/tests/check-node-properties.c @@ -27,7 +27,7 @@ #include <dbus/dbus-glib.h> #include <wocky/wocky-stanza.h> -#include "salut-util.h" +#include "util.h" static WockyStanza * create_sample_stanza (void) diff --git a/tests/salut-debug.c b/tests/debug.c index b5a05d96..9a03bcd8 100644 --- a/tests/salut-debug.c +++ b/tests/debug.c @@ -5,8 +5,8 @@ #include <telepathy-glib/run.h> #include <telepathy-glib/debug.h> -#include "salut-connection-manager.h" -#include "salut-dummy-discovery-client.h" +#include "connection-manager.h" +#include "dummy-discovery-client.h" #include "debug.h" static TpBaseConnectionManager * diff --git a/tests/twisted/saluttest.py b/tests/twisted/saluttest.py index 6383c09d..e3e8a3ea 100644 --- a/tests/twisted/saluttest.py +++ b/tests/twisted/saluttest.py @@ -20,7 +20,7 @@ import ns import dbus import glib -# keep sync with src/salut-capabilities.c:self_advertised_features +# keep sync with src/capabilities.c:self_advertised_features fixed_features = [ns.SI, ns.IBB, ns.TUBES, ns.IQ_OOB, ns.X_OOB] def make_result_iq(iq): |