rpms/gtkhtml3/devel .cvsignore, 1.46, 1.47 gtkhtml-3.13.4-code-cleanup.patch, 1.1, 1.2 gtkhtml3.spec, 1.81, 1.82 sources, 1.46, 1.47
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jan 9 02:38:55 UTC 2007
- Previous message (by thread): rpms/evolution-data-server/devel .cvsignore, 1.57, 1.58 evolution-data-server.spec, 1.141, 1.142 sources, 1.57, 1.58 evolution-data-server-1.8.1-kill-ethread.patch, 1.1, NONE evolution-data-server-1.9.4-implicit-function-declaration.patch, 1.1, NONE
- Next message (by thread): rpms/evolution-connector/devel .cvsignore, 1.42, 1.43 evolution-connector.spec, 1.84, 1.85 sources, 1.42, 1.43 evolution-exchange-2.8.0-deprecated-glib.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mbarnes
Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14118
Modified Files:
.cvsignore gtkhtml-3.13.4-code-cleanup.patch gtkhtml3.spec
sources
Log Message:
* Mon Jan 08 2007 Matthew Barnes <mbarnes at redhat.com> - 3.13.5-1.fc7
- Update to 3.13.5
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore 19 Dec 2006 18:34:12 -0000 1.46
+++ .cvsignore 9 Jan 2007 02:38:52 -0000 1.47
@@ -1 +1 @@
-gtkhtml-3.13.4.tar.bz2
+gtkhtml-3.13.5.tar.bz2
gtkhtml-3.13.4-code-cleanup.patch:
a11y/hyperlink.c | 20
a11y/hyperlink.h | 6
a11y/text.c | 2
art/Makefile.am | 41
components/html-editor/GNOME_GtkHTML_Editor-emacs.xml.in | 95 -
components/html-editor/GNOME_GtkHTML_Editor.xml.in | 112 -
components/html-editor/Makefile.am | 2
components/html-editor/body.c | 38
components/html-editor/cell.c | 75 -
components/html-editor/cell.h | 2
components/html-editor/control-data.c | 8
components/html-editor/control-data.h | 3
components/html-editor/dialog.c | 26
components/html-editor/dialog.h | 4
components/html-editor/e-html-utils.c | 34
components/html-editor/editor-control-factory.c | 13
components/html-editor/gi-color-combo.c | 6
components/html-editor/gi-color-palette.c | 47
components/html-editor/gi-color-palette.h | 4
components/html-editor/gi-combo-box.c | 34
components/html-editor/gtkhtml-editor-properties.glade | 869 +++++----------
components/html-editor/html-stream-mem.c | 2
components/html-editor/htmlsourceview.c | 6
components/html-editor/image.c | 42
components/html-editor/image.h | 2
components/html-editor/link.c | 1
components/html-editor/link.h | 2
components/html-editor/menubar.c | 247 ++--
components/html-editor/paragraph.c | 63 -
components/html-editor/persist-stream.c | 4
components/html-editor/popup.c | 28
components/html-editor/properties.c | 5
components/html-editor/properties.h | 4
components/html-editor/replace.c | 22
components/html-editor/replace.h | 2
components/html-editor/rule.c | 51
components/html-editor/rule.h | 2
components/html-editor/search.c | 11
components/html-editor/search.h | 1
components/html-editor/spellchecker.c | 2
components/html-editor/table.c | 56
components/html-editor/table.h | 2
components/html-editor/template.c | 4
components/html-editor/template.h | 2
components/html-editor/test-html-editor-control.c | 10
components/html-editor/text.c | 16
components/html-editor/toolbar.c | 253 +---
components/html-editor/utils.c | 2
components/html-editor/utils.h | 3
configure.in | 2
src/gtkhtml.c | 47
src/htmlclueflow.c | 44
src/htmlcursor.c | 8
src/htmlembedded.c | 2
src/htmlengine-edit-cursor.c | 8
src/htmlengine-edit-selection-updater.c | 10
src/htmlengine-edit-text.c | 2
src/htmlengine-save.c | 8
src/htmlengine.c | 16
src/htmlgdkpainter.c | 8
src/htmliframe.c | 4
src/htmlimage.c | 16
src/htmlinterval.c | 2
src/htmlobject.c | 2
src/htmlprinter.c | 2
src/htmltextslave.c | 9
src/test.c | 12
src/testgtkhtml.c | 81 -
68 files changed, 1025 insertions(+), 1544 deletions(-)
Index: gtkhtml-3.13.4-code-cleanup.patch
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml-3.13.4-code-cleanup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtkhtml-3.13.4-code-cleanup.patch 8 Jan 2007 13:41:29 -0000 1.1
+++ gtkhtml-3.13.4-code-cleanup.patch 9 Jan 2007 02:38:52 -0000 1.2
@@ -1,5 +1,5 @@
---- gtkhtml-3.13.4/a11y/text.c.code-cleanup 2006-12-04 08:12:51.000000000 -0500
-+++ gtkhtml-3.13.4/a11y/text.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/a11y/text.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500
++++ gtkhtml-3.13.5/a11y/text.c 2007-01-08 21:19:43.000000000 -0500
@@ -946,7 +946,7 @@
x -= html_x;
y -= html_y;
@@ -9,8 +9,8 @@
if (obj == return_obj)
return offset;
---- gtkhtml-3.13.4/a11y/hyperlink.c.code-cleanup 2005-04-05 05:27:32.000000000 -0400
-+++ gtkhtml-3.13.4/a11y/hyperlink.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/a11y/hyperlink.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500
++++ gtkhtml-3.13.5/a11y/hyperlink.c 2007-01-08 21:19:43.000000000 -0500
@@ -92,9 +92,9 @@
{
HTMLA11YHyperLink *hl = HTML_A11Y_HYPER_LINK (obj);
@@ -72,8 +72,8 @@
g_signal_emit_by_name (gtkhtml, "link_clicked", url);
result = TRUE;
---- gtkhtml-3.13.4/a11y/hyperlink.h.code-cleanup 2005-04-05 05:27:32.000000000 -0400
-+++ gtkhtml-3.13.4/a11y/hyperlink.h 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/a11y/hyperlink.h.code-cleanup 2007-01-03 10:28:54.000000000 -0500
++++ gtkhtml-3.13.5/a11y/hyperlink.h 2007-01-08 21:19:43.000000000 -0500
@@ -43,7 +43,11 @@
struct _HTMLA11YHyperLink {
AtkHyperlink atk_hyper_link;
@@ -87,8 +87,8 @@
gint num;
gint offset;
gchar *description;
---- gtkhtml-3.13.4/configure.in.code-cleanup 2007-01-07 10:19:52.000000000 -0500
-+++ gtkhtml-3.13.4/configure.in 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/configure.in.code-cleanup 2007-01-08 21:18:19.000000000 -0500
++++ gtkhtml-3.13.5/configure.in 2007-01-08 21:19:43.000000000 -0500
@@ -22,7 +22,7 @@
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
@@ -97,9 +97,9 @@
+I18N_LIB_CFLAGS="-DGNOME_EXPLICIT_TRANSLATION_DOMAIN=\\\"${GTKHTML_RELEASE_STRING}\\\""
AC_SUBST(I18N_LIB_CFLAGS)
- AM_INIT_AUTOMAKE($PACKAGE, 3.13.4)
---- gtkhtml-3.13.4/components/html-editor/replace.c.code-cleanup 2005-09-11 00:04:19.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/replace.c 2007-01-07 10:20:40.000000000 -0500
+ AM_INIT_AUTOMAKE($PACKAGE, 3.13.5)
+--- gtkhtml-3.13.5/components/html-editor/replace.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/replace.c 2007-01-08 21:19:43.000000000 -0500
@@ -26,8 +26,6 @@
#else
#include <glib/gi18n.h>
@@ -170,8 +170,8 @@
+ run_dialog (&cd->replace_dialog->dialog, cd->html, cd,
+ (DialogCtor) gtk_html_replace_dialog_new, _("Replace"));
}
---- gtkhtml-3.13.4/components/html-editor/utils.c.code-cleanup 2005-10-28 06:04:26.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/utils.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/utils.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/utils.c 2007-01-08 21:19:42.000000000 -0500
@@ -38,7 +38,7 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -181,8 +181,8 @@
#include "utils.h"
#include "properties.h"
---- gtkhtml-3.13.4/components/html-editor/e-html-utils.c.code-cleanup 2005-09-11 00:04:18.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/e-html-utils.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/e-html-utils.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/e-html-utils.c 2007-01-08 21:19:42.000000000 -0500
@@ -80,7 +80,7 @@
return NULL;
}
@@ -289,8 +289,8 @@
out = check_size (&buffer, &buffer_size, out, 10);
---- gtkhtml-3.13.4/components/html-editor/image.h.code-cleanup 2003-01-09 10:31:05.000000000 -0500
-+++ gtkhtml-3.13.4/components/html-editor/image.h 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/image.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/image.h 2007-01-08 21:19:43.000000000 -0500
@@ -23,7 +23,7 @@
#ifndef _GTK_HTML_EDIT_IMAGE_H_
#define _GTK_HTML_EDIT_IMAGE_H_
@@ -300,8 +300,8 @@
#include "control-data.h"
GtkWidget * image_properties (GtkHTMLControlData *cd, gpointer *set_data);
---- gtkhtml-3.13.4/components/html-editor/gtkhtml-editor-properties.glade.code-cleanup 2006-04-29 23:14:17.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/gtkhtml-editor-properties.glade 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/gtkhtml-editor-properties.glade.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/gtkhtml-editor-properties.glade 2007-01-08 21:19:43.000000000 -0500
@@ -142,6 +142,23 @@
<property name="pack_type">GTK_PACK_END</property>
</packing>
@@ -1335,8 +1335,8 @@
</widget>
<packing>
<property name="padding">0</property>
---- gtkhtml-3.13.4/components/html-editor/spellchecker.c.code-cleanup 2006-02-27 08:53:33.000000000 -0500
-+++ gtkhtml-3.13.4/components/html-editor/spellchecker.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/spellchecker.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/spellchecker.c 2007-01-08 21:19:42.000000000 -0500
@@ -268,7 +268,7 @@
rv = control != NULL;
@@ -1346,8 +1346,8 @@
}
return rv;
}
---- gtkhtml-3.13.4/components/html-editor/link.c.code-cleanup 2005-09-11 00:04:18.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/link.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/link.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/link.c 2007-01-08 21:19:43.000000000 -0500
@@ -28,6 +28,7 @@
#include <glib/gi18n.h>
#endif
@@ -1356,8 +1356,8 @@
#include "htmlcolor.h"
#include "htmlcolorset.h"
---- gtkhtml-3.13.4/components/html-editor/gi-color-palette.h.code-cleanup 2004-01-07 13:34:25.000000000 -0500
-+++ gtkhtml-3.13.4/components/html-editor/gi-color-palette.h 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/gi-color-palette.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/gi-color-palette.h 2007-01-08 21:19:43.000000000 -0500
@@ -30,11 +30,11 @@
#ifndef GI_COLOR_PALETTE_H
#define GI_COLOR_PALETTE_H
@@ -1380,8 +1380,8 @@
/*
* Array of colors
*/
---- gtkhtml-3.13.4/components/html-editor/template.c.code-cleanup 2005-09-11 00:04:19.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/template.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/template.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/template.c 2007-01-08 21:19:43.000000000 -0500
@@ -219,8 +219,8 @@
gtk_tree_selection_select_iter (gtk_tree_view_get_selection (GTK_TREE_VIEW (d->tview_template)), &iter);
@@ -1393,8 +1393,8 @@
d->disable_change = FALSE;
---- gtkhtml-3.13.4/components/html-editor/table.c.code-cleanup 2006-04-29 23:14:17.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/table.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/table.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/table.c 2007-01-08 21:19:43.000000000 -0500
@@ -138,33 +138,35 @@
}
@@ -1507,8 +1507,8 @@
gtk_spin_button_set_value (GTK_SPIN_BUTTON (d->spin_cols), d->table->totalCols);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (d->spin_rows), d->table->totalRows);
---- gtkhtml-3.13.4/components/html-editor/text.c.code-cleanup 2005-09-11 00:04:19.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/text.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/text.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/text.c 2007-01-08 21:19:42.000000000 -0500
@@ -85,14 +85,13 @@
}
@@ -1549,8 +1549,8 @@
gtk_widget_show_all (text_page);
---- gtkhtml-3.13.4/components/html-editor/menubar.c.code-cleanup 2006-04-24 01:39:26.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/menubar.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/menubar.c.code-cleanup 2007-01-07 23:53:56.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/menubar.c 2007-01-08 21:19:43.000000000 -0500
@@ -33,7 +33,6 @@
#include <sys/stat.h>
#include <fcntl.h>
@@ -1559,7 +1559,7 @@
#ifdef USE_GTKFILECHOOSER
#include <gtk/gtkfilechooser.h>
#include <gtk/gtkfilechooserdialog.h>
-@@ -132,14 +131,10 @@
+@@ -133,14 +132,10 @@
static void
insert_link_cb (BonoboUIComponent *uic, GtkHTMLControlData *cd, const char *cname)
{
@@ -1575,7 +1575,7 @@
gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog,
GTK_HTML_EDIT_PROPERTY_LINK, _("Link"),
-@@ -153,16 +148,12 @@
+@@ -154,16 +149,12 @@
static void
insert_rule_cb (BonoboUIComponent *uic, GtkHTMLControlData *cd, const char *cname)
{
@@ -1593,7 +1593,7 @@
gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog,
GTK_HTML_EDIT_PROPERTY_RULE, _("Rule"),
-@@ -175,8 +166,6 @@
+@@ -176,8 +167,6 @@
void
insert_table (GtkHTMLControlData *cd)
{
@@ -1602,7 +1602,7 @@
if (cd->properties_dialog)
gtk_html_edit_properties_dialog_close (cd->properties_dialog);
-@@ -188,9 +177,7 @@
+@@ -189,9 +178,7 @@
html_engine_table_set_cols (cd->html->engine, 3);
html_engine_table_set_rows (cd->html->engine, 3);
}
@@ -1613,7 +1613,7 @@
gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog,
GTK_HTML_EDIT_PROPERTY_TABLE, _("Table"),
-@@ -209,14 +196,10 @@
+@@ -210,14 +197,10 @@
static void
insert_template_cb (BonoboUIComponent *uic, GtkHTMLControlData *cd, const char *cname)
{
@@ -1629,37 +1629,58 @@
gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog,
GTK_HTML_EDIT_PROPERTY_TABLE, _("Template"),
-@@ -375,8 +358,7 @@
+@@ -373,15 +356,10 @@
+ static void
+ format_page_cb (BonoboUIComponent *uic, GtkHTMLControlData *cd, const char *cname)
+ {
+- char *filename;
+-
if (cd->properties_dialog)
gtk_html_edit_properties_dialog_close (cd->properties_dialog);
+- filename = gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL);
- cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Format"),
-- gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL));
+- filename);
+- g_free(filename);
+ cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Format"), "gtk-properties");
gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog,
GTK_HTML_EDIT_PROPERTY_BODY, _("Page"),
-@@ -393,8 +375,7 @@
+@@ -395,15 +373,10 @@
+ static void
+ format_text_cb (BonoboUIComponent *uic, GtkHTMLControlData *cd, const char *cname)
+ {
+- char *filename;
+-
if (cd->properties_dialog)
gtk_html_edit_properties_dialog_close (cd->properties_dialog);
+- filename = gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL);
- cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Format"),
-- gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL));
+- filename);
+- g_free(filename);
+ cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Format"), "gtk-properties");
gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog,
GTK_HTML_EDIT_PROPERTY_BODY, _("Text"),
-@@ -411,8 +392,7 @@
+@@ -417,15 +390,10 @@
+ static void
+ format_paragraph_cb (BonoboUIComponent *uic, GtkHTMLControlData *cd, const char *cname)
+ {
+- char *filename;
+-
if (cd->properties_dialog)
gtk_html_edit_properties_dialog_close (cd->properties_dialog);
+- filename = gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL);
- cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Format"),
-- gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL));
+- filename);
+- g_free(filename);
+ cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Format"), "gtk-properties");
gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog,
GTK_HTML_EDIT_PROPERTY_BODY, _("Paragraph"),
-@@ -455,7 +435,7 @@
+@@ -468,7 +436,7 @@
BONOBO_UI_UNSAFE_VERB ("InsertSmiley9", smiley_cb),
BONOBO_UI_UNSAFE_VERB ("InsertSmiley10", smiley_cb),
BONOBO_UI_UNSAFE_VERB ("InsertSmiley11", smiley_cb),
@@ -1668,7 +1689,7 @@
BONOBO_UI_UNSAFE_VERB ("IndentMore", command_cb),
BONOBO_UI_UNSAFE_VERB ("IndentLess", command_cb),
-@@ -690,45 +670,71 @@
+@@ -703,45 +671,71 @@
cd->block_language_changes = FALSE;
}
@@ -1776,7 +1797,7 @@
}
static void
-@@ -740,6 +746,7 @@
+@@ -753,6 +747,7 @@
typedef enum
{
@@ -1784,7 +1805,7 @@
EDITOR_ICON_MENU = 16,
EDITOR_ICON_TOOLBAR = 24,
} EditorIconSize;
-@@ -753,33 +760,56 @@
+@@ -766,33 +761,56 @@
static EditorUIPixmap pixmaps_map [] =
{
@@ -1859,7 +1880,7 @@
};
void
-@@ -810,18 +840,35 @@
+@@ -823,18 +841,35 @@
bonobo_ui_util_set_ui (uic, GTKHTML_DATADIR, "GNOME_GtkHTML_Editor.xml", "GNOME_GtkHTML_Editor", NULL);
}
@@ -1907,8 +1928,8 @@
}
spell_create_language_menu (cd);
---- gtkhtml-3.13.4/components/html-editor/GNOME_GtkHTML_Editor-emacs.xml.in.code-cleanup 2006-03-21 20:43:21.000000000 -0500
-+++ gtkhtml-3.13.4/components/html-editor/GNOME_GtkHTML_Editor-emacs.xml.in 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/GNOME_GtkHTML_Editor-emacs.xml.in.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/GNOME_GtkHTML_Editor-emacs.xml.in 2007-01-08 21:19:43.000000000 -0500
@@ -11,8 +11,7 @@
<cmd name="EditFind" _label="_Find..." _tip="Find"/>
@@ -2070,8 +2091,8 @@
</dockitem>
</Root>
---- gtkhtml-3.13.4/components/html-editor/replace.h.code-cleanup 2002-11-11 12:09:32.000000000 -0500
-+++ gtkhtml-3.13.4/components/html-editor/replace.h 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/replace.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/replace.h 2007-01-08 21:19:43.000000000 -0500
@@ -25,7 +25,7 @@
typedef struct _GtkHTMLReplaceDialog GtkHTMLReplaceDialog;
@@ -2081,8 +2102,8 @@
#include "control-data.h"
GtkHTMLReplaceDialog * gtk_html_replace_dialog_new (GtkHTML *html, GtkHTMLControlData *cd);
---- gtkhtml-3.13.4/components/html-editor/dialog.c.code-cleanup 2005-10-28 05:27:35.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/dialog.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/dialog.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/dialog.c 2007-01-08 21:19:42.000000000 -0500
@@ -28,25 +28,17 @@
#endif
#include "dialog.h"
@@ -2118,8 +2139,8 @@
- gtk_dialog_run (**dialog);
+ gtk_dialog_run (*dialog);
}
---- gtkhtml-3.13.4/components/html-editor/dialog.h.code-cleanup 2005-10-28 05:27:35.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/dialog.h 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/dialog.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/dialog.h 2007-01-08 21:19:42.000000000 -0500
@@ -27,9 +27,7 @@
typedef GtkDialog ** (*DialogCtor)(GtkHTML *html, GtkHTMLControlData *cd);
@@ -2131,8 +2152,8 @@
GtkHTML *html,
GtkHTMLControlData *cd,
DialogCtor ctor,
---- gtkhtml-3.13.4/components/html-editor/test-html-editor-control.c.code-cleanup 2005-09-11 00:04:19.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/test-html-editor-control.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/test-html-editor-control.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/test-html-editor-control.c 2007-01-08 21:19:43.000000000 -0500
@@ -28,11 +28,13 @@
#include <glib/gi18n.h>
#endif
@@ -2169,8 +2190,8 @@
bonobo_activate ();
bonobo_main ();
---- gtkhtml-3.13.4/components/html-editor/cell.h.code-cleanup 2003-01-09 10:31:05.000000000 -0500
-+++ gtkhtml-3.13.4/components/html-editor/cell.h 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/cell.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/cell.h 2007-01-08 21:19:43.000000000 -0500
@@ -23,7 +23,7 @@
#ifndef _GTK_HTML_CELL_H_
#define _GTK_HTML_CELL_H_
@@ -2180,8 +2201,8 @@
#include "control-data.h"
GtkWidget * cell_properties (GtkHTMLControlData *cd, gpointer *set_data);
---- gtkhtml-3.13.4/components/html-editor/cell.c.code-cleanup 2006-04-29 23:14:17.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/cell.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/cell.c.code-cleanup 2007-01-07 23:53:56.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/cell.c 2007-01-08 21:19:43.000000000 -0500
@@ -186,9 +186,10 @@
static void
set_halign (HTMLTableCell *cell, GtkHTMLEditCellProperties *d)
@@ -2231,13 +2252,15 @@
} else
html_engine_table_cell_set_width (d->cd->html->engine, cell, 0, FALSE);
}
-@@ -341,25 +343,6 @@
+@@ -341,27 +343,6 @@
cell_page = glade_xml_get_widget (xml, "cell_page");
+- filename = gnome_icon_theme_lookup_icon (d->cd->icon_theme, "stock_select-cell", 16, NULL, NULL);
- gtk_table_attach (GTK_TABLE (glade_xml_get_widget (xml, "cell_scope_table1")),
-- gtk_image_new_from_file (gnome_icon_theme_lookup_icon (d->cd->icon_theme, "stock_select-cell", 16, NULL, NULL)),
+- gtk_image_new_from_file (filename),
- 0, 1, 0, 1, 0, 0, 0, 0);
+- g_free (filename);
- filename = g_build_filename (ICONDIR, "table-table-16.png", NULL);
- gtk_table_attach (GTK_TABLE (glade_xml_get_widget (xml, "cell_scope_table1")),
- gtk_image_new_from_file (filename),
@@ -2257,7 +2280,7 @@
d->combo_bg_color = gi_color_combo_new (NULL, _("Transparent"), NULL,
color_group_fetch ("cell_bg_color", d->cd));
gi_color_combo_box_set_preview_relief (GI_COLOR_COMBO (d->combo_bg_color), GTK_RELIEF_NORMAL); \
-@@ -371,11 +354,9 @@
+@@ -373,11 +354,9 @@
"selection-changed", G_CALLBACK (changed_bg_pixmap), d);
d->option_halign = glade_xml_get_widget (xml, "option_cell_halign");
@@ -2271,7 +2294,7 @@
d->spin_width = glade_xml_get_widget (xml, "spin_cell_width");
UPPER_FIX (width);
-@@ -383,8 +364,8 @@
+@@ -385,8 +364,8 @@
d->check_width = glade_xml_get_widget (xml, "check_cell_width");
g_signal_connect (d->check_width, "toggled", G_CALLBACK (set_has_width), d);
d->option_width = glade_xml_get_widget (xml, "option_cell_width");
@@ -2282,7 +2305,7 @@
d->check_wrap = glade_xml_get_widget (xml, "check_cell_wrap");
d->check_header = glade_xml_get_widget (xml, "check_cell_header");
-@@ -427,19 +408,25 @@
+@@ -429,19 +408,25 @@
}
if (HTML_CLUE (d->cell)->halign == HTML_HALIGN_NONE)
@@ -2313,8 +2336,8 @@
} else
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (d->check_width), FALSE);
---- gtkhtml-3.13.4/components/html-editor/paragraph.c.code-cleanup 2005-05-17 10:48:59.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/paragraph.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/paragraph.c.code-cleanup 2007-01-07 23:53:56.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/paragraph.c 2007-01-08 21:19:42.000000000 -0500
@@ -30,6 +30,7 @@
#include "htmlengine-save.h"
#include "htmlselection.h"
@@ -2339,18 +2362,19 @@
set_align (GtkWidget *w, GtkHTMLEditParagraphProperties *data)
{
GtkHTMLParagraphAlignment align = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (w), "align"));
-@@ -61,9 +53,8 @@
+@@ -61,10 +53,8 @@
paragraph_properties (GtkHTMLControlData *cd, gpointer *set_data)
{
GtkHTMLEditParagraphProperties *data = g_new0 (GtkHTMLEditParagraphProperties, 1);
- GtkWidget *hbox, *menu, *menuitem, *vbox, *radio, *table, *icon;
+ GtkWidget *hbox, *vbox, *radio, *table, *icon;
GSList *group;
+- char *filename;
- gint h=0, i=0;
*set_data = data;
data->cd = cd;
-@@ -72,42 +63,7 @@
+@@ -73,42 +63,7 @@
gtk_table_set_col_spacings (GTK_TABLE (table), 18);
gtk_table_set_row_spacings (GTK_TABLE (table), 18);
@@ -2394,7 +2418,7 @@
hbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new_with_mnemonic (_("_Style:")), FALSE, FALSE, 0);
-@@ -117,10 +73,10 @@
+@@ -118,12 +73,10 @@
hbox = gtk_hbox_new (FALSE, 12);
@@ -2402,12 +2426,14 @@
+#define ADD_RADIO(x,a,stock_id) \
radio = gtk_radio_button_new_with_label (group, x); \
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)); \
-- icon = gtk_image_new_from_file (gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_text_" icon_name, 16, NULL, NULL)); \
+- filename = gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_text_" icon_name, 16, NULL, NULL); \
+- icon = gtk_image_new_from_file (filename); \
+- g_free(filename); \
+ icon = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU); \
gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); \
gtk_box_pack_start (GTK_BOX (hbox), radio, FALSE, FALSE, 0); \
if (a == gtk_html_get_paragraph_alignment (data->cd->html)) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); \
-@@ -128,9 +84,9 @@
+@@ -131,9 +84,9 @@
g_object_set_data (G_OBJECT (radio), "align", GINT_TO_POINTER (a));
group = NULL;
@@ -2420,8 +2446,8 @@
gtk_table_attach (GTK_TABLE (table), editor_hig_vbox (_("Alignment"), hbox), 0, 1, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
---- gtkhtml-3.13.4/components/html-editor/control-data.c.code-cleanup 2005-05-17 10:48:59.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/control-data.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/control-data.c.code-cleanup 2007-01-07 23:53:56.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/control-data.c 2007-01-08 21:19:43.000000000 -0500
@@ -53,7 +53,7 @@
ncd->replace_text_replace = NULL;
ncd->has_spell_control_set = FALSE;
@@ -2431,9 +2457,9 @@
spell_init (html, ncd);
-@@ -86,10 +86,8 @@
- if (cd->languages)
+@@ -90,10 +90,8 @@
CORBA_free (cd->languages);
+ g_free (cd->language);
- if (cd->icon_theme) {
- g_object_unref (cd->icon_theme);
@@ -2444,8 +2470,8 @@
g_free (cd);
}
---- gtkhtml-3.13.4/components/html-editor/toolbar.c.code-cleanup 2006-04-25 07:09:17.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/toolbar.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/toolbar.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/toolbar.c 2007-01-08 21:19:42.000000000 -0500
@@ -29,10 +29,11 @@
#else
#include <glib/gi18n.h>
@@ -2803,8 +2829,8 @@
}
---- gtkhtml-3.13.4/components/html-editor/properties.c.code-cleanup 2005-10-28 05:27:35.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/properties.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/properties.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/properties.c 2007-01-08 21:19:43.000000000 -0500
@@ -27,7 +27,6 @@
#else
#include <glib/gi18n.h>
@@ -2831,8 +2857,8 @@
gtk_dialog_set_response_sensitive (GTK_DIALOG (d->dialog), 0, FALSE);
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (d->dialog)->vbox), 6);
---- gtkhtml-3.13.4/components/html-editor/control-data.h.code-cleanup 2004-05-21 09:32:49.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/control-data.h 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/control-data.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/control-data.h 2007-01-08 21:19:43.000000000 -0500
@@ -30,7 +30,6 @@
#include <gtkhtml.h>
@@ -2850,8 +2876,8 @@
};
GtkHTMLControlData * gtk_html_control_data_new (GtkHTML *html, GtkWidget *vbox);
---- gtkhtml-3.13.4/components/html-editor/GNOME_GtkHTML_Editor.xml.in.code-cleanup 2006-05-15 10:42:09.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/GNOME_GtkHTML_Editor.xml.in 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/GNOME_GtkHTML_Editor.xml.in.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/GNOME_GtkHTML_Editor.xml.in 2007-01-08 21:19:43.000000000 -0500
@@ -1,41 +1,41 @@
<Root>
<commands>
@@ -3044,8 +3070,8 @@
</dockitem>
</Root>
---- gtkhtml-3.13.4/components/html-editor/body.c.code-cleanup 2006-05-15 05:49:55.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/body.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/body.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/body.c 2007-01-08 21:19:43.000000000 -0500
@@ -50,7 +50,6 @@
};
typedef struct _GtkHTMLEditBodyProperties GtkHTMLEditBodyProperties;
@@ -3137,8 +3163,8 @@
g_signal_connect (data->combo [0], "color_changed", G_CALLBACK (color_changed), data);
g_signal_connect (data->combo [1], "color_changed", G_CALLBACK (color_changed), data);
g_signal_connect (data->combo [2], "color_changed", G_CALLBACK (color_changed), data);
---- gtkhtml-3.13.4/components/html-editor/utils.h.code-cleanup 2004-06-04 11:10:56.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/utils.h 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/utils.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/utils.h 2007-01-08 21:19:42.000000000 -0500
@@ -24,7 +24,6 @@
#define _UTILS_H_
@@ -3156,8 +3182,8 @@
GtkWidget *editor_hig_inner_hbox (gchar *text,
GtkWidget *control);
---- gtkhtml-3.13.4/components/html-editor/Makefile.am.code-cleanup 2006-01-03 23:03:39.000000000 -0500
-+++ gtkhtml-3.13.4/components/html-editor/Makefile.am 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/Makefile.am.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/Makefile.am 2007-01-08 21:19:43.000000000 -0500
@@ -92,6 +92,8 @@
menubar.h \
paragraph.c \
@@ -3167,8 +3193,8 @@
persist-file.c \
persist-file.h \
persist-stream.c \
---- gtkhtml-3.13.4/components/html-editor/gi-combo-box.c.code-cleanup 2005-05-17 10:48:59.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/gi-combo-box.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/gi-combo-box.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/gi-combo-box.c 2007-01-08 21:19:43.000000000 -0500
@@ -434,10 +434,8 @@
*/
@@ -3249,8 +3275,8 @@
}
/**
---- gtkhtml-3.13.4/components/html-editor/editor-control-factory.c.code-cleanup 2006-08-22 13:51:47.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/editor-control-factory.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/editor-control-factory.c.code-cleanup 2007-01-07 23:53:56.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/editor-control-factory.c 2007-01-08 21:19:43.000000000 -0500
@@ -33,7 +33,7 @@
#include <glib/gi18n.h>
#endif
@@ -3276,17 +3302,27 @@
#include "body.h"
#include "spellchecker.h"
#include "html-stream-mem.h"
-@@ -185,8 +187,7 @@
+@@ -172,7 +174,6 @@
+ HTMLEngine *e = cd->html->engine;
+ GtkHTMLEditPropertyType start = GTK_HTML_EDIT_PROPERTY_BODY;
+ gboolean run_dialog = FALSE;
+- char *filename;
+
+ if (cd->obj) {
+ switch (HTML_OBJECT_TYPE (cd->obj)) {
+@@ -186,10 +187,7 @@
;
}
if (run_dialog) {
+- filename = gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL);
- cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Properties"),
-- gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL));
+- filename);
+- g_free(filename);
+ cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Properties"), "gtk-properties");
html_cursor_jump_to (e->cursor, e, cd->obj, 0);
html_engine_disable_selection (e);
html_engine_set_mark (e);
-@@ -260,7 +261,7 @@
+@@ -263,7 +261,7 @@
}
while ((len = read (fd, buffer, 4096)) > 0) {
@@ -3295,7 +3331,7 @@
}
if (len < 0) {
-@@ -418,6 +419,7 @@
+@@ -421,6 +419,7 @@
toolbar_update_format (cd);
menubar_update_format (cd);
@@ -3303,8 +3339,8 @@
if (html->engine->painter != (HTMLPainter *)p) {
html_gdk_painter_unrealize (old_p);
---- gtkhtml-3.13.4/components/html-editor/popup.c.code-cleanup 2006-06-06 01:37:34.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/popup.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/popup.c.code-cleanup 2007-01-07 23:53:56.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/popup.c 2007-01-08 21:19:43.000000000 -0500
@@ -102,14 +102,10 @@
static void
insert_link (GtkWidget *mi, GtkHTMLControlData *cd)
@@ -3321,17 +3357,23 @@
gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog,
GTK_HTML_EDIT_PROPERTY_LINK, _("Link"),
-@@ -192,8 +188,7 @@
+@@ -189,14 +185,10 @@
+ {
+ GtkHTMLEditPropertyType t;
+ GList *cur;
+- char *filename;
if (cd->properties_dialog)
gtk_html_edit_properties_dialog_close (cd->properties_dialog);
+- filename = gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL);
- cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Properties"),
-- gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL));
+- filename);
+- g_free(filename);
+ cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Properties"), "gtk-properties");
cur = cd->properties_types;
while (cur) {
-@@ -267,14 +262,10 @@
+@@ -270,14 +262,10 @@
static void
link_prop_dialog (GtkWidget *mi, GtkHTMLControlData *cd)
{
@@ -3347,7 +3389,7 @@
gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog,
GTK_HTML_EDIT_PROPERTY_LINK, _("Link"),
-@@ -286,12 +277,6 @@
+@@ -289,12 +277,6 @@
}
static void
@@ -3360,7 +3402,7 @@
replace_suggestion_cb (GtkWidget *mi, GtkHTMLControlData *cd)
{
html_engine_replace_spell_word_with (cd->html->engine, g_object_get_data (G_OBJECT (mi), "rep_word"));
-@@ -597,7 +582,7 @@
+@@ -600,7 +582,7 @@
END_SUBMENU;
if (*items == 0) {
@@ -3369,7 +3411,7 @@
menu = NULL;
} else
gtk_widget_show (menu);
-@@ -654,7 +639,7 @@
+@@ -657,7 +639,7 @@
guint items, props;
menu = prepare_properties_and_menu (cd, &items, &props);
@@ -3378,8 +3420,8 @@
if (props)
show_prop_dialog (cd, GTK_HTML_EDIT_PROPERTY_NONE);
}
---- gtkhtml-3.13.4/components/html-editor/template.h.code-cleanup 2003-01-09 10:31:05.000000000 -0500
-+++ gtkhtml-3.13.4/components/html-editor/template.h 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/template.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/template.h 2007-01-08 21:19:43.000000000 -0500
@@ -23,7 +23,7 @@
#ifndef _GTK_HTML_TEMPLATE_H_
#define _GTK_HTML_TEMPLATE_H_
@@ -3389,8 +3431,8 @@
#include "control-data.h"
GtkWidget * template_insert (GtkHTMLControlData *cd, gpointer *set_data);
---- gtkhtml-3.13.4/components/html-editor/search.h.code-cleanup 2004-05-25 14:39:27.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/search.h 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/search.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/search.h 2007-01-08 21:19:43.000000000 -0500
@@ -25,7 +25,6 @@
typedef struct _GtkHTMLSearchDialog GtkHTMLSearchDialog;
@@ -3399,8 +3441,8 @@
#include "gtkhtml.h"
#include "control-data.h"
---- gtkhtml-3.13.4/components/html-editor/gi-color-palette.c.code-cleanup 2005-05-17 10:48:59.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/gi-color-palette.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/gi-color-palette.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/gi-color-palette.c 2007-01-08 21:19:43.000000000 -0500
@@ -152,7 +152,7 @@
* Add the new custom color as the first custom color in the custom color rows
* and shift all of the others 'one step down'
@@ -3527,8 +3569,8 @@
}
---- gtkhtml-3.13.4/components/html-editor/persist-stream.c.code-cleanup 2005-05-17 10:48:59.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/persist-stream.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/persist-stream.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/persist-stream.c 2007-01-08 21:19:43.000000000 -0500
@@ -146,7 +146,7 @@
break;
}
@@ -3547,8 +3589,8 @@
Bonobo_Stream_write (state->stream, &buffer, state->ev);
---- gtkhtml-3.13.4/components/html-editor/table.h.code-cleanup 2003-01-09 10:31:05.000000000 -0500
-+++ gtkhtml-3.13.4/components/html-editor/table.h 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/table.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/table.h 2007-01-08 21:19:43.000000000 -0500
@@ -23,7 +23,7 @@
#ifndef _GTK_HTML_TABLE_H_
#define _GTK_HTML_TABLE_H_
@@ -3558,8 +3600,8 @@
#include "control-data.h"
GtkWidget * table_properties (GtkHTMLControlData *cd, gpointer *set_data);
---- gtkhtml-3.13.4/components/html-editor/rule.h.code-cleanup 2003-01-09 10:31:05.000000000 -0500
-+++ gtkhtml-3.13.4/components/html-editor/rule.h 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/rule.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/rule.h 2007-01-08 21:19:42.000000000 -0500
@@ -23,7 +23,7 @@
#ifndef _GTK_HTML_RULE_H_
#define _GTK_HTML_RULE_H_
@@ -3569,8 +3611,8 @@
#include "control-data.h"
GtkWidget * rule_properties (GtkHTMLControlData *cd, gpointer *set_data);
---- gtkhtml-3.13.4/components/html-editor/search.c.code-cleanup 2006-01-27 04:11:48.000000000 -0500
-+++ gtkhtml-3.13.4/components/html-editor/search.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/search.c.code-cleanup 2007-01-07 23:53:56.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/search.c 2007-01-08 21:19:43.000000000 -0500
@@ -26,8 +26,6 @@
#else
#include <glib/gi18n.h>
@@ -3580,16 +3622,27 @@
#include "search.h"
#include "dialog.h"
#include "htmlengine-search.h"
-@@ -142,7 +140,7 @@
+@@ -107,7 +105,7 @@
+ {
+ GtkHTMLSearchDialog *dialog = g_new (GtkHTMLSearchDialog, 1);
+ GtkWidget *hbox, *vbox;
+- char *filename;
++
+ /* we use CANCEL response for close, because we want Esc to close the dialog - see gtkdialog.c */
+ dialog->dialog = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Find"), NULL, 0,
+ GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL,
+@@ -143,9 +141,7 @@
gtk_widget_show (dialog->entry);
gtk_widget_show_all (hbox);
-- gnome_window_icon_set_from_file (GTK_WINDOW (dialog->dialog), gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_search", 16, NULL, NULL));
+- filename = gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_search", 16, NULL, NULL);
+- gnome_window_icon_set_from_file (GTK_WINDOW (dialog->dialog), filename);
+- g_free(filename);
+ gtk_window_set_icon_name (GTK_WINDOW (dialog->dialog), "gtk-find");
gtk_widget_grab_focus (dialog->entry);
-@@ -168,7 +166,8 @@
+@@ -171,7 +167,8 @@
void
search (GtkHTMLControlData *cd)
{
@@ -3599,8 +3652,8 @@
}
void
---- gtkhtml-3.13.4/components/html-editor/image.c.code-cleanup 2006-08-21 11:06:10.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/image.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/image.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/image.c 2007-01-08 21:19:42.000000000 -0500
@@ -29,6 +29,7 @@
#include <unistd.h>
#include <string.h>
@@ -3708,8 +3761,8 @@
d->spin_border = glade_xml_get_widget (xml, "spin_image_border");
UPPER_FIX (border);
---- gtkhtml-3.13.4/components/html-editor/properties.h.code-cleanup 2004-05-21 09:32:49.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/properties.h 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/properties.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/properties.h 2007-01-08 21:19:42.000000000 -0500
@@ -23,7 +23,7 @@
#ifndef _GTK_HTML_EDIT_PROPERTIES_H_
#define _GTK_HTML_EDIT_PROPERTIES_H_
@@ -3728,8 +3781,8 @@
void gtk_html_edit_properties_dialog_destroy (GtkHTMLEditPropertiesDialog *d);
void gtk_html_edit_properties_dialog_add_entry (GtkHTMLEditPropertiesDialog *d,
---- gtkhtml-3.13.4/components/html-editor/link.h.code-cleanup 2004-06-04 11:10:55.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/link.h 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/link.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/link.h 2007-01-08 21:19:42.000000000 -0500
@@ -23,7 +23,7 @@
#ifndef _GTK_HTML_LINK_H_
#define _GTK_HTML_LINK_H_
@@ -3739,8 +3792,8 @@
#include "control-data.h"
GtkWidget * link_properties (GtkHTMLControlData *cd, gpointer *set_data);
---- gtkhtml-3.13.4/components/html-editor/rule.c.code-cleanup 2005-09-11 00:04:19.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/rule.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/rule.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/rule.c 2007-01-08 21:19:42.000000000 -0500
@@ -62,17 +62,21 @@
static void
set_length (GtkHTMLEditRuleProperties *d)
@@ -3838,8 +3891,8 @@
d->check_shaded = glade_xml_get_widget (xml, "check_rule_shaded");
g_signal_connect (d->check_shaded, "toggled", G_CALLBACK (shaded_toggled), d);
---- gtkhtml-3.13.4/components/html-editor/gi-color-combo.c.code-cleanup 2005-07-13 06:19:31.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/gi-color-combo.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/gi-color-combo.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/gi-color-combo.c 2007-01-08 21:19:43.000000000 -0500
@@ -150,8 +150,8 @@
color_group));
@@ -3860,8 +3913,8 @@
g_signal_connect (cc->preview_button, "clicked",
G_CALLBACK (preview_clicked), cc);
---- gtkhtml-3.13.4/components/html-editor/html-stream-mem.c.code-cleanup 2005-05-17 10:48:59.000000000 -0400
-+++ gtkhtml-3.13.4/components/html-editor/html-stream-mem.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/html-stream-mem.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/html-stream-mem.c 2007-01-08 21:19:43.000000000 -0500
@@ -34,7 +34,7 @@
if (bhtml->html_stream) {
@@ -3871,8 +3924,8 @@
} else {
gtk_html_stream_close (bhtml->html_stream, GTK_HTML_STREAM_OK);
bhtml->html_stream = NULL;
---- gtkhtml-3.13.4/components/html-editor/htmlsourceview.c.code-cleanup 2006-02-28 15:53:33.000000000 -0500
-+++ gtkhtml-3.13.4/components/html-editor/htmlsourceview.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/components/html-editor/htmlsourceview.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/components/html-editor/htmlsourceview.c 2007-01-08 21:19:43.000000000 -0500
@@ -120,10 +120,10 @@
html_source_view_set_timeout (HTMLSourceView *view, guint timeout)
{
@@ -3895,8 +3948,8 @@
priv->timer_id = 0;
if (priv->pstream != CORBA_OBJECT_NIL) {
---- gtkhtml-3.13.4/art/Makefile.am.code-cleanup 2004-07-22 13:58:55.000000000 -0400
-+++ gtkhtml-3.13.4/art/Makefile.am 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/art/Makefile.am.code-cleanup 2007-01-03 10:28:47.000000000 -0500
++++ gtkhtml-3.13.5/art/Makefile.am 2007-01-08 21:19:43.000000000 -0500
@@ -1,58 +1,17 @@
iconsdir = $(datadir)/gtkhtml- at GTKHTML_API_VERSION@/icons
icons_DATA = \
@@ -3956,8 +4009,8 @@
paper.png \
ribbon.jpg \
midnight-stars.jpg \
---- gtkhtml-3.13.4/src/testgtkhtml.c.code-cleanup 2006-02-28 15:51:54.000000000 -0500
-+++ gtkhtml-3.13.4/src/testgtkhtml.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/testgtkhtml.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500
++++ gtkhtml-3.13.5/src/testgtkhtml.c 2007-01-08 21:19:43.000000000 -0500
@@ -196,6 +196,7 @@
GtkWidget *hbox;
GtkWidget *frame;
@@ -4095,8 +4148,8 @@
redirect_timerId = 0;
}
---- gtkhtml-3.13.4/src/htmlprinter.c.code-cleanup 2006-03-25 12:47:41.000000000 -0500
-+++ gtkhtml-3.13.4/src/htmlprinter.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/htmlprinter.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500
++++ gtkhtml-3.13.5/src/htmlprinter.c 2007-01-08 21:19:43.000000000 -0500
@@ -207,7 +207,7 @@
pc = printer->context;
g_return_if_fail (pc);
@@ -4106,8 +4159,8 @@
gnome_print_gsave (pc);
html_printer_coordinates_to_gnome_print (printer, x1, y1, &printer_x1, &printer_y1);
---- gtkhtml-3.13.4/src/htmlcursor.c.code-cleanup 2007-01-07 10:19:52.000000000 -0500
-+++ gtkhtml-3.13.4/src/htmlcursor.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/htmlcursor.c.code-cleanup 2007-01-08 21:18:19.000000000 -0500
++++ gtkhtml-3.13.5/src/htmlcursor.c 2007-01-08 21:19:43.000000000 -0500
@@ -211,7 +211,7 @@
if (!html_object_cursor_forward (cursor->object, cursor, engine)) {
HTMLObject *next;
@@ -4144,8 +4197,8 @@
if (prev && prev->parent) {
cursor->object = prev;
cursor->position --;
---- gtkhtml-3.13.4/src/htmlengine-edit-text.c.code-cleanup 2005-01-28 10:39:16.000000000 -0500
-+++ gtkhtml-3.13.4/src/htmlengine-edit-text.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/htmlengine-edit-text.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500
++++ gtkhtml-3.13.5/src/htmlengine-edit-text.c 2007-01-08 21:19:43.000000000 -0500
@@ -54,7 +54,7 @@
{
if (html_object_is_text (obj)) {
@@ -4155,8 +4208,8 @@
old_text = HTML_TEXT (obj)->text;
HTML_TEXT (obj)->text = up ? g_utf8_strup (old_text, -1) : g_utf8_strdown (old_text, -1);
---- gtkhtml-3.13.4/src/htmlobject.c.code-cleanup 2007-01-07 10:19:52.000000000 -0500
-+++ gtkhtml-3.13.4/src/htmlobject.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/htmlobject.c.code-cleanup 2007-01-08 21:18:19.000000000 -0500
++++ gtkhtml-3.13.5/src/htmlobject.c 2007-01-08 21:19:43.000000000 -0500
@@ -1693,7 +1693,7 @@
if (html_object_accepts_cursor (obj))
break;
@@ -4166,8 +4219,8 @@
break;
obj = last_obj;
}
---- gtkhtml-3.13.4/src/htmliframe.c.code-cleanup 2006-02-28 15:51:54.000000000 -0500
-+++ gtkhtml-3.13.4/src/htmliframe.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/htmliframe.c.code-cleanup 2007-01-03 10:28:53.000000000 -0500
++++ gtkhtml-3.13.5/src/htmliframe.c 2007-01-08 21:19:43.000000000 -0500
@@ -463,7 +463,7 @@
if (state->error ||
@@ -4186,8 +4239,8 @@
html_engine_save_buffer_peek_text_bytes (buffer))) {
html_engine_save_buffer_free (buffer, TRUE);
return FALSE;
---- gtkhtml-3.13.4/src/htmlimage.c.code-cleanup 2005-07-13 06:19:32.000000000 -0400
-+++ gtkhtml-3.13.4/src/htmlimage.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/htmlimage.c.code-cleanup 2007-01-03 10:28:53.000000000 -0500
++++ gtkhtml-3.13.5/src/htmlimage.c 2007-01-08 21:19:43.000000000 -0500
@@ -384,7 +384,7 @@
{
HTMLGdkPainter *p;
@@ -4240,8 +4293,8 @@
ip->stall_timeout = 0;
}
}
---- gtkhtml-3.13.4/src/htmlengine-save.c.code-cleanup 2006-02-28 15:51:54.000000000 -0500
-+++ gtkhtml-3.13.4/src/htmlengine-save.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/htmlengine-save.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500
++++ gtkhtml-3.13.5/src/htmlengine-save.c 2007-01-08 21:19:43.000000000 -0500
@@ -123,7 +123,7 @@
if (encoded_len_return)
*encoded_len_return = out - buffer;
@@ -4278,8 +4331,8 @@
}
int
---- gtkhtml-3.13.4/src/test.c.code-cleanup 2004-11-19 05:19:52.000000000 -0500
-+++ gtkhtml-3.13.4/src/test.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/test.c.code-cleanup 2007-01-03 10:28:53.000000000 -0500
++++ gtkhtml-3.13.5/src/test.c 2007-01-08 21:19:43.000000000 -0500
@@ -169,10 +169,10 @@
gpc = gnome_print_job_get_context (job);
config = gnome_print_job_get_config (job);
@@ -4315,8 +4368,8 @@
result = g_utf8_collate (p_str, q_str);
g_free (p_str);
---- gtkhtml-3.13.4/src/htmlengine-edit-selection-updater.c.code-cleanup 2001-08-24 15:24:08.000000000 -0400
-+++ gtkhtml-3.13.4/src/htmlengine-edit-selection-updater.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/htmlengine-edit-selection-updater.c.code-cleanup 2007-01-03 10:28:53.000000000 -0500
++++ gtkhtml-3.13.5/src/htmlengine-edit-selection-updater.c 2007-01-08 21:19:43.000000000 -0500
@@ -72,7 +72,7 @@
g_return_if_fail (updater != NULL);
@@ -4362,8 +4415,8 @@
updater->idle_id = 0;
/* run it now */
---- gtkhtml-3.13.4/src/htmlengine-edit-cursor.c.code-cleanup 2006-02-28 15:51:54.000000000 -0500
-+++ gtkhtml-3.13.4/src/htmlengine-edit-cursor.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/htmlengine-edit-cursor.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500
++++ gtkhtml-3.13.5/src/htmlengine-edit-cursor.c 2007-01-08 21:19:43.000000000 -0500
@@ -364,7 +364,7 @@
engine->blinking_status = FALSE;
@@ -4391,8 +4444,8 @@
+ g_source_remove (engine->blinking_timer_id);
+ engine->blinking_timer_id = g_timeout_add (BLINK_TIMEOUT, blink_timeout_cb, engine);
}
---- gtkhtml-3.13.4/src/htmlembedded.c.code-cleanup 2006-02-28 15:51:54.000000000 -0500
-+++ gtkhtml-3.13.4/src/htmlembedded.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/htmlembedded.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500
++++ gtkhtml-3.13.5/src/htmlembedded.c 2007-01-08 21:19:43.000000000 -0500
@@ -119,7 +119,7 @@
g_assert (element->widget->parent == element->parent);
gtk_container_remove (GTK_CONTAINER (element->parent), element->widget);
@@ -4402,8 +4455,8 @@
}
}
---- gtkhtml-3.13.4/src/gtkhtml.c.code-cleanup 2007-01-07 10:19:52.000000000 -0500
-+++ gtkhtml-3.13.4/src/gtkhtml.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/gtkhtml.c.code-cleanup 2007-01-08 21:18:19.000000000 -0500
++++ gtkhtml-3.13.5/src/gtkhtml.c 2007-01-08 21:19:43.000000000 -0500
@@ -169,7 +169,7 @@
static gboolean command (GtkHTML *html, GtkHTMLCommandType com_type);
static gint mouse_change_pos (GtkWidget *widget, GdkWindow *window, gint x, gint y, gint state);
@@ -4597,8 +4650,8 @@
if (obj)
return gtk_html_get_url_object_relative (html, obj, html_object_get_url (obj, offset));
---- gtkhtml-3.13.4/src/htmlengine.c.code-cleanup 2006-04-24 02:23:17.000000000 -0400
-+++ gtkhtml-3.13.4/src/htmlengine.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/htmlengine.c.code-cleanup 2007-01-07 23:53:56.000000000 -0500
++++ gtkhtml-3.13.5/src/htmlengine.c 2007-01-08 21:19:43.000000000 -0500
@@ -1403,7 +1403,7 @@
if (!(isspace (*str) || IS_UTF8_NBSP (str)))
return FALSE;
@@ -4617,7 +4670,7 @@
str = html_tokenizer_next_token (p->ht);
/* printf ("\"%s\": was the string\n", str); */
continue;
-@@ -4480,7 +4480,7 @@
+@@ -4481,7 +4481,7 @@
html_tokenizer_write (e->ht, buffer, size == -1 ? strlen (buffer) : size);
if (e->parsing && e->timerId == 0) {
@@ -4626,7 +4679,7 @@
}
}
-@@ -4586,7 +4586,7 @@
+@@ -4587,7 +4587,7 @@
return;
DI (printf ("html_engine_schedule_update - timer %d\n", e->updateTimer));
if (e->updateTimer == 0)
@@ -4635,7 +4688,7 @@
}
-@@ -4856,7 +4856,7 @@
+@@ -4857,7 +4857,7 @@
else if (e->redraw_idle_id == 0) {
clear_pending_expose (e);
html_draw_queue_clear (e->draw_queue);
@@ -4644,7 +4697,7 @@
}
}
-@@ -5043,7 +5043,7 @@
+@@ -5044,7 +5044,7 @@
e->avoid_para = FALSE;
@@ -4653,7 +4706,7 @@
}
-@@ -5110,7 +5110,7 @@
+@@ -5111,7 +5111,7 @@
if (e->clue == NULL)
return NULL;
@@ -4662,7 +4715,7 @@
if (obj != NULL)
return html_object_get_url (obj, offset);
-@@ -5617,7 +5617,7 @@
+@@ -5618,7 +5618,7 @@
if (engine->freeze_count == 1) {
if (engine->thaw_idle_id == 0) {
DF (printf ("queueing thaw_idle %d\n", engine->freeze_count);)
@@ -4671,8 +4724,8 @@
}
} else {
engine->freeze_count--;
---- gtkhtml-3.13.4/src/htmltextslave.c.code-cleanup 2006-02-28 15:51:54.000000000 -0500
-+++ gtkhtml-3.13.4/src/htmltextslave.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/htmltextslave.c.code-cleanup 2007-01-03 10:28:53.000000000 -0500
++++ gtkhtml-3.13.5/src/htmltextslave.c 2007-01-08 21:19:43.000000000 -0500
@@ -740,7 +740,8 @@
HTMLText *text = self->owner;
GSList *cur;
@@ -4704,8 +4757,8 @@
gdk_draw_rectangle (p->pixmap, p->gc, 0, box->x - p->x1, box->y - p->y1, box->width - 1, box->height - 1);
gdk_gc_set_line_attributes (p->gc, 1, values.line_style, values.cap_style, values.join_style);
}
---- gtkhtml-3.13.4/src/htmlgdkpainter.c.code-cleanup 2006-11-06 00:41:00.000000000 -0500
-+++ gtkhtml-3.13.4/src/htmlgdkpainter.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/htmlgdkpainter.c.code-cleanup 2007-01-03 10:28:53.000000000 -0500
++++ gtkhtml-3.13.5/src/htmlgdkpainter.c 2007-01-08 21:19:43.000000000 -0500
@@ -675,7 +675,7 @@
{
HTMLGdkPainter *gdk_painter;
@@ -4730,8 +4783,8 @@
gdk_draw_line (gdk_painter->pixmap, gdk_painter->gc, x, y + 1, x + width, y + 1);
gdk_gc_set_line_attributes (gdk_painter->gc, values.line_width,
values.line_style, values.cap_style, values.join_style);
---- gtkhtml-3.13.4/src/htmlclueflow.c.code-cleanup 2006-06-12 08:06:06.000000000 -0400
-+++ gtkhtml-3.13.4/src/htmlclueflow.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/htmlclueflow.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500
++++ gtkhtml-3.13.5/src/htmlclueflow.c 2007-01-08 21:19:43.000000000 -0500
@@ -1996,14 +1996,14 @@
g_string_append (out, "\n");
} else {
@@ -4883,8 +4936,8 @@
}
}
}
---- gtkhtml-3.13.4/src/htmlinterval.c.code-cleanup 2006-02-28 15:51:54.000000000 -0500
-+++ gtkhtml-3.13.4/src/htmlinterval.c 2007-01-07 10:20:40.000000000 -0500
+--- gtkhtml-3.13.5/src/htmlinterval.c.code-cleanup 2007-01-03 10:28:53.000000000 -0500
++++ gtkhtml-3.13.5/src/htmlinterval.c 2007-01-08 21:19:43.000000000 -0500
@@ -58,7 +58,7 @@
inline void
html_point_next_cursor (HTMLPoint *p)
Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- gtkhtml3.spec 8 Jan 2007 13:38:12 -0000 1.81
+++ gtkhtml3.spec 9 Jan 2007 02:38:52 -0000 1.82
@@ -8,8 +8,8 @@
### Abstract ###
Name: gtkhtml3
-Version: 3.13.4
-Release: 2%{?dist}
+Version: 3.13.5
+Release: 1%{?dist}
License: LGPL/GPL
Group: System Environment/Libraries
Summary: gtkhtml library
@@ -163,6 +163,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Mon Jan 08 2007 Matthew Barnes <mbarnes at redhat.com> - 3.13.5-1.fc7
+- Update to 3.13.5
+
* Mon Jan 08 2007 Matthew Barnes <mbarnes at redhat.com> - 3.13.4-2.fc7
- Add patch for GNOME bug #394182 (code cleanup).
- Remove patch for GNOME bug #363036 (superseded).
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources 19 Dec 2006 18:34:12 -0000 1.46
+++ sources 9 Jan 2007 02:38:52 -0000 1.47
@@ -1 +1 @@
-db962b814de57d902b269dd793594508 gtkhtml-3.13.4.tar.bz2
+e12a6e11c4ef463c047ffab2152a1ff7 gtkhtml-3.13.5.tar.bz2
- Previous message (by thread): rpms/evolution-data-server/devel .cvsignore, 1.57, 1.58 evolution-data-server.spec, 1.141, 1.142 sources, 1.57, 1.58 evolution-data-server-1.8.1-kill-ethread.patch, 1.1, NONE evolution-data-server-1.9.4-implicit-function-declaration.patch, 1.1, NONE
- Next message (by thread): rpms/evolution-connector/devel .cvsignore, 1.42, 1.43 evolution-connector.spec, 1.84, 1.85 sources, 1.42, 1.43 evolution-exchange-2.8.0-deprecated-glib.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list