diff options
25 files changed, 26 insertions, 26 deletions
diff --git a/libpurple/account.h b/libpurple/account.h index 84fe90c528..55d10e491f 100644 --- a/libpurple/account.h +++ b/libpurple/account.h @@ -58,7 +58,7 @@ typedef void (*PurpleAccountUnregistrationCb)(PurpleAccount *account, gboolean s #include "connection.h" #include "group.h" #include "proxy.h" -#include "protocol.h" +#include "purpleprotocol.h" #include "status.h" #include "xmlnode.h" diff --git a/libpurple/buddylist.c b/libpurple/buddylist.c index b40fd27a59..d37caebff7 100644 --- a/libpurple/buddylist.c +++ b/libpurple/buddylist.c @@ -29,8 +29,8 @@ #include "debug.h" #include "notify.h" #include "prefs.h" -#include "protocol.h" #include "purpleprivate.h" +#include "purpleprotocol.h" #include "purpleprotocolchat.h" #include "purpleprotocolclient.h" #include "purpleconversation.h" diff --git a/libpurple/connection.h b/libpurple/connection.h index 2b6fb831be..a6d1381f96 100644 --- a/libpurple/connection.h +++ b/libpurple/connection.h @@ -232,7 +232,7 @@ typedef enum #include <time.h> #include "account.h" -#include "protocol.h" +#include "purpleprotocol.h" #include "status.h" /** diff --git a/libpurple/meson.build b/libpurple/meson.build index 2f01f13984..c7139c08dd 100644 --- a/libpurple/meson.build +++ b/libpurple/meson.build @@ -35,7 +35,6 @@ purple_coresources = [ 'pluginpref.c', 'prefs.c', 'proxy.c', - 'protocol.c', 'protocols.c', 'purple-gio.c', 'purpleaccountoption.c', @@ -63,6 +62,7 @@ purple_coresources = [ 'purpleoptions.c', 'purpleplugininfo.c', 'purplepresence.c', + 'purpleprotocol.c', 'purpleprotocolattention.c', 'purpleprotocolchat.c', 'purpleprotocolclient.c', @@ -130,7 +130,6 @@ purple_coreheaders = [ 'pluginpref.h', 'prefs.h', 'proxy.h', - 'protocol.h', 'protocols.h', 'purple-gio.h', 'purpleaccountoption.h', @@ -158,6 +157,7 @@ purple_coreheaders = [ 'purpleoptions.h', 'purpleplugininfo.h', 'purplepresence.h', + 'purpleprotocol.h', 'purpleprotocolattention.h', 'purpleprotocolchat.h', 'purpleprotocolclient.h', @@ -241,12 +241,12 @@ purple_enumheaders = [ 'eventloop.h', 'notify.h', 'plugins.h', - 'protocol.h', 'purplechatuser.h', 'purpleconversation.h', 'purpleimconversation.h', 'purplemessage.h', 'purpleplugininfo.h', + 'purpleprotocol.h', 'roomlist.h', 'status.h', 'xfer.h', diff --git a/libpurple/protocols.c b/libpurple/protocols.c index 28ca63d9df..ddecf6fcc8 100644 --- a/libpurple/protocols.c +++ b/libpurple/protocols.c @@ -27,11 +27,11 @@ #include "debug.h" #include "network.h" #include "notify.h" -#include "protocol.h" #include "purpleaccountoption.h" #include "purpleconversation.h" #include "purpleconversationmanager.h" #include "purplecredentialmanager.h" +#include "purpleprotocol.h" #include "purpleprotocolattention.h" #include "purpleprotocolmanager.h" #include "purpleprotocolmedia.h" diff --git a/libpurple/protocols.h b/libpurple/protocols.h index 67a1322c1f..dcac6bd067 100644 --- a/libpurple/protocols.h +++ b/libpurple/protocols.h @@ -39,7 +39,7 @@ typedef struct _PurpleProtocolChatEntry PurpleProtocolChatEntry; #include "media.h" -#include "protocol.h" +#include "purpleprotocol.h" #include "status.h" #define PURPLE_TYPE_PROTOCOL_CHAT_ENTRY (purple_protocol_chat_entry_get_type()) diff --git a/libpurple/purpleconversation.c b/libpurple/purpleconversation.c index 61db7ce8fd..7100440abf 100644 --- a/libpurple/purpleconversation.c +++ b/libpurple/purpleconversation.c @@ -30,13 +30,13 @@ #include "debug.h" #include "notify.h" #include "prefs.h" -#include "protocol.h" #include "purpleconversation.h" #include "purpleconversationmanager.h" #include "purpleenums.h" #include "purplehistorymanager.h" #include "purplemarkup.h" #include "purpleprivate.h" +#include "purpleprotocol.h" #include "purpleprotocolclient.h" #include "request.h" #include "signals.h" diff --git a/libpurple/protocol.c b/libpurple/purpleprotocol.c index ad52fa0477..760e35b6a9 100644 --- a/libpurple/protocol.c +++ b/libpurple/purpleprotocol.c @@ -20,7 +20,7 @@ * along with this program; if not, see <https://www.gnu.org/licenses/>. */ -#include "protocol.h" +#include "purpleprotocol.h" #include "accounts.h" #include "purpleenums.h" diff --git a/libpurple/protocol.h b/libpurple/purpleprotocol.h index df30148d15..df30148d15 100644 --- a/libpurple/protocol.h +++ b/libpurple/purpleprotocol.h diff --git a/libpurple/purpleprotocolattention.h b/libpurple/purpleprotocolattention.h index f5b96acd6d..0b9e24fc5c 100644 --- a/libpurple/purpleprotocolattention.h +++ b/libpurple/purpleprotocolattention.h @@ -42,7 +42,7 @@ #include <libpurple/account.h> #include <libpurple/connection.h> -#include <libpurple/protocol.h> +#include <libpurple/purpleprotocol.h> G_BEGIN_DECLS diff --git a/libpurple/purpleprotocolchat.h b/libpurple/purpleprotocolchat.h index ff665632de..8852da71d3 100644 --- a/libpurple/purpleprotocolchat.h +++ b/libpurple/purpleprotocolchat.h @@ -42,7 +42,7 @@ #include <libpurple/connection.h> #include <libpurple/purplemessage.h> -#include <libpurple/protocol.h> +#include <libpurple/purpleprotocol.h> /** * PURPLE_TYPE_PROTOCOL_CHAT: diff --git a/libpurple/purpleprotocolclient.h b/libpurple/purpleprotocolclient.h index 7430c3951f..12e8173ece 100644 --- a/libpurple/purpleprotocolclient.h +++ b/libpurple/purpleprotocolclient.h @@ -42,7 +42,7 @@ #include <libpurple/account.h> #include <libpurple/connection.h> -#include <libpurple/protocol.h> +#include <libpurple/purpleprotocol.h> #define PURPLE_TYPE_PROTOCOL_CLIENT (purple_protocol_client_get_type()) G_DECLARE_INTERFACE(PurpleProtocolClient, purple_protocol_client, PURPLE, diff --git a/libpurple/purpleprotocolfactory.h b/libpurple/purpleprotocolfactory.h index dc594ee92a..798dce1e96 100644 --- a/libpurple/purpleprotocolfactory.h +++ b/libpurple/purpleprotocolfactory.h @@ -41,7 +41,7 @@ #include <libpurple/account.h> #include <libpurple/connection.h> -#include <libpurple/protocol.h> +#include <libpurple/purpleprotocol.h> #include <libpurple/roomlist.h> G_BEGIN_DECLS diff --git a/libpurple/purpleprotocolim.h b/libpurple/purpleprotocolim.h index 3a42ce731a..8fc0735a80 100644 --- a/libpurple/purpleprotocolim.h +++ b/libpurple/purpleprotocolim.h @@ -41,7 +41,7 @@ #include <glib-object.h> #include <libpurple/connection.h> -#include <libpurple/protocol.h> +#include <libpurple/purpleprotocol.h> /** * PURPLE_TYPE_PROTOCOL_IM: diff --git a/libpurple/purpleprotocolmanager.h b/libpurple/purpleprotocolmanager.h index 33fb9d57cb..c387dd6174 100644 --- a/libpurple/purpleprotocolmanager.h +++ b/libpurple/purpleprotocolmanager.h @@ -26,7 +26,7 @@ #include <glib.h> #include <glib-object.h> -#include "protocol.h" +#include "purpleprotocol.h" G_BEGIN_DECLS diff --git a/libpurple/purpleprotocolmedia.h b/libpurple/purpleprotocolmedia.h index d0fefa0b5a..42e4be4bff 100644 --- a/libpurple/purpleprotocolmedia.h +++ b/libpurple/purpleprotocolmedia.h @@ -42,7 +42,7 @@ #include <libpurple/account.h> #include <libpurple/media.h> -#include <libpurple/protocol.h> +#include <libpurple/purpleprotocol.h> #define PURPLE_TYPE_PROTOCOL_MEDIA (purple_protocol_media_get_type()) G_DECLARE_INTERFACE(PurpleProtocolMedia, purple_protocol_media, PURPLE, diff --git a/libpurple/purpleprotocolprivacy.h b/libpurple/purpleprotocolprivacy.h index 83f67e5d51..4c84629e47 100644 --- a/libpurple/purpleprotocolprivacy.h +++ b/libpurple/purpleprotocolprivacy.h @@ -40,7 +40,7 @@ #include <glib-object.h> #include <libpurple/connection.h> -#include <libpurple/protocol.h> +#include <libpurple/purpleprotocol.h> /** * PURPLE_TYPE_PROTOCOL_PRIVACY: diff --git a/libpurple/purpleprotocolroomlist.h b/libpurple/purpleprotocolroomlist.h index 9a17c8051c..b8db36d2d5 100644 --- a/libpurple/purpleprotocolroomlist.h +++ b/libpurple/purpleprotocolroomlist.h @@ -31,7 +31,7 @@ #include "connection.h" #include "roomlist.h" -#include "protocol.h" +#include "purpleprotocol.h" /** * SECTION:protocolroomlist diff --git a/libpurple/purpleprotocolserver.h b/libpurple/purpleprotocolserver.h index 396dce1597..b77d25311f 100644 --- a/libpurple/purpleprotocolserver.h +++ b/libpurple/purpleprotocolserver.h @@ -44,8 +44,8 @@ #include <libpurple/buddy.h> #include <libpurple/connection.h> #include <libpurple/group.h> -#include <libpurple/protocol.h> #include <libpurple/purplemessage.h> +#include <libpurple/purpleprotocol.h> #define PURPLE_TYPE_PROTOCOL_SERVER (purple_protocol_server_get_type()) G_DECLARE_INTERFACE(PurpleProtocolServer, purple_protocol_server, PURPLE, diff --git a/libpurple/purplewhiteboard.c b/libpurple/purplewhiteboard.c index 8d97c200bb..dd662a3f15 100644 --- a/libpurple/purplewhiteboard.c +++ b/libpurple/purplewhiteboard.c @@ -24,9 +24,9 @@ #include "internal.h" #include "purplewhiteboard.h" +#include "purpleprotocol.h" #include "purpleprotocolfactory.h" #include "purplewhiteboarduiops.h" -#include "protocol.h" #include "util.h" typedef struct { diff --git a/libpurple/server.c b/libpurple/server.c index 053ef01495..9145e0bbae 100644 --- a/libpurple/server.c +++ b/libpurple/server.c @@ -30,10 +30,10 @@ #include "debug.h" #include "notify.h" #include "prefs.h" -#include "protocol.h" #include "purpleconversation.h" #include "purpleconversationmanager.h" #include "purpleprivate.h" +#include "purpleprotocol.h" #include "purpleprotocolattention.h" #include "purpleprotocolchat.h" #include "purpleprotocolim.h" diff --git a/libpurple/util.c b/libpurple/util.c index e6224eb823..6f9ab9810e 100644 --- a/libpurple/util.c +++ b/libpurple/util.c @@ -26,9 +26,9 @@ #include "core.h" #include "debug.h" #include "notify.h" -#include "protocol.h" #include "prefs.h" #include "purpleconversation.h" +#include "purpleprotocol.h" #include "purpleprotocolclient.h" #include "util.h" diff --git a/libpurple/util.h b/libpurple/util.h index b083ab3f37..97c6ebc732 100644 --- a/libpurple/util.h +++ b/libpurple/util.h @@ -42,8 +42,8 @@ #include "signals.h" #include "xmlnode.h" #include "notify.h" -#include "protocol.h" #include "protocols.h" +#include "purpleprotocol.h" typedef char *(*PurpleInfoFieldFormatCallback)(const char *field, size_t len); diff --git a/libpurple/xfer.h b/libpurple/xfer.h index 28f640c2c0..453c0c590e 100644 --- a/libpurple/xfer.h +++ b/libpurple/xfer.h @@ -53,7 +53,7 @@ typedef struct _PurpleXferUiOps PurpleXferUiOps; #include <libpurple/account.h> #include <libpurple/connection.h> -#include <libpurple/protocol.h> +#include <libpurple/purpleprotocol.h> /** * PurpleXferType: diff --git a/po/POTFILES.in b/po/POTFILES.in index 856e81e406..fd53646075 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -69,7 +69,6 @@ libpurple/plugins/psychic.c libpurple/plugins/purple-toast.c libpurple/plugins/statenotify.c libpurple/prefs.c -libpurple/protocol.c libpurple/protocols/bonjour/bonjour.c libpurple/protocols/bonjour/bonjour_ft.c libpurple/protocols/bonjour/buddy.c @@ -255,6 +254,7 @@ libpurple/purplenoopcredentialprovider.c libpurple/purpleoptions.c libpurple/purplepresence.c libpurple/purpleplugininfo.c +libpurple/purpleprotocol.c libpurple/purpleprotocolattention.c libpurple/purpleprotocolchat.c libpurple/purpleprotocolclient.c |