Hello community, here is the log from the commit of package gtkhtml2 for openSUSE:Factory checked in at Thu Jan 22 16:49:05 CET 2009. -------- --- GNOME/gtkhtml2/gtkhtml2.changes 2009-01-07 08:40:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/gtkhtml2/gtkhtml2.changes 2009-01-21 12:44:32.086268000 +0100 @@ -1,0 +2,14 @@ +Wed Jan 21 12:47:49 CET 2009 - psankar@suse.de + +- bnc-464064-table-goes-null.patch: Undo causing tables to go null + +------------------------------------------------------------------- +Fri Jan 16 11:33:25 CET 2009 - psankar@suse.de + +Patches backported from upstream to improve stability + +bgo-555388-undo-table.patch - Undo on composer hangs evolution +bgo-565493-ignore-style-change.patch - Do no lose formatting on style change +bnc-465432-delete-table-text.patch - Allow to delete text in tables + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bgo-555388-undo-table.patch bgo-565493-ignore-style-change.patch bnc-464064-table-goes-null.patch bnc-465432-delete-table-text.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkhtml2.spec ++++++ --- /var/tmp/diff_new_pack.u21364/_old 2009-01-22 16:48:17.000000000 +0100 +++ /var/tmp/diff_new_pack.u21364/_new 2009-01-22 16:48:17.000000000 +0100 @@ -20,7 +20,7 @@ Name: gtkhtml2 Version: 3.24.1.1 -Release: 2 +Release: 4 %define _name gtkhtml BuildRequires: enchant-devel BuildRequires: fdupes @@ -56,6 +56,14 @@ Patch5: bnc-449966-gtkhtml-replace-dialog.patch # PATCH-FIX-UPSTREAM bnc-443551-background-table-colors.patch bnc443551 -- Patch yet to be pushed upstream. Patch6: bnc-443551-background-table-colors.patch +# PATCH-FIX-UPSTREAM psankar@suse.de -- Patch already in upstream +Patch7: bgo-555388-undo-table.patch +# PATCH-FIX-UPSTREAM psankar@suse.de -- Patch already in upstream +Patch8: bgo-565493-ignore-style-change.patch +# PATCH-FIX-UPSTREAM psankar@suse.de -- Patch already in upstream +Patch9: bnc-465432-delete-table-text.patch +# PATCH-FIX-OPENSUSE abharath@novell.com -- Patch should be upstreamed +Patch10: bnc-464064-table-goes-null.patch %description GtkHTML is a lightweight HTML rendering, printing, and editing engine. @@ -133,6 +141,10 @@ %patch4 %patch5 %patch6 +%patch7 +%patch8 +%patch9 +%patch10 %build autoreconf -f -i @@ -173,6 +185,13 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jan 21 2009 psankar@suse.de +- bnc-464064-table-goes-null.patch: Undo causing tables to go null +* Fri Jan 16 2009 psankar@suse.de + Patches backported from upstream to improve stability + bgo-555388-undo-table.patch - Undo on composer hangs evolution + bgo-565493-ignore-style-change.patch - Do no lose formatting on style change + bnc-465432-delete-table-text.patch - Allow to delete text in tables * Wed Jan 07 2009 abharath@suse.de - Patches added + bgo#330452 - bgo-330452-spell-suggestions.patch - Automatic spell ++++++ bgo-555388-undo-table.patch ++++++ Index: gtkhtml/htmlengine-edit-table.c =================================================================== --- gtkhtml/htmlengine-edit-table.c (revision 9051) +++ gtkhtml/htmlengine-edit-table.c (working copy) @@ -1051,6 +1051,10 @@ table_set_align (HTMLEngine *e, HTMLTabl { HTMLTableSetAttrUndo *undo; + /* table gone */ + if (!t) + return; + g_return_if_fail (HTML_OBJECT (t)->parent); undo = attr_undo_new (HTML_TABLE_ALIGN); ++++++ bgo-565493-ignore-style-change.patch ++++++ Index: components/editor/gtkhtml-editor-actions.c =================================================================== --- components/editor/gtkhtml-editor-actions.c (revision 9074) +++ components/editor/gtkhtml-editor-actions.c (working copy) @@ -286,6 +286,9 @@ action_bold_cb (GtkToggleAction *action, { const gchar *command; + if (editor->priv->ignore_style_change) + return; + if (gtk_toggle_action_get_active (action)) command = "bold-on"; else @@ -694,6 +697,9 @@ action_italic_cb (GtkToggleAction *actio { const gchar *command; + if (editor->priv->ignore_style_change) + return; + if (gtk_toggle_action_get_active (action)) command = "italic-on"; else @@ -861,6 +867,9 @@ action_monospaced_cb (GtkToggleAction *a GtkHTMLFontStyle and_mask; GtkHTMLFontStyle or_mask; + if (editor->priv->ignore_style_change) + return; + if (gtk_toggle_action_get_active (action)) { and_mask = GTK_HTML_FONT_STYLE_MAX; or_mask = GTK_HTML_FONT_STYLE_FIXED; @@ -957,6 +966,9 @@ action_style_cb (GtkRadioAction *action, { const gchar *command = NULL; + if (editor->priv->ignore_style_change) + return; + switch (gtk_radio_action_get_current_value (current)) { case GTK_HTML_PARAGRAPH_STYLE_NORMAL: command = "style-normal"; @@ -1043,6 +1055,9 @@ action_size_cb (GtkRadioAction *action, { const gchar *command = NULL; + if (editor->priv->ignore_style_change) + return; + switch (gtk_radio_action_get_current_value (current)) { case GTK_HTML_FONT_STYLE_SIZE_1: command = "size-minus-2"; @@ -1083,6 +1098,9 @@ action_strikethrough_cb (GtkToggleAction { const gchar *command; + if (editor->priv->ignore_style_change) + return; + if (gtk_toggle_action_get_active (action)) command = "strikeout-on"; else @@ -1110,6 +1128,9 @@ action_underline_cb (GtkToggleAction *ac { const gchar *command; + if (editor->priv->ignore_style_change) + return; + if (gtk_toggle_action_get_active (action)) command = "underline-on"; else Index: components/editor/gtkhtml-editor.c =================================================================== --- components/editor/gtkhtml-editor.c (revision 9074) +++ components/editor/gtkhtml-editor.c (working copy) @@ -102,6 +102,8 @@ editor_font_style_changed_cb (GtkhtmlEdi { GtkHTMLFontStyle size; + editor->priv->ignore_style_change++; + gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (ACTION (BOLD)), style & GTK_HTML_FONT_STYLE_BOLD); @@ -128,6 +130,8 @@ editor_font_style_changed_cb (GtkhtmlEdi gtk_radio_action_set_current_value ( GTK_RADIO_ACTION (ACTION (SIZE_PLUS_ZERO)), size); + + editor->priv->ignore_style_change--; } static void @@ -141,8 +145,12 @@ static void editor_paragraph_style_changed_cb (GtkhtmlEditor *editor, GtkHTMLParagraphStyle style) { + editor->priv->ignore_style_change++; + gtk_radio_action_set_current_value ( GTK_RADIO_ACTION (ACTION (STYLE_NORMAL)), style); + + editor->priv->ignore_style_change--; } static void Index: components/editor/gtkhtml-editor-private.h =================================================================== --- components/editor/gtkhtml-editor-private.h (revision 9074) +++ components/editor/gtkhtml-editor-private.h (working copy) @@ -172,6 +172,7 @@ struct _GtkhtmlEditorPrivate { gchar *current_folder; GtkhtmlColorPalette *palette; GtkhtmlColorState *text_color; + guint ignore_style_change; gboolean changed; }; ++++++ bnc-464064-table-goes-null.patch ++++++ Index: gtkhtml/htmlengine-edit-table.c =================================================================== --- gtkhtml/htmlengine-edit-table.c (revision 9106) +++ gtkhtml/htmlengine-edit-table.c (working copy) @@ -840,8 +840,12 @@ table_set_bg_color_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after) { HTMLTableSetAttrUndo *data = (HTMLTableSetAttrUndo *) undo_data; + HTMLTable *table = html_engine_get_table (e); - table_set_bg_color (e, html_engine_get_table (e), data->attr.color.has_bg_color + if (!table) + return; + + table_set_bg_color (e, table, data->attr.color.has_bg_color ? &data->attr.color.color : NULL, html_undo_direction_reverse (dir)); } ++++++ bnc-465432-delete-table-text.patch ++++++ Index: gtkhtml/htmlengine-edit-cut-and-paste.c =================================================================== --- gtkhtml/htmlengine-edit-cut-and-paste.c (revision 9066) +++ gtkhtml/htmlengine-edit-cut-and-paste.c (working copy) @@ -1902,9 +1902,18 @@ } } while (prev && prev->parent->next && (cur = html_object_head (prev->parent->next))); - if (prev) - /* cluev end is in the selection */ - delete_upto (e, &start, &end, prev, html_object_get_length (prev)); + if (prev) { + /* cluev end is in the selection. Lets handle this case just like simple delete + since text is the selection itself*/ + if (e->mark) + html_cursor_destroy (e->mark); + html_cursor_destroy (e->cursor); + e->mark = start; + e->cursor = end; + start = end = NULL; + delete_object (e, NULL, NULL, HTML_UNDO_UNDO, TRUE); + break; + } } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org