[Ayttm-commits] CVS: ayttm/src chat_room.c,1.54,1.55 chat_room.h,1.15,1.16 chat_window.c,1.55,1.56 nomodule.c,1.11,1.12 offline_queue_mgmt.c,1.6,1.7 plugin_api.c,1.11,1.12 status.c,1.51,1.52 tcp_util.c,1.3,1.4

[Andy Maloney <address@hidden>]

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

Modified Files:
        chat_room.c chat_room.h chat_window.c nomodule.c 
        offline_queue_mgmt.c plugin_api.c status.c tcp_util.c 
Log Message:
Fix -Wall warnings

Index: chat_room.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- chat_room.c 13 Mar 2003 11:24:07 -0000      1.54
+++ chat_room.c 16 Mar 2003 12:57:27 -0000      1.55
@@ -31,6 +31,7 @@
 #include "dialog.h"
 #include "smileys.h"
 #include "service.h"
+#include "add_contact_window.h"
 
 #ifdef HAVE_ISPELL
 #include "gtk/gtkspell.h"
@@ -632,7 +633,7 @@
        if (!room->loginfo)
                init_loginfo(room);
        
-       g_snprintf(buff, 1024, "You had a <a href=\"log://%s\">group chat with 
%s</a>.\n",
+       g_snprintf(buff, 1024, "You had a <a href=\"log://%s\">group chat with 
%s (%s)</a>.\n",
                        room->loginfo->filename,
                        alias, handle);
        
@@ -761,7 +762,7 @@
                         cur_time->tm_hour, cur_time->tm_min,
                         cur_time->tm_sec, color, chat_room->local_user->alias);
                } else {
-                       g_snprintf(buff, 2048, "<FONT COLOR=\"%s\"><B>%s: 
</B></FONT>", chat_room->local_user->alias);
+                       g_snprintf(buff, 2048, "<FONT COLOR=\"%s\"><B>%s: 
</B></FONT>", color, chat_room->local_user->alias);
                }
        }
        else

Index: chat_room.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- chat_room.h 5 Mar 2003 13:45:57 -0000       1.15
+++ chat_room.h 16 Mar 2003 12:57:27 -0000      1.16
@@ -66,7 +66,7 @@
        /* begin chat room specific stuff */
        
        int connected; /* are we currently in this chat room */
-       char id[255];      /* who are we? 
+       char id[255];      /* who are we? */
        /*int service_id;*/
 
        char room_name[1024];  /* what is this chat room called */

Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- chat_window.c       5 Mar 2003 14:19:51 -0000       1.55
+++ chat_window.c       16 Mar 2003 12:57:27 -0000      1.56
@@ -922,8 +922,7 @@
                        return gtk_true();
                }
        } else if (event->keyval == GDK_Up) {
-               gint p=0;
-
+               
                if(cw->history==NULL) 
                        return gtk_true();
 
@@ -955,8 +954,6 @@
                cw_set_message(cw, cw->hist_pos->data);
                
        } else if (event->keyval == GDK_Down) {
-               gint p=0;
-
                if(cw->history==NULL || cw->hist_pos==NULL) 
                        return gtk_true();
                cw->hist_pos=cw->hist_pos->next;

Index: nomodule.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/nomodule.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nomodule.c  31 Jan 2003 13:30:41 -0000      1.11
+++ nomodule.c  16 Mar 2003 12:57:27 -0000      1.12
@@ -223,8 +223,6 @@
 
 static char **eb_nomodule_get_status_pixmap( eb_account * account)
 {
-       struct eb_nomodule_account_data * aad;
-       
        return nomodule_away_xpm;
 }
 

Index: offline_queue_mgmt.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/offline_queue_mgmt.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- offline_queue_mgmt.c        15 Mar 2003 13:10:33 -0000      1.6
+++ offline_queue_mgmt.c        16 Mar 2003 12:57:27 -0000      1.7
@@ -22,15 +22,16 @@
  *
  */
 
-#include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
+
 #include "intl.h"
-#include "account.h"
-#include "contact.h"
 #include "globals.h"
 #include "service.h"
 #include "mem_util.h"
 #include "offline_queue_mgmt.h"  /* so the compiler tells us about type 
mismatches */
+#include "util.h"
+
 
 /* FIXME: temporary */
 eb_account * find_account_by_handle( char * handle, int type );
@@ -191,8 +192,8 @@
 
 int group_mgmt_check_moved(const char *groupname)
 {
-       FILE *queue, *temp;
-       char buff[NAME_MAX], queue_name[NAME_MAX], temp_name[NAME_MAX];
+       FILE *queue;
+       char buff[NAME_MAX], queue_name[NAME_MAX];
        snprintf(queue_name, NAME_MAX, "%s%cgroup_actions_queue", 
                                config_dir, 
                                G_DIR_SEPARATOR);
@@ -204,9 +205,9 @@
        while( fgets(buff, sizeof(buff), queue)  != NULL )
        {               
                char **tokens  = ay_strsplit( buff, "\t", -1 );
-               int action     = atoi(tokens[0]);
+       /*      int action     = atoi(tokens[0]); */
                char *oldgroup = tokens[1];
-               char *newgroup = tokens[2];
+       /*      char *newgroup = tokens[2]; */
                                
                if (oldgroup && !strcmp(oldgroup, groupname)) {
                        fclose(queue);

Index: plugin_api.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/plugin_api.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plugin_api.c        31 Jan 2003 07:29:19 -0000      1.11
+++ plugin_api.c        16 Mar 2003 12:57:27 -0000      1.12
@@ -24,10 +24,12 @@
 
 #include <stdio.h>
 #include <string.h>    /* for strcmp */
+#include <stdlib.h>
+
 #include "globals.h"
 #include "plugin.h"
 #include "dialog.h"
-#include "prefs.h"
+
 
 static void eb_gtk_dialog_callback(GtkWidget *widget, gpointer data)
 {

Index: status.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/status.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- status.c    15 Mar 2003 12:57:57 -0000      1.51
+++ status.c    16 Mar 2003 12:57:27 -0000      1.52
@@ -1060,8 +1060,6 @@
 /* update the status info (pixmap and state) of a contact */
 void contact_update_status(struct contact * ec)
 {
-       GdkPixmap * pm;
-       GdkBitmap * bm;
        eb_account * ea = NULL;
        LList * l;
        int width, height;
@@ -1130,8 +1128,6 @@
 /* update the status info (pixmap and state) of an account */
 void buddy_update_status(eb_account * ea)
 {
-       GdkPixmap * pm;
-       GdkBitmap * bm;
        char *c = NULL;
        if (!ea || !ea->list_item)
                return;

Index: tcp_util.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/tcp_util.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tcp_util.c  7 Feb 2003 19:51:03 -0000       1.3
+++ tcp_util.c  16 Mar 2003 12:57:27 -0000      1.4
@@ -28,6 +28,7 @@
  *
  */
 
+#include <string.h>
 #include <netdb.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -40,8 +41,6 @@
 #include <values.h>
 
 #include "globals.h"
-#include "debug.h"
-#include "llist.h"
 #include "plugin_api.h"
 
 
@@ -173,8 +172,8 @@
  **/
 int ay_tcp_writeline(const char *buff, int nbytes, int fd)
 {
-       int i, n=0, count=0;
-       int len;
+       int     n=0;
+       int     count=0;
        char eoln[2] = "\015\012";
 
        while((n=write(fd, buff+count, nbytes)) < nbytes) {