[Ayttm-commits] CVS: ayttm/src account.c,1.12,1.13 chat_room.c,1.36,1.37 chat_window.c,1.29,1.30 dialog.c,1.15,1.16 main.c,1.15,1.16 nomodule.c,1.6,1.7 smileys.c,1.10,1.11 status.c,1.30,1.31

[Andy Maloney <address@hidden>]

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

Modified Files:
        account.c chat_room.c chat_window.c dialog.c main.c nomodule.c 
        smileys.c status.c 
Log Message:
Include cleanups and addition of statics

Index: account.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/account.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- account.c   23 Jan 2003 06:34:26 -0000      1.12
+++ account.c   24 Jan 2003 00:29:13 -0000      1.13
@@ -19,17 +19,16 @@
  *
  */
 
-#include <glib.h>
-#include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "account.h"
+
 #include "service.h"
 #include "globals.h"
 #include "value_pair.h"
 #include "util.h"
 #include "add_contact_window.h"
+
 
 void write_account_list()
 {

Index: chat_room.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- chat_room.c 21 Jan 2003 05:31:19 -0000      1.36
+++ chat_room.c 24 Jan 2003 00:29:13 -0000      1.37
@@ -17,23 +17,20 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include "intl.h"
 
 #include <string.h>
 #include <stdlib.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "globals.h"
-#include "intl.h"
 #include "gtk_eb_html.h"
 #include "util.h"
 #include "sound.h"
 #include "dialog.h"
 #include "smileys.h"
 #include "service.h"
-#include "prefs.h"
+
 #ifdef HAVE_ISPELL
 #include "gtkspell.h"
 #endif
@@ -240,7 +237,7 @@
        ecr->invite_window_is_open = 0;
 }
 
-void do_invite_window(eb_chat_room * room )
+static void do_invite_window(eb_chat_room * room )
 {
        GtkWidget * box;
        GtkWidget * box2;

Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- chat_window.c       21 Jan 2003 10:27:25 -0000      1.29
+++ chat_window.c       24 Jan 2003 00:29:13 -0000      1.30
@@ -27,18 +27,13 @@
  */
 
 #include "intl.h"
+
 #include <string.h>
-#include <time.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <ctype.h>
-#include <assert.h>
 
-#include "chat_window.h"
 #include "util.h"
-#include "gtkspell.h"
 #include "add_contact_window.h"
 #include "sound.h"
 #include "dialog.h"
@@ -46,7 +41,6 @@
 #include "status.h"
 #include "away_window.h"
 #include "message_parse.h"
-#include "extgtktext.h"
 #include "gtk_eb_html.h"
 #include "plugin.h"
 #include "contact_actions.h"
@@ -199,8 +193,8 @@
 
 
 /* declare functions */
-void eb_update_window_title(chat_window * cw, gboolean new_message);
-void eb_update_window_title_to_tab(int tab, gboolean new_message);
+static void eb_update_window_title(chat_window * cw, gboolean new_message);
+static void eb_update_window_title_to_tab(int tab, gboolean new_message);
 
 GList *outgoing_message_filters=NULL;
 GList *incoming_message_filters=NULL;
@@ -759,7 +753,7 @@
    eb_debug(DBG_CORE, "change_local_account_on_click: %s\n", account);
 }
 
-GtkWidget *get_local_accounts(chat_window *cw)
+static GtkWidget *get_local_accounts(chat_window *cw)
 {
       GtkWidget *submenu, *label, *button;
       char *handle=NULL, buff[256];
@@ -2377,8 +2371,7 @@
   g_free(tmp);
 }
 
-void
-eb_update_window_title_to_tab (int tab, gboolean new_message)
+static void eb_update_window_title_to_tab (int tab, gboolean new_message)
 {
   char buff[BUF_SIZE];
   chat_window * cw = NULL;
@@ -2409,7 +2402,7 @@
                
 }
 
