diff options
| author |   Joe McCann <joem@gentoo.org> | 2006-03-10 20:01:48 +0000 |
|---|---|---|
| committer | Joe McCann <joem@gentoo.org> | 2006-03-10 20:01:48 +0000 |
| commit | 0efff70cc5f2619cc2508313b6e159fa4e4934c4 (patch) | |
| tree | 7c96c936cf68249fec0defae46f99958bceb804b /app-office/abiword/files | |
| parent | Stable on alpha wrt bug #125111 (diff) | |
| download | gentoo-2-0efff70cc5f2619cc2508313b6e159fa4e4934c4.tar.gz gentoo-2-0efff70cc5f2619cc2508313b6e159fa4e4934c4.tar.bz2 gentoo-2-0efff70cc5f2619cc2508313b6e159fa4e4934c4.zip | |
Patches to fix crash on check spelling. Thanks to reporters in bug 120820
(Portage version: 2.1_pre5-r4)
Diffstat (limited to 'app-office/abiword/files')
3 files changed, 102 insertions, 0 deletions
diff --git a/app-office/abiword/files/abiword-2.4.2-spell_crash_1.patch b/app-office/abiword/files/abiword-2.4.2-spell_crash_1.patch new file mode 100644 index 000000000000..073b579aafec --- /dev/null +++ b/app-office/abiword/files/abiword-2.4.2-spell_crash_1.patch @@ -0,0 +1,40 @@ +Index: src/wp/ap/unix/ap_UnixDialog_Spell.cpp +=================================================================== +RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_Spell.cpp,v +retrieving revision 1.45 +diff -u -5 -r1.45 ap_UnixDialog_Spell.cpp +--- src/wp/ap/unix/ap_UnixDialog_Spell.cpp 19 Feb 2005 04:50:22 -0000 1.45 ++++ src/wp/ap/unix/ap_UnixDialog_Spell.cpp 29 Jan 2006 15:29:46 -0000 +@@ -207,11 +207,16 @@ + makeWordVisible(); + + // update dialog with new misspelled word info/suggestions + _updateWindow(); + +- // run into the GTK event loop for this window ++ m_listHandlerID = g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (m_lvSuggestions)), ++ "changed", ++ G_CALLBACK (AP_UnixDialog_Spell__onSuggestionSelected), ++ (gpointer)this); ++ ++ // run into the GTK event loop for this window + gint response = abiRunModalDialog (GTK_DIALOG(mainWindow), false); + UT_DEBUGMSG (("ROB: response='%d'\n", response)); + switch(response) { + + case SPELL_RESPONSE_CHANGE: +@@ -301,14 +306,10 @@ + (gpointer)this); + g_signal_connect (GTK_TREE_VIEW (m_lvSuggestions), + "row-activated", + G_CALLBACK (AP_UnixDialog_Spell__onSuggestionDblClicked), + (gpointer)this); +- m_listHandlerID = g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (m_lvSuggestions)), +- "changed", +- G_CALLBACK (AP_UnixDialog_Spell__onSuggestionSelected), +- (gpointer)this); + m_replaceHandlerID = g_signal_connect (G_OBJECT(m_eChange), + "changed", + G_CALLBACK (AP_UnixDialog_Spell__onSuggestionChanged), + (gpointer)this); + diff --git a/app-office/abiword/files/abiword-2.4.2-spell_crash_2.patch b/app-office/abiword/files/abiword-2.4.2-spell_crash_2.patch new file mode 100644 index 000000000000..e075a05679d5 --- /dev/null +++ b/app-office/abiword/files/abiword-2.4.2-spell_crash_2.patch @@ -0,0 +1,59 @@ +Index: src/wp/ap/unix/ap_UnixDialog_Spell.cpp +=================================================================== +RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_Spell.cpp,v +retrieving revision 1.46 +diff -u -5 -r1.46 ap_UnixDialog_Spell.cpp +--- src/wp/ap/unix/ap_UnixDialog_Spell.cpp 29 Jan 2006 15:36:28 -0000 1.46 ++++ src/wp/ap/unix/ap_UnixDialog_Spell.cpp 29 Jan 2006 21:06:13 -0000 +@@ -204,17 +204,15 @@ + while (bRes) { + + // show word in main window + makeWordVisible(); + ++ gpointer inst = gtk_tree_view_get_selection (GTK_TREE_VIEW (m_lvSuggestions)); ++ g_signal_handler_block (inst, m_listHandlerID); + // update dialog with new misspelled word info/suggestions + _updateWindow(); +- +- m_listHandlerID = g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (m_lvSuggestions)), +- "changed", +- G_CALLBACK (AP_UnixDialog_Spell__onSuggestionSelected), +- (gpointer)this); ++ g_signal_handler_unblock (inst, m_listHandlerID); + + // run into the GTK event loop for this window + gint response = abiRunModalDialog (GTK_DIALOG(mainWindow), false); + UT_DEBUGMSG (("ROB: response='%d'\n", response)); + switch(response) { +@@ -335,10 +333,14 @@ + "text", COLUMN_SUGGESTION, + NULL); + GtkTreeViewColumn *column = gtk_tree_view_get_column (GTK_TREE_VIEW (m_lvSuggestions), 0); + gtk_tree_view_column_set_sort_column_id (column, COLUMN_SUGGESTION); + ++ m_listHandlerID = g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (m_lvSuggestions)), ++ "changed", ++ G_CALLBACK (AP_UnixDialog_Spell__onSuggestionSelected), ++ (gpointer)this); + + gtk_widget_show_all (m_wDialog); + return m_wDialog; + } + +@@ -432,10 +434,15 @@ + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + COLUMN_SUGGESTION, suggest, + COLUMN_NUMBER, i, + -1); + } ++ // put the first suggestion in the entry ++ suggest = (gchar*) _convertToMB((UT_UCSChar*)m_Suggestions->getNthItem(0)); ++ g_signal_handler_block(G_OBJECT(m_eChange), m_replaceHandlerID); ++ gtk_entry_set_text(GTK_ENTRY(m_eChange), suggest); ++ g_signal_handler_unblock(G_OBJECT(m_eChange), m_replaceHandlerID); + } + + gtk_tree_view_set_model (GTK_TREE_VIEW (m_lvSuggestions), model); + g_object_unref (G_OBJECT (model)); + diff --git a/app-office/abiword/files/digest-abiword-2.4.2-r1 b/app-office/abiword/files/digest-abiword-2.4.2-r1 new file mode 100644 index 000000000000..3fce9b5e6438 --- /dev/null +++ b/app-office/abiword/files/digest-abiword-2.4.2-r1 @@ -0,0 +1,3 @@ +MD5 935f1218eab7ff96b7a23cfeba4e76d1 abiword-2.4.2.tar.bz2 24729796 +RMD160 1b30dd7da238bd282abcce814a0b4d7c93e17199 abiword-2.4.2.tar.bz2 24729796 +SHA256 6a5921f9ab593637008bc0d5411ef9d8a689a4c89d9f7b273236331b14f66933 abiword-2.4.2.tar.bz2 24729796 |