[Ayttm-commits] CVS: ayttm/src about.c,1.16,1.17 edit_account_window.c,1.9,1.10 edit_contact_window.c,1.8,1.9 info_window.c,1.8,1.9info_window.h,1.4,1.5

[Andy Maloney <address@hidden>]

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

Modified Files:
        about.c edit_account_window.c edit_contact_window.c 
        info_window.c info_window.h 
Log Message:
Yet more include cleanups and addition of statics
Changed name of clear_info_window() to eb_info_window_clear() for consistency


Index: about.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/about.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- about.c     19 Jan 2003 01:52:35 -0000      1.16
+++ about.c     24 Jan 2003 11:44:05 -0000      1.17
@@ -19,11 +19,8 @@
  *
  */ 
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "intl.h"
+
 #include "dialog.h"
 
 #include "pixmaps/ayttmlogo.xpm"

Index: edit_account_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_account_window.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- edit_account_window.c       24 Jan 2003 10:37:17 -0000      1.9
+++ edit_account_window.c       24 Jan 2003 11:44:05 -0000      1.10
@@ -20,23 +20,22 @@
  */
 
 #include "intl.h"
-#include <gtk/gtk.h>
+
 #include <string.h>
-#include "contact.h"
-#include "service.h"
+
 #include "status.h"
-#include "account.h"
 #include "util.h"
-#include "globals.h"
 #include "dialog.h"
+
 #include "pixmaps/tb_preferences.xpm"
 #include "pixmaps/cancel.xpm"
 
+
 static gint window_open = 0;
-static eb_account *account;
-static GtkWidget *edit_account_window;
-static GtkWidget *nick;
-static GtkWidget *group;
+static eb_account *account = NULL;
+static GtkWidget *edit_account_window = NULL;
+static GtkWidget *nick = NULL;
+static GtkWidget *group = NULL;
 
 #define COMBO_TEXT(x) gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(x)->entry))
 
@@ -114,7 +113,7 @@
                                account->handle);
 }
 
-void draw_edit_account_window(eb_account *ea, char *window_title, char 
*frame_title, char *add_label)
+static void draw_edit_account_window(eb_account *ea, char *window_title, char 
*frame_title, char *add_label)
 {
        gchar buff[1024];
        static GtkWidget *frame;

Index: edit_contact_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_contact_window.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- edit_contact_window.c       24 Jan 2003 10:37:17 -0000      1.8
+++ edit_contact_window.c       24 Jan 2003 11:44:05 -0000      1.9
@@ -20,24 +20,24 @@
  */
 
 #include "intl.h"
-#include <gtk/gtk.h>
+
 #include <string.h>
-#include "contact.h"
+
 #include "service.h"
 #include "status.h"
 #include "dialog.h"
 #include "util.h"
-#include "add_contact_window.h"
+
 #include "pixmaps/tb_edit.xpm"
 #include "pixmaps/cancel.xpm"
 
 
 static gint window_open = 0;
-static struct contact * my_contact;
-static GtkWidget * edit_contact_window;
-static GtkWidget * nick;
-static GtkWidget * service_list;
-static GtkWidget * group_list;
+static struct contact * my_contact = NULL;
+static GtkWidget * edit_contact_window = NULL;
+static GtkWidget * nick = NULL;
+static GtkWidget * service_list = NULL;
+static GtkWidget * group_list = NULL;
 
 static void destroy( GtkWidget *widget, gpointer data )
 {

Index: info_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/info_window.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- info_window.c       24 Jan 2003 07:06:41 -0000      1.8
+++ info_window.c       24 Jan 2003 11:44:05 -0000      1.9
@@ -26,6 +26,7 @@
  */
  
 #include "intl.h"
+
 #include <stdlib.h>
 
 #include "gtk_eb_html.h"
@@ -134,7 +135,7 @@
 }
 
 
-void clear_info_window(info_window *iw) 
+void eb_info_window_clear(info_window *iw) 
 {
        gtk_editable_delete_text(GTK_EDITABLE(iw->info), 0, -1);
 }

Index: info_window.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/info_window.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info_window.h       16 Jan 2003 13:11:01 -0000      1.4
+++ info_window.h       24 Jan 2003 11:44:05 -0000      1.5
@@ -50,8 +50,8 @@
 #endif
 
 info_window * eb_info_window_new( eb_local_account * local, struct account *);
+void eb_info_window_clear(info_window *iw); 
 void eb_info_window_add_info( eb_account * remote_account, gchar* text, gint 
ignore_bg, gint ignore_fg, gint ignore_font );
-void clear_info_window(info_window *iw); 
 
 #ifdef __cplusplus
 } /*extern "C" */