rpms/purple-plugin_pack/F-9 purple-plugin_pack-2.4.0-switchspell-execstack.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 purple-plugin_pack.spec, 1.6, 1.7 sources, 1.3, 1.4 purple-plugin_pack-2.3.0-switchspell-enchant.patch, 1.1, NONE

[Ignacio Vazquez-Abrams]

Author: ivazquez

Update of /cvs/pkgs/rpms/purple-plugin_pack/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14264

Modified Files:
	.cvsignore purple-plugin_pack.spec sources 
Added Files:
	purple-plugin_pack-2.4.0-switchspell-execstack.patch 
Removed Files:
	purple-plugin_pack-2.3.0-switchspell-enchant.patch 
Log Message:
- Upstream update
- Extract inner function in switchspell (#462822)


purple-plugin_pack-2.4.0-switchspell-execstack.patch:

--- NEW FILE purple-plugin_pack-2.4.0-switchspell-execstack.patch ---
diff -up purple-plugin_pack-2.4.0/switchspell/switchspell.c.execstack purple-plugin_pack-2.4.0/switchspell/switchspell.c
--- purple-plugin_pack-2.4.0/switchspell/switchspell.c.execstack	2008-08-03 17:05:11.000000000 -0400
+++ purple-plugin_pack-2.4.0/switchspell/switchspell.c	2008-10-05 02:47:14.000000000 -0400
@@ -98,16 +98,44 @@ menu_conv_use_dict_cb(GObject *m, gpoint
 		purple_blist_node_set_string(node, "switchspell", lang);
 }
 
+#ifdef USE_ENCHANT
+struct nufan
+{
+	GtkWidget *menu;
+	PidginWindow *win;
+};
+
+	void enchant_dict_desc_cb(const char * const lang_tag, const char * const provider_name,
+			const char * const provider_desc, const char * const provider_file,
+			void *user_data)
+	{
+		GtkWidget *menu = ((struct nufan *)user_data)->menu;
+		PidginWindow *win = ((struct nufan *)user_data)->win;
+
+		GSList *group = NULL;
+		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_full(G_OBJECT(menuitem), "lang", g_strdup(lang_tag), g_free);
+		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);
+	}
+
+#endif
+
 static void
 regenerate_switchspell_menu(PidginConversation *gtkconv)
 {
 	PidginWindow *win;
 	GtkWidget *menu;
 	GtkWidget *mitem;
-	GSList *group = NULL;
 #ifdef USE_ENCHANT
+	struct nufan user_data;
 	EnchantBroker * eb;
 #else
+	GSList *group = NULL;
 	AspellConfig * config;
 	AspellDictInfoList * dlist;
 	AspellDictInfoEnumeration * dels;
@@ -134,13 +162,7 @@ regenerate_switchspell_menu(PidginConver
 	menu = gtk_menu_new();
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), menu);
 
-#ifdef USE_ENCHANT
-	void enchant_dict_desc_cb(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);
-#else
+#ifndef USE_ENCHANT
 	config = new_aspell_config();
 	dlist = get_aspell_dict_info_list(config);
 	delete_aspell_config(config);
@@ -149,23 +171,21 @@ regenerate_switchspell_menu(PidginConver
 	aspell_dict_info_list_empty(dlist);
 	while ((entry = aspell_dict_info_enumeration_next(dels)) != 0) {
 		GtkWidget *menuitem = gtk_radio_menu_item_new_with_label(group, entry->name);
-#endif
 		group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuitem));
 		g_object_set_data(G_OBJECT(menuitem), "user_data", win);
-#ifdef USE_ENCHANT
-		g_object_set_data_full(G_OBJECT(menuitem), "lang", g_strdup(lang_tag), g_free);
-#else
 		g_object_set_data_full(G_OBJECT(menuitem), "lang", g_strdup((gchar *)entry->name), g_free);
-#endif
 		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);
 	}
+#endif
 
 #ifdef USE_ENCHANT
+	user_data.menu = menu;
+	user_data.win = win;
 	eb = enchant_broker_init();
-	enchant_broker_list_dicts(eb, enchant_dict_desc_cb, NULL);
+	enchant_broker_list_dicts(eb, enchant_dict_desc_cb, &user_data);
 	enchant_broker_free(eb);
 #else
 	delete_aspell_dict_info_enumeration(dels);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-plugin_pack/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Apr 2008 17:26:12 -0000	1.3
+++ .cvsignore	7 Oct 2008 22:03:43 -0000	1.4
@@ -1 +1 @@
-purple-plugin_pack-2.3.0.tar.bz2
+purple-plugin_pack-2.4.0.tar.bz2


Index: purple-plugin_pack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-plugin_pack/F-9/purple-plugin_pack.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- purple-plugin_pack.spec	6 Apr 2008 17:26:12 -0000	1.6
+++ purple-plugin_pack.spec	7 Oct 2008 22:03:43 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           purple-plugin_pack
-Version:        2.3.0
+Version:        2.4.0
 Release:        1%{?dist}
 Summary:        A set of plugins for libpurple, pidgin, and finch
 
@@ -7,12 +7,12 @@
 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.3.0-switchspell-enchant.patch
+Patch0:         purple-plugin_pack-2.4.0-switchspell-execstack.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pidgin-devel xmms-devel perl(XML::Parser) gettext-devel
 BuildRequires:  enchant-devel gtkspell-devel
-BuildRequires:  diffutils
+BuildRequires:  diffutils intltool
 #Requires:       
 Provides:       purple-plugin-pack
 
@@ -74,7 +74,7 @@
 
 %prep
 %setup -q
-%patch0 -p 1 -b .enchant
+%patch0 -p 1 -b .execstack
 
 %build
 %configure
@@ -108,6 +108,10 @@
 %{_libdir}/pidgin/xmmsremote.so
 
 %changelog
+* Tue Oct  7 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 2.4.0-1
+- Upstream update
+- Extract inner function in switchspell (#462822)
+
 * Sun Apr  6 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 2.3.0-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-plugin_pack/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Apr 2008 17:26:12 -0000	1.3
+++ sources	7 Oct 2008 22:03:43 -0000	1.4
@@ -1 +1 @@
-32a297e854341c5b043a5325ee6f0819  purple-plugin_pack-2.3.0.tar.bz2
+ae7e133119eb7f127e22566fe9f56145  purple-plugin_pack-2.4.0.tar.bz2


--- purple-plugin_pack-2.3.0-switchspell-enchant.patch DELETED ---