[Ayttm-commits] CVS: ayttm/src chat_room.c,1.56,1.57 chat_window.c,1.62,1.63 plugin.c,1.10,1.11 prefs_window.c,1.7,1.8 status.c,1.70,1.71 util.c,1.59,1.60

[Andy Maloney <address@hidden>]

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

Modified Files:
        chat_room.c chat_window.c plugin.c prefs_window.c status.c 
        util.c 
Log Message:
Fix -Wall warnings

Index: chat_room.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- chat_room.c 22 Mar 2003 12:39:29 -0000      1.56
+++ chat_room.c 24 Mar 2003 10:31:35 -0000      1.57
@@ -54,7 +54,9 @@
 static char *last_clicked_fellow = NULL;
 static guint32 last_time_clicked = 0;
 
-static char *cr_colors[]={
+/* Not used yet */
+/*
+static const char *cr_colors[]={
        "#ff0055",
        "#ff009d",
        "#6e00ff",
@@ -65,7 +67,9 @@
        "#ffff00",
        "#ff9400"
 };
-static int nb_cr_colors = 9;
+*/
+static const int nb_cr_colors = 9;
+
 
 static void handle_fellow_click (char *name, eb_chat_room *cr)
 {

Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- chat_window.c       22 Mar 2003 11:48:25 -0000      1.62
+++ chat_window.c       24 Mar 2003 10:31:35 -0000      1.63
@@ -759,10 +759,8 @@
                GtkWidget *menu;
                GtkWidget *button;
                menu_data *md=NULL;
-               menu_item_data *mid=NULL;
-               ebmContactData *ecd=NULL;
-               LList *list=NULL;
 
+               
                gtk_signal_emit_stop_by_name(GTK_OBJECT(widget),
                                               "button_press_event");
                menu = gtk_menu_new();

Index: plugin.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/plugin.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.c    23 Mar 2003 12:22:43 -0000      1.10
+++ plugin.c    24 Mar 2003 10:31:35 -0000      1.11
@@ -153,7 +153,11 @@
        eb_debug(DBG_CORE, ">Unloading plugin %s\n", epi->name);
        /* This is a service plugin, special handling required */
        if (epi->status!=PLUGIN_LOADED)
-               return;
+       {
+               eb_debug(DBG_CORE, "<Plugin not loaded\n");
+               return( 0 );
+       }
+       
        if(epi->pi.finish) {
                eb_debug(DBG_CORE, "Calling plugins finish function\n");
                error=epi->pi.finish();
@@ -178,7 +182,6 @@
        }
        eb_debug(DBG_CORE, "<Plugin unloaded\n");
        return(0);
-
 }
 
 void unload_modules(void) {

Index: prefs_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs_window.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- prefs_window.c      23 Mar 2003 00:19:31 -0000      1.7
+++ prefs_window.c      24 Mar 2003 10:31:35 -0000      1.8
@@ -80,7 +80,6 @@
      if(!is_prefs_open)
      {
          GtkWidget *hbox;
-         GtkWidget *label;
          GtkWidget *button;
          GtkWidget *hbox2;
          GtkWidget *prefs_vbox;

Index: status.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/status.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- status.c    23 Mar 2003 21:15:07 -0000      1.70
+++ status.c    24 Mar 2003 10:31:35 -0000      1.71
@@ -433,7 +433,8 @@
 static void contact_menu(GdkEventButton * event, gpointer d )
 {
        struct contact *conn=d;
-       GtkWidget *menu, *submenu, *button;
+       GtkWidget *menu = NULL;
+       GtkWidget *submenu = NULL;
        menu_data *md=NULL;
 
        int nbitems = 0;
@@ -490,13 +491,11 @@
 
 static void account_menu(GdkEventButton * event, gpointer d )
 {
-       GtkWidget * menu, *button;
+       GtkWidget * menu = NULL;
        eb_account *acc = (eb_account *)d;
        menu_data *md=NULL;
-       menu_item_data *mid=NULL;
-       ebmContactData *ecd=NULL;
-       LList *list=NULL;
 
+       
        menu = gtk_menu_new();
        if (contact_list && acc->list_item)
                gtk_tree_select_child(GTK_TREE(contact_list), acc->list_item);

Index: util.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/util.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- util.c      23 Mar 2003 23:48:15 -0000      1.59
+++ util.c      24 Mar 2003 10:31:35 -0000      1.60
@@ -712,30 +712,6 @@
        return NULL;
 }
 
-// FIXME: Do we really need to use aim_normalize?  I copied it from the 
libtoc/libtoc.c to facilitate making modules
-static char *aim_normalize(char *s)
-{
-       static char buf[255];
-       char *t, *u;
-       int x=0;
-
-       u = t = g_malloc(strlen(s) + 1);
-
-       strncpy(t, s, strlen(s)+1);
-       g_strdown(t);
-
-       while(*t) {
-               if (*t != ' ') {
-                       buf[x] = *t;
-                       x++;
-               }
-               t++;
-       }
-       buf[x]='\0';
-       g_free(u);
-       return buf;
-}
-
 eb_account * find_account_by_handle( char * handle, int type )
 {
        LList *l1, *l2, *l3;