[Ayttm-commits] CVS: ayttm/src message_parse.c,1.14,1.15 message_parse.h,1.6,1.7

[Philip S Tellis <address@hidden>]

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv3448/src

Modified Files:
        message_parse.c message_parse.h 
Log Message:
remove SERVICE_INFO from eb_parse_incoming_message

Index: message_parse.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/message_parse.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- message_parse.c     29 Jan 2003 19:19:23 -0000      1.14
+++ message_parse.c     30 Jan 2003 08:23:19 -0000      1.15
@@ -166,7 +166,7 @@
 #endif
 }
                
-static int update_send_progress(gpointer data )
+static int update_send_progress(void * data )
 {
        progress_callback_data * pcd = data;
 #ifndef __MINGW32__
@@ -181,21 +181,21 @@
                do_error_dialog(_("Remote Side Disconnected"), _("Ayttm file 
x-fer"));
                progress_window_close(pcd->tag);
                eb_timeout_remove(pcd->timer);
-               g_free(pcd);
+               free(pcd);
        }
        else if( xfer_in_progress == -2 )
        {
                do_error_dialog(_("Unable to open file!"), _("Ayttm file 
x-fer"));
                progress_window_close(pcd->tag);
                eb_timeout_remove(pcd->timer);
-               g_free(pcd);
+               free(pcd);
        }
        else
        {
                do_error_dialog(_("File Sent Successfully"), _("Ayttm file 
x-fer"));
                progress_window_close(pcd->tag);
                eb_timeout_remove(pcd->timer);
-               g_free(pcd);
+               free(pcd);
        }
 #ifndef __MINGW32__
        pthread_mutex_unlock(&mutex);
@@ -232,7 +232,7 @@
                        break;
                }
        }
-       g_snprintf(buff, 1025, "%05d", strlen(filename+i+1));
+       snprintf(buff, 1025, "%05d", strlen(filename+i+1));
        write(s,buff,5);
        write(s,filename+i+1,strlen(filename+i+1));
        filelen = htonl(fileinfo.st_size);
@@ -255,7 +255,7 @@
 
        if(!strcmp(accept,"ACCEPT") )
        {
-               progress_callback_data * pcd = g_new0(progress_callback_data, 
1);
+               progress_callback_data * pcd = calloc(1, 
sizeof(progress_callback_data));
                xfer_in_progress = 1;
                fp = fopen(filename,"rb");
                printf("%s %s %d %5d %p\n", filename, filename+i+1, 
strlen(filename), htons(strlen(filename+i+1)), fp);
@@ -268,7 +268,7 @@
 #else
                send_file2(&sfs);
 #endif
-               pcd->timer = eb_timeout_add((guint32)500, update_send_progress, 
pcd);
+               pcd->timer = eb_timeout_add(500, update_send_progress, pcd);
        }
        else
        {
@@ -295,7 +295,7 @@
 
                xfer_in_progress = 0;
                eb_input_remove(pcd->input);
-               g_free(pcd);
+               free(pcd);
        }
        else
        {
@@ -331,7 +331,7 @@
                fclose(fp);
                xfer_in_progress = 0;
                progress_window_close(pcd->tag);
-               g_free(pcd);
+               free(pcd);
        }
 }
 
@@ -343,7 +343,7 @@
        char buffer2[1024];
        char buffer[1024];
        char buffer3[1024];
-       progress_callback_data *pcd = g_new0(progress_callback_data, 1);
+       progress_callback_data *pcd = calloc(1, sizeof(progress_callback_data));
        fd_set set;
 
        fd = accept(s, NULL, NULL );
@@ -374,20 +374,19 @@
 
        pcd->tag = progress_window_new(buffer2, filelen);
 
-       g_snprintf( buffer, 1024, "%s/%s", getenv("HOME"),buffer2);
+       snprintf( buffer, 1024, "%s/%s", getenv("HOME"),buffer2);
        printf("receiving file %s\n", buffer);
        amount_recieved = 0;
        fp = fopen(buffer, "wb");
 
-       g_snprintf( buffer3, 1024, _("Would you like to accept\n the file 
%s?\nSize=%lu"), buffer2,(unsigned long)filelen);
+       snprintf( buffer3, 1024, _("Would you like to accept\n the file 
%s?\nSize=%lu"), buffer2,(unsigned long)filelen);
        do_dialog( buffer3, _("Download File"), accept_file, pcd );
 }
 
 
 void eb_parse_incoming_message( eb_local_account * account,
                                 eb_account * remote,
-                                 struct service * serv,
-                                gchar * message )
+                                char * message )
 {
        char * buff;
        char * ptr;
@@ -429,7 +428,7 @@
                                return;                               /* bind 
address to socket */
                        }
                        listen(s, 1);                               /* max # of 
queued connects */
-                       g_snprintf(buff2,1024,"EB_COMMAND ACCEPT %s", 
get_local_addresses());
+                       snprintf(buff2,1024,"EB_COMMAND ACCEPT %s", 
get_local_addresses());
                        RUN_SERVICE(remote)->send_im(account,remote, buff2);
                        get_file(s);
                }
@@ -458,15 +457,15 @@
        }
        else
        {
-               gchar * message2 = linkify(message);
+               char * message2 = linkify(message);
                eb_chat_window_display_remote_message( account, remote, 
message2 );
-               g_free(message2);
+               free(message2);
        }
        free(buff);
 }
 
 void eb_update_status( eb_account * remote,
-                       gchar * message )
+                       char * message )
 {
         eb_chat_window_display_status( remote, message );
        eb_chat_room_display_status(remote, message);

Index: message_parse.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/message_parse.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- message_parse.h     29 Jan 2003 19:19:23 -0000      1.6
+++ message_parse.h     30 Jan 2003 08:23:19 -0000      1.7
@@ -43,7 +43,6 @@
 
 void eb_parse_incoming_message( eb_local_account * account,
                                  eb_account * remote,
-                                 struct service * service,
                                  char * message );
 
 void eb_update_status( eb_account * remote,