[Gaim-commits] CVS: gaim/src aim.c,1.162,1.163 conversation.c,1.275,1.276

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv4511

Modified Files:
	aim.c conversation.c 
Log Message:
don't turn on ispell unless you want it.


Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- aim.c	2001/10/03 07:49:38	1.162
+++ aim.c	2001/10/09 19:18:41	1.163
@@ -636,7 +636,8 @@
 	if (misc_options & OPT_MISC_DEBUG)
 		show_debug();
 
-	gtkspell_start(NULL, ispell_cmd);
+	if (convo_options & OPT_CONVO_CHECK_SPELLING)
+		gtkspell_start(NULL, ispell_cmd);
 #ifdef USE_PERL
 	perl_autoload();
 #endif
@@ -681,7 +682,8 @@
 
 #endif /* USE_APPLET */
 
-	gtkspell_stop();
+	if (convo_options & OPT_CONVO_CHECK_SPELLING)
+		gtkspell_stop();
 	core_quit();
 
 	return 0;

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -d -r1.275 -r1.276
--- conversation.c	2001/10/08 03:22:53	1.275
+++ conversation.c	2001/10/09 19:18:41	1.276
@@ -60,6 +60,8 @@
 #include "pixmaps/mrt.xpm"
 #include "pixmaps/download.xpm"
 
+static gchar *ispell_cmd[] = { "ispell", "-a", NULL };
+
 int state_lock = 0;
 
 GdkPixmap *dark_icon_pm = NULL;
@@ -2323,6 +2325,9 @@
 	GSList *con = connections;
 	struct gaim_connection *gc;
 
+	if (convo_options & OPT_CONVO_CHECK_SPELLING)
+		gtkspell_start(NULL, ispell_cmd);
+
 	while (cnv) {
 		c = (struct conversation *)cnv->data;
 		if (convo_options & OPT_CONVO_CHECK_SPELLING)
@@ -2345,6 +2350,9 @@
 		}
 		con = con->next;
 	}
+
+	if (!(convo_options & OPT_CONVO_CHECK_SPELLING))
+		gtkspell_stop();
 }
 
 void toggle_timestamps()