-void   eb_update_window_title (chat_window * cw, gboolean new_message)
+static void    eb_update_window_title (chat_window * cw, gboolean new_message)
 {
   char         buff[BUF_SIZE];
   const int    tabbedChat = iGetLocalPref("do_tabbed_chat");

Index: dialog.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/dialog.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dialog.c    23 Jan 2003 06:38:19 -0000      1.15
+++ dialog.c    24 Jan 2003 00:29:13 -0000      1.16
@@ -20,21 +20,19 @@
  */
 
 #include "intl.h"
+
 #include <string.h>
-#include <gdk/gdkprivate.h>
 #include <stdlib.h>
+#include <gdk/gdkprivate.h>
 
 #include "dialog.h"
-#include "util.h"
-#include "status.h"
+#include "gtk_globals.h"
 
 #include "pixmaps/ayttm.xpm"
 #include "pixmaps/tb_yes.xpm"
 #include "pixmaps/tb_no.xpm"
 #include "pixmaps/ok.xpm"
 
-#include "libproxy/libproxy.h"
-#include "gtk_globals.h"
 
 typedef struct _list_dialog_data {
        void (*callback)(char *value, void *data);
@@ -189,7 +187,7 @@
  //       gdk_window_set_group(w, statuswindow->window);
 }
 
-void list_dialog_callback(GtkWidget *widget,
+static void list_dialog_callback(GtkWidget *widget,
                        gint row,
                        gint column,
                        GdkEventButton *event,

Index: main.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- main.c      19 Jan 2003 23:15:01 -0000      1.15
+++ main.c      24 Jan 2003 00:29:13 -0000      1.16
@@ -23,29 +23,31 @@
  * main.c
  * yipee
  */
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
 
 #include "intl.h"
 
+#include <string.h>
+#include <stdlib.h>
 #include <sys/stat.h>
+#include <errno.h>
+#include <locale.h>
+
 #ifdef __MINGW32__
 #include <winsock2.h>
 #else
 #include <sys/un.h>
+#include <sys/socket.h>
 #endif
-#include <fcntl.h>
+
 #if defined( _WIN32 )
 #include <direct.h>
 #define mkdir( x, y )  _mkdir( x )
 #endif
-#include <string.h>
-#include <stdlib.h>
+
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
-#include <errno.h>
+
 #include "status.h"
 #include "plugin.h"
 #include "gtk_globals.h"
@@ -53,20 +55,17 @@
 #include "util.h"
 #include "sound.h"
 #include "smileys.h"
-#include "libproxy/libproxy.h"
 #include "console_session.h"
-#include "prefs.h"
 #include "crash.h"
 
-#include <locale.h>
 
 #define PACKAGE "ayttm"
 
 #ifdef CRASH_DIALOG
 gchar *startup_dir;
 gchar *argv0;
-int crash;
-gchar *crash_param;
+static int crash;
+static gchar *crash_param;
 #endif
 
 static void eb_cli_ver ()

Index: nomodule.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/nomodule.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nomodule.c  20 Jan 2003 20:33:18 -0000      1.6
+++ nomodule.c  24 Jan 2003 00:29:13 -0000      1.7
@@ -25,24 +25,13 @@
  */
 
 #include "intl.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#if defined( _WIN32 ) && !defined(__MINGW32__)
-typedef unsigned long u_long;
-typedef unsigned long ulong;
-#endif
-
 #include "chat_window.h"
-#include "away_window.h"
-#include "util.h"
-#include "status.h"
 #include "gtk_globals.h"
-#include "dialog.h"
-#include "message_parse.h"
 #include "value_pair.h"
-#include "info_window.h"
-#include "gtk_eb_html.h"
 #include "service.h"
 
 /* Can never be online */
@@ -79,7 +68,7 @@
 static GdkPixmap * eb_nomodule_pixmap[NOMODULE_OFFLINE+1];
 static GdkBitmap * eb_nomodule_bitmap[NOMODULE_OFFLINE+1];
 
-void eb_nomodule_init_pixmaps()
+static void eb_nomodule_init_pixmaps()
 {
        gint i = NOMODULE_OFFLINE;
        gchar ** xpm;
@@ -92,29 +81,29 @@
 
 
 
-gboolean eb_nomodule_query_connected(eb_account * account)
+static gboolean eb_nomodule_query_connected(eb_account * account)
 {              
        return FALSE;
 }
 
-void eb_nomodule_login( eb_local_account * account )
+static void eb_nomodule_login( eb_local_account * account )
 {
        return;                                                   
 }
 
-void eb_nomodule_logout( eb_local_account * account )
+static void eb_nomodule_logout( eb_local_account * account )
 {
        return;
 }
 
-void eb_nomodule_send_im( eb_local_account * account_from,
+static void eb_nomodule_send_im( eb_local_account * account_from,
                                  eb_account * account_to,
                                  gchar * message )
 {
        return;
 }
 
-eb_local_account * eb_nomodule_read_local_config(GList * pairs)
+static eb_local_account * eb_nomodule_read_local_config(GList * pairs)
 {
 
        eb_local_account * ela = g_new0(eb_local_account, 1);
@@ -145,7 +134,7 @@
        return ela;
 }
 
-GList * eb_nomodule_write_local_config( eb_local_account * account )
+static GList * eb_nomodule_write_local_config( eb_local_account * account )
 {
        GList * list = NULL;
        struct eb_nomodule_local_account_data * alad = 
account->protocol_local_account_data;
@@ -156,7 +145,7 @@
        return list;
 }
                        
-eb_account * eb_nomodule_read_config( GList * config, struct contact *contact )
+static eb_account * eb_nomodule_read_config( GList * config, struct contact 
*contact )
 {
        eb_account * ea = g_new0(eb_account, 1 );
        struct eb_nomodule_account_data * aad =  g_new0(struct 
eb_nomodule_account_data,1);
@@ -179,7 +168,7 @@
     return ea;
 }
 
-GList * eb_nomodule_get_states()
+static GList * eb_nomodule_get_states()
 {
        GList * states = NULL;
        states = g_list_append(states, _("No Module or broken account"));
@@ -190,37 +179,37 @@
 /* return an error string in case this login is syntaxically 
  * bad, NULL if everything is OK.
  */
-char * eb_nomodule_check_login(char * login, char * pass)
+static char * eb_nomodule_check_login(char * login, char * pass)
 {
        return NULL;
 }
 
-gint eb_nomodule_get_current_state(eb_local_account * account )
+static gint eb_nomodule_get_current_state(eb_local_account * account )
 {
        return 0;
 }
 
-void eb_nomodule_set_current_state( eb_local_account * account, gint state )
+static void eb_nomodule_set_current_state( eb_local_account * account, gint 
state )
 {
        return;
 }
 
-void eb_nomodule_add_user( eb_account * account )
+static void eb_nomodule_add_user( eb_account * account )
 {
        return;
 }
 
-void eb_nomodule_del_user( eb_account * account )
+static void eb_nomodule_del_user( eb_account * account )
 {
        return;
 }
 
-eb_account * eb_nomodule_new_account( gchar * account )
+static eb_account * eb_nomodule_new_account( gchar * account )
 {
        return NULL;
 }
 
-gchar * eb_nomodule_get_status_string( eb_account * account )
+static gchar * eb_nomodule_get_status_string( eb_account * account )
 {
        static gchar string[255];
 
@@ -229,7 +218,7 @@
        return string;
 }
 
-void eb_nomodule_get_status_pixmap( eb_account * account, GdkPixmap ** pm, 
GdkBitmap ** bm )
+static void eb_nomodule_get_status_pixmap( eb_account * account, GdkPixmap ** 
pm, GdkBitmap ** bm )
 {
        struct eb_nomodule_account_data * aad;
        
@@ -242,33 +231,33 @@
        *bm = eb_nomodule_bitmap[aad->status];
 }
 
-void eb_nomodule_set_idle( eb_local_account * ela, gint idle )
+static void eb_nomodule_set_idle( eb_local_account * ela, gint idle )
 {
        return;
 }
 
-void eb_nomodule_set_away(eb_local_account * account, gchar * message)
+static void eb_nomodule_set_away(eb_local_account * account, gchar * message)
 {
        return;
 }
 
 
-void eb_nomodule_get_info( eb_local_account * from, eb_account * account_to )
+static void eb_nomodule_get_info( eb_local_account * from, eb_account * 
account_to )
 {
        return;
 }
 
-input_list * eb_nomodule_get_prefs()
+static input_list * eb_nomodule_get_prefs()
 {
        return NULL;
 }
 
-void eb_nomodule_read_prefs_config(GList * values)
+static void eb_nomodule_read_prefs_config(GList * values)
 {
        return;
 }
 
-GList * eb_nomodule_write_prefs_config()
+static GList * eb_nomodule_write_prefs_config()
 {
        return NULL;
 }

Index: smileys.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/smileys.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smileys.c   21 Jan 2003 05:31:19 -0000      1.10
+++ smileys.c   24 Jan 2003 00:29:13 -0000      1.11
@@ -17,10 +17,8 @@
  *
  */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glib.h>
 
 #include "globals.h"
 #include "service.h"
@@ -91,7 +89,7 @@
 };
 
 GList *smileys=NULL;
-GList *default_smileys=NULL;
+static GList *default_smileys = NULL;
 
 static GList *_eb_smileys=NULL;
 

Index: status.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/status.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- status.c    21 Jan 2003 13:22:22 -0000      1.30
+++ status.c    24 Jan 2003 00:29:13 -0000      1.31
@@ -25,21 +25,15 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include "intl.h"
+
 #include <string.h>
-#include <gtk/gtk.h>
-#include <time.h>
 #include <X11/Xlib.h>
 #include <assert.h>
+
 #include "service.h"
 #include "globals.h"
 #include "status.h"
-#include "contact.h"
-#include "account.h"
 #include "chat_window.h"
 #include "help_menu.h"
 #include "util.h"
@@ -49,7 +43,6 @@
 #include "message_parse.h"
 #include "contact_actions.h"
 #include "sound.h"
-#include "trigger.h"
 #include "plugin.h"
 
 #include "pixmaps/login_icon.xpm"
@@ -58,11 +51,6 @@
 
 void update_contact_list();
 
-/*** MIZHI
- * log window
- */
-#include "log_window.h"
-
 enum {
        TARGET_STRING,
        TARGET_ROOTWIN,
@@ -78,16 +66,16 @@
 
 /* globals - referenced in gtk_globals.h */
 GtkWidget *statuswindow = NULL;
-GtkWidget *away_menu;
+GtkWidget *away_menu = NULL;
 
 static int window_title_handler = -1;
 
 static GtkTooltips * status_tips=NULL;
 
-static GtkWidget * contact_list;
-static GtkWidget * contact_window;
+static GtkWidget * contact_list = NULL;
+static GtkWidget * contact_window = NULL;
 static GtkWidget * status_bar = 0;
-static GtkWidget * status_message;
+static GtkWidget * status_message = NULL;
 
 /* status_show is:
    0 => show all accounts,
@@ -761,7 +749,7 @@
 static GdkPixmap * iconlogoff_pm = NULL;
 static GdkBitmap * iconlogoff_bm = NULL;
 
-GtkTargetEntry drag_types[1] =
+static GtkTargetEntry drag_types[1] =
 {
        {"text/plain", GTK_TARGET_SAME_APP, 0}
 };
@@ -1052,7 +1040,7 @@
 
 /* timeout function called 10 seconds after a contact logs off
    (removes the logoff icon and hides the contact if necessary) */
-gint hide_contact(struct contact * ec)
+static gint hide_contact(struct contact * ec)
 {
        GList * l;
        
@@ -1496,7 +1484,7 @@
 
 
 
-GtkWidget* MakeStatusMenu(eb_local_account * ela)
+static GtkWidget* MakeStatusMenu(eb_local_account * ela)
 {
   GtkWidget* status_menu_item;
   GtkWidget* status_menu;