rpms/gtkhtml3/devel gtkhtml-3.13.1-compiler-warnings.patch, NONE, 1.1 gtkhtml3.spec, 1.75, 1.76
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Oct 27 20:37:48 UTC 2006
Author: mbarnes
Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2110
Modified Files:
gtkhtml3.spec
Added Files:
gtkhtml-3.13.1-compiler-warnings.patch
Log Message:
* Fri Oct 26 2006 Matthew Barnes <mbarnes at redhat.com> - 3.13.1-3.fc7
- Forgot to commit the patch.
gtkhtml-3.13.1-compiler-warnings.patch:
a11y/hyperlink.c | 20 +++++-----
a11y/hyperlink.h | 6 ++-
a11y/text.c | 2 -
components/html-editor/body.c | 2 -
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 | 2 -
components/html-editor/html-stream-mem.c | 2 -
components/html-editor/persist-stream.c | 4 +-
components/html-editor/popup.c | 6 ---
components/html-editor/replace.c | 3 +
components/html-editor/search.c | 3 +
components/html-editor/test-html-editor-control.c | 2 -
configure.in | 2 -
src/gtkhtml.c | 26 ++++++-------
src/htmlclueflow.c | 44 +++++++++++-----------
src/htmlcursor.c | 8 ++--
src/htmlengine-edit-text.c | 2 -
src/htmlengine-save.c | 8 ++--
src/htmlengine.c | 6 +--
src/htmlgdkpainter.c | 8 +---
src/htmliframe.c | 4 +-
src/htmlimage.c | 8 +---
src/htmlinterval.c | 2 -
src/htmlobject.c | 2 -
src/htmlprinter.c | 2 -
src/htmltextslave.c | 9 ++--
src/test.c | 12 +++---
src/testgtkhtml.c | 6 +--
30 files changed, 125 insertions(+), 140 deletions(-)
--- NEW FILE gtkhtml-3.13.1-compiler-warnings.patch ---
--- gtkhtml-3.13.1/a11y/text.c.compiler-warnings 2006-10-17 22:31:51.000000000 -0400
+++ gtkhtml-3.13.1/a11y/text.c 2006-10-17 22:32:15.000000000 -0400
@@ -946,7 +946,7 @@
x -= html_x;
y -= html_y;
- return_obj = html_engine_get_object_at (top_e, x, y, &offset, FALSE);
+ return_obj = html_engine_get_object_at (top_e, x, y, (guint *) &offset, FALSE);
if (obj == return_obj)
return offset;
--- gtkhtml-3.13.1/a11y/hyperlink.c.compiler-warnings 2005-04-05 05:27:32.000000000 -0400
+++ gtkhtml-3.13.1/a11y/hyperlink.c 2006-10-17 22:32:15.000000000 -0400
@@ -92,9 +92,9 @@
{
HTMLA11YHyperLink *hl = HTML_A11Y_HYPER_LINK (obj);
- if (hl->a11y)
- g_object_remove_weak_pointer (G_OBJECT (hl->a11y),
- (gpointer *) &hl->a11y);
+ if (hl->a11y.object)
+ g_object_remove_weak_pointer (G_OBJECT (hl->a11y.object),
+ &hl->a11y.weakref);
G_OBJECT_CLASS (parent_class)->finalize (obj);
}
@@ -104,7 +104,7 @@
html_a11y_hyper_link_get_start_index (AtkHyperlink *link)
{
HTMLA11YHyperLink *hl = HTML_A11Y_HYPER_LINK (link);
- HTMLText *text = HTML_TEXT (HTML_A11Y_HTML (hl->a11y));
+ HTMLText *text = HTML_TEXT (HTML_A11Y_HTML (hl->a11y.object));
Link *a = (Link *) g_slist_nth_data (text->links, hl->num);
return a ? a->start_offset : -1;
}
@@ -114,7 +114,7 @@
html_a11y_hyper_link_get_end_index (AtkHyperlink *link)
{
HTMLA11YHyperLink *hl = HTML_A11Y_HYPER_LINK (link);
- Link *a = (Link *) g_slist_nth_data (HTML_TEXT (HTML_A11Y_HTML (hl->a11y))->links, hl->num);
+ Link *a = (Link *) g_slist_nth_data (HTML_TEXT (HTML_A11Y_HTML (hl->a11y.object))->links, hl->num);
return a ? a->end_offset : -1;
}
@@ -145,10 +145,10 @@
hl = HTML_A11Y_HYPER_LINK (g_object_new (G_TYPE_HTML_A11Y_HYPER_LINK, NULL));
- hl->a11y = a11y;
+ hl->a11y.object = a11y;
hl->num = link_index;
hl->offset = ((Link *) g_slist_nth_data (HTML_TEXT (HTML_A11Y_HTML (a11y))->links, link_index))->start_offset;
- g_object_add_weak_pointer (G_OBJECT (hl->a11y), (gpointer *) &hl->a11y);
+ g_object_add_weak_pointer (G_OBJECT (hl->a11y.object), &hl->a11y.weakref);
return ATK_HYPERLINK (hl);
}
@@ -165,13 +165,13 @@
hl = HTML_A11Y_HYPER_LINK (action);
- if (i == 0 && hl->a11y) {
- HTMLText *text = HTML_TEXT (HTML_A11Y_HTML (hl->a11y));
+ if (i == 0 && hl->a11y.object) {
+ HTMLText *text = HTML_TEXT (HTML_A11Y_HTML (hl->a11y.object));
gchar *url = html_object_get_complete_url (HTML_OBJECT (text), hl->offset);
if (url && *url) {
GObject *gtkhtml = GTK_HTML_A11Y_GTKHTML_POINTER
- (html_a11y_get_gtkhtml_parent (HTML_A11Y (hl->a11y)));
+ (html_a11y_get_gtkhtml_parent (HTML_A11Y (hl->a11y.object)));
g_signal_emit_by_name (gtkhtml, "link_clicked", url);
result = TRUE;
--- gtkhtml-3.13.1/a11y/hyperlink.h.compiler-warnings 2005-04-05 05:27:32.000000000 -0400
+++ gtkhtml-3.13.1/a11y/hyperlink.h 2006-10-17 22:32:15.000000000 -0400
@@ -43,7 +43,11 @@
struct _HTMLA11YHyperLink {
AtkHyperlink atk_hyper_link;
- HTMLA11Y *a11y;
+ /* use the union for valid type-punning */
+ union {
+ HTMLA11Y *object;
+ gpointer weakref;
+ } a11y;
gint num;
gint offset;
gchar *description;
--- gtkhtml-3.13.1/components/html-editor/editor-control-factory.c.compiler-warnings 2006-08-22 13:51:47.000000000 -0400
+++ gtkhtml-3.13.1/components/html-editor/editor-control-factory.c 2006-10-17 22:32:15.000000000 -0400
@@ -260,7 +260,7 @@
}
while ((len = read (fd, buffer, 4096)) > 0) {
- gtk_html_write (html, handle, buffer, len);
+ gtk_html_write (html, handle, (gchar *) buffer, len);
}
if (len < 0) {
--- gtkhtml-3.13.1/components/html-editor/dialog.h.compiler-warnings 2005-10-28 05:27:35.000000000 -0400
+++ gtkhtml-3.13.1/components/html-editor/dialog.h 2006-10-17 22:32:15.000000000 -0400
@@ -27,9 +27,7 @@
typedef GtkDialog ** (*DialogCtor)(GtkHTML *html, GtkHTMLControlData *cd);
-#define RUN_DIALOG(name,title) run_dialog ((GtkDialog ***)&cd-> name ## _dialog, cd->html, cd, (DialogCtor) gtk_html_ ## name ## _dialog_new, title)
-
-void run_dialog (GtkDialog ***dialog,
+void run_dialog (GtkDialog **dialog,
GtkHTML *html,
GtkHTMLControlData *cd,
DialogCtor ctor,
--- gtkhtml-3.13.1/components/html-editor/dialog.c.compiler-warnings 2005-10-28 05:27:35.000000000 -0400
+++ gtkhtml-3.13.1/components/html-editor/dialog.c 2006-10-17 22:32:15.000000000 -0400
@@ -28,25 +28,17 @@
#endif
#include "dialog.h"
-/*
- somewhat ugly (those *** :) so I feel like I may comment
- as first argument it takes poiter to pointer on Dialog struct
- which MUST contains GtkDialog * as first field
-
- it is bassicaly the same trick as used in GtkObject's
-*/
-
void
-run_dialog (GtkDialog ***dialog, GtkHTML *html, GtkHTMLControlData *cd, DialogCtor ctor, const gchar *title)
+run_dialog (GtkDialog **dialog, GtkHTML *html, GtkHTMLControlData *cd, DialogCtor ctor, const gchar *title)
{
- if (*dialog) {
- gtk_window_set_title (GTK_WINDOW (**dialog), title);
- gtk_widget_show (GTK_WIDGET (**dialog));
- gdk_window_raise (GTK_WIDGET (**dialog)->window);
+ if (dialog) {
+ gtk_window_set_title (GTK_WINDOW (*dialog), title);
+ gtk_widget_show (GTK_WIDGET (*dialog));
+ gdk_window_raise (GTK_WIDGET (*dialog)->window);
} else {
- *dialog = ctor (html, cd);
- gtk_window_set_title (GTK_WINDOW (**dialog), title);
- gtk_widget_show (GTK_WIDGET (**dialog));
+ dialog = ctor (html, cd);
+ gtk_window_set_title (GTK_WINDOW (*dialog), title);
+ gtk_widget_show (GTK_WIDGET (*dialog));
}
- gtk_dialog_run (**dialog);
+ gtk_dialog_run (*dialog);
}
--- gtkhtml-3.13.1/components/html-editor/replace.c.compiler-warnings 2005-09-11 00:04:19.000000000 -0400
+++ gtkhtml-3.13.1/components/html-editor/replace.c 2006-10-17 22:32:15.000000000 -0400
@@ -237,7 +237,8 @@
void
replace (GtkHTMLControlData *cd)
{
- RUN_DIALOG (replace, _("Replace"));
+ run_dialog (&cd->replace_dialog->dialog, cd->html, cd,
+ (DialogCtor) gtk_html_replace_dialog_new, _("Replace"));
gtk_html_replace_dialog_destroy (cd->replace_dialog);
cd->replace_dialog = NULL;
}
--- gtkhtml-3.13.1/components/html-editor/html-stream-mem.c.compiler-warnings 2005-05-17 10:48:59.000000000 -0400
+++ gtkhtml-3.13.1/components/html-editor/html-stream-mem.c 2006-10-17 22:32:15.000000000 -0400
@@ -34,7 +34,7 @@
if (bhtml->html_stream) {
if (ev->_major == CORBA_NO_EXCEPTION) {
- gtk_html_stream_write (bhtml->html_stream, buffer->_buffer, buffer->_length);
+ gtk_html_stream_write (bhtml->html_stream, (gchar *) buffer->_buffer, buffer->_length);
} else {
gtk_html_stream_close (bhtml->html_stream, GTK_HTML_STREAM_OK);
bhtml->html_stream = NULL;
--- gtkhtml-3.13.1/components/html-editor/e-html-utils.c.compiler-warnings 2005-09-11 00:04:18.000000000 -0400
+++ gtkhtml-3.13.1/components/html-editor/e-html-utils.c 2006-10-17 22:32:15.000000000 -0400
@@ -80,7 +80,7 @@
return NULL;
}
- out = g_strndup (*text, end - *text);
+ out = g_strndup ((const gchar *) *text, end - *text);
*text = end;
return out;
}
@@ -111,7 +111,7 @@
if (dot > end)
return NULL;
- addr = g_strndup (start, end - start);
+ addr = g_strndup ((const gchar *) start, end - start);
*out -= *cur - start;
*cur = end;
@@ -130,7 +130,7 @@
if (*c == '>') {
const unsigned char *p;
- if (strncmp (c, ">From ", 6) != 0)
+ if (strncmp ((const gchar *) c, ">From ", 6) != 0)
return TRUE;
/* If the previous line was a citation, then say this
@@ -149,8 +149,8 @@
}
/* Check for "Rupert> " and the like... */
- for (i = 0; c && *c && g_unichar_validate (g_utf8_get_char (c)) && *c != '\n' && i < 10; i ++, c = g_utf8_next_char (c)) {
- u = g_utf8_get_char (c);
+ for (i = 0; c && *c && g_unichar_validate (g_utf8_get_char ((const gchar *) c)) && (gchar) *c != '\n' && i < 10; i ++, c = (const guchar *) g_utf8_next_char (c)) {
+ u = g_utf8_get_char ((const gchar *) c);
if (u == '>')
return TRUE;
if (!g_unichar_isalnum (u))
@@ -223,7 +223,7 @@
col = 0;
- for (cur = linestart = input; cur && *cur; cur = next) {
+ for (cur = linestart = (const guchar *) input; cur && *cur; cur = next) {
gunichar u;
if (flags & E_TEXT_TO_HTML_MARK_CITATION && col == 0) {
@@ -254,23 +254,23 @@
out += sprintf (out, "> ");
}
- u = g_utf8_get_char (cur);
+ u = g_utf8_get_char ((gchar *) cur);
if (g_unichar_isalpha (u) &&
(flags & E_TEXT_TO_HTML_CONVERT_URLS)) {
char *tmpurl = NULL, *refurl = NULL, *dispurl = NULL;
- if (!g_ascii_strncasecmp (cur, "http://", 7) ||
- !g_ascii_strncasecmp (cur, "https://", 8) ||
- !g_ascii_strncasecmp (cur, "ftp://", 6) ||
- !g_ascii_strncasecmp (cur, "nntp://", 7) ||
- !g_ascii_strncasecmp (cur, "mailto:", 7) ||
- !g_ascii_strncasecmp (cur, "news:", 5)) {
+ if (!g_ascii_strncasecmp ((gchar *) cur, "http://", 7) ||
+ !g_ascii_strncasecmp ((gchar *) cur, "https://", 8) ||
+ !g_ascii_strncasecmp ((gchar *) cur, "ftp://", 6) ||
+ !g_ascii_strncasecmp ((gchar *) cur, "nntp://", 7) ||
+ !g_ascii_strncasecmp ((gchar *) cur, "mailto:", 7) ||
+ !g_ascii_strncasecmp ((gchar *) cur, "news:", 5)) {
tmpurl = url_extract (&cur, TRUE);
if (tmpurl) {
refurl = e_text_to_html (tmpurl, 0);
dispurl = g_strdup (refurl);
}
- } else if (!g_ascii_strncasecmp (cur, "www.", 4) &&
+ } else if (!g_ascii_strncasecmp ((gchar *) cur, "www.", 4) &&
(*(cur + 4) < 0x80) &&
g_unichar_isalnum (*(cur + 4))) {
tmpurl = url_extract (&cur, FALSE);
@@ -294,7 +294,7 @@
if (!*cur)
break;
- u = g_utf8_get_char (cur);
+ u = g_utf8_get_char ((gchar *) cur);
}
if (u == '@' && (flags & E_TEXT_TO_HTML_CONVERT_ADDRESSES)) {
@@ -312,7 +312,7 @@
g_free (dispaddr);
g_free (outaddr);
- u = g_utf8_get_char (cur);
+ u = g_utf8_get_char ((gchar *) cur);
}
}
@@ -323,7 +323,7 @@
u = *cur;
next = cur + 1;
} else
- next = g_utf8_next_char (cur);
+ next = (guchar *) g_utf8_next_char (cur);
out = check_size (&buffer, &buffer_size, out, 10);
--- gtkhtml-3.13.1/components/html-editor/search.c.compiler-warnings 2006-01-27 04:11:48.000000000 -0500
+++ gtkhtml-3.13.1/components/html-editor/search.c 2006-10-17 22:32:15.000000000 -0400
@@ -168,7 +168,8 @@
void
search (GtkHTMLControlData *cd)
{
- RUN_DIALOG (search, _("Find"));
+ run_dialog (&cd->search_dialog->dialog, cd->html, cd,
+ (DialogCtor) gtk_html_search_dialog_new, _("Find"));
}
void
--- gtkhtml-3.13.1/components/html-editor/test-html-editor-control.c.compiler-warnings 2005-09-11 00:04:19.000000000 -0400
+++ gtkhtml-3.13.1/components/html-editor/test-html-editor-control.c 2006-10-17 22:32:15.000000000 -0400
@@ -132,7 +132,7 @@
stream_mem = BONOBO_STREAM_MEM (stream);
text = g_byte_array_new ();
- g_byte_array_append (text, stream_mem->buffer, stream_mem->pos);
+ g_byte_array_append (text, (guint8 *) stream_mem->buffer, stream_mem->pos);
bonobo_object_unref (BONOBO_OBJECT (stream));
fd = creat (filename, 0622);
--- gtkhtml-3.13.1/components/html-editor/body.c.compiler-warnings 2006-05-15 05:49:55.000000000 -0400
+++ gtkhtml-3.13.1/components/html-editor/body.c 2006-10-17 22:32:15.000000000 -0400
@@ -283,7 +283,7 @@
}
- atk_object_set_name (gtk_widget_get_accessible (GTK_FILE_CHOOSER (data->pixmap_entry)), _("Background Image File Path"));
+ atk_object_set_name (gtk_widget_get_accessible (data->pixmap_entry), _("Background Image File Path"));
t1 = gtk_table_new (2, 2, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (t1), 6);
--- gtkhtml-3.13.1/components/html-editor/popup.c.compiler-warnings 2006-06-06 01:37:34.000000000 -0400
+++ gtkhtml-3.13.1/components/html-editor/popup.c 2006-10-17 22:32:15.000000000 -0400
@@ -286,12 +286,6 @@
}
static void
-spell_check_cb (GtkWidget *mi, GtkHTMLControlData *cd)
-{
- spell_check_dialog (cd, FALSE);
-}
-
-static void
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"));
--- gtkhtml-3.13.1/components/html-editor/persist-stream.c.compiler-warnings 2005-05-17 10:48:59.000000000 -0400
+++ gtkhtml-3.13.1/components/html-editor/persist-stream.c 2006-10-17 22:32:15.000000000 -0400
@@ -146,7 +146,7 @@
break;
}
- gtk_html_write (persist->html, handle, buffer->_buffer, buffer->_length);
+ gtk_html_write (persist->html, handle, (gchar *) buffer->_buffer, buffer->_length);
CORBA_free (buffer);
} while (1);
@@ -179,7 +179,7 @@
buffer._maximum = length;
buffer._length = length;
- buffer._buffer = (CORBA_char *) data; /* Should be safe. */
+ buffer._buffer = (CORBA_octet *) data;
Bonobo_Stream_write (state->stream, &buffer, state->ev);
--- gtkhtml-3.13.1/configure.in.compiler-warnings 2006-10-16 12:29:24.000000000 -0400
+++ gtkhtml-3.13.1/configure.in 2006-10-17 22:32:15.000000000 -0400
@@ -22,7 +22,7 @@
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
-I18N_LIB_CFLAGS="-DGNOME_EXPLICIT_TRANSLATION_DOMAIN=\\\"${GTKHTML_RELEASE_STRING}\\\" -DBONOBO_EXPLICIT_TRANSLATION_DOMAIN=\\\"${GTKHTML_RELEASE_STRING}\\\""
+I18N_LIB_CFLAGS="-DGNOME_EXPLICIT_TRANSLATION_DOMAIN=\\\"${GTKHTML_RELEASE_STRING}\\\""
AC_SUBST(I18N_LIB_CFLAGS)
AM_INIT_AUTOMAKE($PACKAGE, 3.13.1)
--- gtkhtml-3.13.1/src/htmlcursor.c.compiler-warnings 2006-10-17 22:31:50.000000000 -0400
+++ gtkhtml-3.13.1/src/htmlcursor.c 2006-10-17 22:32:15.000000000 -0400
@@ -211,7 +211,7 @@
if (!html_object_cursor_forward (cursor->object, cursor, engine)) {
HTMLObject *next;
- next = html_object_next_cursor (cursor->object, &cursor->offset);
+ next = html_object_next_cursor (cursor->object, (gint *) &cursor->offset);
if (next) {
if (!html_object_is_container (next))
cursor->offset = (next->parent == cursor->object->parent) ? 1 : 0;
@@ -253,7 +253,7 @@
if (!html_object_cursor_backward (cursor->object, cursor, engine)) {
HTMLObject *prev;
- prev = html_object_prev_cursor (cursor->object, &cursor->offset);
+ prev = html_object_prev_cursor (cursor->object, (gint *) &cursor->offset);
if (prev) {
if (!html_object_is_container (prev))
cursor->offset = html_object_get_length (prev);
@@ -851,7 +851,7 @@
{
HTMLObject *next;
- next = html_object_next_cursor (cursor->object, &cursor->offset);
+ next = html_object_next_cursor (cursor->object, (gint *) &cursor->offset);
if (next && next->parent) {
cursor->object = next;
cursor->position ++;
@@ -875,7 +875,7 @@
{
HTMLObject *prev;
- prev = html_object_prev_cursor (cursor->object, &cursor->offset);
+ prev = html_object_prev_cursor (cursor->object, (gint *) &cursor->offset);
if (prev && prev->parent) {
cursor->object = prev;
cursor->position --;
--- gtkhtml-3.13.1/src/testgtkhtml.c.compiler-warnings 2006-02-28 15:51:54.000000000 -0500
+++ gtkhtml-3.13.1/src/testgtkhtml.c 2006-10-17 22:32:15.000000000 -0400
@@ -301,7 +301,7 @@
gnome_print_setrgbcolor (context, .0, .0, .0);
gnome_print_moveto (context, x + (width - tw)/2, y - gnome_font_get_ascender (font));
gnome_print_setfont (context, font);
- gnome_print_show (context, text);
+ gnome_print_show (context, (guchar *) text);
}
g_free (text);
@@ -321,7 +321,7 @@
gtk_html_print_set_master (html, print_master);
print_context = gnome_print_job_get_context (print_master);
- font = gnome_font_find_closest ("Helvetica", 12);
+ font = gnome_font_find_closest ((guchar *) "Helvetica", 12);
page_num = 1;
pages = gtk_html_print_get_pages_num (html, print_context,
@@ -333,7 +333,7 @@
g_object_unref (font);
gnome_print_job_close (print_master);
- preview = gnome_print_job_preview_new (print_master, "Print Preview");
+ preview = gnome_print_job_preview_new (print_master, (guchar *) "Print Preview");
gtk_widget_show (preview);
g_object_unref (print_master);
--- gtkhtml-3.13.1/src/htmlprinter.c.compiler-warnings 2006-03-25 12:47:41.000000000 -0500
+++ gtkhtml-3.13.1/src/htmlprinter.c 2006-10-17 22:32:15.000000000 -0400
@@ -207,7 +207,7 @@
pc = printer->context;
g_return_if_fail (pc);
- gnome_print_beginpage (pc, "page");
+ gnome_print_beginpage (pc, (guchar *) "page");
gnome_print_gsave (pc);
html_printer_coordinates_to_gnome_print (printer, x1, y1, &printer_x1, &printer_y1);
--- gtkhtml-3.13.1/src/htmlengine.c.compiler-warnings 2006-04-24 02:23:17.000000000 -0400
+++ gtkhtml-3.13.1/src/htmlengine.c 2006-10-17 22:32:15.000000000 -0400
@@ -1403,7 +1403,7 @@
if (!(isspace (*str) || IS_UTF8_NBSP (str)))
return FALSE;
- str = g_utf8_next_char (str);
+ str = (guchar *) g_utf8_next_char (str);
}
return TRUE;
}
@@ -1444,7 +1444,7 @@
if (*str == '\0' ||
*str == '\n' ||
- is_leading_space (str)) {
+ is_leading_space ((guchar *) str)) {
str = html_tokenizer_next_token (p->ht);
/* printf ("\"%s\": was the string\n", str); */
continue;
@@ -5110,7 +5110,7 @@
if (e->clue == NULL)
return NULL;
- obj = html_engine_get_object_at (e, x, y, &offset, FALSE);
+ obj = html_engine_get_object_at (e, x, y, (guint *) &offset, FALSE);
if (obj != NULL)
return html_object_get_url (obj, offset);
--- gtkhtml-3.13.1/src/htmlinterval.c.compiler-warnings 2006-02-28 15:51:54.000000000 -0500
+++ gtkhtml-3.13.1/src/htmlinterval.c 2006-10-17 22:32:15.000000000 -0400
@@ -58,7 +58,7 @@
inline void
html_point_next_cursor (HTMLPoint *p)
{
- p->object = html_object_next_cursor (p->object, &p->offset);
+ p->object = html_object_next_cursor (p->object, (gint *) &p->offset);
}
HTMLInterval *
--- gtkhtml-3.13.1/src/htmlengine-edit-text.c.compiler-warnings 2005-01-28 10:39:16.000000000 -0500
+++ gtkhtml-3.13.1/src/htmlengine-edit-text.c 2006-10-17 22:32:15.000000000 -0400
@@ -54,7 +54,7 @@
{
if (html_object_is_text (obj)) {
gboolean up = GPOINTER_TO_INT (data);
- guchar *old_text;
+ gchar *old_text;
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.1/src/htmlimage.c.compiler-warnings 2005-07-13 06:19:32.000000000 -0400
+++ gtkhtml-3.13.1/src/htmlimage.c 2006-10-17 22:32:15.000000000 -0400
@@ -384,7 +384,7 @@
{
HTMLGdkPainter *p;
GdkGCValues values;
- gchar dash [2];
+ gint8 dash_list[] = { 1, 1 };
HTMLEngine *e;
if (painter->widget && GTK_IS_HTML (painter->widget))
@@ -402,10 +402,8 @@
painter, HTMLTextColor)->color);
gdk_gc_get_values (p->gc, &values);
- dash [0] = 1;
- dash [1] = 1;
gdk_gc_set_line_attributes (p->gc, 1, GDK_LINE_ON_OFF_DASH, values.cap_style, values.join_style);
- gdk_gc_set_dashes (p->gc, 2, dash, 2);
+ gdk_gc_set_dashes (p->gc, 2, dash_list, 2);
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);
}
@@ -1146,7 +1144,7 @@
HTMLImagePointer *p = user_data;
/* FIXME ! Check return value */
- gdk_pixbuf_loader_write (p->loader, buffer, size, NULL);
+ gdk_pixbuf_loader_write (p->loader, (const guchar *) buffer, size, NULL);
}
static void
--- gtkhtml-3.13.1/src/htmltextslave.c.compiler-warnings 2006-02-28 15:51:54.000000000 -0500
+++ gtkhtml-3.13.1/src/htmltextslave.c 2006-10-17 22:32:15.000000000 -0400
@@ -740,7 +740,8 @@
HTMLText *text = self->owner;
GSList *cur;
int run_width;
- int selection_start_index, selection_end_index;
+ int selection_start_index = 0;
+ int selection_end_index = 0;
int isect_start, isect_end;
gboolean selection;
GdkColor selection_fg, selection_bg;
@@ -854,7 +855,7 @@
{
HTMLGdkPainter *p;
GdkGCValues values;
- gchar dash [2];
+ gint8 dash_list[] = { 1, 1 };
HTMLEngine *e;
if (painter->widget && GTK_IS_HTML (painter->widget))
@@ -872,10 +873,8 @@
painter, HTMLTextColor)->color);
gdk_gc_get_values (p->gc, &values);
- dash [0] = 1;
- dash [1] = 1;
gdk_gc_set_line_attributes (p->gc, 1, GDK_LINE_ON_OFF_DASH, values.cap_style, values.join_style);
- gdk_gc_set_dashes (p->gc, 2, dash, 2);
+ gdk_gc_set_dashes (p->gc, 2, dash_list, 2);
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.1/src/htmlengine-save.c.compiler-warnings 2006-02-28 15:51:54.000000000 -0500
+++ gtkhtml-3.13.1/src/htmlengine-save.c 2006-10-17 22:32:15.000000000 -0400
@@ -123,7 +123,7 @@
if (encoded_len_return)
*encoded_len_return = out - buffer;
- return buffer;
+ return (gchar *) buffer;
}
gboolean
@@ -131,7 +131,7 @@
const gchar *buffer,
guint length)
{
- guchar *encoded_buffer;
+ gchar *encoded_buffer;
guint encoded_length;
gboolean success;
@@ -141,7 +141,7 @@
if (length == 0)
return TRUE;
- encoded_buffer = html_encode_entities ((const guchar *) buffer, length, &encoded_length);
+ encoded_buffer = html_encode_entities (buffer, length, &encoded_length);
success = state->receiver (state->engine, encoded_buffer, encoded_length, state->user_data);
g_free (encoded_buffer);
@@ -412,7 +412,7 @@
g_return_val_if_fail (state != NULL, NULL);
string = (GString *)state->user_data;
- return string->str;
+ return (guchar *) string->str;
}
int
--- gtkhtml-3.13.1/src/htmlgdkpainter.c.compiler-warnings 2005-07-13 06:19:32.000000000 -0400
+++ gtkhtml-3.13.1/src/htmlgdkpainter.c 2006-10-17 22:32:15.000000000 -0400
@@ -672,7 +672,7 @@
{
HTMLGdkPainter *gdk_painter;
GdkGCValues values;
- gchar dash [2];
+ gint8 dash_list[] = { 2, 2 };
gdk_painter = HTML_GDK_PAINTER (painter);
@@ -681,12 +681,10 @@
gdk_gc_get_values (gdk_painter->gc, &values);
gdk_gc_set_fill (gdk_painter->gc, GDK_OPAQUE_STIPPLED);
- dash [0] = 2;
- dash [1] = 2;
gdk_gc_set_line_attributes (gdk_painter->gc, 1, GDK_LINE_ON_OFF_DASH, values.cap_style, values.join_style);
- gdk_gc_set_dashes (gdk_painter->gc, 2, dash, 2);
+ gdk_gc_set_dashes (gdk_painter->gc, 2, dash_list, 2);
gdk_draw_line (gdk_painter->pixmap, gdk_painter->gc, x, y, x + width, y);
- gdk_gc_set_dashes (gdk_painter->gc, 0, dash, 2);
+ gdk_gc_set_dashes (gdk_painter->gc, 0, dash_list, 2);
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.1/src/test.c.compiler-warnings 2004-11-19 05:19:52.000000000 -0500
+++ gtkhtml-3.13.1/src/test.c 2006-10-17 22:32:15.000000000 -0400
@@ -169,10 +169,10 @@
gpc = gnome_print_job_get_context (job);
config = gnome_print_job_get_config (job);
- gnome_print_config_set (config, "Printer", "GENERIC");
+ gnome_print_config_set (config, (guchar *) "Printer", (guchar *) "GENERIC");
gnome_print_job_print_to_file (job, "o.ps");
- gnome_print_config_set (config, GNOME_PRINT_KEY_PAPER_SIZE, "USLetter");
+ gnome_print_config_set (config, (guchar *) GNOME_PRINT_KEY_PAPER_SIZE, (guchar *) "USLetter");
gtk_html_print (GTK_HTML (html), gpc);
@@ -224,8 +224,8 @@
}
if (p_digit) {
- int num_a = atoi (p);
- int num_b = atoi (q);
+ int num_a = atoi ((const gchar *) p);
+ int num_b = atoi ((const gchar *) q);
if (num_a < num_b) {
result = -1;
@@ -250,8 +250,8 @@
while (*(q + q_len) && !g_ascii_isdigit (*(q + q_len)))
q_len++;
- p_str = g_strndup (p, p_len);
- q_str = g_strndup (q, q_len);
+ p_str = g_strndup ((gchar *) p, p_len);
+ q_str = g_strndup ((gchar *) q, q_len);
result = g_utf8_collate (p_str, q_str);
g_free (p_str);
--- gtkhtml-3.13.1/src/htmliframe.c.compiler-warnings 2006-02-28 15:51:54.000000000 -0500
+++ gtkhtml-3.13.1/src/htmliframe.c 2006-10-17 22:32:15.000000000 -0400
@@ -463,7 +463,7 @@
if (state->error ||
!html_engine_save_output_buffer (state,
- html_engine_save_buffer_peek_text (buffer),
+ (gchar *) html_engine_save_buffer_peek_text (buffer),
html_engine_save_buffer_peek_text_bytes (buffer))) {
html_engine_save_buffer_free (buffer, TRUE);
return FALSE;
@@ -514,7 +514,7 @@
html_object_save_plain (e->clue, buffer, requested_width);
if (state->error ||
!html_engine_save_output_buffer (state,
- html_engine_save_buffer_peek_text (buffer),
+ (gchar *) html_engine_save_buffer_peek_text (buffer),
html_engine_save_buffer_peek_text_bytes (buffer))) {
html_engine_save_buffer_free (buffer, TRUE);
return FALSE;
--- gtkhtml-3.13.1/src/htmlclueflow.c.compiler-warnings 2006-06-12 08:06:06.000000000 -0400
+++ gtkhtml-3.13.1/src/htmlclueflow.c 2006-10-17 22:32:15.000000000 -0400
@@ -1996,14 +1996,14 @@
g_string_append (out, "\n");
} else {
PangoAttrList *attrs = pango_attr_list_new ();
- gint bytes = html_engine_save_buffer_peek_text_bytes (buffer_state), slen = g_utf8_strlen (s, -1), i, clen, n_items;
+ gint bytes = html_engine_save_buffer_peek_text_bytes (buffer_state), slen = g_utf8_strlen ((gchar *) s, -1), i, clen, n_items;
GList *items_list, *cur;
PangoContext *pc = state->engine->painter->pango_context;
PangoLogAttr *lattrs;
PangoItem **items;
gint len, width, skip;
- items_list = pango_itemize (pc, s, 0, bytes, attrs, NULL);
+ items_list = pango_itemize (pc, (gchar *) s, 0, bytes, attrs, NULL);
lattrs = g_new (PangoLogAttr, slen + 1);
n_items = g_list_length (items_list);
items = g_new (PangoItem *, n_items);
@@ -2028,10 +2028,10 @@
break;
}
- pango_break (s + tmp_item.offset, tmp_item.length, &tmp_item.analysis, lattrs + start_offset, tmp_item.num_chars + 1);
+ pango_break ((gchar *) s + tmp_item.offset, tmp_item.length, &tmp_item.analysis, lattrs + start_offset, tmp_item.num_chars + 1);
}
- html_text_remove_unwanted_line_breaks (s, slen, lattrs);
+ html_text_remove_unwanted_line_breaks ((gchar *) s, slen, lattrs);
g_list_free (items_list);
for (i = 0; i < n_items; i ++)
@@ -2041,9 +2041,9 @@
clen = 0;
while (*s) {
- len = strcspn (s, "\n");
- len = g_utf8_strlen (s, len);
- width = utf8_width (s, len);
+ len = strcspn ((gchar *) s, "\n");
+ len = g_utf8_strlen ((gchar *) s, len);
+ width = utf8_width ((gchar *) s, len);
skip = 0;
if ((flow->style != HTML_CLUEFLOW_STYLE_PRE)
@@ -2053,7 +2053,7 @@
gint wmax;
gint wi, wl;
- wmax = clen + utf8_length_in_width (s, len, max_width);
+ wmax = clen + utf8_length_in_width ((gchar *) s, len, max_width);
wl = wmax;
if (lattrs [wl].is_white) {
@@ -2080,7 +2080,7 @@
while (wi > clen && lattrs [wi - 1].is_white)
wi --;
len = wi - clen;
- width = utf8_width (s, len);
+ width = utf8_width ((gchar *) s, len);
skip = wl - wi;
}
}
@@ -2114,10 +2114,10 @@
align_pad--;
}
- bytes = ((guchar *) g_utf8_offset_to_pointer (s, len)) - s;
+ bytes = ((guchar *) g_utf8_offset_to_pointer ((gchar *) s, len)) - s;
html_engine_save_string_append_nonbsp (out, s, bytes);
s += bytes;
- s = g_utf8_offset_to_pointer (s, skip);
+ s = (guchar *) g_utf8_offset_to_pointer ((gchar *) s, skip);
clen += len + skip;
if (*s == '\n') {
@@ -2201,15 +2201,15 @@
cur_bytes = HTML_TEXT (cur)->text_bytes;
if (text_bytes + cur_bytes > index) {
if (!info->found) {
- info->start_pos = g_utf8_pointer_to_offset (text + text_bytes,
- text + index);
+ info->start_pos = g_utf8_pointer_to_offset ((gchar *) text + text_bytes,
+ (gchar *) text + index);
}
info->found = g_list_append (info->found, cur);
}
text_bytes += cur_bytes;
if (text_bytes >= index + info->found_bytes) {
- info->stop_pos = info->start_pos + g_utf8_pointer_to_offset (text + index,
- text + index + info->found_bytes);
+ info->stop_pos = info->start_pos + g_utf8_pointer_to_offset ((gchar *) text + index,
+ (gchar *) text + index + info->found_bytes);
info->last = HTML_OBJECT (cur);
return;
}
@@ -2250,7 +2250,7 @@
}
if (text_bytes > 0) {
- par = g_new (gchar, text_bytes + 1);
+ par = (guchar *) g_new (gchar, text_bytes + 1);
par [text_bytes] = 0;
pp = (info->forward) ? par : par + text_bytes;
@@ -2263,7 +2263,7 @@
if (!info->forward) {
pp -= HTML_TEXT (cur)->text_bytes;
}
- strncpy (pp, HTML_TEXT (cur)->text, HTML_TEXT (cur)->text_bytes);
+ strncpy ((gchar *) pp, HTML_TEXT (cur)->text, HTML_TEXT (cur)->text_bytes);
if (info->forward) {
pp += HTML_TEXT (cur)->text_bytes;
}
@@ -2277,9 +2277,9 @@
eq_bytes = 0;
if (info->found) {
if (info->start_pos > 0)
- index = ((guchar *)g_utf8_offset_to_pointer (par, info->start_pos + ((info->forward) ? 1 : -1))) - par;
+ index = ((guchar *)g_utf8_offset_to_pointer ((gchar *) par, info->start_pos + ((info->forward) ? 1 : -1))) - par;
else
- index = ((guchar *)g_utf8_offset_to_pointer (par, info->start_pos + ((info->forward) ? 1 : 0))) - par;
+ index = ((guchar *)g_utf8_offset_to_pointer ((gchar *) par, info->start_pos + ((info->forward) ? 1 : 0))) - par;
} else {
index = (info->forward) ? 0 : text_bytes - 1;
}
@@ -2309,7 +2309,7 @@
while ((info->forward && index < text_bytes)
|| (!info->forward && index >= 0)) {
rv = regexec (info->reb,
- par + index,
+ (gchar *) par + index,
1, &match, 0);
if (rv == 0) {
search_set_info (head, info, par,
@@ -2319,7 +2319,7 @@
}
index += (info->forward)
? (((guchar *) g_utf8_next_char (par + index)) - par - index)
- : (((guchar *) g_utf8_prev_char (par + index)) - par - index);
+ : (((guchar *) g_utf8_prev_char ((gchar *) par + index)) - par - index);
}
#else
rv = re_search (info->reb, par, text_bytes, index,
@@ -2361,7 +2361,7 @@
}
index += (info->forward)
? (((guchar *) g_utf8_next_char (par + index)) - par - index)
- : (((guchar *) g_utf8_prev_char (par + index)) - par - index);
+ : (((guchar *) g_utf8_prev_char ((gchar *) par + index)) - par - index);
}
}
}
--- gtkhtml-3.13.1/src/htmlobject.c.compiler-warnings 2006-10-17 22:31:50.000000000 -0400
+++ gtkhtml-3.13.1/src/htmlobject.c 2006-10-17 22:32:15.000000000 -0400
@@ -1693,7 +1693,7 @@
if (html_object_accepts_cursor (obj))
break;
last_obj = obj;
- if (obj = move_object_downtree_cursor (obj, down_fn, next_fn))
+ if ((obj = move_object_downtree_cursor (obj, down_fn, next_fn)))
break;
obj = last_obj;
}
--- gtkhtml-3.13.1/src/gtkhtml.c.compiler-warnings 2006-10-17 22:31:50.000000000 -0400
+++ gtkhtml-3.13.1/src/gtkhtml.c 2006-10-17 22:32:15.000000000 -0400
@@ -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);
static void add_bindings (GtkHTMLClass *klass);
-static gchar * get_value_nick (GtkHTMLCommandType com_type);
+static const gchar * get_value_nick (GtkHTMLCommandType com_type);
static void gtk_html_adjust_cursor_position (GtkHTML *html);
@@ -1337,7 +1337,7 @@
html = GTK_HTML (widget);
engine = html->engine;
- obj = html_engine_get_object_at (engine, x, y, &offset, FALSE);
+ obj = html_engine_get_object_at (engine, x, y, (guint *) &offset, FALSE);
if ((html->in_selection || html->in_selection_drag) && html->allow_selection) {
gboolean need_scroll;
@@ -1812,7 +1812,7 @@
gchar *url = NULL;
orig_e = GTK_HTML (orig_widget)->engine;
- obj = html_engine_get_object_at (engine, x, y, &offset, FALSE);
+ obj = html_engine_get_object_at (engine, x, y, (guint *) &offset, FALSE);
if (obj && ((HTML_IS_IMAGE (obj) && HTML_IMAGE (obj)->url && *HTML_IMAGE (obj)->url)
|| (HTML_IS_TEXT (obj) && (url = html_object_get_complete_url (obj, offset))))) {
g_free (url);
@@ -2107,7 +2107,7 @@
if (selection_string)
gtk_selection_data_set (selection_data,
gdk_atom_intern ("text/html", FALSE), 8,
- selection_string,
+ (guchar *) selection_string,
len);
g_free (html_string);
@@ -2152,7 +2152,7 @@
break;
}
- utf8_ret = g_convert (data, len, "UTF-8", fromcode, &read_len, &written_len, &error);
+ utf8_ret = g_convert ((gchar *) data, len, "UTF-8", fromcode, &read_len, &written_len, &error);
if (error) {
g_warning ("g_convert error: %s\n", error->message);
@@ -2243,7 +2243,7 @@
*/
if (len > 1 &&
- !g_utf8_validate (data, len - 1, NULL)) {
+ !g_utf8_validate ((gchar *) data, len - 1, NULL)) {
utf8 = ucs2_to_utf8_with_bom_check (data, len);
d_s (g_warning ("UCS-2 selection = %s", utf8);)
} else if (len > 0) {
@@ -2271,7 +2271,7 @@
g_warning ("selection was empty");
g_free (utf8);
- } else if ((utf8 = gtk_selection_data_get_text (selection_data))) {
+ } else if ((utf8 = (gchar *) gtk_selection_data_get_text (selection_data))) {
if (as_cite) {
char *encoded;
@@ -2585,13 +2585,13 @@
ucs2 = g_convert (utf8, strlen (utf8), "UCS-2", "UTF-8", NULL, &written_len, NULL);
gtk_selection_data_set (selection_data, selection_data->target, 8,
- ucs2, written_len);
+ (guchar *) ucs2, written_len);
g_free (utf8);
g_free (complete_url);
GTK_HTML (widget)->priv->dnd_url = ucs2;
} else {
gtk_selection_data_set (selection_data, selection_data->target, 8,
- complete_url, strlen (complete_url));
+ (guchar *) complete_url, strlen (complete_url));
/* printf ("complete URL %s\n", complete_url); */
GTK_HTML (widget)->priv->dnd_url = complete_url;
}
@@ -2622,14 +2622,14 @@
(*list_len) --;
}
- uri = g_strndup (begin, *len);
+ uri = (guchar *) g_strndup ((gchar *) begin, *len);
while ((!**uri_list || **uri_list == '\n' || **uri_list == '\r') && *list_len) {
(*uri_list) ++;
(*list_len) --;
}
- return uri;
+ return (gchar *) uri;
}
static HTMLObject *
@@ -5549,7 +5549,7 @@
gtk_html_api_set_language (html);
}
-static gchar *
+static const gchar *
get_value_nick (GtkHTMLCommandType com_type)
{
GEnumValue *val;
@@ -5922,7 +5922,7 @@
g_return_val_if_fail (GTK_IS_HTML (html), NULL);
- obj = html_engine_get_object_at (html->engine, x, y, &offset, FALSE);
+ obj = html_engine_get_object_at (html->engine, x, y, (guint *) &offset, FALSE);
if (obj)
return gtk_html_get_url_object_relative (html, obj, html_object_get_url (obj, offset));
Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- gtkhtml3.spec 27 Oct 2006 20:30:35 -0000 1.75
+++ gtkhtml3.spec 27 Oct 2006 20:37:46 -0000 1.76
@@ -9,7 +9,7 @@
Name: gtkhtml3
Version: 3.13.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPL/GPL
Group: System Environment/Libraries
Summary: gtkhtml library
@@ -138,6 +138,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Oct 26 2006 Matthew Barnes <mbarnes at redhat.com> - 3.13.1-3.fc7
+- Forgot to commit the patch.
+
* Tue Oct 17 2006 Matthew Barnes <mbarnes at redhat.com> - 3.13.1-2.fc7
- Add patch for Gnome.org bug #363036 (so long, compiler warnings).
- Remove patch for Gnome.org bug #360619 (superseded).
More information about the fedora-cvs-commits
mailing list