Ticket #31: buddy_image_01.patch

src/nateon.c

@@ -2258 +2258 @@
         0, //OPT_PROTO_MAIL_CHECK,
         NULL,                                   /* user_splits */
         NULL,                                   /* protocol_options */
-        NO_BUDDY_ICONS,                         /* icon_spec */
+        { "bmp,jpg", 0, 0, 500, 500, 0, PURPLE_ICON_SCALE_SEND},    /* icon_spec */
         nateon_list_icon,                       /* list_icon */
         NULL,                                   /* list_emblems */
         nateon_status_text,                     /* status_text */

src/switchboard.c

@@ -806 +806 @@
 
                 g_strfreev(split);
         }
+        else if (cmd->param_count == 4 && !strcmp(cmd->params[2], "DPIMG") && \
+                        !strncmp(cmd->params[3], "REQUEST", strlen("REQUEST")) )
+        {
+                /* Receive Buddy Image */
+                char **split;
+                char **file_data;
+                PurpleBuddyIcon *icon;
+                char *icon_checksum;
+
+                split = g_strsplit(cmd->params[3], "%09", 0);
+                file_data = g_strsplit(split[2], "|", 0);
+
+                icon = purple_buddy_icons_find(session->account, account_name);
+                if ( (icon == NULL) || \
+                                ( strcmp(purple_buddy_icon_get_checksum(icon), file_data[0]) != 0))
+                {
+                        nateon_xfer_receive_buddyimage(session, swboard, account_name, file_data[0],\
+                                        atoi(file_data[1]), file_data[2]);
+                }
+                if (icon)
+                        purple_buddy_icon_unref(icon);
+
+                g_strfreev(split);
+        }
 }
 
 //static void

src/xfer.c

@@ -30 +30 @@
 }
 
 static void
+nateon_xfer_cancel_recv_dummy(PurpleXfer *xfer)
+{
+        return;
+}
+
+static void
 nateon_xfer_cancel_recv(PurpleXfer *xfer)
 {
         purple_debug_info("nateon", "%s\n", __FUNCTION__);
@@ -351 +357 @@
                         if (wc != r)
                         {
                                 purple_debug_error("nateon", "%s:Unable to write whole buffer.\n");
-                                purple_xfer_cancel_remote(nate_xfer->prpl_xfer);
+                                if (nate_xfer->content_type == NATEON_XFER_CONTENT_FILE)
+                                {
+                                        purple_xfer_cancel_remote(nate_xfer->prpl_xfer);
+                                }
                                 g_free(buffer);
                                 return;
                         }
-                        purple_xfer_set_bytes_sent(nate_xfer->prpl_xfer, nate_xfer->recv_len);
-                        purple_xfer_update_progress(nate_xfer->prpl_xfer);
+                        if (nate_xfer->content_type == NATEON_XFER_CONTENT_FILE)
+                        {
+                                purple_xfer_set_bytes_sent(nate_xfer->prpl_xfer, nate_xfer->recv_len);
+                                purple_xfer_update_progress(nate_xfer->prpl_xfer);
+                        }
                 }
                 else if (r < 0)
                 {
-                        purple_xfer_cancel_remote(nate_xfer->prpl_xfer);
+                        if (nate_xfer->content_type == NATEON_XFER_CONTENT_FILE)
+                        {
+                                purple_xfer_cancel_remote(nate_xfer->prpl_xfer);
+                        }
 
                 }
         }
@@ -381 +396 @@
                         fclose(nate_xfer->dest_fp);
                         nate_xfer->dest_fp = NULL;
                 }
+                if (nate_xfer->content_type == NATEON_XFER_CONTENT_BUDDYIMG)
+                {
+                        const gchar *filepath;
+                        guchar *imgbuf;
+                        gint filesize;
+                        gint ret;
+                        FILE *fp;
+
+                        filesize = purple_xfer_get_size(nate_xfer->prpl_xfer);
+                        imgbuf = g_malloc(filesize);
+                        filepath = purple_xfer_get_local_filename(nate_xfer->prpl_xfer);
+                        fp = fopen(filepath, "rb");
+                        if (fp)
+                        {
+                                ret = fread(imgbuf, 1, filesize, fp);
+                                fclose(fp);
+                                if (ret == filesize)
+                                {
+                                        purple_buddy_icons_set_for_user(nate_xfer->session->account,
+                                                        nate_xfer->who, imgbuf, filesize, 
+                                                        purple_xfer_get_filename(nate_xfer->prpl_xfer));
+                                }
+                        }
+                        g_unlink(filepath);
+                }
                 purple_xfer_end(nate_xfer->prpl_xfer);
         }
 
