SF.net SVN: geany-plugins:[958] trunk/geany-plugins/spellcheck/src

[eht16 at users.sourceforge.net]

Revision: 958
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=958&view=rev
Author:   eht16
Date:     2009-09-27 21:14:58 +0000 (Sun, 27 Sep 2009)

Log Message:
-----------
Fix build with older Enchant versions

Modified Paths:
--------------
    trunk/geany-plugins/spellcheck/src/scplugin.c
    trunk/geany-plugins/spellcheck/src/speller.c

Modified: trunk/geany-plugins/spellcheck/src/scplugin.c
===================================================================
--- trunk/geany-plugins/spellcheck/src/scplugin.c	2009-09-27 17:39:02 UTC (rev 957)
+++ trunk/geany-plugins/spellcheck/src/scplugin.c	2009-09-27 21:14:58 UTC (rev 958)
@@ -272,10 +272,10 @@
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+	g_object_set_data(G_OBJECT(dialog), "dict_dir", entry_dir);
 #endif
-
 	g_object_set_data(G_OBJECT(dialog), "combo", combo);
-	g_object_set_data(G_OBJECT(dialog), "dict_dir", entry_dir);
 	g_object_set_data(G_OBJECT(dialog), "check_type", check_type);
 	g_object_set_data(G_OBJECT(dialog), "check_msgwin", check_msgwin);
 	g_object_set_data(G_OBJECT(dialog), "check_toolbar", check_toolbar);

Modified: trunk/geany-plugins/spellcheck/src/speller.c
===================================================================
--- trunk/geany-plugins/spellcheck/src/speller.c	2009-09-27 17:39:02 UTC (rev 957)
+++ trunk/geany-plugins/spellcheck/src/speller.c	2009-09-27 21:14:58 UTC (rev 958)
@@ -398,22 +398,24 @@
 
 void sc_speller_init(void)
 {
-	const gchar *old_path;
-	gchar *new_path, *dict_dir;
-
 	sc_speller_broker = enchant_broker_init();
 #if HAVE_ENCHANT_1_5
-	/* add custom dictionary path for myspell (primarily used on Windows) */
-	dict_dir = sc_info->dictionary_dir;
-	old_path = enchant_broker_get_param(sc_speller_broker, "enchant.myspell.dictionary.path");
-	if (old_path != NULL)
-		new_path = g_strconcat(old_path, G_SEARCHPATH_SEPARATOR_S, dict_dir, NULL);
-	else
-		new_path = dict_dir;
+	{
+		const gchar *old_path;
+		gchar *new_path, *dict_dir;
 
-	enchant_broker_set_param(sc_speller_broker, "enchant.myspell.dictionary.path", new_path);
-	if (new_path != dict_dir)
-		g_free(new_path);
+		/* add custom dictionary path for myspell (primarily used on Windows) */
+		dict_dir = sc_info->dictionary_dir;
+		old_path = enchant_broker_get_param(sc_speller_broker, "enchant.myspell.dictionary.path");
+		if (old_path != NULL)
+			new_path = g_strconcat(old_path, G_SEARCHPATH_SEPARATOR_S, dict_dir, NULL);
+		else
+			new_path = dict_dir;
+
+		enchant_broker_set_param(sc_speller_broker, "enchant.myspell.dictionary.path", new_path);
+		if (new_path != dict_dir)
+			g_free(new_path);
+	}
 #endif
 	create_dicts_array();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.