rpms/purple-plugin_pack/devel purple-plugin_pack-2.2.0-switchspell-enchant.patch, NONE, 1.1 purple-plugin_pack.spec, 1.3, 1.4

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

Update of /cvs/pkgs/rpms/purple-plugin_pack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24811

Modified Files:
	purple-plugin_pack.spec 
Added Files:
	purple-plugin_pack-2.2.0-switchspell-enchant.patch 
Log Message:
Switch from aspell to enchant (#427949)

purple-plugin_pack-2.2.0-switchspell-enchant.patch:

--- NEW FILE purple-plugin_pack-2.2.0-switchspell-enchant.patch ---
diff -up purple-plugin_pack-2.2.0/switchspell/switchspell.c.enchant purple-plugin_pack-2.2.0/switchspell/switchspell.c
--- purple-plugin_pack-2.2.0/switchspell/switchspell.c.enchant	2008-01-08 01:27:21.000000000 -0500
+++ purple-plugin_pack-2.2.0/switchspell/switchspell.c	2008-01-08 02:40:35.000000000 -0500
@@ -34,7 +34,7 @@
 #include <gtkconv.h>
 #include <gtkplugin.h>
 
-#include <aspell.h>
+#include <enchant/enchant.h>
 #include <gtkspell/gtkspell.h>
 #include <string.h>
 
@@ -96,10 +96,7 @@ regenerate_switchspell_menu(PidginConver
 	GtkWidget *menu;
 	GtkWidget *mitem;
 	GSList *group = NULL;
-	AspellConfig * config;
-	AspellDictInfoList * dlist;
-	AspellDictInfoEnumeration * dels;
-	const AspellDictInfo * entry;
+	EnchantBroker * eb;
 
 	if (gtkconv == NULL)
 		return;
@@ -121,23 +118,25 @@ regenerate_switchspell_menu(PidginConver
 	menu = gtk_menu_new();
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), menu);
 
-	config = new_aspell_config();
-	dlist = get_aspell_dict_info_list(config);
-	delete_aspell_config(config);
-
-	dels = aspell_dict_info_list_elements(dlist);
-	while ((entry = aspell_dict_info_enumeration_next(dels)) != 0) {
-		GtkWidget *menuitem = gtk_radio_menu_item_new_with_label(group, entry->name);
+	void enchDictDescCb(const char * const lang_tag,
+		const char * const provider_name,
+		const char * const provider_desc,
+		const char * const provider_file,
+		void * user_data)
+	{
+		GtkWidget *menuitem = gtk_radio_menu_item_new_with_label(group, lang_tag);
 		group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuitem));
 		g_object_set_data(G_OBJECT(menuitem), "user_data", win);
-		g_object_set_data(G_OBJECT(menuitem), "lang", (gchar *)entry->name);
+		g_object_set_data(G_OBJECT(menuitem), "lang", (gchar *)lang_tag);
 		g_signal_connect(G_OBJECT(menuitem), "activate",
 					G_CALLBACK(menu_conv_use_dict_cb), NULL);
 		gtk_widget_show(menuitem);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 	}
 
-	delete_aspell_dict_info_enumeration(dels);
+	eb = enchant_broker_init();
+	enchant_broker_list_dicts(eb, enchDictDescCb, null);
+	enchant_broker_free(eb);
 	gtk_widget_show_all(menu);
 }
 


Index: purple-plugin_pack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-plugin_pack/devel/purple-plugin_pack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- purple-plugin_pack.spec	8 Jan 2008 00:24:36 -0000	1.3
+++ purple-plugin_pack.spec	9 Jan 2008 02:22:10 -0000	1.4
@@ -1,16 +1,17 @@
 Name:           purple-plugin_pack
 Version:        2.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A set of plugins for libpurple, pidgin, and finch
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://plugins.guifications.org/trac/wiki/PluginPack
 Source0:        http://downloads.guifications.org/plugins/Plugin%20Pack/purple-plugin_pack-%{version}.tar.bz2
+Patch0:         purple-plugin_pack-2.2.0-switchspell-enchant.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pidgin-devel xmms-devel perl(XML::Parser) gettext-devel
-BuildRequires:  aspell-devel
+BuildRequires:  enchant-devel
 BuildRequires:  diffutils
 #Requires:       
 Provides:       purple-plugin-pack
@@ -73,6 +74,7 @@
 
 %prep
 %setup -q
+%patch0 -p 1 -b .enchant
 
 %build
 %configure
@@ -105,6 +107,9 @@
 %{_libdir}/pidgin/xmmsremote.so
 
 %changelog
+* Tue Jan  8 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 2.2.0-4
+- Switch from aspell to enchant (#427949)
+
 * Mon Jan  7 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 2.2.0-3
 - Switch from gtkspell to aspell