@@ -862 +902 @@
 
         if (purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE)
         {
-                nate_xfer->dest_fp = fopen(purple_xfer_get_local_filename(xfer), "wb");
+                if (nate_xfer->content_type == NATEON_XFER_CONTENT_FILE)
+                {
+                        nate_xfer->dest_fp = fopen(purple_xfer_get_local_filename(xfer), "wb");
+                }
+                else if (nate_xfer->content_type == NATEON_XFER_CONTENT_BUDDYIMG)
+                {
+                        char *filepath;
+                        nate_xfer->dest_fp = purple_mkstemp(&filepath, TRUE);
+                        purple_xfer_set_local_filename(xfer, filepath);
+                        g_free(filepath);
+                }
 
                 if (nate_xfer->dest_fp == NULL) {
                         purple_debug_info("nateon", "%s: Error Writing File %s\n", __FUNCTION__,
@@ -1133 +1183 @@
 
         xfer = nateon_xfer_new(session, PURPLE_XFER_RECEIVE, who);
 
+        xfer->content_type = NATEON_XFER_CONTENT_FILE;
         xfer->file_cookie = g_strdup(cookie);
         xfer->swboard = swboard;
         purple_xfer_set_filename(xfer->prpl_xfer, filename);
@@ -1154 +1205 @@
         purple_debug_info("nateon", "%s: who:%s file:%s\n", __FUNCTION__, who, filename);
 
         xfer = nateon_xfer_new(session, PURPLE_XFER_SEND, who);
+        xfer->content_type = NATEON_XFER_CONTENT_FILE;
         purple_xfer_set_init_fnc(xfer->prpl_xfer, nateon_xfer_init);
         purple_xfer_set_cancel_recv_fnc(xfer->prpl_xfer, nateon_xfer_cancel_recv);
         purple_xfer_set_request_denied_fnc(xfer->prpl_xfer, nateon_xfer_request_denied);
@@ -1176 +1228 @@
 void
 nateon_xfer_cancel_transfer(NateonSession *session, const char *who, const char *filename, const char *cookie)
 {
-    NateonXfer *xfer = NULL;
-    GList *l;
-
-    for (l = session->xfers; l; l = l->next)
-    {
-        NateonXfer *tmp;
-        tmp = l->data;
-        if ( !strcmp(tmp->who, who) && \
+        NateonXfer *xfer = NULL;
+        GList *l;
+
+        for (l = session->xfers; l; l = l->next)
+        {
+                NateonXfer *tmp;
+                tmp = l->data;
+                if ( !strcmp(tmp->who, who) && \
                                 ((filename == NULL) || !strcmp(purple_xfer_get_filename(tmp->prpl_xfer), filename)) && \
-                tmp->file_cookie && !strcmp(tmp->file_cookie, cookie) )
-        {
-            xfer = tmp;
-            break;
-        }
-    }
-    if (!xfer)
-    {
-        purple_debug_info("nateon", "%s: no matching xfer found for deny request\n", __FUNCTION__);
-        return;
-    }
+                                tmp->file_cookie && !strcmp(tmp->file_cookie, cookie) )
+                {
+                        xfer = tmp;
+                        break;
+                }
+        }
+        if (!xfer)
+        {
+                purple_debug_info("nateon", "%s: no matching xfer found for deny request\n", __FUNCTION__);
+                return;
+        }
 
         purple_xfer_cancel_remote(xfer->prpl_xfer);
 }
+
+void
+nateon_xfer_receive_buddyimage(NateonSession *session, NateonSwitchBoard *swboard, \
+                const char *who, const char *uniq_name, const int filesize, const char *cookie)
+{
+        NateonXfer *xfer;
+
+        xfer = nateon_xfer_new(session, PURPLE_XFER_RECEIVE, who);
+
+        xfer->file_cookie = g_strdup(cookie);
+        xfer->swboard = swboard;
+
+        xfer->content_type = NATEON_XFER_CONTENT_BUDDYIMG;
+
+        purple_xfer_set_filename(xfer->prpl_xfer, uniq_name);
+        purple_xfer_set_size(xfer->prpl_xfer, filesize);
+        purple_xfer_set_cancel_recv_fnc(xfer->prpl_xfer, nateon_xfer_cancel_recv_dummy);
+        //purple_xfer_set_init_fnc(xfer->prpl_xfer, nateon_xfer_init);
+        //purple_xfer_set_request_denied_fnc(xfer->prpl_xfer, nateon_xfer_request_denied);
+        purple_xfer_set_end_fnc(xfer->prpl_xfer, nateon_xfer_end);
+
+        nateon_xfer_init(xfer->prpl_xfer);
+}

src/xfer.h

@@ -57 +57 @@
         NATEON_XFER_CONN_FR
 } NateonXferConnType;
 
+typedef enum
+{
+    NATEON_XFER_CONTENT_FILE,
+    NATEON_XFER_CONTENT_BUDDYIMG
+} NateonXferContentType;
+
 /**
  * File Transfer.
  */
@@ -70 +76 @@
         char *who;      /**< peer's account name */
         char *my_ip;
 
+    NateonXferConnType content_type;
+
         /* P2P related */
         PurpleNetworkListenData *p2p_listen_data;
         PurpleProxyConnectData  *p2p_connect_data;
@@ -134 +142 @@
 void nateon_xfer_cancel_transfer(NateonSession *session, const char *who, const char *filename,\
                                                                         const char *cookie);
 
+void nateon_xfer_receive_buddyimage(NateonSession *session, NateonSwitchBoard *swboard, \
+                const char *who, const char *uniq_name, const int filesize, const char *cookie);
+
 #endif /* _NATEON_XFER_H_ */