grim/purple-spasm

Remove Purple namespace prefix from structs

2019-10-01, Gary Kramlich
19b2bc38ec1f
Parents 1f592ea4eaf0
Children 1d89ecd8082c
Remove Purple namespace prefix from structs
8 files changed, 80 insertions(+), 80 deletions(-)
  • +30 -30
    spasm-account.c
  • +19 -19
    spasm-account.h
  • +15 -15
    spasm-chat.c
  • +4 -4
    spasm-chat.h
  • +8 -8
    spasm-rest.c
  • +2 -2
    spasm-rest.h
  • +1 -1
    spasm-user.c
  • +1 -1
    spasm-user.h
    • --- a/spasm-account.c Mon Sep 30 23:51:10 2019 -0500
    +++ b/spasm-account.c Tue Oct 01 00:08:41 2019 -0500
    @@ -28,7 +28,7 @@
    /******************************************************************************
    * Structs
    *****************************************************************************/
    -struct _PurpleSpasmAccount {
    +struct _SpasmAccount {
    PurpleAccount *account;
    PurpleConnection *connection;
    @@ -49,19 +49,19 @@
    gboolean partnered;
    gboolean twitter_connected;
    - PurpleSpasmChatService *chat;
    + SpasmChatService *chat;
    };
    /******************************************************************************
    * Helpers
    *****************************************************************************/
    -static PurpleSpasmAccount *
    +static SpasmAccount *
    spasm_account_new(PurpleAccount *account,
    PurpleConnection *connection)
    {
    - PurpleSpasmAccount *sa = NULL;
    + SpasmAccount *sa = NULL;
    - sa = g_new0(PurpleSpasmAccount, 1);
    + sa = g_new0(SpasmAccount, 1);
    sa->account = account;
    sa->connection = connection;
    @@ -75,7 +75,7 @@
    }
    static void
    -spasm_account_free(PurpleSpasmAccount *sa) {
    +spasm_account_free(SpasmAccount *sa) {
    g_return_if_fail(sa);
    g_free(sa->access_token);
    @@ -86,7 +86,7 @@
    }
    static void
    -spasm_account_set_access_token(PurpleSpasmAccount *sa,
    +spasm_account_set_access_token(SpasmAccount *sa,
    const gchar *access_token)
    {
    g_return_if_fail(sa);
    @@ -95,7 +95,7 @@
    }
    static GError *
    -spasm_account_update_profile(PurpleSpasmAccount *sa, JsonParser *parser) {
    +spasm_account_update_profile(SpasmAccount *sa, JsonParser *parser) {
    JsonNode *root = NULL;
    JsonObject *obj = NULL;
    const gchar *str_attr = NULL;
    @@ -142,10 +142,10 @@
    /******************************************************************************
    * Auth
    *****************************************************************************/
    -static void spasm_oauth_login(PurpleSpasmAccount *sa);
    +static void spasm_oauth_login(SpasmAccount *sa);
    static void
    -spasm_login_test_cb(PurpleSpasmAccount *sa, JsonParser *parser,
    +spasm_login_test_cb(SpasmAccount *sa, JsonParser *parser,
    GError *error, gpointer data)
    {
    PurpleAccount *account = NULL;
    @@ -192,7 +192,7 @@
    spasm_access_token_input_cb(gpointer data, const gchar *access_token) {
    PurpleAccount *account = NULL;
    PurpleConnection *connection = NULL;
    - PurpleSpasmAccount *sa = SPASM_ACCOUNT(data);
    + SpasmAccount *sa = SPASM_ACCOUNT(data);
    account = spasm_account_get_account(sa);
    purple_account_set_remember_password(account, TRUE);
    @@ -208,7 +208,7 @@
    static void
    spasm_access_token_cancel_cb(gpointer data) {
    - PurpleSpasmAccount *sa = SPASM_ACCOUNT(data);
    + SpasmAccount *sa = SPASM_ACCOUNT(data);
    purple_connection_error(
    spasm_account_get_connection(sa),
    @@ -220,7 +220,7 @@
    }
    static void
    -spasm_oauth_login(PurpleSpasmAccount *sa) {
    +spasm_oauth_login(SpasmAccount *sa) {
    PurpleAccount *account = NULL;
    PurpleConnection *connection = NULL;
    PurpleRequestCommonParameters *cpar = NULL;
    @@ -275,28 +275,28 @@
    * API
    *****************************************************************************/
    PurpleAccount *
    -spasm_account_get_account(const PurpleSpasmAccount *sa) {
    +spasm_account_get_account(const SpasmAccount *sa) {
    g_return_val_if_fail(sa, NULL);
    return sa->account;
    }
    PurpleConnection *
    -spasm_account_get_connection(const PurpleSpasmAccount *sa) {
    +spasm_account_get_connection(const SpasmAccount *sa) {
    g_return_val_if_fail(sa, NULL);
    return sa->connection;
    }
    GCancellable *
    -spasm_account_get_cancellable(const PurpleSpasmAccount *sa) {
    +spasm_account_get_cancellable(const SpasmAccount *sa) {
    g_return_val_if_fail(sa, NULL);
    return sa->cancellable;
    }
    SoupSession *
    -spasm_account_get_session(const PurpleSpasmAccount *sa) {
    +spasm_account_get_session(const SpasmAccount *sa) {
    g_return_val_if_fail(sa, NULL);
    if(sa->session) {
    @@ -307,77 +307,77 @@
    }
    const gchar *
    -spasm_account_get_access_token(const PurpleSpasmAccount *sa) {
    +spasm_account_get_access_token(const SpasmAccount *sa) {
    g_return_val_if_fail(sa, NULL);
    return sa->access_token;
    }
    const gchar *
    -spasm_account_get_display_name(const PurpleSpasmAccount *sa) {
    +spasm_account_get_display_name(const SpasmAccount *sa) {
    g_return_val_if_fail(sa, NULL);
    return sa->display_name;
    }
    const gchar *
    -spasm_account_get_id(const PurpleSpasmAccount *sa) {
    +spasm_account_get_id(const SpasmAccount *sa) {
    g_return_val_if_fail(sa, NULL);
    return sa->id;
    }
    const gchar *
    -spasm_account_get_name(const PurpleSpasmAccount *sa) {
    +spasm_account_get_name(const SpasmAccount *sa) {
    g_return_val_if_fail(sa, NULL);
    return sa->name;
    }
    const gchar *
    -spasm_account_get_type(const PurpleSpasmAccount *sa) {
    +spasm_account_get_type(const SpasmAccount *sa) {
    g_return_val_if_fail(sa, NULL);
    return sa->type;
    }
    const gchar *
    -spasm_account_get_bio(const PurpleSpasmAccount *sa) {
    +spasm_account_get_bio(const SpasmAccount *sa) {
    g_return_val_if_fail(sa, NULL);
    return sa->bio;
    }
    const gchar *
    -spasm_account_get_logo(const PurpleSpasmAccount *sa) {
    +spasm_account_get_logo(const SpasmAccount *sa) {
    g_return_val_if_fail(sa, NULL);
    return sa->logo;
    }
    const gchar *
    -spasm_account_get_email(const PurpleSpasmAccount *sa) {
    +spasm_account_get_email(const SpasmAccount *sa) {
    g_return_val_if_fail(sa, NULL);
    return sa->email;
    }
    gboolean
    -spasm_account_get_email_verified(const PurpleSpasmAccount *sa) {
    +spasm_account_get_email_verified(const SpasmAccount *sa) {
    g_return_val_if_fail(sa, FALSE);
    return sa->email_verified;
    }
    gboolean
    -spasm_account_get_partnered(const PurpleSpasmAccount *sa) {
    +spasm_account_get_partnered(const SpasmAccount *sa) {
    g_return_val_if_fail(sa, FALSE);
    return sa->partnered;
    }
    gboolean
    -spasm_account_get_twitter_connected(const PurpleSpasmAccount *sa) {
    +spasm_account_get_twitter_connected(const SpasmAccount *sa) {
    g_return_val_if_fail(sa, FALSE);
    return sa->twitter_connected;
    @@ -387,7 +387,7 @@
    spasm_account_login_got_password(PurpleAccount *account, const gchar *password,
    GError *error, gpointer data)
    {
    - PurpleSpasmAccount *sa = SPASM_ACCOUNT(data);
    + SpasmAccount *sa = SPASM_ACCOUNT(data);
    if(password != NULL) {
    spasm_account_set_access_token(sa, password);
    @@ -400,7 +400,7 @@
    void
    spasm_account_login(PurpleAccount *account) {
    PurpleConnection *pc = NULL;
    - PurpleSpasmAccount *sa = NULL;
    + SpasmAccount *sa = NULL;
    pc = purple_account_get_connection(account);
    --- a/spasm-account.h Mon Sep 30 23:51:10 2019 -0500
    +++ b/spasm-account.h Tue Oct 01 00:08:41 2019 -0500
    @@ -28,38 +28,38 @@
    #include <purple.h>
    -#define SPASM_ACCOUNT(obj) ((PurpleSpasmAccount *)(obj))
    +#define SPASM_ACCOUNT(obj) ((SpasmAccount *)(obj))
    -typedef struct _PurpleSpasmAccount PurpleSpasmAccount;
    +typedef struct _SpasmAccount SpasmAccount;
    #include "spasm-chat.h"
    G_BEGIN_DECLS
    -// PurpleSpasmAccount *spasm_account_new(PurpleAccount *account, PurpleConnection *connection);
    -// void spasm_account_free(PurpleSpasmAccount *sa);
    +// SpasmAccount *spasm_account_new(PurpleAccount *account, PurpleConnection *connection);
    +// void spasm_account_free(SpasmAccount *sa);
    -PurpleAccount *spasm_account_get_account(const PurpleSpasmAccount *sa);
    -PurpleConnection *spasm_account_get_connection(const PurpleSpasmAccount *sa);
    +PurpleAccount *spasm_account_get_account(const SpasmAccount *sa);
    +PurpleConnection *spasm_account_get_connection(const SpasmAccount *sa);
    void spasm_account_login(PurpleAccount *account);
    -GCancellable *spasm_account_get_cancellable(const PurpleSpasmAccount *sa);
    +GCancellable *spasm_account_get_cancellable(const SpasmAccount *sa);
    -SoupSession *spasm_account_get_session(const PurpleSpasmAccount *sa);
    +SoupSession *spasm_account_get_session(const SpasmAccount *sa);
    -const gchar *spasm_account_get_access_token(const PurpleSpasmAccount *sa);
    +const gchar *spasm_account_get_access_token(const SpasmAccount *sa);
    -const gchar *spasm_account_get_display_name(const PurpleSpasmAccount *sa);
    -const gchar *spasm_account_get_id(const PurpleSpasmAccount *sa);
    -const gchar *spasm_account_get_name(const PurpleSpasmAccount *sa);
    -const gchar *spasm_account_get_type(const PurpleSpasmAccount *sa);
    -const gchar *spasm_account_get_bio(const PurpleSpasmAccount *sa);
    -const gchar *spasm_account_get_logo(const PurpleSpasmAccount *sa);
    -const gchar *spasm_account_get_email(const PurpleSpasmAccount *sa);
    -gboolean spasm_account_get_email_verified(const PurpleSpasmAccount *sa);
    -gboolean spasm_account_get_partnered(const PurpleSpasmAccount *sa);
    -gboolean spasm_account_get_twitter_connected(const PurpleSpasmAccount *sa);
    +const gchar *spasm_account_get_display_name(const SpasmAccount *sa);
    +const gchar *spasm_account_get_id(const SpasmAccount *sa);
    +const gchar *spasm_account_get_name(const SpasmAccount *sa);
    +const gchar *spasm_account_get_type(const SpasmAccount *sa);
    +const gchar *spasm_account_get_bio(const SpasmAccount *sa);
    +const gchar *spasm_account_get_logo(const SpasmAccount *sa);
    +const gchar *spasm_account_get_email(const SpasmAccount *sa);
    +gboolean spasm_account_get_email_verified(const SpasmAccount *sa);
    +gboolean spasm_account_get_partnered(const SpasmAccount *sa);
    +gboolean spasm_account_get_twitter_connected(const SpasmAccount *sa);
    G_END_DECLS
    --- a/spasm-chat.c Mon Sep 30 23:51:10 2019 -0500
    +++ b/spasm-chat.c Tue Oct 01 00:08:41 2019 -0500
    @@ -27,8 +27,8 @@
    /******************************************************************************
    * Structs
    *****************************************************************************/
    -struct _PurpleSpasmChatService {
    - PurpleSpasmAccount *sa;
    +struct _SpasmChatService {
    + SpasmAccount *sa;
    GSocketClient *socket_client;
    GSocketConnection *socket_connection;
    @@ -40,7 +40,7 @@
    * sending
    *****************************************************************************/
    static void
    -spasm_chat_service_real_send(PurpleSpasmChatService *chat,
    +spasm_chat_service_real_send(SpasmChatService *chat,
    const gchar *format, ...)
    {
    GCancellable *cancellable = NULL;
    @@ -93,7 +93,7 @@
    * read loop
    *****************************************************************************/
    static void
    -spasm_chat_service_parse(PurpleSpasmChatService *chat,
    +spasm_chat_service_parse(SpasmChatService *chat,
    const gchar *buffer)
    {
    if(purple_str_has_prefix(buffer, "PING ")) {
    @@ -103,14 +103,14 @@
    }
    }
    -static void spasm_chat_read(PurpleSpasmChatService *chat);
    +static void spasm_chat_read(SpasmChatService *chat);
    static void
    spasm_chat_read_cb(GObject *obj, GAsyncResult *res, gpointer data) {
    GError *error = NULL;
    gchar *buffer = NULL;
    gsize buffer_len;
    - PurpleSpasmChatService *chat = (PurpleSpasmChatService *)data;
    + SpasmChatService *chat = (SpasmChatService *)data;
    buffer = g_data_input_stream_read_line_finish(
    G_DATA_INPUT_STREAM(obj),
    @@ -158,7 +158,7 @@
    }
    static void
    -spasm_chat_read(PurpleSpasmChatService *chat) {
    +spasm_chat_read(SpasmChatService *chat) {
    g_data_input_stream_read_line_async(
    chat->input_stream,
    G_PRIORITY_DEFAULT,
    @@ -175,7 +175,7 @@
    spasm_chat_login_cb(GObject *obj, GAsyncResult *res, gpointer data) {
    GError *error = NULL;
    PurpleConnection *purple_connection = NULL;
    - PurpleSpasmChatService *chat = (PurpleSpasmChatService *)data;
    + SpasmChatService *chat = (SpasmChatService *)data;
    purple_connection = spasm_account_get_connection(chat->sa);
    @@ -232,30 +232,30 @@
    spasm_chat_read(chat);
    }
    -PurpleSpasmChatService *
    -spasm_chat_service_new(PurpleSpasmAccount *sa) {
    - PurpleSpasmChatService *chat = NULL;
    +SpasmChatService *
    +spasm_chat_service_new(SpasmAccount *sa) {
    + SpasmChatService *chat = NULL;
    g_return_val_if_fail(sa, NULL);
    - chat = g_slice_new0(PurpleSpasmChatService);
    + chat = g_slice_new0(SpasmChatService);
    chat->sa = sa;
    return chat;
    }
    void
    -spasm_chat_service_free(PurpleSpasmChatService *chat) {
    +spasm_chat_service_free(SpasmChatService *chat) {
    g_object_unref(chat->input_stream);
    g_object_unref(chat->output_stream);
    g_object_unref(chat->socket_client);
    g_object_unref(chat->socket_connection);
    - g_slice_free(PurpleSpasmChatService, chat);
    + g_slice_free(SpasmChatService, chat);
    }
    void
    -spasm_chat_service_connect(PurpleSpasmChatService *chat) {
    +spasm_chat_service_connect(SpasmChatService *chat) {
    g_return_if_fail(chat);
    chat->socket_client = g_socket_client_new();
    --- a/spasm-chat.h Mon Sep 30 23:51:10 2019 -0500
    +++ b/spasm-chat.h Tue Oct 01 00:08:41 2019 -0500
    @@ -22,16 +22,16 @@
    #include <glib.h>
    -typedef struct _PurpleSpasmChatService PurpleSpasmChatService;
    +typedef struct _SpasmChatService SpasmChatService;
    #include "spasm-account.h"
    G_BEGIN_DECLS
    -PurpleSpasmChatService *spasm_chat_service_new(PurpleSpasmAccount *sa);
    -void spasm_chat_service_free(PurpleSpasmChatService *chat);
    +SpasmChatService *spasm_chat_service_new(SpasmAccount *sa);
    +void spasm_chat_service_free(SpasmChatService *chat);
    -void spasm_chat_service_connect(PurpleSpasmChatService *chat);
    +void spasm_chat_service_connect(SpasmChatService *chat);
    GList *spasm_chat_service_info(PurpleConnection *connection);
    GHashTable *spasm_chat_service_info_default(PurpleConnection *connection, const gchar *name);
    --- a/spasm-rest.c Mon Sep 30 23:51:10 2019 -0500
    +++ b/spasm-rest.c Tue Oct 01 00:08:41 2019 -0500
    @@ -29,10 +29,10 @@
    * Types
    *****************************************************************************/
    typedef struct {
    - PurpleSpasmAccount *sa;
    - PurpleSpasmRestCallback cb;
    + SpasmAccount *sa;
    + SpasmRestCallback cb;
    gpointer data;
    -} PurpleSpasmRestCallbackData;
    +} SpasmRestCallbackData;
    /******************************************************************************
    * Callbacks
    @@ -44,7 +44,7 @@
    JsonParser *parser = NULL;
    JsonNode *root = NULL;
    JsonObject *json_obj = NULL;
    - PurpleSpasmRestCallbackData *cb_data = (PurpleSpasmRestCallbackData *)data;
    + SpasmRestCallbackData *cb_data = (SpasmRestCallbackData *)data;
    istream = soup_session_send_finish(SOUP_SESSION(obj), res, &error);
    if(error) {
    @@ -128,11 +128,11 @@
    * API
    *****************************************************************************/
    void
    -spasm_rest_request(PurpleSpasmAccount *sa, const gchar *method,
    +spasm_rest_request(SpasmAccount *sa, const gchar *method,
    const gchar *path, const gchar *body,
    - PurpleSpasmRestCallback callback, gpointer data)
    + SpasmRestCallback callback, gpointer data)
    {
    - PurpleSpasmRestCallbackData *cb;
    + SpasmRestCallbackData *cb;
    SoupMessage *msg = NULL;
    SoupSession *session = NULL;
    gchar *url = NULL, *auth = NULL;
    @@ -165,7 +165,7 @@
    );
    g_free(auth);
    - cb = g_new0(PurpleSpasmRestCallbackData, 1);
    + cb = g_new0(SpasmRestCallbackData, 1);
    cb->sa = sa;
    cb->cb = callback;
    cb->data = data;
    --- a/spasm-rest.h Mon Sep 30 23:51:10 2019 -0500
    +++ b/spasm-rest.h Tue Oct 01 00:08:41 2019 -0500
    @@ -28,9 +28,9 @@
    G_BEGIN_DECLS
    -typedef void (*PurpleSpasmRestCallback)(PurpleSpasmAccount *sa, JsonParser *parser, GError *error, gpointer data);
    +typedef void (*SpasmRestCallback)(SpasmAccount *sa, JsonParser *parser, GError *error, gpointer data);
    -void spasm_rest_request(PurpleSpasmAccount *sa, const gchar *method, const gchar *path, const gchar *body, PurpleSpasmRestCallback callback, gpointer data);
    +void spasm_rest_request(SpasmAccount *sa, const gchar *method, const gchar *path, const gchar *body, SpasmRestCallback callback, gpointer data);
    G_END_DECLS
    --- a/spasm-user.c Mon Sep 30 23:51:10 2019 -0500
    +++ b/spasm-user.c Tue Oct 01 00:08:41 2019 -0500
    @@ -28,7 +28,7 @@
    * User endpoint
    *****************************************************************************/
    void
    -spasm_get_user(PurpleSpasmAccount *sa, PurpleSpasmRestCallback cb, gpointer data) {
    +spasm_get_user(SpasmAccount *sa, SpasmRestCallback cb, gpointer data) {
    spasm_rest_request(
    sa,
    "GET",
    --- a/spasm-user.h Mon Sep 30 23:51:10 2019 -0500
    +++ b/spasm-user.h Tue Oct 01 00:08:41 2019 -0500
    @@ -27,7 +27,7 @@
    G_BEGIN_DECLS
    -void spasm_get_user(PurpleSpasmAccount *sa, PurpleSpasmRestCallback cb, gpointer data);
    +void spasm_get_user(SpasmAccount *sa, SpasmRestCallback cb, gpointer data);
    G_END_DECLS