From 077edc19d543f7648f7519207058f6e57e738e28 Mon Sep 17 00:00:00 2001 From: mjentsch Date: Fri, 13 Mar 2015 00:17:35 +0100 Subject: [PATCH] Repository cleanup and coding guidelines --- telegram-purple.c | 22 ++++------------------ tgp-ft.c | 3 ++- tgp-msg.c | 17 +++++++++-------- 3 files changed, 15 insertions(+), 27 deletions(-) diff --git a/telegram-purple.c b/telegram-purple.c index 8bf8ce3..3eb9524 100755 --- a/telegram-purple.c +++ b/telegram-purple.c @@ -382,7 +382,7 @@ void on_ready (struct tgl_state *TLS) { connection_data *conn = TLS->ev_base; purple_connection_set_state (conn->gc, PURPLE_CONNECTED); - purple_connection_set_display_name (conn->gc, purple_account_get_username(conn->pa)); + purple_connection_set_display_name (conn->gc, purple_account_get_username (conn->pa)); purple_blist_add_account (conn->pa); tggroup = purple_find_group ("Telegram"); if (tggroup == NULL) { @@ -655,7 +655,6 @@ static void tgprpl_chat_join (PurpleConnection * gc, GHashTable * data) { } static char *tgprpl_get_chat_name (GHashTable * data) { - debug ("tgprpl_get_chat_name()"); return g_strdup(g_hash_table_lookup(data, "subject")); } @@ -688,18 +687,6 @@ static int tgprpl_send_chat (PurpleConnection * gc, int id, const char *message, return ret; } -static void tgprpl_group_buddy (PurpleConnection * gc, const char *who, const char *old_group, const char *new_group) { - debug ("tgprpl_group_buddy()"); -} - -static void tgprpl_rename_group (PurpleConnection * gc, const char *old_name, PurpleGroup * group, GList * moved_buddies) { - debug ("tgprpl_rename_group()"); -} - -static void tgprpl_convo_closed (PurpleConnection * gc, const char *who) { - debug ("tgprpl_convo_closed()"); -} - static void tgprpl_set_buddy_icon (PurpleConnection * gc, PurpleStoredImage * img) { debug ("tgprpl_set_buddy_icon()"); @@ -715,7 +702,6 @@ static void tgprpl_set_buddy_icon (PurpleConnection * gc, PurpleStoredImage * im } static gboolean tgprpl_can_receive_file (PurpleConnection * gc, const char *who) { - debug ("tgprpl_can_receive_file()"); return TRUE; } @@ -770,10 +756,10 @@ static PurplePluginProtocolInfo prpl_info = { NULL, // get_cb_info NULL, // get_cb_away NULL, // alias_buddy - tgprpl_group_buddy, - tgprpl_rename_group, + NULL, // group_buddy + NULL, // rename_group NULL, // buddy_free - tgprpl_convo_closed, + NULL, // convo_closed NULL, // normalize tgprpl_set_buddy_icon, NULL, // remove_group diff --git a/tgp-ft.c b/tgp-ft.c index 8b91cb5..7b617f7 100644 --- a/tgp-ft.c +++ b/tgp-ft.c @@ -29,6 +29,7 @@ static void tgprpl_xfer_free_data (struct tgp_xfer_send_data *data); + static void tgprpl_xfer_recv_on_finished (struct tgl_state *TLS, void *_data, int success, char *filename) { debug ("tgprpl_xfer_recv_on_finished()"); struct tgp_xfer_send_data *data = _data; @@ -38,7 +39,7 @@ static void tgprpl_xfer_recv_on_finished (struct tgl_state *TLS, void *_data, in debug ("purple_xfer_set_completed"); purple_xfer_set_bytes_sent (data->xfer, purple_xfer_get_size (data->xfer)); purple_xfer_set_completed (data->xfer, TRUE); - purple_xfer_end(data->xfer); + purple_xfer_end (data->xfer); } g_unlink (purple_xfer_get_local_filename (data->xfer)); diff --git a/tgp-msg.c b/tgp-msg.c index da69472..4481d3e 100644 --- a/tgp-msg.c +++ b/tgp-msg.c @@ -135,13 +135,13 @@ static char *format_message (struct tgl_message *M) { return format_document_desc ("DOCUMENT", M->media.encr_document.caption, M->media.encr_document.size); break; case tgl_message_media_photo_encr: - return format_document_desc ("PHOTO", "", M->media.encr_photo.size); + return format_document_desc ("ENCRYPTED PHOTO", "(not yet supported)", M->media.encr_photo.size); break; case tgl_message_media_contact: return g_strdup_printf ("%s %s
%s", M->media.first_name, M->media.last_name, M->media.phone); break; case tgl_message_media_geo: - return g_strdup_printf("" + return g_strdup_printf ("" "http://openstreetmap.org/?lat=%f&lon=%f&zoom=20", M->media.geo.latitude, M->media.geo.longitude, M->media.geo.latitude, M->media.geo.longitude); @@ -151,7 +151,7 @@ static char *format_message (struct tgl_message *M) { if (*M->message != 0) { return purple_markup_escape_text (M->message, strlen (M->message)); } - return g_strdup(""); + return NULL; break; } } @@ -269,7 +269,7 @@ int tgp_msg_send (struct tgl_state *TLS, const char *message, tgl_peer_id_t to) static void tgp_msg_display (struct tgl_state *TLS, struct tgp_msg_loading *C) { connection_data *conn = TLS->ev_base; struct tgl_message *M = C->msg; - char *text; + char *text = NULL; int flags = 0; // Filter message updates and deletes, are not created and @@ -311,6 +311,10 @@ static void tgp_msg_display (struct tgl_state *TLS, struct tgp_msg_loading *C) { } + if (! text || ! *text) { + warning ("No text to display"); + return; + } switch (tgl_get_peer_type (M->to_id)) { case TGL_PEER_CHAT: { if (chat_show (conn->gc, tgl_get_peer_id (M->to_id))) { @@ -396,10 +400,7 @@ void tgp_msg_recv (struct tgl_state *TLS, struct tgl_message *M) } if (M->media.type == tgl_message_media_geo) { - } - - if (M->media.type == tgl_message_media_photo_encr) { - // TODO: handle encrypted document. + // TODO: load geo thumbnail } g_queue_push_tail (conn->new_messages, C);