rpms/logjam/devel logjam-4.5.3-gtkspell.patch, NONE, 1.1 logjam.spec, 1.24, 1.25

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19558/devel

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.5.3-gtkspell.patch 
Log Message:

Resolve bugzilla 186906


logjam-4.5.3-gtkspell.patch:

--- NEW FILE logjam-4.5.3-gtkspell.patch ---
--- logjam-4.5.3/src/jamview.c.orig  Sat Mar 25 16:56:46 2006
+++ logjam-4.5.3/src/jamview.c       Sat Mar 25 16:55:06 2006
@@ -816,26 +816,30 @@

 void
 jam_view_settings_changed(JamView *view) {
-#if 0
-	XXX make this work
 #ifdef HAVE_GTKSPELL
-	if (conf.options.usespellcheck != hadspell) {
-		GtkSpell *spell;
-		if (conf.options.usespellcheck) {
+       GtkSpell *spell;
+       GError *err = NULL;
+       spell = gtkspell_get_from_text_view(GTK_TEXT_VIEW(view->entry));
+       if (conf.options.usespellcheck) {
+               if (spell) {
+                       if (!gtkspell_set_language(spell, conf.spell_language, &err)) {
+                               jam_warning(NULL, // XXX GTK_WINDOW(view->jw),
+                                               _("GtkSpell error: %s"), err->message);
+                               g_error_free(err);
+                       }
+               } else {
 			GError *err = NULL;
-			if (gtkspell_new_attach(GTK_TEXT_VIEW(fetcheentry(jw)), conf.spell_language , &err) == NULL) {
-				jam_warning(GTK_WINDOW(jw),
+                       if (gtkspell_new_attach(GTK_TEXT_VIEW(view->entry), conf.spell_language , &err) == NULL) {
+                               jam_warning(NULL,
 						_("GtkSpell error: %s"), err->message);
 				conf.options.usespellcheck = FALSE;
 				g_error_free(err);
 			}
-		} else {
-			spell = gtkspell_get_from_text_view(GTK_TEXT_VIEW(fetcheentry(jw)));
-			if (spell)
-				gtkspell_detach(spell);
 		}
+       } else {
+               if (spell)
+                       gtkspell_detach(spell);
 	}
-#endif
 #endif
        if (conf.uifont)
                jam_widget_set_font(view->entry, conf.uifont);


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- logjam.spec	7 Mar 2006 17:25:52 -0000	1.24
+++ logjam.spec	6 Apr 2006 22:27:38 -0000	1.25
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -24,6 +24,7 @@
 Patch5:		logjam-4.5-patch8-manfix.patch
 Patch6:		logjam-4.5.2-gtkhtml38.patch
 Patch7:		logjam-4.4.1-ru.po.asp.patch
+Patch8:		logjam-4.5.3-gtkspell.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -48,6 +49,7 @@
 %patch5 -p1 -b .manfix
 %patch6 -p1 -b .gtkhtml38
 %patch7 -p1 -b .ru.po
+%patch8 -p1 -b .bz186906
 
 %build
 autoconf
@@ -85,6 +87,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Apr  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.3-3
+- fix gtkspell language settings, bz 186906
+
 * Tue Mar  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.3-2
 - update russian translations, bz 183619