[Ayttm-commits] CVS: ayttm/src Makefile.am,1.18,1.19 chat_room.c,1.39,1.40 chat_window.c,1.36,1.37 info_window.c,1.9,1.10 log_window.c,1.14,1.15 extgtktext.c,1.10,NONE gtk_eb_html.c,1.10,NONEgtk_eb_html.h,1.4,NONE

[Colin Leroy <address@hidden>]

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

Modified Files:
        Makefile.am chat_room.c chat_window.c info_window.c 
        log_window.c 
Removed Files:
        extgtktext.c extgtktext.h gtk_eb_html.c gtk_eb_html.h 
Log Message:
some more gtk separation


Index: Makefile.am
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.am 27 Jan 2003 17:12:59 -0000      1.18
+++ Makefile.am 28 Jan 2003 00:35:04 -0000      1.19
@@ -1,3 +1,5 @@
+SUBDIRS = gtk
+
 bin_PROGRAMS = ayttm
 
 ayttm_SOURCES = main.c contactlist.c edit_local_accounts.c service.c status.c \
@@ -5,8 +7,8 @@
        edit_contact_window.c edit_account_window.c  sound.c about.c dialog.c \
        prefs.c away_window.c browser.c message_parse.c progress_window.c \
        chat_room.c value_pair.c edit_group_window.c log_window.c gtkspell.c \
-       trigger.c console_session.c gtk_eb_html.c input_list.c nomodule.c \
-       plugin_api.c plugin.c file_select.c extgtktext.c contact_actions.c \
+       trigger.c console_session.c input_list.c nomodule.c \
+       plugin_api.c plugin.c file_select.c contact_actions.c \
        smileys.c help_menu.c crash.c account_parser.y account_scanner.l \
        contact_parser.y contact_scanner.l llist.c mem_util.c gtkutils.c
 
@@ -15,8 +17,8 @@
        sound.h dialog.h prefs.h progress_window.h away_window.h \
        message_parse.h help_menu.h chat_room.h value_pair.h log_window.h \
        info_window.h log_window.h gtkspell.h trigger.h console_session.h \
-       gtk_eb_html.h browser.h input_list.h plugin.h plugin_api.h debug.h \
-       nomodule.h file_select.h extgtktext.h contact_actions.h \
+       browser.h input_list.h plugin.h plugin_api.h debug.h \
+       nomodule.h file_select.h contact_actions.h \
        smileys.h intl.h account_parser.h contact_parser.h crash.h \
        externs.h llist.h mem_util.h gtkutils.h
 
@@ -26,10 +28,15 @@
        $(GNOME_INCLUDEDIR)
 LIBS = @LIBS@ $(EB_LIBS) -lproxy $(GNOME_LIBDIR) $(GNOME_APPLETS_LIBS)
 ayttm_LDFLAGS = $(EB_LDFLAGS) -L$(top_srcdir)/libproxy
-ayttm_LDADD = @LEXLIB@
 CLEANFILES = @CLEANFILES@ defaults.h
 localedir = $(datadir)/locale
 DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -D_REENTRANT
+
+ayttm_LDADD = \
+       gtk/libayttmgtk.la \
+       $(INTLLIBS) \
+       $(GTK_LIBS) \
+       @LEXLIB@
 
 bin_SCRIPTS = 
 

Index: chat_room.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- chat_room.c 27 Jan 2003 09:00:35 -0000      1.39
+++ chat_room.c 28 Jan 2003 00:35:04 -0000      1.40
@@ -24,7 +24,7 @@
 #include <gdk/gdkkeysyms.h>
 
 #include "globals.h"
-#include "gtk_eb_html.h"
+#include "gtk/gtk_eb_html.h"
 #include "util.h"
 #include "sound.h"
 #include "dialog.h"

Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- chat_window.c       27 Jan 2003 13:48:19 -0000      1.36
+++ chat_window.c       28 Jan 2003 00:35:04 -0000      1.37
@@ -41,7 +41,7 @@
 #include "status.h"
 #include "away_window.h"
 #include "message_parse.h"
-#include "gtk_eb_html.h"
+#include "gtk/gtk_eb_html.h"
 #include "plugin.h"
 #include "contact_actions.h"
 #include "smileys.h"

Index: info_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/info_window.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- info_window.c       24 Jan 2003 11:44:05 -0000      1.9
+++ info_window.c       28 Jan 2003 00:35:04 -0000      1.10
@@ -29,7 +29,7 @@
 
 #include <stdlib.h>
 
-#include "gtk_eb_html.h"
+#include "gtk/gtk_eb_html.h"
 #include "info_window.h"
 #include "dialog.h"
 

Index: log_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/log_window.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- log_window.c        27 Jan 2003 18:16:31 -0000      1.14
+++ log_window.c        28 Jan 2003 00:35:04 -0000      1.15
@@ -33,7 +33,7 @@
 #include <ctype.h>
 
 #include "globals.h"
-#include "gtk_eb_html.h"
+#include "gtk/gtk_eb_html.h"
 #include "log_window.h"
 #include "util.h"
 #include "prefs.h"

--- extgtktext.c DELETED ---

--- extgtktext.h DELETED ---

--- gtk_eb_html.c DELETED ---

--- gtk_eb_html.h DELETED ---